Changeset 59

Timestamp:

27/05/05 22:50:39 (4 years ago)

Author:

rollercow

Message:

Moved admin bits from blog to admin,

WTF has dave done to add comment?

Files:

• admin.lib.php (modified) (1 diff)
• blog.lib.php (modified) (17 diffs)

admin.lib.php

@@ -162 +162 @@
-                echo "</div>\n";
-        }
+        
+        // post an entry to the db
+        function postEntry()
+        {
+                $category = '';
+                $subject = '';
+                $body = '';
+                $err = 0;
+
+                //sanitise category (make sure it IS a number!)
+                if (isset($_POST['category']) && trim($_POST['category']) != "" && (int)$_POST['category'] == 0) {
+                        $category = (int)$_POST['category'];
+                } else {
+                        $this->entryError = _("Undefined Category!");
+                        //error(4,_("Undefined Category."));
+                        $err = 1;
+                }
+
+                //sanitise subject (make sure its not a number!)
+                if (isset($_POST['subject']) && trim($_POST['subject']) != "" && (int)$_POST['category'] != 0) {
+                        $subject = $_POST['subject'];
+                } else {
+                        $this->entryError = _("No Subject!");
+                        //error(4,_("No Subject!"));
+                        $err = 1;
+                }
+                        
+                //sanitise body
+                if (isset($_POST['body']) && trim($_POST['body']) != "") {
+                        $body = $_POST['body'];
+                } else {
+                        $this->entryError = _("No Entry!");
+                        //error(4,_("No Entry!"));
+                        $err = 1;
+                }
+
+                if ($err == 0) {
+                        $shortsubject = makeCleanString($subject);
+                
+                        // need to check title existence and do the nescessary.
+                        $sql = db_query("SELECT shortsubject from entries where user_id = ".$this->id." and (shortsubject = '".$shortsubject."' or shortsubject like '%".$shortsubject."%!_%'escape'!';"); //we're matching == anything-like-this*_
+                        $sqlNum = db_num_rows($sql);
+                        if ($sqlNum != 0) {
+                                $shortsubject .= $sqlNum; // format this-is-a-title1_ (the _ is so we can LIKE match it.)
+                        }
+                
+                        if (!db_query("INSERT INTO entries (category, subject, shortsubject, body) VALUES ({$category},'{add_slashes($subject)}','{$shortsubject}','{add_slashes($body)}')")) {
+                                error(2,"Database commit failed - ".db_error());
+                        } else {
+                                // we want to display the post? maybe we just want to return to the page, but this will display it for now :)
+                                $sql = db_getrow(db_query("SELECT id from entries where user_id = ".$this->id." and shortsubject = '".$shortsubject."';"));
+                                
+                                $this->printEntry(shortSubjectToID($shortsubject));
+                        }
+                }               
+        }
+        
+        //update an entry in the db, possibly the body or the post will be updated
+        function updateEntry($id)
+        {               
+                $category = '';
+                $subject = '';
+                $body = '';
+                $err = 0;
+
+                //sanitise category (make sure it IS a number!)
+                if (isset($_POST['category']) && trim($_POST['category']) != "" && (int)$_POST['category'] == 0) {
+                        $category = (int)$_POST['category'];
+                } else {
+                        error(4,_("Undefined Category."));
+                        $err = 1;
+                }
+
+                //sanitise subject (make sure its not a number!)
+                if (isset($_POST['subject']) && trim($_POST['subject']) != "" && (int)$_POST['subject'] != 0) {
+                        $subject = $_POST['subject'];
+                } else {
+                        error(4,_("No Subject!"));
+                        $err = 1;
+                }
+                        
+                //sanitise body
+                if (isset($_POST['body']) && trim($_POST['body']) != "") {
+                        $body = $_POST['body'];
+                } else {
+                        error(4,_("No Entry!"));
+                        $err = 1;
+                }
+
+                if ($err == 0) {
+                        $sql = db_query("SELECT id from entries where id = ".$id."';");
+                        $sqlNum = db_num_rows($sql);
+                        if ($sqlNum != 0) { //existio?
+                                $sql = db_query("UPDATE entries SET (category, subject, body) = ({$category},'{add_slashes($subject)}','{add_slashes($body)}') WHERE id = '{$id}';");
+                                
+                                $this->printEntry($id); //printenate it
+                                
+                        } else {
+                                 error(2,_("Cannot update entry - It never existed!".db_error()));
+                        }       
+                } else {
+                        error(4,_("You can't change it to be blank :)"));
+                }
+                
+        
+        }
+        
+        // this will... uh ... print the blog Entry form...
+        function printEntryForm() 
+        {
+                echo "<div class=\"entry\">\n";
+                echo "<h2>Write Entry</h2>\n";
+                echo "<form action=\"".$this->blogPath."postentry\" method=\"post\" id=\"entryform\">\n";
+                echo "<p>\n";
+                echo "<input type=\"text\" name=\"subject\" id=\"subject\" value=\"" . (($this->entryError != "") ? strip_tags(trim($_POST['subject'])) : "") . "\" size=\"22\" maxlength=\"50\" tabindex=\"1\" />\n";
+                echo "<label for=\"subject\">Subject</label>\n";
+                echo "</p>\n";
+                echo "<p>\n";
+                // lookup... category...?
+                echo "<select name=\"category\" id=\"category\">";
+                $sql = db_query("SELECT name FROM categories");
+                while ($sqlRow = db_getrow($sql)) {
+                        echo "<option value=\"{$sqlRow['name']}\">{$sqlRow['name']}</option>";
+                        }
+                echo "</select>";
+                //echo "<input type=\"text\" name=\"category\" id=\"category\" value=\"" . (($this->entryError != "") ? strip_tags(trim($_POST['category'])) : "") . "\" size=\"22\" maxlength=\"70\" tabindex=\"2\" />\n";
+                echo "<label for=\"category\">Category</label>\n";
+                echo "</p>\n";
+                echo "<p>\n";
+                echo "<textarea name=\"entry\" id=\"entry\" cols=\"50\" rows=\"10\" tabindex=\"3\">" . (($this->entryError != "") ? strip_tags($_POST['comment'],$entryTags) : "") . "</textarea>\n";
+                echo "</p>\n";
+                echo "<p>\n";
+                echo "<input name=\"submit\" type=\"submit\" id=\"submit\" tabindex=\"4\" value=\"Submit Entry\" />\n";
+                echo "</p>\n";
+                echo "</form>\n";
+                echo "</div>\n";
+                echo "</div>\n";
+        }
-}

