Changeset 121

Timestamp:

15/06/05 20:08:33 (4 years ago)

Author:

davea

Message:

More business:
* Tweaked the comment posting interface a little
* A user can allow certain e-mail addresses to bypass moderation, this is configurable from the admin pages.
* probably a couple of other things i've forgotten about

Files:

• admin.lib.php (modified) (5 diffs)
• admin.php (modified) (1 diff)
• blog.css (modified) (1 diff)
• blog.lib.php (modified) (9 diffs)
• blog.sql (modified) (1 diff)
• img/spinner.gif (added)
• index.php (modified) (2 diffs)
• postcomment.php (modified) (2 diffs)
• xmlhttp.js (modified) (2 diffs)

admin.lib.php

@@ -403 +403 @@
-                                error(2,_("Database Insertion failed."));
-                        } else {
-
+
+
-                        }
-                } else {
@@ -491 +492 @@
-                $result = db_query("SELECT comments.*,entries.subject,entries.shortsubject FROM comments,entries WHERE post IN (SELECT id FROM entries WHERE user_id=".$this->id.") AND moderated=false AND comments.post = entries.id ORDER BY entries.subject ASC;");
-                if(db_num_rows($result)==0) {
-                        error(5, _("No comments need approval."));
-                        return;
-                }
+                echo "<div class=\"entry\">\n";
+                echo "<h2>Comments Pending Approval</h2>\n";
-                echo "<form action=\"{$this->adminPath}updatecomments/\" method=\"post\">\n";
-                echo "<table class=\"td\">\n";
@@ -516 +518 @@
-                echo "\t<tr>\n\t\t<td></td>\n\t\t<td></td>\n\t\t<td></td>\n\t\t<td colspan=\"2\"><input type=\"submit\" value=\"Commit\" name=\"submit\" /></td>\n\t</tr>\n";
-                echo "</table>\n";
+                echo "</form>\n";
+                echo "</div>\n";
-        }
-
@@ -550 +554 @@
-                        db_query("UPDATE comments SET moderated=true WHERE id IN ($approved);");
-                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        function printEntries($amount=0, $title=TRUE)
-        {
@@ -569 +649 @@
-                        while($row = db_getrow($result)){
-                                echo "\t<tr>\n";
-'%c'
+$this->blog->longDateFormat
-                                echo "\t\t<td><a href=\"".$this->adminPath."update/".$row['shortsubject']."\">".$row['subject']."</a></td>\n";
-                                echo "\t\t<td><input type=\"checkbox\" name=\"entry[".$rownum++."]\" value=\"{$row['shortsubject']}\" /></td>\n";

admin.php

@@ -68 +68 @@
-                                        case "moderatecomments":
-                                                $admin->printComments();
+                                                $admin->printAuthorisedUsers();
-                                                break;
-                                        case "updatecomments":
-                                                $admin->updateComments();
-                                                break;
+                                        case "updateauthusers":
+                                                $admin->updateAuthorisedUsers();
+                                                break;
-                                        default:
-
-
-
-
-
-
-
-
-
+
-                                }
-                }

blog.css

@@ -267 +267 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+

blog.lib.php

