Merge branch 'dev' into live
authorDylan Lloyd <dylan@miniscule>
Wed, 27 Jun 2012 06:37:13 +0000 (02:37 -0400)
committerDylan Lloyd <dylan@miniscule>
Wed, 27 Jun 2012 06:37:13 +0000 (02:37 -0400)
16 files changed:
controller.php [new file with mode: 0644]
index.php
model/archive.php [new file with mode: 0644]
model/captcha.php [new file with mode: 0644]
model/index.php [new file with mode: 0644]
model/model.php [new file with mode: 0644]
model/note.php [new file with mode: 0644]
model/page.php [new file with mode: 0644]
model/project.php [new file with mode: 0644]
model/rss.php [new file with mode: 0644]
view/archive.php [new file with mode: 0644]
view/comment-form.php [new file with mode: 0644]
view/index.php [new file with mode: 0644]
view/note.php [new file with mode: 0644]
view/page.php [new file with mode: 0644]
view/rss.php [new file with mode: 0644]

diff --git a/controller.php b/controller.php
new file mode 100644 (file)
index 0000000..280fb3e
--- /dev/null
@@ -0,0 +1,58 @@
+<?php
+
+require_once("model/model.php");
+
+abstract class cms {
+
+  public function __construct() {
+    $this->model = new model();
+    ob_start();
+  }
+
+  public static function init() {
+    if (isset($_GET['page']) && is_numeric($_GET['page'])) {
+      require_once("model/page.php");
+      $page = new page();
+      $page->display();
+    } else if (isset($_GET['year'])) {
+      require_once("model/archive.php");
+      $archive = new archive();
+      $archive->display();
+    } else if (isset($_GET['note'])) {
+      require_once("model/note.php");
+      $note = new note();
+      $note->display();
+    } else if ($_SERVER['REQUEST_URI'] == '/') {
+      require_once("model/index.php");
+      $index = new index();
+      $index->display();
+    } else if (isset($_GET['project'])) {
+      require_once("model/project.php");
+      $project = new project();
+      $project->display();
+       } else if (isset($_GET['rss'])) {
+      require_once("model/rss.php");
+      $rss = new rss();
+      $rss->display();
+       } else if (isset($_GET['challenge'])) {
+      require_once("model/captcha.php");
+      $captcha = new captcha();
+      $captcha->display();
+    }
+  }
+
+}
+
+class notFound extends Exception {
+
+    public function __construct() {
+      header('HTTP/1.0 404 Not Found');
+      ob_end_clean();
+      include('404.php');
+      exit();
+    }
+
+}
+
+
+?>
index bf2249b..493069a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,772 +1,4 @@
 <?php