blog.lib.php

@@ -8 +8 @@
-$db_type = "pgsql";
-require_once("database.lib.php");
+
-// Some useful validation functions
-require_once("validation.lib.php");
@@ -23 +24 @@
-        echo("Level ".$level." error - ".$error);
-}
+
-//Our Blogs Class
-class blogs {
-                       
- 
-         
-                    
-      
-          
-          
-           
-         
-         
- 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
-        var $entryError; //new entry errors
-        var $entryTags; //what we allow in the entry
@@ -48 +50 @@
-                $sql = db_query("SELECT id, name, title, description, css from users where username = '".$user."' and enabled = true;");
-                $sqlNum = db_num_rows($sql);
-
-
+
-                        error(1,"No such user");
-                }
-
-
+
-                        $sqlRow = db_getrow($sql);
-                        $this->id = $sqlRow['id'];
@@ -75 +75 @@
-        {
-                echo "<div class=\"entry\">\n";
-
-
+
-                        echo "<h2><a href=\"{$this->blogPath}entry/{$row['shortsubject']}\">{$row['subject']}</a></h2>\n";
-                }
-
-
+
-                        echo "<h2>{$row['subject']}</h2>\n";
-                }
@@ -87 +85 @@
-                echo "</div>\n";
-                echo "<p class=\"entryfoot\">[ Entry posted at: ".strftime($this->longDateFormat,strtotime($row['timestamp']));
-
-
+
-                        echo " | <a href=\"".$this->blogPath."entry/{$row['shortsubject']}\">Comments</a>: ".$this->commentCount($row['id']);
-                }
@@ -104 +101 @@
-                $sql = db_query("SELECT id, category, subject, body, timestamp, shortsubject from entries where user_id = '".$this->id."' ".$constraint." order by timestamp desc limit ".$limit." offset ".$offset.";");
-                $sqlNum = db_num_rows($sql);
-
-
+
-                        error(5,"No relevant posts");
-                }
-
-
+
-                        while ($sqlRow = db_getrow($sql)) {
-                                $this->printEntry($sqlRow);
@@ -119 +114 @@
-        function printEntryAndComments($id) 
-        {
-
+       
-                $sql = db_query("SELECT id, category, subject, body, timestamp from entries where shortsubject='".$id."' and user_id = ".$this->id." LIMIT 1;");
-                $sqlNum = db_num_rows($sql);
-
-
+
-                        error(5,"No relevant posts");
-                }
-
-
+
-                        $sqlRow = db_getrow($sql);
-                        $this->printEntry($sqlRow, false, false);
@@ -133 +126 @@
-                        $this->printCommentForm($id);
-                }
-                
-        }
-
@@ -141 +133 @@
-                $sql = db_query("SELECT timestamp, name, email, body, host FROM comments WHERE post = ".$postid."  ORDER BY timestamp ASC limit ".$limit." OFFSET ".$offset.";");
-                $sqlNum = db_num_rows($sql);
-
-
+
-                        error(5,"No relevent comments");
-                }
-
-
+
-                        while ($sqlRow = db_getrow($sql)) {
-                                $this->printComment($sqlRow);
@@ -156 +146 @@
-        function printComment($row) 
-        {
-        
+               
-                echo "<h3>" . $row['name'] . " writes:</h3>";
-                echo "<p>" . $row['body'] . "</p>\n";
-                echo "<p class=\"entryfoot\">[ " .strftime($this->longDateFormat,strtotime($row['timestamp'])). " ]</p>\n";
-        
+               
-        }
-
@@ -184 +174 @@
-                echo "<h2>Add Comment<a id=\"cmt\"></a></h2>\n";
-                echo "<div class=\"td\">\n";
-
-
+
-                        echo "<p class=\"invalid\">*** " . $this->commentError . " ***</p>\n";
-                }
-
-
+
-                        echo "<p>Thank you for your comment</p>\n";
-                }
@@ -226 +214 @@
-        function newComment($id) 
-        {
-        
+               
-
-                $author = "";
@@ -242 +230 @@
-                        $comment = addslashes(nl2br(trim(strip_tags($_POST['comment']))));
-                } 
-  
+
-                        $this->commentError = "Please check the comment field";
-                }
@@ -249 +237 @@
-                        $email = addslashes(trim($_POST['email']));
-                }
-  
+
-                        $this->commentError = "Check email address";
-                }
@@ -256 +244 @@
-                        $author = addslashes(nl2br(trim(strip_tags($_POST['author']))));
-                } 
-  
+
-                        $this->commentError = "Check your name.";
-                }
@@ -263 +251 @@
-                $sqlNum = db_num_rows($sql);
-                $row = db_getrow($sql);
-
-
-
+
+
-                        $this->commenterror = "Invalid blog entry, This entry may have been removed..?";
-                }
-        
+               
-                if ($this->commentError == "") {
-            
+                       
-                        if(!db_query($query)) {
-                                error(2,"Database commit failed -".db_error());
@@ -276 +263 @@
-                }
-                $this->printEntryAndComments($id);
-        }
-        
-        // post an entry to the db
-        function postEntry()
-        {
-                $category = '';
-                $subject = '';
-                $body = '';
-                $err = 0;
-
-                //sanitise category (make sure it IS a number!)
-                if (isset($_POST['category']) && trim($_POST['category']) != "" && (int)$_POST['category'] == 0) {
-                        $category = (int)$_POST['category'];
-                } else {
-                        $this->entryError = _("Undefined Category!");
-                        //error(4,_("Undefined Category."));
-                        $err = 1;
-                }
-
-                //sanitise subject (make sure its not a number!)
-                if (isset($_POST['subject']) && trim($_POST['subject']) != "" && (int)$_POST['category'] != 0) {
-                        $subject = $_POST['subject'];
-                } else {
-                        $this->entryError = _("No Subject!");
-                        //error(4,_("No Subject!"));
-                        $err = 1;
-                }
-                        
-                //sanitise body
-                if (isset($_POST['body']) && trim($_POST['body']) != "") {
-                        $body = $_POST['body'];
-                } else {
-                        $this->entryError = _("No Entry!");
-                        //error(4,_("No Entry!"));
-                        $err = 1;
-                }
-
-                if ($err == 0) {
-                        $shortsubject = makeCleanString($subject);
-                
-                        // need to check title existence and do the nescessary.
-                        $sql = db_query("SELECT shortsubject from entries where user_id = ".$this->id." and (shortsubject = '".$shortsubject."' or shortsubject like '%".$shortsubject."%!_%'escape'!';"); //we're matching == anything-like-this*_
-                        $sqlNum = db_num_rows($sql);
-                        if ($sqlNum != 0) {
-                                $shortsubject .= $sqlNum; // format this-is-a-title1_ (the _ is so we can LIKE match it.)
-                        }
-                
-                        if (!db_query("INSERT INTO entries (category, subject, shortsubject, body) VALUES ({$category},'{add_slashes($subject)}','{$shortsubject}','{add_slashes($body)}')")) {
-                                error(2,"Database commit failed - ".db_error());
-                        } else {
-                                // we want to display the post? maybe we just want to return to the page, but this will display it for now :)
-                                $sql = db_getrow(db_query("SELECT id from entries where user_id = ".$this->id." and shortsubject = '".$shortsubject."';"));
-                                
-                                $this->printEntry(shortSubjectToID($shortsubject));
-                        }
-                }               
-        }
-        
-        //update an entry in the db, possibly the body or the post will be updated
-        function updateEntry($id)
-        {               
-                $category = '';
-                $subject = '';
-                $body = '';
-                $err = 0;
-
-                //sanitise category (make sure it IS a number!)
-                if (isset($_POST['category']) && trim($_POST['category']) != "" && (int)$_POST['category'] == 0) {
-                        $category = (int)$_POST['category'];
-                } else {
-                        error(4,_("Undefined Category."));
-                        $err = 1;
-                }
-
-                //sanitise subject (make sure its not a number!)
-                if (isset($_POST['subject']) && trim($_POST['subject']) != "" && (int)$_POST['subject'] != 0) {
-                        $subject = $_POST['subject'];
-                } else {
-                        error(4,_("No Subject!"));
-                        $err = 1;
-                }
-                        
-                //sanitise body
-                if (isset($_POST['body']) && trim($_POST['body']) != "") {
-                        $body = $_POST['body'];
-                } else {
-                        error(4,_("No Entry!"));
-                        $err = 1;
-                }
-
-                if ($err == 0) {
-                        $sql = db_query("SELECT id from entries where id = ".$id."';");
-                        $sqlNum = db_num_rows($sql);
-                        if ($sqlNum != 0) { //existio?
-                                $sql = db_query("UPDATE entries SET (category, subject, body) = ({$category},'{add_slashes($subject)}','{add_slashes($body)}') WHERE id = '{$id}';");
-                                
-                                $this->printEntry($id); //printenate it
-                                
-                        } else {
-                                 error(2,_("Cannot update entry - It never existed!".db_error()));
-                        }       
-                } else {
-                        error(4,_("You can't change it to be blank :)"));
-                }
-                
-        
-        }
-        
-        // this will... uh ... print the blog Entry form...
-        function printEntryForm() 
-        {
-                echo "<div class=\"entry\">\n";
-                echo "<h2>Write Entry</h2>\n";
-                echo "<form action=\"".$this->blogPath."postentry\" method=\"post\" id=\"entryform\">\n";
-                echo "<p>\n";
-                echo "<input type=\"text\" name=\"subject\" id=\"subject\" value=\"" . (($this->entryError != "") ? strip_tags(trim($_POST['subject'])) : "") . "\" size=\"22\" maxlength=\"50\" tabindex=\"1\" />\n";
-                echo "<label for=\"subject\">Subject</label>\n";
-                echo "</p>\n";
-                echo "<p>\n";
-                // lookup... category...?
-                echo "<select name=\"category\" id=\"category\">";
-                $sql = db_query("SELECT name FROM categories");
-                while ($sqlRow = db_getrow($sql)) {
-                        echo "<option value=\"{$sqlRow['name']}\">{$sqlRow['name']}</option>";
-                        }
-                echo "</select>";
-                //echo "<input type=\"text\" name=\"category\" id=\"category\" value=\"" . (($this->entryError != "") ? strip_tags(trim($_POST['category'])) : "") . "\" size=\"22\" maxlength=\"70\" tabindex=\"2\" />\n";
-                echo "<label for=\"category\">Category</label>\n";
-                echo "</p>\n";
-                echo "<p>\n";
-                echo "<textarea name=\"entry\" id=\"entry\" cols=\"50\" rows=\"10\" tabindex=\"3\">" . (($this->entryError != "") ? strip_tags($_POST['comment'],$entryTags) : "") . "</textarea>\n";
-                echo "</p>\n";
-                echo "<p>\n";
-                echo "<input name=\"submit\" type=\"submit\" id=\"submit\" tabindex=\"4\" value=\"Submit Entry\" />\n";
-                echo "</p>\n";
-                echo "</form>\n";
-                echo "</div>\n";
-                echo "</div>\n";
-        }
-