disinclined.org / git / dylansserver.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'dev' into live
[dylansserver.git] / index.php
diff --git a/index.php b/index.php
index 1eb083b..e58f737 100644 (file)
--- a/index.php
+++ b/index.php
@@ -40,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';
     }
   }
@@ -91,7 +93,7 @@ abstract class cms {
   $scripts
 </head>
 
-<body>
+<body onload="return typeof highlight == 'function' ? highlight() : true;">
   <div id="structure">
     <div id="banner">
       <a href="$this->home_link">
@@ -136,7 +138,7 @@ class index extends cms {
     $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>
@@ -168,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>
@@ -238,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() {
@@ -280,9 +300,7 @@ class page extends cms {
       echo <<<END_NOTE
       <div class='note'>
       <h1>
-        <span class='date'>
-          $year_posted/$month_posted/$day_posted/
-        </span><a rel="canonical" href='$url'>$title</a>
+        <span class='date'>$year_posted/$month_posted/$day_posted/</span><a rel="canonical" href='$url'>$title</a>
       </h1>
       $text
       </div>
@@ -325,8 +343,27 @@ class note extends cms {
   public $number_of_comments;
 
   public function __construct() {
-    if (isset($_GET['comments'])) {
       $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>";
     }
@@ -416,7 +453,7 @@ END_OF_NOTE;
 
   private function write_navigation() {
     echo <<<END_OF_NAVIGATION
-    <br>
+    <br><br><br><br>
     <div id='navigation'>
     <h1>
 END_OF_NAVIGATION;
@@ -424,7 +461,7 @@ END_OF_NAVIGATION;
       $this->display_comment_link();
     }
     echo <<<END_OF_NAVIGATION
-    <a href="/notes/">back to notes</a>/
+    <a href="/notes/">back to notes/</a>
     </h1>
     </div>
 END_OF_NAVIGATION;
@@ -490,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); 
@@ -621,6 +658,50 @@ class archive extends cms {
 }
 
 
+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() {
@@ -667,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();
my (old) website