X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=index.php;h=a2c85eacf2196dbc8b4a5e75f09efc72ed879b94;hb=353b047dd912955763184787347927b58bd0e84f;hp=bbd22540865f8eb3812a38893325c11437fe8f9f;hpb=f9f5098e264fd94ce501df8776fc80caf97bbd3b;p=dylansserver.git

diff --git a/index.php b/index.php
index bbd2254..a2c85ea 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 
 abstract class cms {
 
-  private $config_file = '/etc/dylanstestserver.ini';
+  private $config_file = '/etc/dylansserver.ini';
   protected $db;
   protected $recaptcha_publickey;
   protected $recaptcha_privatekey;
@@ -69,13 +69,13 @@ abstract class cms {
     return $return;
       }
 
-  public function display_head($title = "dylanstestserver",
+  public function display_head($title = "dylansserver",
                                   $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#";
+      $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.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>";
@@ -102,7 +102,7 @@ abstract class cms {
   <div id="structure">
     <div id="banner">
       <a href="$this->home_link">
-      <img src="/images/dylanstestserver.png" alt="dylanstestserver"
+      <img src="/images/dylansserver.png" alt="dylansserver"
       border="0"></a>
     </div>
 
@@ -167,7 +167,7 @@ class index extends cms {
         </li>
 
         <li><a href=
-        "git">git://dylanstestserver.com</a></li>
+        "git">git://dylansserver.com</a></li>
 
         <li>
           <h3>some notes:</h3>
@@ -182,21 +182,21 @@ OTHER_PROJECTS;
     // Because of the CSS necessary for the animations,
     // the contact link needs to be in #portfolio to clear
     // the floats.
-	echo "<li>";
+    echo "<li>";
     $this->display_contact();
-	echo "</li>";
+    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 "<div class='exhibit'>";
       echo $entry->text;
-      echo "</div>";
     }
+    echo "</div>";
   }
 
   private function list_projects() {
@@ -385,15 +385,14 @@ class note extends cms {
     }
     if (isset($_POST['captcha']) || $resp->is_valid) {
       $sql = ("INSERT INTO comments (date_posted, author,
-                  email, text, note)
-                VALUES(NOW(), ?, ?, ?, ?)");
+                  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
+      // and a default author needs to be set
       // for no-javascript users.
-      $stmt->bind_param('ssss',
+      $stmt->bind_param('sss',
                           htmlspecialchars($_POST['name']),
-                          htmlspecialchars($_POST['email']),
                           htmlspecialchars($_POST['text']),
                         $this->id);
       $stmt->execute();
@@ -441,15 +440,15 @@ END_OF_NAVIGATION;
 
   private function display_comments() {
     echo "<div id='comments'>";
-    $sql= "SELECT date_posted, author, email, text
+    $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'];
-      $email = $entry['email'];
       $text = htmlspecialchars($entry['text']);
+      $head = "<h3>$author</h3>";
       echo <<<END_OF_COMMENT
       <div class='comment'>
       $head
@@ -482,8 +481,6 @@ END_CAPTCHA_STYLE;
       <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"> 
@@ -492,7 +489,7 @@ END_CAPTCHA_STYLE;
         <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 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" />
@@ -505,19 +502,31 @@ END_CAPTCHA_STYLE;
 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?">
+    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_FORM;
+END_OF_ERRORS;
     } else {
-      echo <<<END_OF_FORM
+      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;
-    }
   }
 }
 
@@ -565,7 +574,7 @@ class archive extends cms {
                 AND DAY(date_posted) = ?
                 ORDER BY date_posted DESC";
         $result = $this->query($sql, "ddd",
-                                  $_GET['year'], $_GET['month'],
+                                $_GET['year'], $_GET['month'],
                                 $_GET['day']);
         break;
     }
@@ -581,8 +590,8 @@ class archive extends cms {
         $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 "$year_posted/$month_posted/$day_posted/";
+        echo "</span><a href='$url'>$title</a></h2>";
         echo $entry['text'];
         echo "</div>";
       }