Comments now displayed, and captcha functioning

There is still no ability to submit a comment, and everything looks very ugly.

index.php is getting uncomfortably big...

diff --git a/.htaccess b/.htaccess
index f2421fc..2d0df8f 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,8 @@ ErrorDocument 404 /404.php
 RewriteEngine on
 
 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

diff --git a/captcha.php b/captcha.php
new file mode 100644 (file)
index 0000000..f7335b6
--- /dev/null
+++ b/captcha.php
@@ -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/recaptchalib.php b/includes/recaptchalib.php
new file mode 100644 (file)
index 0000000..32c4f4d
--- /dev/null
+++ b/includes/recaptchalib.php
@@ -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]);
+
+}
+
+
+?>

diff --git a/includes/style.css b/includes/style.css
index 1af153d..f4e7094 100644 (file)
--- a/includes/style.css
+++ b/includes/style.css
@@ -139,11 +139,19 @@ li {
        margin-top:20px;
 }
 
-#notes h2, #note h2 {
+#notes h2 {
        margin-bottom:10px;
        font-family:sans-serif;
 }
 
+#note h2 {
+       font-family:sans-serif;
+}
+
+#comment_link {
+       font-size:80%;
+}
+
 .note {
        margin-bottom:40px;
 }
@@ -159,3 +167,15 @@ pre {
 #navigation {
        text-align:right;
 }
+
+#comments {
+       border-right:3px solid black;
+       padding-right:15px;
+}
+
+#comment {
+}
+
+#recaptcha_widget_div {
+       float:right;
+}

diff --git a/index.php b/index.php
index 700f69a..16a01ec 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,19 +3,23 @@
 abstract class cms {
   private $config_file = '/etc/dylanstestserver.ini';
   protected $db;
+  protected $recaptcha_publickey;
+  protected $recaptcha_privatekey;
 
   public function __construct() {
-    $config = parse_ini_file($this->config_file);
+    $config = parse_ini_file($this->config_file, true);
     $this->db = new mysqli(
-         $config['domain'],
-         $config['user'],
-         $config['password'],
-      $config['database']);
+         $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'];
        ob_start();
   }
 
@@ -62,8 +66,7 @@ abstract class cms {
                                                                $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\">";
+       if (cms::determine_type() == "index") { $scripts = "<script type=\"text/javascript\" src=\"/includes/all.js\">";
          $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&amp;ucn_task=conformance#";
        }
   echo <<<END_OF_HEAD
@@ -121,6 +124,10 @@ END_OF_CLOSE;
 
 }
 
+class blank_page extends cms {
+
+}
+
 class index extends cms {
        public function display() {
                $this->display_head();
@@ -287,9 +294,19 @@ class page extends cms {
 
 class note extends cms {
 
-  public function __construct() {
+  private $id;
+  private $comments_enabled = false;
+  private $url;
+
+  public function __construct($comments_enabled = false) {
     parent::__construct();
        $this->check_exists();
+       $this->comments_enabled = $comments_enabled;
+    $url = htmlspecialchars($_SERVER['REQUEST_URI']);
+       if (isset($_GET['verify'])) {
+      $url = substr($url, 0, (strlen($url)-7));
+       }
+       $this->url = $url;
   }
 
   private function check_exists() {
@@ -303,11 +320,36 @@ class note extends cms {
 
   public function display() {
        $this->display_head();
-    $sql = "SELECT title, date_posted, text
+       $this->display_note();
+       if (isset($_GET['verify'])) {
+         $this->verify();
+       }
+       if ($this->comments_enabled) {
+         $this->display_comments();  // but where are they?
+         $this->display_comment_form();
+       }
+       $this->write_navigation();
+    $this->display_close();
+  }
+
+  private function verify() {
+    require_once('includes/recaptchalib.php');
+    $resp = recaptcha_check_answer ($this->recaptcha_privatekey,
+                                                                   $_SERVER["REMOTE_ADDR"],
+                                                                   $_POST["recaptcha_challenge_field"],
+                                                                   $_POST["recaptcha_response_field"]);
+    if (!$resp->is_valid) {
+      echo "The reCAPTCHA wasn't entered correctly. Go back and try it again." . "(reCAPTCHA said: " . $resp->error . ")";
+    }
+  }
+
+  private function display_note() {
+    $sql = "SELECT title, date_posted, text, id
                          FROM notes WHERE url = ?";
        $result = $this->query($sql, "s",
                                                          $_GET['note']);
        $entry = $result[0];
+       $this->id = $entry["id"]; // This is needed for display_comments()
        $title = $entry["title"];
        $date_posted =  explode("-", $entry["date_posted"]);
        $year_posted = $date_posted[0];
@@ -316,9 +358,10 @@ class note extends cms {
        $day_posted = $datetime_posted[0];
        echo "<div id=\"note\">";
     echo "<h2><span style=\"color:grey;\">$year_posted/$month_posted/$day_posted/</span>$title</h2>";
+       if (!$this->comments_enabled) {
+         $this->display_comment_link();
+       }
        echo $entry['text'];
-       $this->write_navigation();
-    $this->display_close();
   }
 
   private function write_navigation() {
@@ -329,6 +372,41 @@ class note extends cms {
     echo "</h2>";
     echo "</div>";
   }
+
+  private function display_comment_link() {
+    $url = $this->url . 'comments/';
+    echo "<a id=\"comment_link\" href=\"$url\">comments</a>";
+  }
+
+  private function display_comments() {
+    echo "<div id=\"comments\">";
+       $sql= "SELECT date_posted, author, email, text
+                FROM comments WHERE note = ?";
+    $result = $this->query($sql, "d", $this->id);
+       foreach ($result as $row => $entry) {
+         $date_posted = $entry['date_posted'];
+         $author = $entry['author'];
+         $email = $entry['email'];
+         $text = htmlspecialchars($entry['text']);
+         echo <<<END_OF_COMMENT
+         <h3><a href="mailto:$email">$author</a></h3>
+         $text
+         <br>
+         <br>
+END_OF_COMMENT;
+       }
+       echo "</div>";
+  }
+
+  private function display_comment_form() {
+       // Trailing slash is necessary for reloads to work
+    $url = $this->url . "verify/";
+       echo "<form id=\"comment\" method=\"post\" action=\"$url\">";
+    require_once('includes/recaptchalib.php');
+       echo recaptcha_get_html($this->recaptcha_publickey);
+       echo "<input type=\"submit\">";
+       echo "</form>";
+  }
 }
 
 
@@ -437,7 +515,11 @@ switch (cms::determine_type()) {
        $project->display();
        break;
   case "note":
-    $note = new note;
+    if (isset($_GET['comments'])) {
+      $note = new note($comments_enabled = true);
+       } else {
+      $note = new note;
+       }
        $note->display();
        break;
   case "page":