From a7feeb576f491f285cb76cba0b99e01e7a3ae390 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 10 Jan 2009 00:34:23 +0000
Subject: Big set of changes to comments, with related changes to akismet and
 user modules.

* Don't delete vars when we delete a module.  This makes
  reinstalling a module a lot easier.

* Add user::lookup() as the preferred way to load a user, so that
  other modules don't delve into the user module (that'd be a
  problem when we swap out user modules)

* Notify site admins if Akismet is not fully configured

* Bundle all server variables into the comment so that if/when we
  re-check the comment, we are not using the server info from the
  site admin's request.

* Update Akismet to grab request context data from the comment

* Pre-seed comment fields if we have a logged in user.  Update
  comment::create() API to clarify it for this.

* Delete comment::update(), that's a controller function.

* Add url to User_Model

* Add author_name() author_email() and author_url() to
  Comment_Model.  It'll return the appropriate values depending
  on whether the comment was left by a logged in user or a guest.

* Use resetForm() instead of clearForm() when we reload the
  comment form after ajax submit, this way we preserve the
  pre-seeded values.

* In the user profile page, ignore blank passwords.
---
 modules/comment/views/admin_comments.html.php | 22 ++++++++++++----------
 modules/comment/views/comment.html.php        |  8 +++++---
 modules/comment/views/comments.html.php       | 10 ++++++----
 3 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'modules/comment/views')

diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index d2c17f71..311a27c9 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -30,11 +30,13 @@
 
   <? if ($queue == "spam"): ?>
   <div>
+    <? if ($spam_caught > 0): ?>
     <p>
       <?= t(array("one" => "Gallery has caught {{count}} spam for you since you installed spam filtering.",
                   "other" => "Gallery has caught {{count}} spam for you since you installed spam filtering."),
             array("count" => $spam_caught)) ?>
     </p>
+    <? endif ?>
     <p>
       <? if ($spam->count()): ?>
       <?= t(array("one" => "There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
@@ -51,7 +53,7 @@
     </p>
   </div>
   <? endif ?>
-  
+
   <form id="gBulkAction" action="#" method="post">
     <label for="bulk_actions"><?= t("Bulk actions")?></label>
     <select id="bulk_actions">
@@ -61,7 +63,7 @@
       <option><?= t("Delete")?></option>
     </select>
     <input type="submit" value="Apply" />
-    
+
 	  <table id="gAdminCommentsList">
 	    <tr>
 	      <th>
@@ -90,9 +92,9 @@
 	      </td>
 	      <td>
 	        <a href="#"><img src="<?= $theme->url("images/avatar.jpg") ?>"
-	            alt="<?= $comment->author ?>"/></a><br/>
-	        <a href="mailto:<?= $comment->email ?>"
-	            title="<?= $comment->email ?>"> <?= $comment->author ?> </a>
+	            alt="<?= $comment->author_name() ?>"/></a><br/>
+	        <a href="mailto:<?= $comment->author_email() ?>"
+	            title="<?= $comment->author_email() ?>"> <?= $comment->author_name() ?> </a>
 	      </td>
 	      <td>
 	        <?= $comment->text ?>
@@ -109,7 +111,7 @@
 	            </a>
 	          </li>
 	          <? endif ?>
-	
+
 	          <? if ($comment->state != "published"): ?>
 	          <li>
 	            <a href="javascript:set_state('published',<?=$comment->id?>)">
@@ -117,7 +119,7 @@
 	            </a>
 	          </li>
 	          <? endif ?>
-	
+
 	          <? if ($comment->state != "spam"): ?>
 	          <li>
 	            <a href="javascript:set_state('spam',<?=$comment->id?>)">
@@ -125,7 +127,7 @@
 	            </a>
 	          </li>
 	          <? endif ?>
-	
+
 	          <li>
 	            <a href="javascript:reply(<?=$comment->id?>)">
 	            <?= t("Reply") ?>
@@ -157,8 +159,8 @@
 	    <? endforeach ?>
 	  </table>
   </form>
-  
-  
+
+
   <div class="pager">
     <?= $pager ?>
   </div>
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index fc53fefa..59b00b73 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -1,10 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li id="gComment-<?= $comment->id; ?>">
   <p class="gAuthor">
-    <a href="#"><img src="<?= $theme->url("images/avatar.jpg") ?>"
-                     class="gAvatar" alt="<?= $comment->author ?>" /></a>
+    <a href="#">
+      <img src="<?= $theme->url("images/avatar.jpg") ?>"
+           class="gAvatar" alt="<?= $comment->author_name() ?>" />
+    </a>
     <?= t("on ") . date("Y-M-d H:i:s", $comment->created) ?>
-    <a href="#"><?= $comment->author ?></a> <?= t("said") ?>
+    <a href="#"><?= $comment->author_name() ?></a> <?= t("said") ?>
   </p>
   <div>
     <?= $comment->text ?>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 6c319317..7f82241e 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -2,11 +2,13 @@
 <a name="comments"></a>
 <ul id="gComments">
   <? foreach ($comments as $comment): ?>
-  <li id="gComment-<?= $comment->id; ?>">
+  <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
-      <a href="#"><img src="<?= $theme->url("images/avatar.jpg") ?>" class="gAvatar" alt="<?= $comment->author ?>" /></a>
-      <?= t("on ") . date("Y-M-d H:i:s", $comment->created) ?>
-      <a href="#"><?= $comment->author ?></a> <?= t("said") ?>
+      <a href="#">
+        <img src="<?= $theme->url("images/avatar.jpg") ?>"
+             class="gAvatar" alt="<?= $comment->author_name() ?>" />
+      </a>
+      <? printf(t("on %s <a href=#>%s</a> said"), date("Y-M-d H:i:s", $comment->created), $comment->author_name()) ?>
     </p>
     <div>
       <?= $comment->text ?>
-- 
cgit v1.2.3