X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=index.php;h=55986790efb50816b95c9912f18cd767a11a46a2;hb=c30849c73508b5a0168b6559b9935115186a20c7;hp=8f8baaeb8471e9ba19f55b0beeed73b102b5b21b;hpb=32b53fe9b8a5903e32e0552c097b3035dc39c5d5;p=dylansserver.git

diff --git a/index.php b/index.php
index 8f8baae..5598679 100644
--- a/index.php
+++ b/index.php
@@ -361,9 +361,6 @@ class note extends cms {
   }
 
   private function verify() {
-    var_dump($_POST['captcha']);
-    var_dump(isset($_POST['captcha']));
-    var_dump(isset($_POST['captcha']) || false);
     if (!isset($_POST['captcha'])) {
       require_once('includes/recaptchalib.php');
 	  echo "<br>";
@@ -404,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();
 	}
@@ -442,11 +436,16 @@ END_OF_NAVIGATION;
 	  $author = $entry['author'];
 	  $email = $entry['email'];
 	  $text = htmlspecialchars($entry['text']);
+	  if ($email == '') {
+	    $head = "<h3>$author</h3>";
+	  } else {
+	    $head = "<h3><a href='mailto:$email'>$author</a></h3>";
+	  }
 	  echo <<<END_OF_COMMENT
-	  <h3><a href="mailto:$email">$author</a></h3>
+	  <div class='comment'>
+	  $head
 	  $text
-	  <br>
-	  <br>
+	  </div>
 END_OF_COMMENT;
 	  }
 	echo "</div>";
@@ -456,7 +455,6 @@ END_OF_COMMENT;
     $publickey = $this->recaptcha_publickey;
     echo <<<END_CAPTCHA_STYLE
 <script type="text/javascript">
-function showRecaptcha() {
 Recaptcha.create("$publickey",
    "recaptcha_div", 
    {
@@ -464,41 +462,53 @@ 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 id=\"comment_form\"  method=\"post\" action=\"$url\">";
-	echo  <<<END_OF_FORM
-<div id="comment">
-<h3><a onclick="showRecaptcha();">comment?</a></h3>
-
-<div id="recaptcha_div">
-<br>
-<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">
-<h3>email:</h3>
-<input type=text name="email" id="comment_email"><br>
-<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')">Get an image CAPTCHA</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>
-</div>
-
-<input class="submit" type="submit" value="comment">
-</form>
-</div>
+	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">
+      <h3>email:</h3>
+      <input type=text name="email" id="comment_email"><br>
+  
+      <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')">Get an image CAPTCHA</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_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;
+    }
   }
 }