disinclined.org / git / dylansserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc745a8)
update links and .htaccess for SSL
authorDylan Lloyd <dylan@dylansserver.com>
Wed, 13 Feb 2013 08:44:36 +0000 (03:44 -0500)
committerDylan Lloyd <dylan@dylansserver.com>
Wed, 13 Feb 2013 08:44:36 +0000 (03:44 -0500)
.htaccess patch | blob | history
view/archive.php patch | blob | history
view/comment.php [new file with mode: 0644] patch | blob
view/note.php patch | blob | history
view/page.php patch | blob | history
view/rss.php patch | blob | history

diff --git a/.htaccess b/.htaccess
index dc5f0ab..1793730 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,8 @@ ErrorDocument 404 /404.php
 RewriteEngine on
 
 RewriteRule ^resume$ /res.pdf [L]
+RewriteCond %{HTTPS} off
+RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
 
 RewriteRule ^notes/rss/?$ /index.php?rss=true [L]
 
diff --git a/view/archive.php b/view/archive.php
index 073c65f..4231b17 100644 (file)
--- a/view/archive.php
+++ b/view/archive.php
@@ -22,8 +22,9 @@
       SyntaxHighlighter.all();
     }
   </script>
-  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+  <script type='text/javascript' src='https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
   <script type='text/javascript' src='/includes/comment.js'></script>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 </head>
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">
diff --git a/view/comment.php b/view/comment.php
new file mode 100644 (file)
index 0000000..44f62fd
--- /dev/null
+++ b/view/comment.php
@@ -0,0 +1,5 @@
+<?php
+    foreach ($this->comment as $comment) {
+        //echo '<h3>' . $comment['text'] . '</h3>';
+    }
+?>
diff --git a/view/note.php b/view/note.php
index 367b334..36a3dd2 100644 (file)
--- a/view/note.php
+++ b/view/note.php
@@ -22,8 +22,9 @@
       SyntaxHighlighter.all();
     }
   </script>
-  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+  <script type='text/javascript' src='https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
   <script type='text/javascript' src='/includes/comment.js'></script>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 </head>
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">
diff --git a/view/page.php b/view/page.php
index 72d5edd..10de5f4 100644 (file)
--- a/view/page.php
+++ b/view/page.php
@@ -22,8 +22,9 @@
       SyntaxHighlighter.all();
     }
   </script>
-  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+  <script type='text/javascript' src='https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
   <script type='text/javascript' src='/includes/comment.js'></script>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 </head>
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">
diff --git a/view/rss.php b/view/rss.php
index 7d0c60c..a2ac042 100644 (file)
--- a/view/rss.php
+++ b/view/rss.php
@@ -1,9 +1,9 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>dylansserver.com/notes/rss</title>
-    <link>http://dylansserver.com/notes</link>
+    <link>https://dylansserver.com/notes</link>
     <description>dylansserver.com/notes/rss</description>
-    <atom:link href="http://dylansserver.com/notes/rss" rel="self" type="application/rss+xml" />
+    <atom:link href="https://dylansserver.com/notes/rss" rel="self" type="application/rss+xml" />
     <?php
       foreach ($this->items as $item) {
         echo "<item>";
my (old) website