Merge branch 'dev' into live
authorDylan Lloyd <dylan@psu.edu>
Fri, 25 Mar 2011 02:42:49 +0000 (22:42 -0400)
committerDylan Lloyd <dylan@psu.edu>
Fri, 25 Mar 2011 02:42:49 +0000 (22:42 -0400)
12 files changed:
.htaccess
404.php
captcha.php [new file with mode: 0644]
includes/ajax.js [new file with mode: 0644]
includes/all.js
includes/recaptchalib.php [new file with mode: 0644]
includes/style.css
includes/tabs.js
index.php
publish_notes.py [new file with mode: 0755]
publish_projects.py [new file with mode: 0755]
sample.ini [new file with mode: 0644]

index fe7ef14..d06e66b 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1,22 @@
 ErrorDocument 404 /404.php
+
+
+RewriteEngine on
+
+RewriteRule ^captcha/?$ /index.php [L]
+
+RewriteRule ^note/([^/\.]+)?/?$ /index.php?note=$1 [L]
+RewriteRule ^note/([^/\.]+)?/comments/?$ /index.php?comments=true&note=$1 [L]
+RewriteRule ^note/([^/\.]+)?/(comments/)?verify/?$ /index.php?comments=true&verify=true&note=$1 [L]
+
+RewriteRule ^notes/?$ notes/page/1
+RewriteRule ^notes/page/?$ notes/page/1
+RewriteRule ^notes/page/([0-9]+)/?$ /index.php?page=$1 [L]
+
+RewriteRule ^notes/([0-9]{4})/?$ /index.php?year=$1 [L]
+RewriteRule ^notes/([0-9]{4})/([0-9]{2})/?$ /index.php?year=$1&month=$2 [L]
+RewriteRule ^notes/([0-9]{4})/([0-9]{2})/([0-9]{2})/?$ /index.php?year=$1&month=$2&day=$3 [L]
+
+## This needs to be last as to avoid catching /notes/ etc.
+RewriteRule ^([^/\.]+)/?$ /index.php?project=$1 [L]
+
diff --git a/404.php b/404.php
index 157d02d..1b17517 100644 (file)
--- a/404.php
+++ b/404.php
@@ -4,6 +4,7 @@
 <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>404: not found</title>
 </head>
diff --git a/captcha.php b/captcha.php
new file mode 100644 (file)
index 0000000..f7335b6
--- /dev/null
@@ -0,0 +1,19 @@
+<?php
+
+require_once('index.php');
+
+$page = new blank_page();
+
+require_once('includes/recaptchalib.php');
+$resp = recaptcha_check_answer ($page->recaptcha_privatekey,
+                                                               $_SERVER["REMOTE_ADDR"],
+                                                               $_POST["recaptcha_challenge_field"],
+                                                               $_POST["recaptcha_response_field"]);
+if (!$resp->is_valid) {
+  die ("The reCAPTCHA wasn't entered correctly. Go back and try it again." .
+  "(reCAPTCHA said: " . $resp->error . ")");
+} else {
+  echo "success!";
+}
+
+?>
diff --git a/includes/ajax.js b/includes/ajax.js
new file mode 100644 (file)
index 0000000..6e94941
--- /dev/null
@@ -0,0 +1,56 @@
+$(document).ready(function() {
+  $('#recaptcha_widget').show();
+  $('.submit').click(function() {
+    $('#not_human').hide();
+    $('#blank_comment').hide();
+    $('#comment_text').css('border', '1px solid grey')
+    $('#recaptcha_response_field').css('border', '1px solid grey')
+    if ($('#comment_text').val() != '') {
+        var challenge = Recaptcha.get_challenge();
+        var response = Recaptcha.get_response();
+     var captcha_data = { "challenge" : challenge,
+                                            "response" : response};
+     $.ajax({  
+       type: "GET",  
+       url: "/captcha",  
+       data: captcha_data,  
+       success: function(data) {  
+            if (data.split('\n')[0] == 'true') {
+              var name = $("#comment_name").val();
+              var text = $("#comment_text").val();
+                  if (name == '') { name = "anon" }
+           var comment_data = { "captcha" : "passed",
+                                       "name" : name,
+                                "text" : text};
+                  $.ajax({
+                    type: "POST",
+                        // the url may need to be adjusted for
+                        // trailing slashes
+                        url: "verify",
+                        data: comment_data,
+                        success: function() {
+                          var new_post = "<h3>" + name + "</h3>"
+                                                            + text + "<br><br>";
+                          $('#comments').prepend(new_post);
+                          $('#comment').hide();
+                        }
+                  });
+                } else {
+                  $('#not_human').show();
+           $('#recaptcha_response_field').css('border', '2px solid red')
+                }
+       },
+          error: function() {
+            console.log('error');
+          },  
+          complete: function() {
+                   Recaptcha.reload();
+          }
+     }); 
+       } else {
+         $('#blank_comment').show();
+      $('#comment_text').css('border', '2px solid red')
+       }
+       return false;
+  });
+});
index a910e5c..f29299e 100644 (file)
@@ -248,11 +248,16 @@ b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
 (function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","left"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);var i={};i[g]=(f==
 "show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
 ;$(document).ready(function() {
-       $(".exhibit").hide();
-       var divs = document.getElementsByTagName('div');
        if(document.location.hash){
                $(document.location.hash + '_').show();
        }
+       $("ul#portfolio li a.tab").each(function(){
+               if (document.location.href.indexOf($(this).attr("href")) == 0) {
+                       $("#" + this.attr("href")).show("slide", 600);
+               }
+               $(this).attr("href", "#" + $(this).attr("href"));
+       });
+       var divs = document.getElementsByTagName('div');
        var i = 0;
        $("ul#portfolio li a.tab").click(function() {
                i++;
@@ -269,5 +274,4 @@ b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
                        divs[i].className += (" shownDiv");
                }
        });
-
 });
