Merge branch 'dev' into live
[dylansserver.git] / index.php
index 54b5bf2..e58f737 100644 (file)
--- a/index.php
+++ b/index.php
@@ -6,6 +6,7 @@ abstract class cms {
   protected $db;
   protected $recaptcha_publickey;
   protected $recaptcha_privatekey;
+  protected  $scripts;
   public $title;
   public $home_link;
 
@@ -39,7 +40,9 @@ abstract class cms {
       return 'index';
     } else if (isset($_GET['project'])) {
       return 'project';
-    } else if (isset($_GET['challenge'])) {
+       } else if (isset($_GET['rss'])) {
+         return 'rss';
+       } else if (isset($_GET['challenge'])) {
       return 'captcha';
     }
   }
@@ -71,16 +74,9 @@ abstract class cms {
 
   public function display_head($title = "dylansserver",
                                   $home_link = "/") {
-    $scripts = "";
+    $scripts = $this->scripts;
     $stylesheets = "<link href='/includes/style.css' rel='stylesheet' type='text/css'>";
-    if (cms::determine_type() == "index") {
-      $scripts = "<script type='text/javascript' src='/includes/all.js'></script>"; 
-      $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&amp;ucn_task=conformance#";
-    } else if ($this->determine_type() == 'note'
-                 && isset($_GET['comments'])) {
-      $scripts = "<script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>";
-      $scripts .= "<script type='text/javascript' src='/includes/comment.js'></script>";
-    }
+    $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&amp;ucn_task=conformance#";
     echo <<<END_OF_HEAD
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
@@ -92,12 +88,12 @@ abstract class cms {
   <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 
   <title>$this->title</title>
-  <link rel="icon" href="favicon.ico" type="image/png">
+  <link rel="icon" href="/favicon.ico" type="image/png">
   $stylesheets
   $scripts
 </head>
 
-<body>
+<body onload="return typeof highlight == 'function' ? highlight() : true;">
   <div id="structure">
     <div id="banner">
       <a href="$this->home_link">
@@ -139,9 +135,10 @@ END_OF_CLOSE;
 class index extends cms {
 
   public function display() {
+    $this->scripts = "<script type='text/javascript' src='/includes/index.js'></script>"; 
     $this->display_head();
     $this->display_exhibits();
-    echo "<ul id='portfolio' style='text-align:right'>";
+    echo "<ul id='portfolio'>";
     $this->list_projects();
     echo <<<OTHER_PROJECTS
         <li>
@@ -173,7 +170,7 @@ class index extends cms {
         </li>
 
         <li><a href=
-        "/notes/">here</a></li>
+        "/notes/">here</a> [<a href="/notes/rss">rss</a>]</li>
 
         <li>
         </li>
@@ -243,6 +240,24 @@ class page extends cms {
   public function __construct() {
     parent::__construct();
     $this->page_offset();
+    $this->scripts = "
+        <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
+        <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+        <script type='text/javascript'>
+          function highlight() {
+            SyntaxHighlighter.autoloader(
+             'js /includes/syntax/scripts/shBrushJScript.js',
+             'bash /includes/syntax/scripts/shBrushBash.js',
+             'sql /includes/syntax/scripts/shBrushSql.js',
+             'cpp /includes/syntax/scripts/shBrushCpp.js');
+            SyntaxHighlighter.defaults['gutter'] = false;
+            SyntaxHighlighter.defaults['toolbar'] = false;
+            SyntaxHighlighter.all();
+          }
+        </script>
+    ";
   }
 
   private function page_offset() {
@@ -281,10 +296,15 @@ class page extends cms {
       $month_posted = $date_posted[1];
       $datetime_posted = explode(' ', $date_posted[2]);
       $day_posted = $datetime_posted[0];
-      echo "<div class='note'>";
-      echo "<h2><span style='color:grey;'>$year_posted/$month_posted/$day_posted/</span><a href='$url'>$title</a></h2>";
-      echo $entry['text'];
-      echo "</div>";
+      $text = $entry['text'];
+      echo <<<END_NOTE
+      <div class='note'>
+      <h1>
+        <span class='date'>$year_posted/$month_posted/$day_posted/</span><a rel="canonical" href='$url'>$title</a>
+      </h1>
+      $text
+      </div>
+END_NOTE;
     }
     echo "</div>";
     $this->write_navigation();
@@ -293,7 +313,7 @@ class page extends cms {
 
   private function write_navigation() {
     echo "<div id='navigation'>";
-    echo "<h2>";
+    echo "<h1>";
     if($this->page > 1){
       $previous_page = $this->page - 1;
       echo "<a href='/notes/page/$previous_page'>prev</a>";
@@ -302,7 +322,7 @@ class page extends cms {
     $forward_page = $this->page + 1;
     echo " <a href='/notes/page/$forward_page'>next</a>";
     }
-    echo "</h2>";
+    echo "</h1>";
     echo "</div>";
   }
 
@@ -323,6 +343,30 @@ class note extends cms {
   public $number_of_comments;
 
   public function __construct() {
+      $this->scripts = "
+        <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
+        <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+        <script type='text/javascript'>
+          function highlight() {
+            SyntaxHighlighter.autoloader(
+             'js /includes/syntax/scripts/shBrushJScript.js',
+             'bash /includes/syntax/scripts/shBrushBash.js',
+             'sql /includes/syntax/scripts/shBrushSql.js',
+             'cpp /includes/syntax/scripts/shBrushCpp.js');
+            SyntaxHighlighter.defaults['gutter'] = false;
+            SyntaxHighlighter.defaults['toolbar'] = false;
+            SyntaxHighlighter.all();
+          }
+        </script>
+      ";
+
+    if (isset($_GET['comments'])) {
+      $this->scripts .= "
+        <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+        <script type='text/javascript' src='/includes/comment.js'></script>";
+    }
     parent::__construct();
     if (isset($_GET['comments'])) {
       $this->comments_enabled = true;
@@ -401,7 +445,7 @@ class note extends cms {
   private function display_note() {
     echo <<<END_OF_NOTE
     <div id='note'>
-    <h2><span style='color:grey;'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>
+    <h1><span class='date'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h1>
     $this->text
     </div>
 END_OF_NOTE;
@@ -409,16 +453,16 @@ END_OF_NOTE;
 
   private function write_navigation() {
     echo <<<END_OF_NAVIGATION
-    <br>
+    <br><br><br><br>
     <div id='navigation'>
-    <h2>
+    <h1>
 END_OF_NAVIGATION;
     if (!$this->comments_enabled) {
       $this->display_comment_link();
     }
     echo <<<END_OF_NAVIGATION
-    <a href="/notes/">back to notes</a>/
-    </h2>
+    <a href="/notes/">back to notes/</a>
+    </h1>
     </div>
 END_OF_NAVIGATION;
   }
@@ -483,20 +527,20 @@ END_CAPTCHA_STYLE;
   
       <nowiki>
       <div id="recaptcha_widget"> 
-        <h3 class="recaptcha_only_if_image"><b>what's this say</b>?</h3>
-        <h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3>
-        <span style="font-size:80%;">
-          ( <a href="javascript:Recaptcha.reload()">another</a> /
-          <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio</a></span> /
-          <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">image</a></span><a href="javascript:Recaptcha.showhelp()">help</a> )
-        </span>
-        <br><br>
+        <br>
+        <h3><b>what's this say</b>?</h3>
+        <br>
+          <div id="recaptcha_image"></div>
+        <br><br><br>
+        <span class="recaptcha_only_if_image"><br><br><br></span>
         <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
         <br><br>
-        <div style="float:right;position:relative;width:100px;">
-          <div id="recaptcha_image"></div>
-        </div>
-        <br><br><br><br>
+        <h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3>
+        <span class="recaptcha_help">
+          <a href="javascript:Recaptcha.reload()">another?</a> /
+          <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio?</a> /</span>
+          <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">image?</a></span><a href="javascript:Recaptcha.showhelp()">help?</a>
+        </span>
       </div>
 END_OF_FORM;
     echo recaptcha_get_html($this->recaptcha_publickey); 
@@ -588,9 +632,9 @@ class archive extends cms {
         $datetime_posted = explode(' ', $date_posted[2]);
         $day_posted = $datetime_posted[0];
         echo "<div class='note'>";
-        echo "<h2><span style='color:grey;'>";
+        echo "<h1><span class='date'>";
         echo "$year_posted/$month_posted/$day_posted/";
-        echo "</span><a href='$url'>$title</a></h2>";
+        echo "</span><a href='$url'>$title</a></h1>";
         echo $entry['text'];
         echo "</div>";
       }
@@ -598,7 +642,7 @@ class archive extends cms {
       $this->write_navigation();
     } else {
       echo "<br>";
-      echo "<h2 style='font-family:sans-serif;'>sorry, nothing here</h2>";
+      echo "<h1>sorry, nothing here</h2>";
       echo "<pre>Empty set (0.00 sec)</pre>";
     }
     $this->display_close();
@@ -607,15 +651,57 @@ class archive extends cms {
   private function write_navigation() {
     echo "<br>";
     echo "<div id='navigation'>";
-    echo "<h2>";
     // fill me in!
-    echo "</h2>";
     echo "</div>";
   }
 
 }
 
 
+class rss extends cms {
+  public function display() {
+    $result = $this->db->query("SELECT date_posted, title, text, url
+                                         FROM notes ORDER BY date_posted DESC
+                                         LIMIT 5");
+         echo <<<END_OF_ENTRY
+         <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+      <channel>
+           <title>dylanstestserver.com/notes/rss</title>
+               <link>http://dylanstestserver.com/notes</link>
+               <description>dylanstestserver.com/notes/rss</description>
+               <atom:link href="http://dylanstestserver.com/notes/rss" rel="self" type="application/rss+xml" />
+END_OF_ENTRY;
+       while ($entry = $result->fetch_object()) {
+         $title = $entry->title;
+         $date_posted = $entry->date_posted;
+         $url = "http://dylanstestserver.com/note/" . $entry->url;
+         $text = $entry->text;
+         $text = strip_tags($text);
+         $end_of_first_sentence = strpos($text, '.');
+         if ($end_of_first_sentence) {
+           $end_of_second_sentence = strpos($text, '.', ($end_of_first_sentence + 1));
+               if ($end_of_second_sentence) {
+                 $description = substr($text, '0', ($end_of_second_sentence + 1));
+               } else {
+                 $description = substr($text, '0', ($end_of_first_sentence + 1));
+               }
+         }
+         echo <<<END_OF_ENTRY
+           <item>
+                 <title>$title</title>
+                 <link>$url</link>
+                 <guid>$url</guid>
+                 <description>$description</description>
+           </item>
+END_OF_ENTRY;
+       }
+      echo "</channel>";
+      echo "</rss>";
+    
+  }
+}
+
+
 class notFound extends Exception {
 
     public function __construct() {
@@ -662,10 +748,13 @@ switch (cms::determine_type()) {
     $page = new page;
     $page->display();
     break;
+  case "rss":
+    $rss = new rss();
+       $rss->display();
   case 'archive':
     $archive = new archive;
-    $archive->display();
-    break;
+       $archive->display();
+       break;
   case "captcha":
     $captcha = new captcha;
     $captcha->display();