Changeset 2313

Timestamp:

12/18/10 13:21:10 (17 months ago)

Author:

nick_ramsay

Message:

[1.5] Removed most comments-related code from core - needs some testing.

Location:

branches/1.5

Files:

• Hotaru.php (modified) (2 diffs)
• install/index.php (modified) (1 diff)
• install/install-upgrade.php (modified) (2 diffs)
• install/install_tables.php (modified) (1 diff)
• libs/AdminPages.php (modified) (1 diff)
• libs/Caching.php (modified) (1 diff)
• libs/Comment.php (deleted)
• libs/Initialize.php (modified) (1 diff)
• libs/UserAuth.php (modified) (1 diff)

branches/1.5/Hotaru.php

@@ -40 +40 @@
         protected $post;                            // Post object
         protected $avatar;                          // Avatar object
-        protected $comment;                         // Comment object
         protected $includes;                        // for CSS/JavaScript includes
         protected $pageHandling;                    // PageHandling object
@@ -2012 +2011 @@
 /* *************************************************************
  *
- *  COMMENT FUNCTIONS
- *
- * *********************************************************** */
-
-        /**
-         * Count comments
-         *
-         * @param bool $digits_only - return just the count (if false, returns "3 comments", etc.)
-         * @param string $no_comments_text - e.g. "Leave a comment" or "No comments"
-         * @return string - text to show, e.g. "3 comments"
-         */
-        function countComments($digits_only = true, $no_comments_text = '')
-        {
-                $comment = new Comment();
-                return $comment->countComments($this, $digits_only, $no_comments_text);
-        }
-
-
-        /**
-         * Count all user comments
-         *
-         * @param int $user_id
-         * @return int
-         */
-        function countUserComments($user_id = 0)
-        {
-                $comment = new Comment();
-                return $comment->countUserComments($this, $user_id);
-        }
-
-
-        /**
-         * Physically delete all comments by a specified user (and responses)
-         *
-         * @param array $user_id
-         * @return bool
-         */
-        public function deleteComments($user_id)
-        {
-                $comment = new Comment();
-                return $comment->deleteComments($this, $user_id);
-        }
-
-
-        /**
-         * Get comment from database
-         *
-         * @param int $comment_id
-         * @return array|false
-         */
-        function getComment($comment_id = 0)
-        {
-                $comment = new Comment();
-                return $comment->getComment($this, $comment_id);
-        }
-
-
-        /**
-         * Read comment
-         *
-         * @param array $comment_row pulled from database
-         */
-        function readComment($comment_row = array())
-        {
-                $comment = new Comment();
-                return $comment->readComment($this, $comment_row);
-        }
-
-
-/* *************************************************************
- *
  *  WIDGET FUNCTIONS
  *

branches/1.5/install/index.php

@@ -499 +499 @@
         } else {
 
-                $tables = array('blocked', 'categories', 'comments', 'miscdata', 'plugins', 'pluginhooks', 'pluginsettings', 'posts', 'postvotes', 'settings', 'tags', 'tempdata', 'tokens', 'users', 'usermeta', 'widgets');
+                $tables = array('blocked', 'categories', 'miscdata', 'plugins', 'pluginhooks', 'pluginsettings', 'posts', 'postvotes', 'settings', 'tags', 'tempdata', 'tokens', 'users', 'usermeta', 'widgets');
 
                 // delete *all* tables in db:

branches/1.5/install/install-upgrade.php

@@ -260 +260 @@
                 if (!$exists) {
                         // Alter the Users table to include user_lastvisit
-                        $sql = "ALTER TABLE " . TABLE_COMMENTS . " ADD comment_votes_down smallint(11) NOT NULL DEFAULT '0' AFTER comment_votes";
+                        $sql = "ALTER TABLE ".DB_PREFIX."comments ADD comment_votes_down smallint(11) NOT NULL DEFAULT '0' AFTER comment_votes";
                         $h->db->query($h->db->prepare($sql));
                 }
@@ -268 +268 @@
                 if (!$exists) {
                         // Alter the Users table to include user_lastvisit
-                        $sql = "ALTER TABLE " . TABLE_COMMENTS . " CHANGE comment_votes comment_votes_up smallint(11) NOT NULL DEFAULT '0'";
+                        $sql = "ALTER TABLE ".DB_PREFIX."comments CHANGE comment_votes comment_votes_up smallint(11) NOT NULL DEFAULT '0'";
                         $h->db->query($h->db->prepare($sql));
                 }
                 
                 // move any negative comment vote counts to the down column
-                $sql = "SELECT comment_id, comment_votes_up FROM " . TABLE_COMMENTS . " WHERE comment_votes_up < %d";
+                $sql = "SELECT comment_id, comment_votes_up FROM ".DB_PREFIX."comments WHERE comment_votes_up < %d";
                 $negatives = $h->db->get_results($h->db->prepare($sql, 0));
                 if ($negatives) {
                         foreach ($negatives as $neg) {
-                                $sql = "UPDATE " . TABLE_COMMENTS . " SET comment_votes_up = %d, comment_votes_down = %d WHERE comment_id = %d";
+                                $sql = "UPDATE ".DB_PREFIX."comments SET comment_votes_up = %d, comment_votes_down = %d WHERE comment_id = %d";
                                 $h->db->query($h->db->prepare($sql, 0, abs($neg->comment_votes_up), $neg->comment_id));
                         }

branches/1.5/install/install_tables.php

@@ -83 +83 @@
                 $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (category_name, category_safe_name) VALUES (%s, %s)";
                 $db->query($db->prepare($sql, urlencode('All'), urlencode('all')));
-        }
-
-
-        // COMMENTS TABLE - comments
-        
-        if ($table_name == "comments") {
-                //echo "table doesn't exist. Stopping before creation."; exit;
-                $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
-                        `comment_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `comment_archived` enum('Y','N') NOT NULL DEFAULT 'N',
-                        `comment_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
-                        `comment_post_id` int(20) NOT NULL DEFAULT '0',
-                        `comment_user_id` int(20) NOT NULL DEFAULT '0',
-                        `comment_parent` int(20) DEFAULT '0',
-                        `comment_date` timestamp NULL,
-                        `comment_status` varchar(32) NOT NULL DEFAULT 'approved',
-                        `comment_content` text NULL,
-                        `comment_votes_up` smallint(11) NOT NULL DEFAULT '0',
-                        `comment_votes_down` smallint(11) NOT NULL DEFAULT '0',
-                        `comment_subscribe` tinyint(1) NOT NULL DEFAULT '0',
-                        `comment_updateby` int(20) NOT NULL DEFAULT 0,
-                        FULLTEXT (`comment_content`),
-                        INDEX  (`comment_archived`),
-                        INDEX  (`comment_post_id`),
-                        INDEX  (`comment_status`)
-                ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Post Comments';";
-                echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
-                $db->query($sql); 
         }
 

branches/1.5/libs/AdminPages.php

@@ -385 +385 @@
                                 DB_PREFIX.'usermeta',
                                 DB_PREFIX.'categories',
-                                DB_PREFIX.'comments',
                                 DB_PREFIX.'miscdata',
                                 DB_PREFIX.'posts',

branches/1.5/libs/Caching.php

@@ -204 +204 @@
                                 break;
                         case 'comments':
-                                $sql = "SELECT comment_updatedts FROM ".TABLE_COMMENTS." ORDER BY comment_updatedts DESC LIMIT 1";
+                                $sql = "SELECT comment_updatedts FROM ".DB_PREFIX."comments ORDER BY comment_updatedts DESC LIMIT 1";
                                 break;
                         case 'commentvotes':

branches/1.5/libs/Initialize.php

@@ -114 +114 @@
                         'TABLE_BLOCKED' => 'blocked',
                         'TABLE_CATEGORIES' => 'categories',
-                        'TABLE_COMMENTS' => 'comments',
                         'TABLE_MISCDATA' => 'miscdata',
                         'TABLE_PLUGINS' => 'plugins',

branches/1.5/libs/UserAuth.php

@@ -327 +327 @@
                                 $viewee->updatePermissions($h);
                                 if ($role_check == 'killspammed' || $role_check == 'deleted') {
-                                        $h->deleteComments($viewee->id); // includes child comments from *other* users
+                                        if (isset($h->vars['comment'])) {
+                                                $h->vars['comment']->deleteComments($h, $viewee->id); // includes child comments from *other* users
+                                        }
                                         $h->deletePosts($viewee->id); // includes tags and votes for self-submitted posts