@@ -99 +99 @@
-                if($this->checkSessionOwner()){
-                        echo "| <a href=\"".$this->httpPath."admin.php/update/{$row['shortsubject']}\">"._("Edit")."</a> ";
-
+//
-                }
-                echo " ]</p>\n";
@@ -144 +144 @@
-                }
-                
-A
+DE
-                $result = db_query($sql);
-
@@ -236 +236 @@
-                        echo "<p>Thank you for your comment</p>\n";
-                }
+
+                // try to work out the viewer's name + email
+                if(isset($_SESSION['realName'])) {
+                        $name = $_SESSION['realName'];
+                } elseif(isset($_COOKIE['Blog_CommentRealName'])) {
+                        $name = $_COOKIE['Blog_CommentRealName'];
+                } else {
+                        $name = "";
+                }
+                if(isset($_SESSION['userName'])) {
+                        $email = $_SESSION['userName']."@sucs.org";
+                } elseif(isset($_COOKIE['Blog_CommentEmailAddress'])) {
+                        $email = $_COOKIE['Blog_CommentEmailAddress'];
+                } else {
+                        $email = "";
+                }
-                echo "<form onsubmit=\"return postcomment('".$this->httpPath."', '".$this->userName."', '".$id."')\" action=\"".$this->blogPath."postcomment/".$id."\" method=\"post\" id=\"commentform\">\n";
-                echo "<p>\n";
-" . (($this->commentError != "") ? strip_tags(trim($_POST['author'])) : "") . "
+$name
-                echo "<label for=\"author\">Name (required)</label>\n";
-                echo "</p>\n";
-                echo "<p>\n";
-" . (($this->commentError != "") ? strip_tags(trim($_POST['email'])) : "") . "
+$email
-                echo "<label for=\"email\">E-mail (required, not displayed)</label>\n";
-                echo "</p>\n";
@@ -250 +266 @@
-                echo "<p>\n";
-                echo "<input name=\"submit\" type=\"submit\" id=\"submit\" tabindex=\"4\" value=\"Submit Comment\" />";
+                echo "<img src=\"".$this->httpPath."img/spinner.gif\" alt=\"\" id=\"spinner\"/>\n";
-                echo "<label class=\"invalid\" for=\"submit\" id=\"errors\"></label>\n";
-                echo "</p>\n";
@@ -288 +305 @@
-                else {
-                        $this->commentError = _("Please check the comment field");
+                        $element = "comment";
-                }
-                //sanitise email
@@ -295 +313 @@
-                else {
-                        $this->commentError = _("Check email address");
+                        $element = "email";
-                }
-                //sanitse author
@@ -302 +321 @@
-                else {
-                        $this->commentError = _("Check your name.");
+                        $element = "author";
-                }
-                //check the post exists, and is part of this blog
@@ -312 +332 @@
-                //if no errors have been raised so far commit to the db
-                if ($this->commentError == "") {
-
+
+
+
+
+
+
+
+
+
+
+
-                        if(!db_query($query)) {
-                                error(2,_("Database commit failed -").db_error());
-                        }
-                        else {
-$this->comment_moderation
-invalid
+!$moderated
+updateinfo
-                                } elseif(!$printentry) {
-                                        echo "<div class=\"blogcomment\">\n";
@@ -329 +359 @@
-                                        $this->printEntryAndComments($id);
-                                }
-
+
+
+
+
-                        }
-                } else {
-                        echo $this->commentError;
-FALSE
+array(FALSE, $element)
-                }
-        }

blog.sql

@@ -41 +41 @@
-    moderated bool NOT NULL DEFAULT false;
-);
+
+CREATE TABLE authorised_emails (
+    user_id integer REFERENCES users ON DELETE CASCADE NOT NULL,
+    email text NOT NULL,
+    name text
+);

index.php

@@ -8 +8 @@
-        $request = array("list");
-    }
-
+ob_start();
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -64 +64 @@
-</div>
-<div id="botbot"></div>
+<pre><?php print_r($_SESSION); print_r($_COOKIE); ?></pre>
-</body>
-</html>

postcomment.php

@@ -1 +1 @@
-<?php
+ob_start();
-include "blog.lib.php";
-
@@ -6 +7 @@
-$blog = new blogs($blogid);
-
-
+
+
-        echo "<split>OK";
-} else {
-"
+<split>".$ret[1]
-}
-?>

xmlhttp.js

@@ -11 +11 @@
-        }
-
+        document.getElementById("spinner").style.visibility = "visible";
+        document.getElementById("errors").innerHTML = "";
-        frm = document.forms['commentform'];
-        url = "blog=" + strBlog + "&post=" + strPost + "&author=" + escape(frm.elements['author'].value) + "&email=" + escape(frm.elements['email'].value) + "&comment=" + escape(frm.elements['comment'].value);
@@ -18 +20 @@
-        xmlhttp.onreadystatechange = function() {
-                if (xmlhttp.readyState == 4) {
+                        //alert(xmlhttp.responseText);
+                        //alert(xmlhttp.getAllResponseHeaders());
+                        document.getElementById("spinner").style.visibility = "hidden";
+                        frm.elements['author'].style.backgroundColor = "#FFF";
+                        frm.elements['email'].style.backgroundColor = "#FFF";
+                        frm.elements['comment'].style.backgroundColor = "#FFF";
-                        responseArray = xmlhttp.responseText.split("<split>");
-                        if(responseArray[1] == "OK"){
-                                document.getElementById("comments").innerHTML += responseArray[0];
-                                document.getElementById("errors").innerHTML = "";
-
-
+//
+//
-                                frm.elements['comment'].value = "";
-                        } else {
-
+
+
+
+
+
+
-                        }
-                }