diff --git a/includes/recaptchalib.php b/includes/recaptchalib.php
new file mode 100644 (file)
index 0000000..32c4f4d
--- /dev/null
@@ -0,0 +1,277 @@
+<?php
+/*
+ * This is a PHP library that handles calling reCAPTCHA.
+ *    - Documentation and latest version
+ *          http://recaptcha.net/plugins/php/
+ *    - Get a reCAPTCHA API Key
+ *          https://www.google.com/recaptcha/admin/create
+ *    - Discussion group
+ *          http://groups.google.com/group/recaptcha
+ *
+ * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * AUTHORS:
+ *   Mike Crawford
+ *   Ben Maurer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * The reCAPTCHA server URL's
+ */
+define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
+define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
+define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
+
+/**
+ * Encodes the given data into a query string format
+ * @param $data - array of string elements to be encoded
+ * @return string - encoded request
+ */
+function _recaptcha_qsencode ($data) {
+        $req = "";
+        foreach ( $data as $key => $value )
+                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+
+        // Cut the last '&'
+        $req=substr($req,0,strlen($req)-1);
+        return $req;
+}
+
+
+
+/**
+ * Submits an HTTP POST to a reCAPTCHA server
+ * @param string $host
+ * @param string $path
+ * @param array $data
+ * @param int port
+ * @return array response
+ */
+function _recaptcha_http_post($host, $path, $data, $port = 80) {
+
+        $req = _recaptcha_qsencode ($data);
+
+        $http_request  = "POST $path HTTP/1.0\r\n";
+        $http_request .= "Host: $host\r\n";
+        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
+        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+        $http_request .= "\r\n";
+        $http_request .= $req;
+
+        $response = '';
+        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+                die ('Could not open socket');
+        }
+
+        fwrite($fs, $http_request);
+
+        while ( !feof($fs) )
+                $response .= fgets($fs, 1160); // One TCP-IP packet
+        fclose($fs);
+        $response = explode("\r\n\r\n", $response, 2);
+
+        return $response;
+}
+
+
+
+/**
+ * Gets the challenge HTML (javascript and non-javascript version).
+ * This is called from the browser, and the resulting reCAPTCHA HTML widget
+ * is embedded within the HTML form it was called from.
+ * @param string $pubkey A public key for reCAPTCHA
+ * @param string $error The error given by reCAPTCHA (optional, default is null)
+ * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
+
+ * @return string - The HTML to be embedded in the user's form.
+ */
+function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+{
+       if ($pubkey == null || $pubkey == '') {
+               die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+       }
+       
+       if ($use_ssl) {
+                $server = RECAPTCHA_API_SECURE_SERVER;
+        } else {
+                $server = RECAPTCHA_API_SERVER;
+        }
+
+        $errorpart = "";
+        if ($error) {
+           $errorpart = "&amp;error=" . $error;
+        }
+        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+
+       <noscript>
+               <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+               <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+               <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+       </noscript>';
+}
+
+
+
+
+/**
+ * A ReCaptchaResponse is returned from recaptcha_check_answer()
+ */
+class ReCaptchaResponse {
+        var $is_valid;
+        var $error;
+}
+
+
+/**
+  * Calls an HTTP POST function to verify if the user's guess was correct
+  * @param string $privkey
+  * @param string $remoteip
+  * @param string $challenge
+  * @param string $response
+  * @param array $extra_params an array of extra variables to post to the server
+  * @return ReCaptchaResponse
+  */
+function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+{
+       if ($privkey == null || $privkey == '') {
+               die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+       }
+
+       if ($remoteip == null || $remoteip == '') {
+               die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+       }
+
+       
+       
+        //discard spam submissions
+        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+                $recaptcha_response = new ReCaptchaResponse();
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = 'incorrect-captcha-sol';
+                return $recaptcha_response;
+        }
+
+        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+                                          array (
+                                                 'privatekey' => $privkey,
+                                                 'remoteip' => $remoteip,
+                                                 'challenge' => $challenge,
+                                                 'response' => $response
+                                                 ) + $extra_params
+                                          );
+
+        $answers = explode ("\n", $response [1]);
+        $recaptcha_response = new ReCaptchaResponse();
+
+        if (trim ($answers [0]) == 'true') {
+                $recaptcha_response->is_valid = true;
+        }
+        else {
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = $answers [1];
+        }
+        return $recaptcha_response;
+
+}
+
+/**
+ * gets a URL where the user can sign up for reCAPTCHA. If your application
+ * has a configuration page where you enter a key, you should provide a link
+ * using this function.
+ * @param string $domain The domain where the page is hosted
+ * @param string $appname The name of your application
+ */
+function recaptcha_get_signup_url ($domain = null, $appname = null) {
+       return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+}
+
+function _recaptcha_aes_pad($val) {
+       $block_size = 16;
+       $numpad = $block_size - (strlen ($val) % $block_size);
+       return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+}
+
+/* Mailhide related code */
+
+function _recaptcha_aes_encrypt($val,$ky) {
+       if (! function_exists ("mcrypt_encrypt")) {
+               die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+       }
+       $mode=MCRYPT_MODE_CBC;   
+       $enc=MCRYPT_RIJNDAEL_128;
+       $val=_recaptcha_aes_pad($val);
+       return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+}
+
+
+function _recaptcha_mailhide_urlbase64 ($x) {
+       return strtr(base64_encode ($x), '+/', '-_');
+}
+
+/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
+function recaptcha_mailhide_url($pubkey, $privkey, $email) {
+       if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
+               die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+                    "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+       }
+       
+
+       $ky = pack('H*', $privkey);
+       $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+       
+       return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+}
+
+/**
+ * gets the parts of the email to expose to the user.
+ * eg, given johndoe@example,com return ["john", "example.com"].
+ * the email is then displayed as john...@example.com
+ */
+function _recaptcha_mailhide_email_parts ($email) {
+       $arr = preg_split("/@/", $email );
+
+       if (strlen ($arr[0]) <= 4) {
+               $arr[0] = substr ($arr[0], 0, 1);
+       } else if (strlen ($arr[0]) <= 6) {
+               $arr[0] = substr ($arr[0], 0, 3);
+       } else {
+               $arr[0] = substr ($arr[0], 0, 4);
+       }
+       return $arr;
+}
+
+/**
+ * Gets html to display an email address given a public an private key.
+ * to get a key, go to:
+ *
+ * http://www.google.com/recaptcha/mailhide/apikey
+ */
+function recaptcha_mailhide_html($pubkey, $privkey, $email) {
+       $emailparts = _recaptcha_mailhide_email_parts ($email);
+       $url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+       
+       return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
+               "' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+
+}
+
+
+?>
index 084bec1..18878f5 100644 (file)
@@ -5,6 +5,7 @@
 
 h3 {
        margin-top:15px;
+       font-family:sans-serif;
 }
 
 a {
@@ -36,12 +37,12 @@ li {
        padding:5px;
        padding-left:20px;
        padding-bottom:25px;
+       text-align:right;
 }
 
 #portfolio {
        float:right;
        width:350px;
-       margin-right:17px;
 }
 
 #portfolio li{
