Changeset 2319 for branches

Timestamp:

12/19/10 11:53:59 (17 months ago)

Author:

nick_ramsay

Message:

[1.5] Removing most category-related code from the core.

Location:

branches/1.5

Files:

• Hotaru.php (modified) (1 diff)
• install/index.php (modified) (1 diff)
• install/install-upgrade.php (modified) (1 diff)
• install/install_tables.php (modified) (1 diff)
• libs/Category.php (deleted)
• libs/Initialize.php (modified) (2 diffs)
• libs/PageHandling.php (modified) (2 diffs)

branches/1.5/Hotaru.php

@@ -1685 +1685 @@
         }
 
-        ########################
-        ## CATEGORY FUNCTIONS ##
-        ########################
-
-        /**
-         * Returns the category id for a given category safe name.
-         *
-         * @param string $cat_name
-         * @return int
-         */
-        public function getCatId($cat_safe_name = '')
-        {
-                $category = new Category();
-                return $category->getCatId($this, $cat_safe_name);
-        }
-
-
-        /**
-         * Returns the category name for a given category id or safe name.
-         *
-         * @param int $cat_id
-         * @param string $cat_safe_name
-         * @return string
-         */
-        public function getCatName($cat_id = 0, $cat_safe_name = '')
-        {
-                $category = new Category();
-                return $category->getCatName($this, $cat_id, $cat_safe_name);
-        }
-
-
-        /**
-         * Returns the category safe name for a given category id
-         *
-         * @param int $cat_id
-         * @return string
-         */
-        public function getCatSafeName($cat_id = 0)
-        {
-                $category = new Category();
-                return $category->getCatSafeName($this, $cat_id);
-        }
-
-
-        /**
-         * Returns parent id
-         *
-         * @param int $cat_id
-         * @return int
-         */
-        public function getCatParent($cat_id = 0)
-        {
-                $category = new Category();
-                return $category->getCatParent($this, $cat_id);
-        }
-
-
-        /**
-         * Returns child ids
-         *
-         * @param int $cat_parent_id
-         * @return int
-         */
-        public function getCatChildren($cat_parent_id = 0)
-        {
-                $category = new Category();
-                return $category->getCatChildren($this, $cat_parent_id);
-        }
-
-         /**
-         * Returns Category list ids
-         *
-         * @param array $args
-         * @return int
-         */
-        public function getCategories($args = array())
-        {
-                $category = new Category();
-                return $category->getCategories($this, $args);
-        }
-
-
-        /**
-         * Returns meta description and keywords for the category (if available)
-         *
-         * @param int $cat_id
-         * @return array|false
-         */
-        public function getCatMeta($cat_id = 0)
-        {
-                $category = new Category();
-                return $category->getCatMeta($this, $cat_id);
-        }
-
-
-        /**
-         * Add a new category
-         *
-         * @param int $parent
-         * @param string $new_cat_name
-         * @return bool
-         */
-        public function addCategory($parent = 0, $new_cat_name = '')
-        {
-                $category = new Category();
-                return $category->addCategory($this, $parent, $new_cat_name);
-        }
-
-
-        /**
-         * rebuild the category tree
-         *
-         * @param int $parent_id
-         * @param int $left
-         * @return int
-         */
-        public function rebuildTree($parent_id = 0, $left = 0)
-        {
-                $category = new Category();
-                return $category->rebuildTree($this, $parent_id, $left);
-        }
-
-
-        /**
-         * Delete a category
-         *
-         * @param int $delete_category
-         * @return bool
-         */
-        function deleteCategory($delete_category = 0)
-        {
-                $category = new Category();
-                return $category->deleteCategory($this, $delete_category);
-        }
 
         ######################

branches/1.5/install/index.php

@@ -499 +499 @@
         } else {
 
-                $tables = array('blocked', 'categories', 'miscdata', 'plugins', 'pluginhooks', 'pluginsettings', 'posts', 'postvotes', 'settings', 'tags', 'tempdata', 'tokens', 'users', 'usermeta', 'widgets');
+                $tables = array('blocked', '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

@@ -587 +587 @@
 
                 // Drop unique site_id keys
-                $sql = "ALTER TABLE `" . TABLE_CATEGORIES . "` DROP INDEX `key`";
-                $h->db->query($sql);
-                $sql = "ALTER TABLE `" . TABLE_CATEGORIES . "` ADD UNIQUE KEY `key` (`category_name`)";
+                $sql = "ALTER TABLE `".DB_PREFIX."categories` DROP INDEX `key`";
+                $h->db->query($sql);
+                $sql = "ALTER TABLE `".DB_PREFIX."categories` ADD UNIQUE KEY `key` (`category_name`)";
                 $h->db->query($sql);
                 

branches/1.5/install/install_tables.php

@@ -60 +60 @@
         
         
-        // CATEGORIES TABLE - categories
-        
-        if ($table_name == "categories") {
-                //echo "table doesn't exist. Stopping before creation."; exit;
-                $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
-                        `category_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `category_parent` int(11) NOT NULL DEFAULT '1',
-                        `category_name` varchar(64) NOT NULL DEFAULT '',
-                        `category_safe_name` varchar(64) NOT NULL DEFAULT '',
-                        `rgt` int(11) NOT NULL DEFAULT '0',
-                        `lft` int(11) NOT NULL DEFAULT '0',
-                        `category_order` int(11) NOT NULL DEFAULT '0',
-                        `category_desc` text NULL,
-                        `category_keywords` varchar(255) NULL,
-                        `category_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
-                        `category_updateby` int(20) NOT NULL DEFAULT 0,
-                        UNIQUE KEY `key` (`category_name`)
-                ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Categories';";
-                echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
-                $db->query($sql);
-                
-                $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (category_name, category_safe_name) VALUES (%s, %s)";
-                $db->query($db->prepare($sql, urlencode('All'), urlencode('all')));
-        }
-
-
         // MISCDATA TABLE - for storing default permissions, etc.
         

branches/1.5/libs/Initialize.php

@@ -113 +113 @@
                 $tableConstants = array(
                         'TABLE_BLOCKED' => 'blocked',
-                        'TABLE_CATEGORIES' => 'categories',
                         'TABLE_MISCDATA' => 'miscdata',
                         'TABLE_PLUGINS' => 'plugins',
@@ -158 +157 @@
                 require_once(FUNCTIONS.'funcs.arrays.php');
                 require_once(FUNCTIONS.'funcs.times.php');
-                require_once(FUNCTIONS.'funcs.files.php');
                 require_once(FUNCTIONS.'funcs.http.php');
         }

branches/1.5/libs/PageHandling.php

@@ -351 +351 @@
                                         // if we're using categories and the category is not "all"...
                                         if ($h->isActive('categories') && $h->post->category > 1) {
-                                                $url .= $h->getCatSafeName($h->post->category).'/';
+                                                $url .= $h->vars['category']->getCatSafeName($h, $h->post->category).'/';
                                         }
 
@@ -357 +357 @@
                                 } elseif ($key == 'category' && is_numeric($value)) {
 
-                                        $url .= $key.'/'.$h->getCatSafeName($value).'/';
+                                        $url .= $key.'/'.$h->vars['category']->getCatSafeName($h, $value).'/';
                                 } elseif ($key == 'page') {