X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=index.php;h=f1b2cc1e76b57f2cce5be88fc578e2fcff7745b8;hb=5ce1eece3bc1c171e6923f8864122a6cbd0d093b;hp=c2fb0789087819c79a1e04db6b4dbe7f08b9e63b;hpb=f4e95bddee9079e56f5ffbfe8ede9875b0d7bd49;p=dylansserver.git

diff --git a/index.php b/index.php
index c2fb078..f1b2cc1 100644
--- 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';
     }
   }
@@ -86,7 +88,7 @@ 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>
@@ -133,10 +135,10 @@ END_OF_CLOSE;
 class index extends cms {
 
   public function display() {
-    $this->scripts = "<script type='text/javascript' src='/includes/all.js'></script>"; 
+    $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>
@@ -217,7 +219,7 @@ class project extends index {
              WHERE title = ?";
     $result = $this->query($sql, "s", $_GET['project']);
     if ($result = $result[0]['text']) {
-      $text =  str_replace("class='exhibit'", "class='exhibit' style='display:block;'", $result);
+      $text =  str_replace("class='exhibit'", "class='exhibit'", $result);
       echo $text;
       echo "</div>";
     } else {
@@ -276,10 +278,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();
@@ -288,7 +295,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>";
@@ -297,7 +304,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>";
   }
 
@@ -401,7 +408,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 +416,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>
+    </h1>
     </div>
 END_OF_NAVIGATION;
   }
@@ -483,20 +490,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 +595,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 +605,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 +614,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 +711,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();