@@ -50,6 +51,7 @@ li {
 
 #exhibit {
        float:right;
+       margin-left:17px;
 }
 
 #exhibit h1 {
@@ -61,6 +63,8 @@ li {
        min-height:600px;
        border:1px solid black;
        padding:10px;
+       display:none;
+       text-align:left;
 }
 
 .shownDiv {
@@ -69,6 +73,9 @@ li {
 
 #contact_me {
        margin-top:100px;
+       font-family:sans-serif;
+       text-align:right;
+       clear:both;
 }
 
 /* reprap */
@@ -95,13 +102,8 @@ li {
        font:1.4em "lucida console";
 }
 
-/* readoo */
-#readoo_title {
-       font:1.6em arial;
-}
-
-#readoo_entry {
-       font:1.6em arial;
+#peepshow_entry {
+       font:1.4em "lucida console";
 }
 
 /* drawcss */
@@ -130,3 +132,105 @@ li {
 #i_like_pandora_entry {
        font:1.4em "lucida console";
 }
+
+/* notes */
+#notes, #note {
+       text-align:right;
+       margin-top:20px;
+}
+
+#notes h2 {
+       margin-bottom:10px;
+       font-family:sans-serif;
+}
+
+#note h2 {
+       font-family:sans-serif;
+}
+
+#comment_link {
+       font-size:80%;
+}
+
+.note {
+       margin-bottom:40px;
+}
+
+p {
+       margin-top:15px;
+}
+
+pre {
+       margin-top:20px;
+       margin-bottom:20px;
+}
+
+#navigation {
+       text-align:right;
+       font-family:sans-serif;
+}
+
+#comments {
+       border-right:1px solid black;
+       padding-right:15px;
+}
+
+.comment {
+       margin-bottom:30px;
+}
+
+#comment {
+       padding-right:15px;
+       border-right:1px solid black;
+       margin-top:15px;
+       text-align:right;
+}
+
+#comment input {
+       border:1px solid grey;
+}
+
+#comment textarea {
+       border:1px solid grey;
+}
+
+#comment .submit {
+       background:#FFF;
+       border:1px solid white;
+       color:blue;
+       cursor:pointer;
+       font-size:120%;
+       font-weight:bold;
+}
+
+#recaptcha_widget {
+       position:relative;
+}
+
+#recaptcha_image {
+       position:absolute;
+       top:0px;
+       right:0px;
+}
+
+#recaptcha_widget {
+       display:none;
+}
+
+#not_human {
+    display:none;
+    font-weight:bold;
+    font-family:sans-serif;
+    color:red;
+    margin-top:15px;
+    margin-bottom:15px;
+}
+
+#blank_comment {
+    display:none;
+    font-weight:bold;
+    font-family:sans-serif;
+    color:red;
+    margin-top:15px;
+    margin-bottom:15px;
+}
index 79d76bb..346b76b 100644 (file)
@@ -1,9 +1,14 @@
 $(document).ready(function() {
-       $(".exhibit").hide();
-       var divs = document.getElementsByTagName('div');
        if(document.location.hash){
                $(document.location.hash + '_').show();
        }
+       $("ul#portfolio li a.tab").each(function(){
+               if (document.location.href.indexOf($(this).attr("href")) == 0) {
+                       $("#" + this.attr("href")).show("slide", 600);
+               }
+               $(this).attr("href", "#" + $(this).attr("href"));
+       });
+       var divs = document.getElementsByTagName('div');
        var i = 0;
        $("ul#portfolio li a.tab").click(function() {
                i++;
@@ -20,5 +25,4 @@ $(document).ready(function() {
                        divs[i].className += (" shownDiv");
                }
        });
-
 });
index 965d933..424f850 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,3 +1,88 @@
+<?php
+
+abstract class cms {
+
+  private $config_file = '/etc/dylanstestserver.ini';
+  protected $db;
+  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'];
+    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['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 = "dylanstestserver",
+                                  $home_link = "/") {
+    $scripts = "";
+    $stylesheets = "<link href='/includes/style.css' rel='stylesheet' type='text/css'>";
+    if (cms::determine_type() == "index") {
+      $scripts = "<script type='text/javascript' src='/includes/all.js'></script>"; 
+      $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&amp;ucn_task=conformance#";
+    } else if ($this->determine_type() == 'note') {
+      $scripts = "<script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>";
+      $scripts .= "<script type='text/javascript' src='/includes/jquery-core.js'></script>";
+      $scripts .= "<script type='text/javascript' src='/includes/jquery-all-components.js'></script>";
+      $scripts .= "<script type='text/javascript' src='/includes/ajax.js'></script>";
+    }
+    echo <<<END_OF_HEAD
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 
   "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
   <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 
-  <title>dylanstestserver</title>
-  <link href="includes/style.css" rel="stylesheet" type="text/css">
+  <title>$this->title</title>
   <link rel="icon" href="favicon.ico" type="image/png">
-  <script type="text/javascript" src="includes/all.js">
-</script>
+  $stylesheets
+  $scripts
 </head>
 
 <body>
   <div id="structure">
     <div id="banner">
-      <a href=
-      "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&amp;ucn_task=conformance#">
-      <img src="images/dylanstestserver.png" alt="dylanstestserver"
+      <a href="$this->home_link">
+      <img src="/images/dylanstestserver.png" alt="dylanstestserver"
       border="0"></a>
     </div>
 
     <div id="content">
-      <div id="exhibit">
-        <div class="exhibit" id="repthis_">
-          <span id="reprap_entry">3D printing is a form of additive
-          manufacturing technology where a three dimensional object
-          is created by successive layers of material. [1]:<a href=
-          "http://repthis.info/">http://en.wikipedia.org/wiki/3D_printing</a><br>
-
-          <br>
-          <a href="http://reprap.org">reprap</a> is a <a href=
-          "http://en.wikipedia.org/wiki/Free_software">free</a>
-          desktop 3D printer capable of printing plastic
-          objects.<br>
-          <br>
-          <a href="http://repthis.info">repthis.info</a> is the
-          account of a friend and I learning to build our own.<br>
-          <br></span>
-        </div>
-
-        <div class="exhibit" id="youtube_backup_">
-          <h1 id="youtube_backup_title"><a href=
-          "https://github.com/nospampleasemam/youtube_backup">youtube_backup</a></h1><span id="youtube_backup_entry">backs
-          up all the <a href="http://youtube.com">youtube</a>
-          videos in a users favorites list.<br>
-          <br>
-          this is my fork of the <a href=
-          "https://github.com/hagnas/youtube_backup">original
-          youtube_backup</a> which adds asynchronous alerts after
-          successful downloads.<br>
-          <br>
-          it's written in <a href=
-          "http://www.python.org/">python</a>.</span>
-        </div>
-
-        <div class="exhibit" id="i_like_pandora_">
-          <h1 id="i_like_pandora_title"><a href=
-          "https://github.com/nospampleasemam/i_like_pandora">i_like_pandora</a></h1><span id="i_like_pandora_entry">searches
-          <a href="http://youtube.com">youtube</a> for what you
-          like on <a href="http://pandora.com">pandora</a>.<br>
-          <br>
-          then it downloads the first video.<br>
-          <br>
-          it's working, but i'm still making it better.<br>
-          <br>
-          <br>
-          the code is free (as in freedom), <a href=
-          "http://github.com/nospampleasemam/i_like_pandora">here</a>.<br>
-          </span>
-        </div>
+END_OF_HEAD;
+  }
 
-        <div class="exhibit" id="peepshow_">
-          <h3 id="peepshow_title_1"><a href=
-          "foxy-addons/peepshow/peepshow.xpi">foxy-addons/</a></h3>
-
-          <h1 id="peepshow_title_2"><a href=
-          "foxy-addons/peepshow/peepshow.xpi">peepshow</a></h1><span id="peepshow_entry">a
-          <a href=
-          "http://www.mozilla.com/en-US/products/download.html">firefox</a>
-          addon, to load linked images inline (like on <a href=
-          "http://reddit.com/r/pics">reddit</a>).<br>
-          <br>
-          here's the <a href=
-          "http://github.com/nospampleasemam/peepshow/">repo</a>
-          for the source code.</span>
-        </div>
-
-        <div class="exhibit" id="drawcss_">
-          <h1 id="drawcss_title"><a href=
-          "drawcss">drawcss</a></h1><span id=
-          "drawcss_entry">writing markup for website wireframes
-          always seemed silly.<br>
-          <br>
-          this is a tool to draw them (it's not done).<br>
-          <br>
-          <a href="#show" id="showdivs" name="showdivs">check
-          out</a> the invisible divs this page is built on.<br>
-          <br>
-          then get <a href=
-          "http://github.com/nospampleasemam/drawcss">the
-          code</a>.</span>
-        </div>
-
-        <div class="exhibit" id="readoo_">
-          <h1 id="readoo_title"><a href=
-          "http://github.com/nospampleasemam/readoo">readoo</a></h1><span id="readoo_entry">helps
-          you find search keywords to target.<br>
-          <br>
-          it reads your IIS logs, and finds successful keywords
-          worth focusing on.<br>
-          <br>
-          it's not done yet! here's the <a href=
-          "http://github.com/nospampleasemam/readoo">source
-          code</a>.</span>
-        </div>
+  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;
+  }
 
-      <ul id="portfolio" style="text-align:right">
-        <li>
-          <h3>my projects:</h3>
-        </li>
-
-        <li><a class="tab" href="#repthis">repthis.info</a></li>
-
-        <li><a class="tab" href=
-        "#youtube_backup">youtube_backup</a></li>
-
-        <li><a class="tab" href=
-        "#i_like_pandora">i_like_pandora</a></li>
+  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();
+    }
 
-        <li><a class="tab" href=
-        "#peepshow">foxy-addons/peepshow</a></li>
+}
 