-
-abstract class cms {
-
-  private $config_file = '/etc/dylansserver.ini';
-  protected $db;
-  protected $recaptcha_publickey;
-  protected $recaptcha_privatekey;
-  protected  $scripts;
-  public $title;
-  public $home_link;
-
-  public function __construct() {
-    $config = parse_ini_file($this->config_file, true);
-    $this->db = new mysqli(
-      $config['database']['domain'],
-      $config['database']['user'],
-      $config['database']['password'],
-      $config['database']['database']);
-    if (mysqli_connect_errno()) {
-      echo "Problem connecting to database: ";
-      echo mysqli_connect_error();
-      exit();
-    }
-    $this->recaptcha_publickey = $config['recaptcha']['publickey'];
-    $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() {
-    $args = func_get_args();
-    $statement = $this->db->prepare($args[0]);
-    $args = array_slice($args, 1);
-    call_user_func_array(array($statement, 'bind_param'), &$args);
-    $statement->execute();
-    $return = array();
-    $statement->store_result();
-    $row = array();
-    $data = $statement->result_metadata();
-    $fields = array();
-    $fields[0] = &$statement;
-    while($field = $data->fetch_field()) {
-      $fields[] = &$row[$field->name];
-    }
-    call_user_func_array("mysqli_stmt_bind_result", $fields);
-    $i = 0;
-    while ($statement->fetch()) {
-        foreach ($row as $key=>$value) $return[$i][$key] = $value;
-      $i++;
-    }
-    $statement->free_result();
-    return $return;
-      }
-
-  public function display_head($title = "dylansserver",
-                                  $home_link = "/") {
-    $scripts = $this->scripts;
-    $stylesheets = "<link href='/includes/style.css' rel='stylesheet' type='text/css'>";
-    $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">
-
-<html>
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-  <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-
-  <title>$this->title</title>
-  <link rel="icon" href="/favicon.ico" type="image/png">
-  $stylesheets
-  $scripts
-</head>
-
-<body onload="return typeof highlight == 'function' ? highlight() : true;">
-  <div id="structure">
-    <div id="banner">
-      <a href="$this->home_link">
-      <img src="/images/dylansserver.png" alt="dylansserver"
-      border="0"></a>
-    </div>
-
-    <div id="content">
-END_OF_HEAD;
-  }
-
-  public function display_contact() {
-    echo <<<END_OF_CONTACT
-      <div id="contact_me"><h1><a href=
-      "mailto:dylan@psu.edu">dylan</a></h1><a href=
-      "mailto:dylan@psu.edu">@psu.edu</a>
-      </div>
-END_OF_CONTACT;
-  }
-
-  public function display_close($show_contact = true) {
-    if ($show_contact) {
-      $this->display_contact();
-    }
-    echo <<<END_OF_CLOSE
-    </div>
-    <br>
-    <br>
-  </div>
-</body>
-</html>
-END_OF_CLOSE;
-    ob_flush();
-    }
-
-}
-
-
-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'>";
-    $this->list_projects();
-    echo <<<OTHER_PROJECTS
-        <li>
-          <h3>things i've done for others:</h3>
-        </li>
-
-        <li><a href=
-        "http://activehamptons.com">activehamptons.com</a></li>
-
-        <li><a href=
-        "http://transfishing.com">transfishing.com</a></li>
-
-        <li>
-          <h3>something i've worked on:</h3>
-        </li>
-
-        <li><a href=
-        "http://tempositions.com">tempositions.com</a></li>
-
-        <li>
-          <h3>my repositories:</h3>
-        </li>
-
-        <li><a href=
-        "/git/">git://dylansserver.com</a></li>
-
-        <li>
-          <h3>some notes:</h3>
-        </li>
-
-        <li><a href=
-        "/notes/">here</a> [<a href="/notes/rss">rss</a>]</li>
-
-        <li>
-          <h3>my resume:</h3>
-        </li>
-
-        <li>[<a href=
-        "/resume">pdf</a>]</li>
-
-        <li>
-        </li>
-OTHER_PROJECTS;
-    // Because of the CSS necessary for the animations,
-    // the contact link needs to be in #portfolio to clear
-    // the floats.
-    echo "<li>";
-    $this->display_contact();
-    echo "</li>";
-    echo "</ul>";
-    $this->display_close($show_contact = false);
-  }
-
-  protected function display_exhibits() {
-    echo "<div id='exhibit'>";
-    $sql = "SELECT text FROM projects ORDER BY rank";
-    $result = $this->db->query($sql);
-    while ($entry = $result->fetch_object()) {
-      echo $entry->text;
-    }
-    echo "</div>";
-  }
-
-  private function list_projects() {
-    echo <<<HEREDOC
-        <li>
-          <h3>my projects:</h3>
-        </li>
-HEREDOC;
-    $sql = "SELECT title FROM projects ORDER BY rank";
-    $result = $this->db->query($sql);
-    while ($entry = $result->fetch_object()) {
-      echo "<li><a class='tab' href='$entry->title'>$entry->title</a></li>";
-    }
-  }
-
-}
-
-
-class project extends index {
-
-  protected function display_exhibits() {
-    echo "<div id='exhibit'>";
-    $sql = "SELECT text FROM projects
-             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);
-      echo $text;
-      echo "</div>";
-    } else {
-      throw new notFound();
-    }
-  }
-
-}
-
-
-class page extends cms {
-
-  private $page = 1;
-  private $offset = 0;
-  private $notes_per_page = 4;
-  private $number_of_pages = 1;
-
-  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() {
-    $sql = "SELECT COUNT(*) FROM notes";
-    $result = $this->db->query($sql);
-    $result = $result->fetch_array();
-    $this->number_of_pages = ceil($result[0] / $this->notes_per_page);
-    if (isset($_GET['page']) && is_numeric($_GET['page'])) {
-      $this->page = (int) $_GET['page'];
-    } else {
-      throw new notFound();
-    }
-    if ($this->page > $this->number_of_pages) {
-      throw new notFound();
-    }
-    if ($this->page < 1) {
-      throw new notFound();
-    }
-    $this->offset = ($this->page - 1) * $this->notes_per_page;
-  }
-
-  public function display() {
-    $this->display_head();
-    echo "<div id='notes'>";
-    $sql = "SELECT date_posted, title, url, text
-              FROM notes ORDER BY date_posted DESC
-              LIMIT ?, ?";
-    $result = $this->query($sql, "ii",
-                              $this->offset,
-                              $this->notes_per_page);
-    foreach ($result as $row => $entry) {
-      $title = $entry['title'];
-      $url = '/note/' . $entry['url'];
-      $date_posted =  explode("-", $entry['date_posted']);
-      $year_posted = $date_posted[0];
-      $month_posted = $date_posted[1];
-      $datetime_posted = explode(' ', $date_posted[2]);
-      $day_posted = $datetime_posted[0];
-      $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();
-    $this->display_close();
-  }
-
-  private function write_navigation() {
-    echo "<div id='navigation'>";
-    echo "<h1>";
-    if($this->page > 1){
-      $previous_page = $this->page - 1;
-      echo "<a href='/notes/page/$previous_page'>prev</a>";
-    }
-    if($this->page < $this->number_of_pages) {
-    $forward_page = $this->page + 1;
-    echo " <a href='/notes/page/$forward_page'>next</a>";
-    }
-    echo "</h1>";
-    echo "</div>";
-  }
-
-}
-
-
-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() {
-      $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;
-    }
-    $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() {
-    $this->display_head();
-    $this->display_note();
-    if ($this->comments_enabled) {
-      $this->display_comments();
-      $this->display_comment_form();
-    }
-    $this->write_navigation();
-    $this->display_close();
-  }
-
-  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_note() {
-    echo <<<END_OF_NOTE
-    <div id='note'>
-    <h1><span class='date'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h1>
-    $this->text
-    </div>
-END_OF_NOTE;
-  }
-
-  private function write_navigation() {
-    echo <<<END_OF_NAVIGATION
-    <br><br><br><br>
-    <div id='navigation'>
-    <h1>
-END_OF_NAVIGATION;
-    if (!$this->comments_enabled) {
-      $this->display_comment_link();
-    }
-    echo <<<END_OF_NAVIGATION
-    <a href="/notes/">back to notes/</a>
-    </h1>
-    </div>
-END_OF_NAVIGATION;
-  }
-
-  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() {
-    parent::__construct();
-  }
-
-  private function check_exists() {
-    $sql = "SELECT COUNT(*) FROM notes
-              WHERE url = ?";
-    $results = $this->query($sql, "s", $_GET['note']);
-    if ($results[0]["COUNT(*)"] != 1) {
-      $this->not_found();
-    }
-  }
-
-  public function display() {
-    $this->display_head();
-    switch (true) {
-      case (isset($_GET['year']) && !isset($_GET['month'])
-                && !isset($_GET['day'])):
-        $sql = "SELECT title, url, date_posted, text
-                  FROM notes WHERE YEAR(date_posted) = ?
-                ORDER BY date_posted DESC";
-        $result = $this->query($sql, "d",
-                                  $_GET['year']);
-        break;
-      case (isset($_GET['year']) && isset($_GET['month'])
-               && !isset($_GET['day'])):
-        $sql = "SELECT title, url, date_posted, text
-                  FROM notes WHERE YEAR(date_posted) = ?
-                AND MONTH(date_posted) = ?
-                ORDER BY date_posted DESC";
-        $result = $this->query($sql, "dd",
-                                  $_GET['year'], $_GET['month']);
-        break;
-      case (isset($_GET['year']) && isset($_GET['month'])
-              && isset($_GET['day'])):
-        $sql = "SELECT title, url, date_posted, text
-                  FROM notes WHERE YEAR(date_posted) = ?
-                AND MONTH(date_posted) = ?
-                AND DAY(date_posted) = ?
-                ORDER BY date_posted DESC";
-        $result = $this->query($sql, "ddd",
-                                $_GET['year'], $_GET['month'],
-                                $_GET['day']);
-        break;
-    }
-    if (count($result) >= 1) {
-      echo "<div id='notes'>";
-      foreach ($result as $row => $entry) {
-        $title = $entry['title'];
-        $url = '/note/' . $entry['url'];
-        $date_posted =  explode("-", $entry['date_posted']);
-        $year_posted = $date_posted[0];
-        $month_posted = $date_posted[1];
-        $datetime_posted = explode(' ', $date_posted[2]);
-        $day_posted = $datetime_posted[0];
-        echo "<div class='note'>";
-        echo "<h1><span class='date'>";
-        echo "$year_posted/$month_posted/$day_posted/";
-        echo "</span><a href='$url'>$title</a></h1>";
-        echo $entry['text'];
-        echo "</div>";
-      }
-      echo "</div>";
-      $this->write_navigation();
-    } else {
-      echo "<br>";
-      echo "<h1>sorry, nothing here</h2>";
-      echo "<pre>Empty set (0.00 sec)</pre>";
-    }
-    $this->display_close();
-  }
-
-  private function write_navigation() {
-    echo "<br>";
-    echo "<div id='navigation'>";
-    // fill me in!
-    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>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;
-         $url = "http://dylansserver.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() {
-      header('HTTP/1.0 404 Not Found');
-      ob_end_clean();
-      include('404.php');
-      exit();
-    }
-
-}
-
-
-class captcha extends cms {
-
-    public function display() {
-      $challenge = $_GET['challenge'];
-      $response = $_GET['response'];
-      $remoteip = $_SERVER['REMOTE_ADDR'];
-      $curl = curl_init('http://api-verify.recaptcha.net/verify?');
-      curl_setopt ($curl, CURLOPT_POST, 4);
-      curl_setopt ($curl, CURLOPT_POSTFIELDS, "privatekey=$this->recaptcha_privatekey&remoteip=$remoteip&challenge=$challenge&response=$response");
-      $result = curl_exec ($curl);
-      curl_close ($curl);
-    }
-
-}
-
-
-## now actually do something:
-switch (cms::determine_type()) {
-  case 'index':
-    $index = new index();
-    $index->display();
-    break;
-  case 'project':
-    $project = new project();
-    $project->display();
-    break;
-  case 'note':
-    $note = new note;
-    $note->display();
-    break;
-  case 'page':
-    $page = new page;
-    $page->display();
-    break;
-  case "rss":
-    $rss = new rss();
-       $rss->display();
-    break;
-  case 'archive':
-    $archive = new archive;
-       $archive->display();
-       break;
-  case "captcha":
-    $captcha = new captcha;
-    $captcha->display();
-    break;
-}
-
+require_once("controller.php");
+cms::init();
 ?>
