From 7c68050a90dac5eec6b27f895deb9aeabf49cd47 Mon Sep 17 00:00:00 2001
From: Dylan Lloyd <dylan@dylansserver.com>
Date: Thu, 22 Mar 2012 19:45:24 -0400
Subject: [PATCH] comment-form now in view/comment-form.php

---
 cms.php               | 77 +++----------------------------------------
 view/comment-form.php | 52 +++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 72 deletions(-)
 create mode 100644 view/comment-form.php

diff --git a/cms.php b/cms.php
index 1f455a4..961a1f5 100644
--- a/cms.php
+++ b/cms.php
@@ -326,84 +326,17 @@ class note extends cms {
       $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 class='comment'>";
+      echo $head;
+      echo $text;
+      echo "</div>";
       }
     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;
+    require_once("view/comment-form.php");
   }
 }
 
diff --git a/view/comment-form.php b/view/comment-form.php
new file mode 100644
index 0000000..745226b
--- /dev/null
+++ b/view/comment-form.php
@@ -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>
-- 
2.30.2