Changeset 203

Timestamp:

07/02/07 21:34:32 (2 years ago)

Author:

dez

Message:

Moves the blog over to ADOdb - the same database library as the main SUCS site uses

Files:

• admin.lib.php (modified) (41 diffs)
• blog.lib.php (modified) (29 diffs)
• database.lib.php (deleted)
• feed.php (modified) (4 diffs)

admin.lib.php

@@ -4 +4 @@
- */
-
-// RC's nasty horrible database library, really needs replacing with something more sane..
-$db_name = "blogs";
-$db_type = "pgsql";
-require_once("database.lib.php");
-// Some useful validation functions
-require_once("validation.lib.php");
-// random other functions that aren't validation or db related
-require_once("miscfunctions.lib.php");
-l
+
-require_once("blog.lib.php");
-
@@ -93 +89 @@
-        function login() 
-        {
+                global $BlogDB;
-                $username = "";
-                $password = "";
@@ -113 +110 @@
-                {
-                        //try to pull in the users details
- = db_query
-
-$sqlNum = db_num_rows($sql);
-$sqlNum != 1
+Row = $BlogDB->GetRow
+
+//check we returned a user
+!$sqlRow
-                                $this->error =_("Invalid Username or Password");
-                        }
-                        else    {
-                                //fetch the user details 
-                                $sqlRow = db_getrow($sql);
-                                //check the password the user gave us agaisnt the one in the database
-                                if ($sqlRow['password']!=crypt($password, $sqlRow['password'])) {
@@ -148 +143 @@
-        //admin menu
-        function menu() {
+                global $BlogDB;
-                echo "<ul class=\"side-menu\">\n";
-                echo "<li><a href=\"".$this->adminPath."newentry\">"._("Write new entry")."</a></li>\n";
@@ -154 +150 @@
-                echo "<li><a href=\"".$this->adminPath."moderatecomments\">"._("Comments");
-                //count how many unmoderated comments there are
-db_getrow(db_query("SELECT count(comments.id) from comments join entries on comments.post = entries.id where moderated = false and entries.user_id = ".$this->id.";")
-['count']>0
-'count'
+$BlogDB->GetOne("SELECT count(comments.id) from comments join entries on comments.post = entries.id where moderated = false and entries.user_id = ".$this->id.";"
+
+0
-                }
-                echo "</a></li>\n";
@@ -198 +194 @@
-        function postEntry()
-        {
+                global $BlogDB;
-                $category = '';
-                $subject = '';
@@ -235 +232 @@
-                        $shortsubject = $this->blog->makeCleanString($subject,true);
-                        //need to check if there are any short titles like this one already
-
-
+
-                        //if so we grab the last one, and add 1 to it..
-$sqlNum
-db_getrow
+count($sql)
+array_shift
-                                // Put the matched _number into $matches[0] if there is one
-                                if (preg_match("/\_[0-9]{1,3}$/",$sqlRow['shortsubject'],$matches)) {
@@ -250 +246 @@
-                        //shortsubject is now safe..
-                        //insert our new entry
-db_query
+$BlogDB->Execute
-                        if (!$sql) {
-db_error
+$BlogDB->ErrorMsg
-                        } 
-                        else {
-                                // $row = db_last($sql, "entries");
-
-
+
-                                $this->blog->printEntry($row,false,false);
-                        }
@@ -270 +265 @@
-        function updateEntry($shortSubject)
-        {               
+                global $BlogDB;
-                $category = '';
-                $subject = '';
@@ -311 +307 @@
-                if (!$this->error) {
-                        //check to see this post exists
-
-
+
-                        //yes?, we can update it then..
-Num == 1
-db_query("UPDATE entries SET category = {$category}, subject = '{$subject}', body = '{$body}' WHERE shortsubject = '{$shortSubject}' AND user_id = '".$this->id."';");                  
+
+$BlogDB->Execute("UPDATE entries SET category = {$category}, subject = '{$subject}', body = '{$body}' WHERE shortsubject = '{$shortSubject}' AND user_id = '".$this->id."';");
-                                if (!$sql) {
-db_error
+$BlogDB->ErrorMsg
-                                } 
-                                else {
@@ -326 +321 @@
-                        //cant update non-existant entrys
-                        else {
-db_error
+$BlogDB->ErrorMsg
-                        }
-                }
@@ -338 +333 @@
-        function updateForm($shortSubject)
-        {
+                global $BlogDB;
-                //sanitise and check the short subject
-                $shortSubject = $this->blog->makeCleanString($shortSubject);
@@ -344 +340 @@
-                }
-                //try to grab the post
-
-
+
-                //if it exists we can do stuff with it
-
-
+
-                        $this->printEntryForm($row,true,true);
-                } 
@@ -383 +377 @@
-        function updateSettings()
-        {
+                global $BlogDB;
-                $name = '';
-                $title = '';
@@ -463 +458 @@
-                        $query .= " WHERE username='{$this->userName}';";
-                        //execute query
-db_query
+$BlogDB->Execute
-                                error(2,_("Database Insertion failed."));
-                        } 
@@ -479 +474 @@
-        function printEntryForm($row='',$show=false,$edit=false)
-        {
+                global $BlogDB;
-                echo "<div class=\"entry\">\n";
-                if ($this->error) {
@@ -492 +488 @@
-                echo "<select name=\"category\" id=\"category\" tabindex=\"2\">";
-                //pull in the list of catogories from the database
-db_query
-db_getrow
+$BlogDB->GetAll
+array_shift
-                        echo "<option value=\"{$sqlRow['id']}\"".(((int)$row['category'] == $sqlRow['id']) ? " selected=\"selected\"" : "").">{$sqlRow['name']}</option>\n";
-                }
@@ -522 +518 @@
-        function printSettingsForm()
-        {
+                global $BlogDB;
-                //pull in user's current settings from the database
-
-
+
-                echo "<div class=\"entry\">\n";
-                if ($this->error) {
@@ -571 +567 @@
-        //shows unmoderated comments
-        function printComments() {
+                global $BlogDB;
-                //grab all unmoderated comments
-db_query
-db_num_rows
+$BlogDB->GetAll
+count
-                        return;
-                }
@@ -584 +581 @@
-                $count = 0;
-                //for each comment
-db_getrow
+array_shift
-                        //if the post has changed
-                        if ($post != $r['shortsubject']) {
-                                //grab the post, display it and the subject then some headers
-
-
+
-                                echo "\t<tr>\n";
-                                echo "\t\t<th colspan=\"4\"><a href=\"{$this->blogPath}entry/{$r['shortsubject']}\">{$internalR['subject']}</a></td>\n";
@@ -627 +623 @@
-        // approve or delete comments
-        function updateComments() {
+                global $BlogDB;
-                if (count($_POST['group'])==0) {
-                        error(2, _("No comments selected for approval/deletion."));
@@ -659 +656 @@
-                }
-                //check the comments exist and blong to the user
-db_getrow(db_query("SELECT count(comments.id) from comments join entries on comments.post = entries.id where entries.user_id = ".$this->id." and comments.id IN($check);")
+$BlogDB->GetRow("SELECT count(comments.id) from comments join entries on comments.post = entries.id where entries.user_id = ".$this->id." and comments.id IN($check);"
-                if($result[count] != ($acount + $dcount)) {
-                        error(1,_("Cant find the requested comments, maybe they have already been deleted."));
@@ -666 +663 @@
-                //delete comments
-                if($deleted!="") {
-db_query
+$BlogDB->Execute
-                }
-                //set moderated flag on comments
-                if($approved!="") {
-db_query
+$BlogDB->Execute
-                }
-                //reprint the form
@@ -677 +674 @@
-                $this->printAuthorisedUsers();
-        }
+
-        //Delete moderated comments from (a single post)
-        function deleteComments($entry) {
+                global $BlogDB;
-                if(isset($_POST['submit'])) {
-                        if(count($_POST['comment'])==0){
@@ -690 +689 @@
-                                $del = substr($del, 0, -4).")";
-                                //check the comments exist and blong to the user
-db_getrow(db_query("SELECT count(comments.id) from comments join entries on comments.post = entries.id where entries.user_id = ".$this->id." and $del;")
-count
+$BlogDB->GetOne("SELECT count(comments.id) from comments join entries on comments.post = entries.id where entries.user_id = ".$this->id." and $del;"
+0
-                                        error(1,_("Cant find the requested comments, maybe they have already been deleted."));
-                                        return;
@@ -697 +696 @@
-                                //delete the comments
-                                $sql = "DELETE FROM comments WHERE $del";
-db_query
+$BlogDB->Execute
-                                        error(2, _("Database commit error."));
-                                } else {
@@ -708 +707 @@
-        //prints a form populated with email addresses that can avoid moderation on comments
-        function printAuthorisedUsers() {
+                global $BlogDB;
-                echo "<div class=\"entry\">\n";
-                echo "<a name=\"emails\"></a>\n";
@@ -721 +721 @@
-                echo "<form name=\"emailform\" id=\"emailform\" action=\"".$this->adminPath."updateauthusers\" method=\"post\">\n";
-                echo "<select multiple=\"multiple\" name=\"emaillist[]\" size=\"10\">\n";
-db_query
-db_getrow
+$BlogDB->GetAll
+array_shift
-                        echo "\t<option value=\"{$r['email']}\">{$r['email']} ({$r['name']})</option>\n";
-                }
@@ -741 +741 @@
-        //udates the list of authorised users.
-        function updateAuthorisedUsers($quiet=FALSE) {
+                global $BlogDB;
-                //hack so we get error returned from validEmail
-                global $error;
@@ -759 +760 @@
-                                $del = substr($del, 0, -4).")";
-                                $sql = "DELETE FROM authorised_emails WHERE $del AND user_id={$this->id}";
-db_query
-db_error($ret)
-db_error($ret
+$BlogDB->Execute
+!$ret
+$BlogDB->ErrorMsg(
-                                } else {
-                                        echo "<div class=\"updateinfo\">"._("Address(es) deleted")."</div>\n";
@@ -767 +768 @@
-                        }
-                } 
-
+n
-                elseif(isset($_POST['addnew'])) {
-                        if(trim($_POST['name'])=="" or !eregi("^([a-z0-9]+([:space:][a-z0-9]*))$",trim($_POST['name']))) {
@@ -778 +779 @@
-                                $name = addslashes(trim($_POST['name']));
-                                $email = addslashes(trim($_POST['email']));
-db_query
-db_error($ret)
-db_error($ret
+$BlogDB->Execute
+!$ret
+$BlogDB->ErrorMsg(
-                                } else {
-                                        echo "<div class=\"updateinfo\">"._("Address added")."</div>\n";
@@ -796 +797 @@
-        //prints a list of entries for the admin front page.
-        function printEntries($amount=0, $title=TRUE) {
+                global $BlogDB;
-                $limit = ($amount > 0) ? " LIMIT $amount" : "";
-db_query
-db_num_rows
+$BlogDB->GetAll
+count
-                        error(5, _("No entries found."));
-                } else {
@@ -804 +806 @@
-                                echo "<div class=\"entry\"><h2>"._("Edit Entries")."</h2>\n";
-                        }
->Date</th>\n\t\t<th>Title</th>\n\t\t<th
+ width=\"38%\">Date</th>\n\t\t<th>Title</th>\n\t\t<th width=\"5%\"
-                        $rownum = 0;
-db_getrow
+array_shift
-                                echo "\t<tr>\n";
-                                echo "\t\t<td>".strftime($this->blog->longDateFormat, strtotime($row['timestamp']))."</td>\n";
@@ -814 +816 @@
-                        }
-                        echo "\t<tr>\n";
-></td><td></td><td
+ colspan=\"3\" align=\"right\"
-                        echo "\t</tr>\n";
-                        echo "</table>\n";
@@ -839 +841 @@
-        //deletes entries
-        function deleteEntries() {
+                global $BlogDB;
-                if (count($_POST['entry'])==0) {
-                        error(4, _("No entries marked for deletion."));
@@ -849 +852 @@
-                                $sql = substr($sql, 0, -4);
-                                $sql .= ") AND user_id = {$this->id};";
-db_query
-db_affected_rows($sql
+$BlogDB->Execute
+$BlogDB->AffectedRows(
-                        } else {
-                                error(4, _("Entries not deleted."));
@@ -869 +872 @@
-        //adds a user
-        function addUser() {
+                global $BlogDB;
-                $username = '';
-                $password = makePassword();
@@ -908 +912 @@
-                }
-                //check the user doesn't already exist
-
-
-
+
+
-                        $this->error = _("Username already in use!");
-                }
@@ -917 +920 @@
-                        $this->error = _("You need to be a SUCS member to sign up for a blog here!");
-                } else {
-y
+tie
-                        $posixInfo = posix_getpwnam($username);
-                        if ($posixInfo[gid] != 100 && $posixInfo[gid] != 106 && $posixInfo[gid] != 113) {
@@ -930 +933 @@
-                        $sql = ("INSERT into USERS (username,password,name,title,description) VALUES ('{$username}','{$cryptPassword}','{$name}','{$title}','{$description}');");
-                        //error if that failed
-db_query
-db_error(db_query($sql)
+$BlogDB->Execute
+$BlogDB->ErrorMsg(
-                        } else {
-                                //else mail the password to the user and report sucsess

blog.lib.php

@@ -5 +5 @@
- */
-
-
-
-
-
+
+
+
+
+
-
-// Some useful validation functions
@@ -68 +69 @@
-        //Constructor - checks we've been given a valid username, and pulls in generic blog info
-        function blogs($user) {
+                global $BlogDB;
-                //set the error string first, so we dont wipe out any errors
-                $this->error = null;
@@ -80 +82 @@
-                } else {
-                        //check to see if the user has a blog
-
-
-
+
+
-                                $this->error = 1;
-                                $this->errormsg = "No such user";
@@ -88 +89 @@
-                        } else {
-                                //pull in the blog details
-
-
+
-                                $this->userName = $user;
-Row
-Row
-Row
-Row
+[0]
+[0]
+[0]
+[0]
-                                $this->shortDateFormat = "%x %X";
-                                $this->longDateFormat = "%c";
@@ -109 +109 @@
-                                //path to the admin bits
-                                $this->adminPath = $this->httpPath."admin.php/";
-Row
-Row
+[0]
+[0]
-                                $this->currentEntry = "";
-                                $this->svnRevision = getSVNRevision();
@@ -149 +149 @@
-        // print lots of blog entries
-        function printEntries($offset=0, $limit=15, $constraint='') {
+                global $BlogDB;
-                //get the entries from the database
-
-
+
-                //return an error if we cant find any
-$sqlNum
+count($sql)
-                        error(5,"No relevant posts");
-                } else {
-                        //print each entry
-db_getrow
+array_shift
-                                $this->printEntry($sqlRow);
-                        }
@@ -188 +188 @@
-        function printArchiveByDate($request) 
-        {
+                global $BlogDB;
-                $request = preg_grep('/.+/', $request); // Remove any additional silly extra elements due to additional /'s
-                //get the refinements if set
@@ -221 +222 @@
-                $sql = "SELECT shortsubject,subject,timestamp FROM entries WHERE ".((!$year)? "" : "timestamp >= $year$month$day AND timestamp < $enddate AND ") . 
-                        "user_id = '".$this->id."' ORDER BY timestamp " . $order;
-db_query
+$BlogDB->GetAll
-
-                $requestPath = (count($request) > 0)?implode ( $request, '/' ) . '/':'';
@@ -232 +233 @@
-                        "</a> || Sort By <a href=\"" . $this->blogPath . "archive/category\">Category</a> | <a href=\"" .
-                        $this->blogPath . "archive/subject\"> Subject </a><br />";
-db_num_rows
-db_getrow
+count
+array_shift
-                                if($curyear!=date("Y", strtotime($row['timestamp']))) {
-                                        $curyear = date("Y", strtotime($row['timestamp']));
@@ -249 +250 @@
-                        }
-                } else {
-?'':" for $year" . ($month != ''?"/$month":'') . ($day != ''?
+ ? '' : " for $year" . ($month != '' ? "/$month":'') . ($day != '' ? 
-                }
-                echo "</div>";
@@ -257 +258 @@
-    function printArchiveByCategory($request) 
-    {
+                global $BlogDB;
-                // Check for a category id
-                // There must be a better way to check that it isn't $order
@@ -292 +294 @@
-                        ($allentries ? "" : " lower(c.name) = '" . $category . "' AND ") .
-                        "e.user_id = '".$this->id."' AND e.category = c.id ORDER BY " . ($allentries? "name " . $order . " ,timestamp ASC" : "timestamp " . $order );
-db_query
+$BlogDB->GetAll
-
-                $requestPath = (count($request) > 0)?implode ( $request, '/' ) . '/':'';
@@ -301 +303 @@
-                        $this->blogPath . "archive/subject\"> Subject </a><br />";
-                
-db_num_rows
-db_getrow
+count
+array_shift
-                                if($dbCategory != $row['name']) {
-                                        $dbCategory = $row['name'];
@@ -311 +313 @@
-                        echo "</div>";
-                } else {
-?
+ ? 
-                }
-        }
@@ -318 +320 @@
-        function printArchiveBySubject ($request) 
-        {
+                global $BlogDB;
-                // Look for a single character to show subjects by 
-                $request = preg_grep('/.+/', $request); // Remove any additional silly extra elements due to additional /'s
@@ -353 +356 @@
-                $sql = "SELECT shortsubject,subject,timestamp FROM entries WHERE ".(($allentries)? "" : "lower(subject) LIKE '" . $letter . "%' AND ") . 
-                        "user_id = '".$this->id."' ORDER BY subject " . $order;
-db_query
+$BlogDB->GetAll
-
-                echo "<div class=\"td\"><h2>Sorted By <a href=\"" . $this->blogPath . "archive/subject/\">Subject</a> (" . $strOrder . ")</h2><a href=\"" . $this->blogPath . 
@@ -385 +388 @@
-                        "archive/subject/y/$order\">y</a> | <a href=\"" . $this->blogPath . 
-                        "archive/subject/z/$order\">z</a><br />";
-db_num_rows
-db_getrow
+count
+array_shift
-                                echo date("d/m/Y", strtotime($row['timestamp'])) . " - <a href=\"{$this->blogPath}entry/{$row['shortsubject']}\">{$row['subject']}</a><br />\n";
-                        }
-                } else {
-"No Entries Available" . ($allentries?'':
+ "No Entries Available" . ($allentries ? '' : 
-                }
-                echo "</div>";
@@ -397 +400 @@
-        //print Prev/Next nav bar
-        function printNavigationBar($id) {
-$res = db_query("SELECT timestamp from entries WHERE id='".$id."'")
-db_getrow($res
-db_query
-db_query
-db_num_rows($prev)>0) $prevRow=db_getrow
-db_num_rows($next)>0) $nextRow=db_getrow
+global $BlogDB
+$BlogDB->GetRow("SELECT timestamp from entries WHERE id='".$id."'"
+$BlogDB->GetAll
+$BlogDB->GetAll
+count($prev)>0) $prevRow=array_shift
+count($next)>0) $nextRow=array_shift
-
-                echo "<ul class=\"entryfoot\">";
@@ -413 +416 @@
-        function printEntryAndComments($shortsubject) 
-        {
+                global $BlogDB;
-                $shortsubject = $this->makeCleanString($shortsubject);
-
-
-
+
+
-                        error(5,"No relevant posts");
-                }
-                else    {
-
-
-
-
-
-
+
+
+
+
+
-                }
-        }
@@ -432 +434 @@
-        function printComments($postid, $offset=0, $limit=15) 
-        {
-$sql = db_query("SELECT timestamp, name, email, body, host, id FROM comments WHERE post = ".$postid." and moderated = true ORDER BY timestamp ASC limit ".$limit." OFFSET ".$offset.";")
-Num = db_num_rows($sql
+global $BlogDB
+ = $BlogDB->GetAll("SELECT timestamp, name, email, body, host, id FROM comments WHERE post = ".$postid." and moderated = true ORDER BY timestamp ASC limit ".$limit." OFFSET ".$offset.";"
-                echo "<div id=\"comments\">\n";
-$sqlNum
+count($sql)
-                        $blogOwner = $this->checkSessionOwner();
-                        if($blogOwner) {
@@ -442 +444 @@
-                        
-                        $count=0;
-db_getrow
+array_shift
-                                $this->printComment($sqlRow, $blogOwner, $count++);
-                        }
@@ -474 +476 @@
-        //counts the number of comments 
-        function commentCount($entry) {
-$sql = db_query("SELECT count(id) from comments where post = ".$entry." and moderated = true;");               
-Row = db_getrow($sql);
-Row['count'
+global $BlogDB;
+ = $BlogDB->GetCol("SELECT count(id) from comments where post = ".$entry." and moderated = true;");                
+[0
-        }
-        
-        //returns a category name
-
-
-
-
-
+
+
+
+
-        }
-        
@@ -556 +557 @@
-        function newComment($id, $printentry=TRUE) 
-        {
+                global $BlogDB;
-                $author = "";
-                $email = "";
-                $comment = "";
-                //check the post exists, and is part of this blog
-
-
-
+
+
-                        error(1,_("Invalid blog entry, This entry may have been removed..?"));
-                        return;
-                }
-                //pull in the unadulterated subject for later on
-                $row = db_getrow($sql);
-                $subject = $row['subject'];
-                $postid =  $row['id'];
@@ -624 +624 @@
-                        } else {
-                                //check the list of 'authorised' commentors
-db_num_rows(db_query
+count($BlogDB->GetAll
-                                        $moderated = TRUE;
-                                } else {
@@ -632 +632 @@
-                        //actualy insert the new comment and check it worked
-                        $query = "INSERT INTO comments (post, name, email, body, host, moderated, spam) VALUES ('{$postid}','{$author}','{$email}','{$comment}','{$host}', ".(($moderated) ? "true" : "false").", ".(($spam) ? "true" : "false").")";
-db_query
-db_error
-
-s
+$BlogDB->Execute
+$BlogDB->