now using a model for note pages, but its not clean
[dylansserver.git] / cms.php
diff --git a/cms.php b/cms.php
index b4790b2..a3d9c3b 100644 (file)
--- a/cms.php
+++ b/cms.php
@@ -1,15 +1,18 @@
 <?php
 
+require_once("model/model.php");
+
 abstract class cms {
 
   private $config_file = '/etc/dylansserver.ini';
-  protected $db;
+  protected $model;
   protected $recaptcha_publickey;
   protected $recaptcha_privatekey;
   public $title;
   public $home_link;
 
   public function __construct() {
+    $this->model = new model();
     $config = parse_ini_file($this->config_file, true);
     $this->db = new mysqli(
       $config['database']['domain'],
@@ -25,25 +28,6 @@ abstract class cms {
     $this->recaptcha_privatekey = $config['recaptcha']['privatekey'];
     $this->title = $config['site']['default_title'];
     $this->home_link = $config['site']['home_link'];
-    ob_start();
-  }
-
-  public static function determine_type() {
-    if (isset($_GET['page']) && is_numeric($_GET['page'])) {
-      return 'page';
-    } else if (isset($_GET['year'])) {
-      return 'archive';
-    } else if (isset($_GET['note'])) {
-      return 'note';
-    } else if ($_SERVER['REQUEST_URI'] == '/') {
-      return 'index';
-    } else if (isset($_GET['project'])) {
-      return 'project';
-       } else if (isset($_GET['rss'])) {
-         return 'rss';
-       } else if (isset($_GET['challenge'])) {
-      return 'captcha';
-    }
   }
 
   public function query() {
@@ -71,6 +55,24 @@ abstract class cms {
     return $return;
   }
 
+  public static function determine_type() {
+    if (isset($_GET['page']) && is_numeric($_GET['page'])) {
+      return 'page';
+    } else if (isset($_GET['year'])) {
+      return 'archive';
+    } else if (isset($_GET['note'])) {
+      return 'note';
+    } else if ($_SERVER['REQUEST_URI'] == '/') {
+      return 'index';
+    } else if (isset($_GET['project'])) {
+      return 'project';
+       } else if (isset($_GET['rss'])) {
+         return 'rss';
+       } else if (isset($_GET['challenge'])) {
+      return 'captcha';
+    }
+  }
+
   public function init() {
     switch (cms::determine_type()) {
       case 'index':
@@ -82,8 +84,9 @@ abstract class cms {
         $project->display();
         break;
       case 'note':
-        $note = new note;
-        $note->display();
+        require_once("model/note.php");
+        $note = new note();
+        require_once("view/note.php");
         break;
       case 'page':
         $page = new page;
@@ -219,195 +222,6 @@ END_NOTE;
 }
 
 
-class note extends cms {
-
-  private $id;
-  private $comments_enabled = false;
-  private $failed_captcha;
-  public $url;
-  public $title;
-  public $year_posted;
-  public $month_posted;
-  public $day_posted;
-  public $text;
-  public $number_of_comments;
-
-  public function __construct() {
-    parent::__construct();
-    if (isset($_GET['comments'])) {
-      $this->comments_enabled = true;
-    }
-    $url = htmlspecialchars($_SERVER['REQUEST_URI']);
-    if (isset($_GET['verify'])) {
-      $url = substr($url, 0, (strlen($url)-6));
-    }
-    $this->url = $url;
-    $sql = "SELECT title, date_posted, text, id
-              FROM notes WHERE url = ?";
-    $result = $this->query($sql, "s",
-                              $_GET['note']);
-    if ($result) {
-      $entry = $result[0];
-      $this->id = $entry["id"];
-      $this->title = $entry["title"];
-      $date_posted =  explode("-", $entry["date_posted"]);
-      $this->year_posted = $date_posted[0];
-      $this->month_posted = $date_posted[1];
-      $datetime_posted = explode(' ', $date_posted[2]);
-      $this->day_posted = $datetime_posted[0];
-      $this->text = $entry["text"];
-    } else {
-      throw new notFound();
-    }
-    $sql = "SELECT COUNT(*) FROM comments
-              WHERE note = $this->id";
-    $result = $this->db->query($sql);
-    $result = $result->fetch_array();
-    $this->number_of_comments = $result[0];
-    if (isset($_GET['verify'])) {
-      $this->verify();
-    }
-  }
-
-  public function display() {
-      require_once("view/note.php");
-  }
-
-  private function verify() {
-    if (!isset($_POST['captcha'])) {
-      require_once('includes/recaptchalib.php');
-      echo "<br>";
-      $resp = recaptcha_check_answer ($this->recaptcha_privatekey,
-                                      $_SERVER["REMOTE_ADDR"],
-                                      $_POST["recaptcha_challenge_field"],
-                                      $_POST["recaptcha_response_field"]);
-      if (!$resp->is_valid) {
-        $this->failed_captcha = true;
-      }
-    }
-    if (isset($_POST['captcha']) || $resp->is_valid) {
-      $sql = ("INSERT INTO comments (date_posted, author,
-                  text, note)
-                VALUES(NOW(), ?, ?, ?)");
-      $stmt = $this->db->prepare($sql);
-      // Checks are needed here (no blank text,
-      // and a default author needs to be set
-      // for no-javascript users.
-      $stmt->bind_param('sss',
-                          $_POST['name'],
-                          $_POST['text'],
-                        $this->id);
-      $stmt->execute();
-    }
-  }
-
-  private function display_comment_link() {
-    if ($this->number_of_comments > 0) {
-      $anchor_text = "comments($this->number_of_comments)/";
-    } else {
-      $anchor_text = "comment?";
-    }
-    if (substr($this->url, (strlen($this->url)-1), strlen($this->url)) == '/') {
-      $url = $this->url . 'comments/';
-    } else {
-      $url = $this->url . '/comments/';
-    }
-    echo "<a id='comment_link' href='$url'>$anchor_text</a>";
-  }
-
-  private function display_comments() {
-    echo "<div id='comments'>";
-    $sql= "SELECT date_posted, author, text
-             FROM comments WHERE note = ?
-             ORDER BY date_posted DESC";
-    $result = $this->query($sql, 'd', $this->id);
-    foreach ($result as $row => $entry) {
-      $date_posted = $entry['date_posted'];
-      $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>";
-  }
-
-  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;
-  }
-}
-
-
 class archive extends cms {
 
   public function __construct() {
@@ -487,18 +301,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 +325,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>";
-    
   }
 }