diff --git a/model/archive.php b/model/archive.php
new file mode 100644 (file)
index 0000000..d0947c4
--- /dev/null
@@ -0,0 +1,69 @@
+<?php
+
+class archive extends model {
+
+  public $notes = array();
+
+  public function __construct() {
+    parent::__construct();
+  }
+
+  private function check_exists() {
+    $sql = "SELECT COUNT(*) FROM notes
+              WHERE url = ?";
+    $results = $this->query($sql, "s", $_GET['note']);
+    if ($results[0]["COUNT(*)"] != 1) {
+      $this->not_found();
+    }
+  }
+
+  public function display() {
+      $this->fetch_notes();
+      require_once("view/archive.php");
+  }
+
+  public function fetch_notes() {
+    switch (true) {
+      case (isset($_GET['year']) && !isset($_GET['month'])
+                && !isset($_GET['day'])):
+        $sql = "SELECT title, url, date_posted, text
+                  FROM notes WHERE YEAR(date_posted) = ?
+                ORDER BY date_posted DESC";
+        $result = $this->query($sql, "d",
+                                  $_GET['year']);
+        break;
+      case (isset($_GET['year']) && isset($_GET['month'])
+               && !isset($_GET['day'])):
+        $sql = "SELECT title, url, date_posted, text
+                  FROM notes WHERE YEAR(date_posted) = ?
+                AND MONTH(date_posted) = ?
+                ORDER BY date_posted DESC";
+        $result = $this->query($sql, "dd",
+                                  $_GET['year'], $_GET['month']);
+        break;
+      case (isset($_GET['year']) && isset($_GET['month'])
+              && isset($_GET['day'])):
+        $sql = "SELECT title, url, date_posted, text
+                  FROM notes WHERE YEAR(date_posted) = ?
+                AND MONTH(date_posted) = ?
+                AND DAY(date_posted) = ?
+                ORDER BY date_posted DESC";
+        $result = $this->query($sql, "ddd",
+                                $_GET['year'], $_GET['month'],
+                                $_GET['day']);
+        break;
+    }
+    foreach ($result as $row => $entry) {
+      $entry['url'] = '/note/' . $entry['url'];
+      $date_posted = explode("-", $entry['date_posted']);
+      $entry['year_posted'] = $date_posted[0];
+      $entry['month_posted'] = $date_posted[1];
+      $entry['datetime_posted'] = explode(' ', $date_posted[2]);
+      $entry['day_posted'] = $entry['date_posted'][0];
+      $this->notes[$row] = $entry;
+    }
+  }
+
+}
+
+?>
diff --git a/model/captcha.php b/model/captcha.php
new file mode 100644 (file)
index 0000000..b2af33c
--- /dev/null
@@ -0,0 +1,18 @@
+<?php
+
+class captcha extends model {
+
+    public function display() {
+      $challenge = $_GET['challenge'];
+      $response = $_GET['response'];
+      $remoteip = $_SERVER['REMOTE_ADDR'];
+      $curl = curl_init('http://api-verify.recaptcha.net/verify?');
+      curl_setopt ($curl, CURLOPT_POST, 4);
+      curl_setopt ($curl, CURLOPT_POSTFIELDS, "privatekey=$this->recaptcha_privatekey&remoteip=$remoteip&challenge=$challenge&response=$response");
+      $result = curl_exec ($curl);
+      curl_close ($curl);
+    }
+
+}
+
+?>
diff --git a/model/index.php b/model/index.php
new file mode 100644 (file)
index 0000000..f649ecc
--- /dev/null
@@ -0,0 +1,36 @@
+<?php
+
+class index extends model {
+
+  public $exhibits = array();
+  public $projects = array();
+
+  public function __construct() {
+      parent::__construct();
+      $this->fetch_exhibits();
+      $this->fetch_projects();
+  }
+
+  public function display() {
+      require_once("view/index.php");
+  }
+
+  private function fetch_exhibits() {
+    $sql = "SELECT text FROM projects ORDER BY rank";
+    $result = $this->db->query($sql);
+    while ($entry = $result->fetch_object()) {
+      $this->exhibits[] = $entry->text;
+    }
+  }
+
+  private function fetch_projects() {
+    $sql = "SELECT title FROM projects ORDER BY rank";
+    $result = $this->db->query($sql);
+    while ($entry = $result->fetch_object()) {
+        $this->projects[] = $entry->title;
+    }
+  }
+
+}
+
+?>
diff --git a/model/model.php b/model/model.php
new file mode 100644 (file)
index 0000000..9088831
--- /dev/null
@@ -0,0 +1,57 @@
+<?php
+
+class model {
+
+  private $config_file = '/etc/dylansserver.ini';
+  protected $model;
+  protected $recaptcha_publickey;
+  protected $recaptcha_privatekey;
+  public $title;
+  public $home_link;
+
+  public function __construct() {
+    $config = parse_ini_file($this->config_file, true);
+    $this->db = new mysqli(
+      $config['database']['domain'],
+      $config['database']['user'],
+      $config['database']['password'],
+      $config['database']['database']);
+    if (mysqli_connect_errno()) {
+      echo "Problem connecting to database: ";
+      echo mysqli_connect_error();
+      exit();
+    }
+    $this->recaptcha_publickey = $config['recaptcha']['publickey'];
+    $this->recaptcha_privatekey = $config['recaptcha']['privatekey'];
+    $this->title = $config['site']['default_title'];
+    $this->home_link = $config['site']['home_link'];
+  }
+
+  public function query() {
+    $args = func_get_args();
+    $statement = $this->db->prepare($args[0]);
+    $args = array_slice($args, 1);
+    call_user_func_array(array($statement, 'bind_param'), $args);
+    $statement->execute();
+    $return = array();
+    $statement->store_result();
+    $row = array();
+    $data = $statement->result_metadata();
+    $fields = array();
+    $fields[0] = &$statement;
+    while($field = $data->fetch_field()) {
+      $fields[] = &$row[$field->name];
+    }
+    call_user_func_array("mysqli_stmt_bind_result", $fields);
+    $i = 0;
+    while ($statement->fetch()) {
+        foreach ($row as $key=>$value) $return[$i][$key] = $value;
+      $i++;
+    }
+    $statement->free_result();
+    return $return;
+  }
+
+}
+
+?>
diff --git a/model/note.php b/model/note.php
new file mode 100644 (file)
index 0000000..8e863f1
--- /dev/null
@@ -0,0 +1,130 @@
+<?php
+
+class note extends model {
+
+  public $id;
+  public $comments_enabled = false;
+  public $failed_captcha;
+  public $url;
+  public $title;
+  public $year_posted;
+  public $month_posted;
+  public $day_posted;
+  public $text;
+  public $number_of_comments;
+  public $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;
+    $this->fetch_note();
+    $this->fetch_comments();
+  }
+
+  public function fetch_note() {
+    $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();
+    }
+  }
+
+  public function fetch_comments() {
+    $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");
+  }
+
+  public 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>";
+  }
+
+  public function display_comments() {
+    $sql= "SELECT date_posted, author, text
+             FROM comments WHERE note = ?
+             ORDER BY date_posted DESC";
+    $result = $this->query($sql, 'd', $this->id);
+    $i = 0;
+    foreach ($result as $row => $entry) {
+      $this->comment[$i]['date_posted'] = $entry['date_posted'];
+      $this->comment[$i]['author']  = $entry['author'];
+      $this->comment[$i]['text'] = htmlspecialchars($entry['text']);
+      $this->comment[$i]['head'] = "<h3>" . htmlspecialchars($author) . "</h3>";
+      $i++;
+    }
+  }
+
+  public function display_comment_form() {
+    $publickey = $this->recaptcha_publickey;
+    require_once("view/comment-form.php");
+  }
+
+  public 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();
+    }
+  }
+
+}
+
+?>
diff --git a/model/page.php b/model/page.php
new file mode 100644 (file)
index 0000000..b4c5577
--- /dev/null
@@ -0,0 +1,59 @@
+<?php
+
+class page extends model {
+
+  public $page = 1;
+  public $offset = 0;
+  public $notes_per_page = 4;
+  public $number_of_pages = 1;
+  public $notes = array();
+
+  public function __construct() {
+    parent::__construct();
+    $this->page_offset();
+    $this->fetch_notes();
+  }
+
+  private function page_offset() {
+    $sql = "SELECT COUNT(*) FROM notes";
+    $result = $this->db->query($sql);
+    $result = $result->fetch_array();
+    $this->number_of_pages = ceil($result[0] / $this->notes_per_page);
+    if (isset($_GET['page']) && is_numeric($_GET['page'])) {
+      $this->page = (int) $_GET['page'];
+    } else {
+      throw new notFound();
+    }
+    if ($this->page > $this->number_of_pages) {
+      throw new notFound();
+    }
+    if ($this->page < 1) {
+      throw new notFound();
+    }
+    $this->offset = ($this->page - 1) * $this->notes_per_page;
+  }
+
+  public function display() {
+      require_once("view/page.php");
+  }
+
+  protected function fetch_notes() {
+    $sql = "SELECT date_posted, title, url, text
+              FROM notes ORDER BY date_posted DESC
+              LIMIT ?, ?";
+    $result = $this->query($sql, "ii",
+                              $this->offset,
+                              $this->notes_per_page);
+    foreach ($result as $row => $entry) {
+      $entry['url'] = '/note/' . $entry['url'];
+      $date_posted = explode("-", $entry['date_posted']);
+      $entry['year_posted'] = $date_posted[0];
+      $entry['month_posted'] = $date_posted[1];
+      $entry['datetime_posted'] = explode(' ', $date_posted[2]);
+      $entry['day_posted'] = $entry['date_posted'][0];
+      $this->notes[$row] = $entry;
+    }
+  }
+}
+
+?>
diff --git a/model/project.php b/model/project.php
new file mode 100644 (file)
index 0000000..c7f780d
--- /dev/null
@@ -0,0 +1,23 @@
+<?php
+
+require_once("model/index.php");
+
+class project extends index {
+
+  public function display_exhibits() {
+    echo "<div id='exhibit'>";
+    $sql = "SELECT text FROM projects
+             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);
+      echo $text;
+      echo "</div>";
+    } else {
+      throw new notFound();
+    }
+  }
+
+}
+
+?>
diff --git a/model/rss.php b/model/rss.php
new file mode 100644 (file)
index 0000000..a169ead
--- /dev/null
@@ -0,0 +1,35 @@
+<?php
+
+class rss extends model {
+
+  public $items = array();
+
+  public function display() {
+    $this->fetch_items();
+    require_once("view/rss.php");
+  }
+
+  public function fetch_items() {
+    $result = $this->db->query("SELECT date_posted, title, text, url
+                                         FROM notes ORDER BY date_posted DESC
+                                         LIMIT 5");
+       while ($entry = $result->fetch_object()) {
+         $entry->url = "http://dylansserver.com/note/" . $entry->url;
+         $entry->text = strip_tags($entry->text);
+         $end_of_first_sentence = strpos($entry->text, '.');
+         if ($end_of_first_sentence) {
+           $end_of_second_sentence = strpos($entry->text, '.', ($end_of_first_sentence + 1));
+               if ($end_of_second_sentence) {
+                 $entry->description = substr($entry->text, '0', ($end_of_second_sentence + 1));
+               } else {
+                 $entry->description = substr($entry->text, '0', ($end_of_first_sentence + 1));
+               }
+        foreach ($entry as $key => $val) {
+          $this->items[][$key] = $entry->$key;
+        }
+         }
+       }
+  }
+}
+
+?>
diff --git a/view/archive.php b/view/archive.php
new file mode 100644 (file)
index 0000000..073c65f
--- /dev/null
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+  <title><?php echo $this->title; ?></title>
+  <link rel="icon" href="/favicon.ico" type="image/png">
+  <link href='/includes/style.css' rel='stylesheet' type='text/css'>
+  <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>
+  <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>
+</head>
+
+<body onload="return typeof highlight == 'function' ? highlight() : true">
+  <div id="structure">
+    <div id="banner">
+      <a href="<?php echo $this->home_link ?>">
+      <img src="/images/dylansserver.png" alt="dylansserver"
+      border="0"></a>
+    </div>
+
+    <div id="content">
+      <div id='notes'>
+        <?php
+          if (count($this->notes) >= 1) {
+            foreach ($this->notes as $note) {
+              echo "<div class='note'>";
+              echo "<h1><span class='date'>";
+              echo $note['year_posted'] . "/";
+              echo $note['month_posted'] . "/";
+              echo $note['day_posted'] . "/";
+              echo "</span><a href='" . $note['url'] . "'>";
+              echo $note['title'] . "</a></h1>";
+              echo $note['text'];
+              echo "</div>";
+            }
+          } else {
+            echo "<br>";
+            echo "<h1>sorry, nothing here</h2>";
+            echo "<pre>Empty set (0.00 sec)</pre>";
+          }
+        ?>
+      </div>
+      <div id="contact_me"><h1><a href=
+      "mailto:dylan@psu.edu">dylan</a></h1><a href=
+      "mailto:dylan@psu.edu">@psu.edu</a>
+      </div>
+    </div>
+    <br>
+    <br>
+  </div>
+</body>
+</html>
diff --git a/view/comment-form.php b/view/comment-form.php
new file mode 100644 (file)
index 0000000..745226b
--- /dev/null
@@ -0,0 +1,52 @@
+<script type="text/javascript">
+Recaptcha.create("$publickey",
+   "recaptcha_div", 
+   {
+     theme : 'custom',
+     custom_theme_widget: 'recaptcha_widget',
+     callback: Recaptcha.focus_response_field
+   });
+</script>
+<?php
+require_once('/srv/http/dylansserver.com/includes/recaptchalib.php');
+$url = $this->url . "verify";
+?>
+<form id='comment_form'  method='post' action='$url'>
+  <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>
+    <?php recaptcha_get_html($this->recaptcha_publickey);
+    if ($this->failed_captcha) {
+        echo "<div id=\"not_human\">";
+        echo "  reCAPTCHA said you're not human, <br>";
+        echo "  try again?";
+        echo "</div>";
+    } else {
+        echo "<div id=\"blank_comment\">";
+        echo "  but you didn't write anything! <br>";
+        echo "</div>";
+    } ?>
+    <input id="submit" class="submit" type="submit" value="post comment">
+  </div>
+</form>
+<br><br><br><br>
diff --git a/view/index.php b/view/index.php
new file mode 100644 (file)
index 0000000..2f9b0c9
--- /dev/null
@@ -0,0 +1,107 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+  <title><?php echo $this->title ?></title>
+  <link rel="icon" href="/favicon.ico" type="image/png">
+  <link href='/includes/style.css' rel='stylesheet' type='text/css'>
+  <script type='text/javascript' src='/includes/index.js'></script>
+  <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>
+  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+</head>
+
+<body onload="return typeof highlight == 'function' ? highlight() : true">
+  <div id="structure">
+    <div id="banner">
+      <a href="<?php echo $this->home_link ?>">
+      <img src="/images/dylansserver.png" alt="dylansserver"
+      border="0"></a>
+    </div>
+    <div id="content">
+      <div id='exhibit'>
+        <?php
+          foreach ($this->exhibits as $exhibit) {
+            echo $exhibit;
+          }
+        ?>
+      </div>
+      <ul id="portfolio">
+        <li>
+           <h3>my projects:</h3>
+        </li>
+        <?php
+          foreach ($this->projects as $project => $title) {
+              echo "<li><a class='tab' href='$title'>$title</a></li>";
+          }
+        ?>
+        <li>
+          <h3>things i've done for others:</h3>
+        </li>
+        <li><a href=
+        "http://activehamptons.com">activehamptons.com</a></li>
+        <li><a href=
+        "http://transfishing.com">transfishing.com</a></li>
+        <li>
+          <h3>something i've worked on:</h3>
+        </li>
+        <li><a href=
+        "http://tempositions.com">tempositions.com</a></li>
+        <li>
+          <h3>my repositories:</h3>
+        </li>
+        <li><a href=
+        "/git/">git://dylansserver.com</a></li>
+        <li>
+          <h3>some notes:</h3>
+        </li>
+        <li><a href=
+        "/notes/">here</a> [<a href="/notes/rss">rss</a>]</li>
+        <li>
+          <h3>my resume:</h3>
+        </li>
+        <li>[<a href=
+        "/resume">pdf</a>]</li>
+        <li>
+        </li>
+
+        <li>
+          <div id="contact_me"><h1><a href=
+          "mailto:dylan@psu.edu">dylan</a></h1><a href=
+          "mailto:dylan@psu.edu">@psu.edu</a>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <br>
+    <br>
+  </div>
+</body>
+</html>
+</html>
diff --git a/view/note.php b/view/note.php
new file mode 100644 (file)
index 0000000..367b334
--- /dev/null
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+  <title><?php echo $this->title; ?></title>
+  <link rel="icon" href="/favicon.ico" type="image/png">
+  <link href='/includes/style.css' rel='stylesheet' type='text/css'>
+  <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>
+  <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>
+</head>
+
+<body onload="return typeof highlight == 'function' ? highlight() : true">
+  <div id="structure">
+    <div id="banner">
+      <a href="<?php echo $this->home_link ?>">
+      <img src="/images/dylansserver.png" alt="dylansserver"
+      border="0"></a>
+    </div>
+
+    <div id="content">
+      <div id='notes'>
+        <div class='note'>
+            <h1><span class='date'>
+              <?php echo "$this->year_posted/$this->month_posted/$this->day_posted/" ?>
+            </span><?php echo $this->title ?></h1>
+            <?php echo $this->text ?>
+        </div>
+        <br><br><br><br>
+        <div id='navigation'>
+          <?php if ($this->comments_enabled) {
+            $this->display_comments();
+            $this->display_comment_form();
+          } ?>
+          <h1>
+          <?php if (!$this->comments_enabled) $this->display_comment_link(); ?>
+          <a href="/notes/">back to notes/</a>
+          </h1>
+        </div>
+        <div id="contact_me"><h1><a href=
+        "mailto:dylan@psu.edu">dylan</a></h1><a href=
+        "mailto:dylan@psu.edu">@psu.edu</a>
+        </div>
+      </div>
+    <br>
+    <br>
+  </div>
+</body>
+</html>
diff --git a/view/page.php b/view/page.php
new file mode 100644 (file)
index 0000000..72d5edd
--- /dev/null
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+  <title><?php echo $this->title; ?></title>
+  <link rel="icon" href="/favicon.ico" type="image/png">
+  <link href='/includes/style.css' rel='stylesheet' type='text/css'>
+  <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>
+  <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>
+</head>
+
+<body onload="return typeof highlight == 'function' ? highlight() : true">
+  <div id="structure">
+    <div id="banner">
+      <a href="<?php echo $this->home_link ?>">
+      <img src="/images/dylansserver.png" alt="dylansserver"
+      border="0"></a>
+    </div>
+
+    <div id="content">
+      <div id="notes">
+        <div id="notes">
+        <?php
+          foreach ($this->notes as $note) {
+            echo "<div class='note'>";
+            echo "<h1>";
+            echo "<span class='date'>";
+            echo $note['year_posted'] . "/";
+            echo $note['month_posted'] . "/";
+            echo $note['day_posted'] . "/";
+            echo "</span>";
+            echo "<a href='" . $note['url'] . "'>";
+            echo $note['title'];
+            echo "</a>";
+            echo "</h1>";
+            echo $note['text'];
+          }
+        ?>
+      </div>
+    <div id='navigation'>
+    <h1>
+    <?php
+    if($this->page > 1){
+      $previous_page = $this->page - 1;
+      echo "<a href='/notes/page/$previous_page'>prev</a>";
+    }
+    if($this->page < $this->number_of_pages) {
+    $forward_page = $this->page + 1;
+    echo " <a href='/notes/page/$forward_page'>next</a>";
+    } ?>
+    </h1>
+    </div>
+      <div id="contact_me"><h1><a href=
+      "mailto:dylan@psu.edu">dylan</a></h1><a href=
+      "mailto:dylan@psu.edu">@psu.edu</a>
+      </div>
+    </div>
+    <br>
+    <br>
+  </div>
+</body>
+</html>
diff --git a/view/rss.php b/view/rss.php
new file mode 100644 (file)
index 0000000..7d0c60c
--- /dev/null
@@ -0,0 +1,18 @@
+<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" />
+    <?php
+      foreach ($this->items as $item) {
+        echo "<item>";
+        echo "  <title>" . $item['title'] . "</title>";
+        echo "  <link>" . $item['url'] . "</link>";
+        echo "  <guid>" . $item['url'] . "</guid>";
+        echo "  <description>" . $item['description'] . "</description>";
+        echo "</item>";
+      }
+    ?>
+  </channel>
+</rss>