X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=cms.php;h=961a1f5ce7265b3cbb59a973151c14be1197df30;hb=7c68050a90dac5eec6b27f895deb9aeabf49cd47;hp=b4790b2f0e8ef9b9ae62b5d71c26f2c0b49515ec;hpb=bc92e5a9bf480ef176836b84adb8768400adcbba;p=dylansserver.git

diff --git a/cms.php b/cms.php
index b4790b2..961a1f5 100644
--- a/cms.php
+++ b/cms.php
@@ -326,84 +326,17 @@ class note extends cms {
       $author = $entry['author'];
       $text = htmlspecialchars($entry['text']);
       $head = "<h3>" . htmlspecialchars($author) . "</h3>";
-      echo <<<END_OF_COMMENT
-      <div class='comment'>
-      $head
-      $text
-      </div>
-END_OF_COMMENT;
+      echo "<div class='comment'>";
+      echo $head;
+      echo $text;
+      echo "</div>";
       }
     echo "</div>";
   }
 
   private function display_comment_form() {
     $publickey = $this->recaptcha_publickey;
-    echo <<<END_CAPTCHA_STYLE
-<script type="text/javascript">
-Recaptcha.create("$publickey",
-   "recaptcha_div", 
-   {
-     theme : 'custom',
-     custom_theme_widget: 'recaptcha_widget',
-     callback: Recaptcha.focus_response_field
-   });
-</script>
-END_CAPTCHA_STYLE;
-    require_once('includes/recaptchalib.php');
-    $url = $this->url . "verify";
-    echo "<form id='comment_form'  method='post' action='$url'>";
-    echo <<<END_OF_FORM
-    <div id="comment">
-      <h3>comment:</h3>
-      <textarea rows="10" cols="70" name="text" id="comment_text"></textarea>
-      <h3>name:</h3>
-      <input type=text name="name" id="comment_name">
-  
-      <nowiki>
-      <div id="recaptcha_widget"> 
-        <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>
-        <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); 
-    if ($this->failed_captcha) {
-    echo <<<END_OF_ERRORS
-        <div id="not_human">
-          reCAPTCHA said you're not human, <br>
-          try again?
-        </div>
-        <input id="submit" class="submit" type="submit" value="post comment">
-        </form>
-      </div>
-END_OF_ERRORS;
-    } else {
-      echo <<<END_OF_ERRORS
-        <div id="not_human">
-          reCAPTCHA said you're not human, <br>
-          try again?
-        </div>
-        <div id="blank_comment">
-          but you didn't write anything! <br>
-        </div>
-END_OF_ERRORS;
-    }
-    echo <<<END_OF_FORM
-      <input id="submit" class="submit" type="submit" value="post comment">
-      </form>
-      </div>
-END_OF_FORM;
+    require_once("view/comment-form.php");
   }
 }
 
@@ -487,18 +420,15 @@ class archive extends cms {
 
 
 class rss extends cms {
+
   public function display() {
+    require_once("view/rss.php");
+  }
+
+  public function display_items() {
     $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>dylansserver.com/notes/rss</title>
-		<link>http://dylansserver.com/notes</link>
-		<description>dylansserver.com/notes/rss</description>
-		<atom:link href="http://dylansserver.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;
@@ -514,18 +444,13 @@ END_OF_ENTRY;
 		  $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 "<item>";
+      echo "  <title>$title</title>";
+      echo "  <link>$url</link>";
+      echo "  <guid>$url</guid>";
+      echo "  <description>$description</description>";
+      echo "</item>";
 	}
-      echo "</channel>";
-      echo "</rss>";
-    
   }
 }