-        <li><a class="tab" href="#drawcss">drawcss</a></li>
 
-        <li><a class="tab" href="#readoo">readoo</a></li>
+class index extends cms {
 
-        <li>
+  public function display() {
+    $this->display_head();
+    $this->display_exhibits();
+    echo "<ul id='portfolio' style='text-align:right'>";
+    $this->list_projects();
+    echo <<<OTHER_PROJECTS
           <h3>things i've done for others:</h3>
         </li>
 
         "http://tempositions.com">tempositions.com</a></li>
 
         <li>
-          <h3>my github repo:</h3>
+          <h3>my repositories:</h3>
         </li>
 
         <li><a href=
-        "http://github.com/nospampleasemam">github@github.com:nospampleasemam</a></li>
+        "git">git://dylanstestserver.com</a></li>
 
         <li>
-          <h3>my repo:</h3>
+          <h3>some notes:</h3>
         </li>
 
         <li><a href=
-        "git">git://dylanstestserver.com</a></li>
+        "/notes/">here</a></li>
 
         <li>
-          <h1 id="contact_me"><a href=
-          "mailto:dylan@psu.edu">dylan</a></h1><a href=
-          "mailto:dylan@psu.edu">@psu.edu</a>
         </li>
-      </ul>
-    </div><br>
+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";
+    $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";
+    $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();
+  }
+
+  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];
+      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>";
+    }
+    echo "</div>";
+    $this->write_navigation();
+    $this->display_close();
+  }
+
+  private function write_navigation() {
+    echo "<div id='navigation'>";
+    echo "<h2>";
+    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 "</h2>";
+    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() {
+    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',
+                          htmlspecialchars($_POST['name']),
+                          htmlspecialchars($_POST['text']),
+                        $this->id);
+      $stmt->execute();
+    }
+  }
+
+  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>
+    $this->text
+    </div>
+END_OF_NOTE;
+  }
+
+  private function write_navigation() {
+    echo <<<END_OF_NAVIGATION
     <br>
-  </div>
-</body>
-</html>
+    <div id='navigation'>
+    <h2>
+END_OF_NAVIGATION;
+    if (!$this->comments_enabled) {
+      $this->display_comment_link();
+    }
+    echo <<<END_OF_NAVIGATION
+    <a href="/notes/">back to notes</a>/
+    </h2>
+    </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>$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"> 
+        <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>
+        <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>
+      </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 "<h2><span style='color:grey;'>";
+        echo "$year_posted/$month_posted/$day_posted/";
+        echo "</span><a href='$url'>$title</a></h2>";
+        echo $entry['text'];
+        echo "</div>";
+      }
+      echo "</div>";
+      $this->write_navigation();
+    } else {
+      echo "<br>";
+      echo "<h2 style='font-family:sans-serif;'>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'>";
+    echo "<h2>";
+    // fill me in!
+    echo "</h2>";
+    echo "</div>";
+  }
+
+}
+
+
+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 'archive':
+    $archive = new archive;
+    $archive->display();
+    break;
+  case "captcha":
+    $captcha = new captcha;
+    $captcha->display();
+    break;
+}
+
+?>
diff --git a/publish_notes.py b/publish_notes.py
new file mode 100755 (executable)
index 0000000..331030c
--- /dev/null
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+
+NOTES_DIRECTORY = '/home/dylan/docs/notes'
+
+import os
+import time
+import MySQLdb as db
+import ConfigParser
+
+config = ConfigParser.RawConfigParser()
+config.read('/etc/dylanstestserver.ini')
+domain = config.get('database', 'domain')
+user = config.get('database', 'user')
+password = config.get('database', 'password').replace('"', '')
+database = config.get('database', 'database')
+cursor = db.connect(domain, user, password, database).cursor()
+
+notes = os.listdir(NOTES_DIRECTORY)
+
+sql = "SELECT title FROM notes"
+cursor.execute(sql)
+results = cursor.fetchall()
+existing_titles = []
+for row in results:
+    existing_titles.append(row[0])
+
+for note in notes:
+    if note[:1] == '.': continue
+    if note == 'index.php' or note == 'notes.php': continue
+    url = note[:note.index('.')]
+    f = open(os.path.join(NOTES_DIRECTORY, note))
+    title = str(f.readline()[:-1])
+    date_posted = time.strptime(str(f.readline()[:-1]), "%Y/%m/%d %I:%M%p")
+    text = ''.join(f.readlines()) #converts list to single string
+    if title in existing_titles: continue
+    sql = "INSERT INTO notes (date_posted, url, title, text)\
+             VALUES(\"%s\", \"%s\", \"%s\", \"%s\")"\
+             % (time.strftime("%Y/%m/%d %I:%M:00", date_posted), url, title, db.escape_string(text))
+
+    #print sql
+    cursor.execute(sql)
diff --git a/publish_projects.py b/publish_projects.py
new file mode 100755 (executable)
index 0000000..14a5772
--- /dev/null
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+
+PROJECTS_DIRECTORY = '/home/dylan/docs/projects'
+
+import os
+import time
+import MySQLdb as db
+import ConfigParser
+
+config = ConfigParser.RawConfigParser()
+config.read('/etc/dylanstestserver.ini')
+domain = config.get('database', 'domain')
+user = config.get('database', 'user')
+password = config.get('database', 'password').replace('"', '')
+database = config.get('database', 'database')
+cursor = db.connect(domain, user, password, database).cursor()
+
+notes = os.listdir(PROJECTS_DIRECTORY)
+
+sql = "SELECT title FROM projects"
+cursor.execute(sql)
+results = cursor.fetchall()
+existing_titles = []
+for row in results:
+    existing_titles.append(row[0])
+
+for note in notes:
+    if (note[:1] == '.'): continue
+    title = note[:note.index('.')]
+    f = open(os.path.join(PROJECTS_DIRECTORY, note))
+    if title in existing_titles: continue
+    text = f.read()
+    cursor.execute("INSERT INTO projects (title, text)\
+                        VALUES (%s, %s)", (title, text))
diff --git a/sample.ini b/sample.ini
new file mode 100644 (file)
index 0000000..cb1b244
--- /dev/null
@@ -0,0 +1,17 @@
+# this file will be looked for at /etc/dylanstestserver.ini
+
+[database]
+domain = localhost
+user = dylanstestuser
+password = "dylanstestpassword"
+database = dylanstestserver
+
+[recaptcha]
+# sign up here:
+# https://www.google.com/recaptcha/admin/create
+publickey = <your 40 character recaptcha public key>
+privatekey = <your 40 character recaptcha private key>
+
+[site]
+default_title = dylanstestserver
+home_link = /