disinclined.org / git / dylansserver.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Got rid of console.log()s and improved formatting
[dylansserver.git] / index.php
diff --git a/index.php b/index.php
index a0c48f2..56b216a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -34,7 +34,10 @@ abstract class cms {
       return 'index';
        } else if (isset($_GET['project'])) {
       return 'project';
+       } else if (isset($_GET['challenge'])) {
+      return 'captcha';
        }
+
   }
 
   public function query() {
@@ -71,6 +74,9 @@ abstract class cms {
          $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&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"
@@ -355,23 +361,27 @@ class note extends cms {
   }
 
   private function verify() {
-    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;
-    } else {
+    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,
                                email, text, note)
                                VALUES(NOW(), ?, ?, ?, ?)");
          $stmt = $this->db->prepare($sql);
          // Checks are needed here (no blank text,
          // and a default author / email need to be set
+         // for no-javascript users.
          $stmt->bind_param('ssss',
-                                               htmlspecialchars($_POST['author']),
+                                               htmlspecialchars($_POST['name']),
                                                htmlspecialchars($_POST['email']),
                                                htmlspecialchars($_POST['text']),
                                                $this->id);
@@ -391,9 +401,6 @@ class note extends cms {
     <div id=\"navigation\">
     <h2>
 END_OF_NAVIGATION;
-    if ($this->failed_captcha) {
-      echo "<span style=\"color:red;border:1px solid black;padding:15px;\">sorry, reCAPTCHA said you're not human.</span><br><br><br>";
-       }
        if (!$this->comments_enabled) {
          $this->display_comment_link();
        }
@@ -443,7 +450,6 @@ END_OF_COMMENT;
     $publickey = $this->recaptcha_publickey;
     echo <<<END_CAPTCHA_STYLE
 <script type="text/javascript">
-function showRecaptcha(element) {
 Recaptcha.create("$publickey",
    "recaptcha_div", 
    {
@@ -451,25 +457,22 @@ Recaptcha.create("$publickey",
      custom_theme_widget: 'recaptcha_widget',
      callback: Recaptcha.focus_response_field
    });
-}
 </script>
 END_CAPTCHA_STYLE;
     require_once('includes/recaptchalib.php');
-       // Trailing slash is necessary for reloads to work
     $url = $this->url . "verify";
-       echo "<form method=\"post\" action=\"$url\">";
-       echo  <<<END_OF_FORM
+       echo "<form id=\"comment_form\"  method=\"post\" action=\"$url\">";
+       echo <<<END_OF_FORM
 <div id="comment">
-<input type="button" value="comment" onclick="showRecaptcha('recaptcha_div');"></input>
 
 <div id="recaptcha_div">
 <br>
 <h3>comment:</h3>
-<textarea rows="10" cols="70" name=text></textarea>
+<textarea rows="10" cols="70" name="text" id="comment_text"></textarea>
 <h3>name:</h3>
-<input type=text name=author>
+<input type=text name="name" id="comment_name">
 <h3>email:</h3>
-<input type=text name=email><br>
+<input type=text name="email" id="comment_email"><br>
 <nowiki>
 
 <div id="recaptcha_widget"> 
@@ -481,11 +484,22 @@ END_CAPTCHA_STYLE;
 <br><br><br><br>
 </div>
 </div>
-
-<input class="submit" type="submit" value="comment">
-</form>
-</div>
 END_OF_FORM;
+    echo recaptcha_get_html($this->recaptcha_publickey); 
+    if ($this->failed_captcha) {
+    echo <<<END_OF_FORM
+      <span style='font-weight:bold;font-family:sans-serif;color:red;margin-top:15px;'>reCAPTCHA said you're not human,</span>
+      <input id="submit" class="submit" type="submit" value="try again?">
+      </form>
+      </div>
+END_OF_FORM;
+    } else {
+         echo <<<END_OF_FORM
+      <input id="submit" class="submit" type="submit" value="post comment">
+      </form>
+      </div>
+END_OF_FORM;
+    }
   }
 }
 
@@ -584,6 +598,19 @@ class notFound extends Exception {
        }
 }
 
+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":
@@ -610,6 +637,10 @@ switch (cms::determine_type()) {
     $archive = new archive;
        $archive->display();
        break;
+  case "captcha":
+    $captcha = new captcha;
+       $captcha->display();
+       break;
 }
 
 ?>
my (old) website