From 5f64206765eef863a8fa3baade0fed97c0405345 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 18 Jan 2016 10:12:10 +0100 Subject: [PATCH] Move Other category (Misc and Hashed) to categoryid 0000. --- Changelog | 2 ++ misc/testing/DB/reset_postprocessing.php | 2 +- misc/testing/Various/renametopre.php | 6 +++--- misc/testing/recategorize.php | 2 +- .../python/postprocess_threaded.py | 6 +++--- newznab/Categorize.php | 16 ++++++++-------- newznab/Category.php | 11 ++++++----- newznab/MiscSorter.php | 2 +- newznab/NameFixer.php | 6 +++--- newznab/PreDb.php | 2 +- newznab/Regexes.php | 2 +- newznab/ReleaseRemover.php | 18 +++++++++--------- newznab/Releases.php | 2 +- newznab/processing/ProcessReleases.php | 10 +++++----- newznab/processing/post/ProcessAdditional.php | 4 ++-- resources/db/schema/nntmux_fi_schema.sql | 10 +++++----- resources/db/schema/schema.sql | 8 ++++---- www/themes/Charisma/templates/headermenu.tpl | 6 +++--- www/themes/Charisma/templates/predb.tpl | 4 ++-- www/themes/Gamma/templates/headermenu.tpl | 2 +- www/themes/Gamma/templates/predb.tpl | 4 ++-- www/themes/Omicron/templates/headermenu.tpl | 8 ++++---- www/themes/Omicron/templates/predb.tpl | 4 ++-- 23 files changed, 70 insertions(+), 67 deletions(-) diff --git a/Changelog b/Changelog index 5c378e7f7..512a3a3b4 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2016-01-18 DariusIII + Chg: Move Other category (Misc and Hashed) to categoryid 0000. 2016-01-15 DariusIII Rmv: Remove the unused Sphinx class. 2016-01-14 DariusIII diff --git a/misc/testing/DB/reset_postprocessing.php b/misc/testing/DB/reset_postprocessing.php index cbd4f759b..0c0e075fe 100755 --- a/misc/testing/DB/reset_postprocessing.php +++ b/misc/testing/DB/reset_postprocessing.php @@ -254,7 +254,7 @@ if (isset($argv[1]) && ($argv[1] === "books" || $argv[1] === "all")) { $where = ' WHERE bookinfoid IS NOT NULL'; } else { echo $pdo->log->header("Resetting all failed Book postprocessing"); - $where = " WHERE bookinfoid IN (-2, 0) AND categoryid BETWEEN 8000 AND 8999"; + $where = " WHERE bookinfoid IN (-2, 0) AND categoryid BETWEEN 0000 AND 8999"; } $qry = $pdo->queryDirect("SELECT id FROM releases" . $where); diff --git a/misc/testing/Various/renametopre.php b/misc/testing/Various/renametopre.php index 77306e0d2..577b49841 100644 --- a/misc/testing/Various/renametopre.php +++ b/misc/testing/Various/renametopre.php @@ -222,7 +222,7 @@ function preName($argv, $argc) } $timestart = TIME(); if (isset($argv[1]) && is_numeric($argv[1])) { - $relcount = catRelease("searchname", "WHERE (iscategorized = 0 OR categoryid = 8010) AND adddate > NOW() - INTERVAL " . $argv[1] . " HOUR", true); + $relcount = catRelease("searchname", "WHERE (iscategorized = 0 OR categoryid = 0010) AND adddate > NOW() - INTERVAL " . $argv[1] . " HOUR", true); } else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $full === true) { $relcount = catRelease("searchname", str_replace(" AND", "WHERE", $where) . " AND iscategorized = 0 ", true); } else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $all === true) { @@ -232,13 +232,13 @@ function preName($argv, $argc) } else if (isset($argv[2]) && is_numeric($argv[2]) && $argv[1] == "all") { $relcount = catRelease("searchname", str_replace(" AND", "WHERE", $where), true); } else if (isset($argv[1]) && $argv[1] == "full") { - $relcount = catRelease("searchname", "WHERE categoryid = 8010 OR iscategorized = 0", true); + $relcount = catRelease("searchname", "WHERE categoryid = 0010 OR iscategorized = 0", true); } else if (isset($argv[1]) && $argv[1] == "all") { $relcount = catRelease("searchname", "", true); } else if (isset($argv[1]) && $argv[1] == "preid") { $relcount = catRelease("searchname", "WHERE preid = 0 AND nzbstatus = 1", true); } else { - $relcount = catRelease("searchname", "WHERE (iscategorized = 0 OR categoryid = 8010) AND adddate > NOW() - INTERVAL " . $argv[1] . " HOUR", true); + $relcount = catRelease("searchname", "WHERE (iscategorized = 0 OR categoryid = 0010) AND adddate > NOW() - INTERVAL " . $argv[1] . " HOUR", true); } $consoletools = new ConsoleTools(['ColorCLI' => $pdo->log]); $time = $consoletools->convertTime(TIME() - $timestart); diff --git a/misc/testing/recategorize.php b/misc/testing/recategorize.php index c041f9e4e..7ca755dfc 100644 --- a/misc/testing/recategorize.php +++ b/misc/testing/recategorize.php @@ -33,7 +33,7 @@ function reCategorize($argv) } else if (isset($argv[1]) && preg_match('/\([\d, ]+\)/', $argv[1])) { $where = ' AND groupid IN ' . $argv[1]; } else if (isset($argv[1]) && $argv[1] === 'misc') { - $where = ' AND categoryid IN (1090, 2020, 3050, 4040, 5050, 6050, 7050, 8010)'; + $where = ' AND categoryid IN (1090, 2020, 3050, 4040, 5050, 6050, 7050, 0010)'; } if (isset($argv[2]) && $argv[2] === 'test') { $update = false; diff --git a/misc/update_scripts/python/postprocess_threaded.py b/misc/update_scripts/python/postprocess_threaded.py index 790355770..585a76848 100644 --- a/misc/update_scripts/python/postprocess_threaded.py +++ b/misc/update_scripts/python/postprocess_threaded.py @@ -59,9 +59,9 @@ elif len(sys.argv) == 3 and sys.argv[2].isdigit() and len(sys.argv[2]) == 4: elif sys.argv[2] == '7000': group_id = 'AND categoryid BETWEEN 7000 AND 7999' print(bcolors.HEADER + "Using categoryids 7000-7999" + bcolors.ENDC) - elif sys.argv[2] == '8000': - group_id = 'AND categoryid BETWEEN 8000 AND 8999' - print(bcolors.HEADER + "Using categoryids 8000-8999" + bcolors.ENDC) + elif sys.argv[2] == '0000': + group_id = 'AND categoryid BETWEEN 0000 AND 8999' + print(bcolors.HEADER + "Using categoryids 0000-8999" + bcolors.ENDC) else: group_id = 'AND categoryid = '+sys.argv[2] print(bcolors.HEADER + "Using categoryid "+sys.argv[2] + bcolors.ENDC) diff --git a/newznab/Categorize.php b/newznab/Categorize.php index d25f8cbb6..a85034a08 100644 --- a/newznab/Categorize.php +++ b/newznab/Categorize.php @@ -24,7 +24,7 @@ class Categorize extends Category * Temporary category while we sort through the name. * @var int */ - protected $tmpCat = Category::CAT_MISC_OTHER; + protected $tmpCat = Category::CAT_OTHER_MISC; /** * Release name to sort through. @@ -60,7 +60,7 @@ class Categorize extends Category /** * Look up the site to see which language of categorizing to use. * Then work out which category is applicable for either a group or a binary. - * Returns Category::CAT_MISC_OTHER if no category is appropriate. + * Returns Category::CAT_OTHER_MISC if no category is appropriate. * * @param string $releaseName The name to parse. * @param int|string $groupID The groupid. @@ -71,7 +71,7 @@ class Categorize extends Category { $this->releaseName = $releaseName; $this->groupid = $groupID; - $this->tmpCat = Category::CAT_MISC_OTHER; + $this->tmpCat = Category::CAT_OTHER_MISC; switch (true) { case $this->isMisc(): @@ -229,7 +229,7 @@ class Categorize extends Category case $this->isMovie(): break; default: - $this->tmpCat = Category::CAT_MISC_OTHER; + $this->tmpCat = Category::CAT_OTHER_MISC; break; } break; @@ -237,7 +237,7 @@ class Categorize extends Category if ($this->isMovie()) { break; } - $this->tmpCat = Category::CAT_MISC_OTHER; + $this->tmpCat = Category::CAT_OTHER_MISC; break; case preg_match('/alt\.binaries\.(dvdnordic\.org|nordic\.(dvdr?|xvid))|dk\.(binaer|binaries)\.film(\.divx)?/', $group): if ($this->categorizeForeign && $this->isMovieForeign()) { @@ -290,7 +290,7 @@ class Categorize extends Category $this->tmpCat = Category::CAT_BOOK_EBOOK; break; default: - $this->tmpCat = Category::CAT_MISC_OTHER; + $this->tmpCat = Category::CAT_OTHER_MISC; break; } break; @@ -1432,11 +1432,11 @@ class Categorize extends Category case preg_match('/[^a-z0-9]((480|720|1080)[ip]|s\d{1,3}[-._ ]?[ed]\d{1,3}([ex]\d{1,3}|[-.\w ]))[^a-z0-9]/i', $this->releaseName): return false; case preg_match('/[a-f0-9]{32,64}/i', $this->releaseName): - $this->tmpCat = Category::CAT_MISC_HASHED; + $this->tmpCat = Category::CAT_OTHER_HASHED; break; case preg_match('/[a-z0-9]{20,}/i', $this->releaseName): case preg_match('/^[A-Z0-9]{1,}$/i', $this->releaseName): - $this->tmpCat = Category::CAT_MISC_OTHER; + $this->tmpCat = Category::CAT_OTHER_MISC; break; default: return false; diff --git a/newznab/Category.php b/newznab/Category.php index 40bba2ea0..0f5f0db95 100644 --- a/newznab/Category.php +++ b/newznab/Category.php @@ -8,6 +8,9 @@ use newznab\db\Settings; */ class Category { + + const CAT_OTHER_MISC = 0010; + const CAT_OTHER_HASHED = 0020; const CAT_GAME_NDS = 1010; const CAT_GAME_PSP = 1020; const CAT_GAME_WII = 1030; @@ -68,8 +71,7 @@ class Category const CAT_BOOK_TECHNICAL = 7040; const CAT_BOOK_OTHER = 7050; const CAT_BOOK_FOREIGN = 7060; - const CAT_MISC_OTHER = 8010; - const CAT_MISC_HASHED = 8020; + const CAT_PARENT_OTHER = 0000; const CAT_PARENT_GAME = 1000; const CAT_PARENT_MOVIE = 2000; const CAT_PARENT_MUSIC = 3000; @@ -77,7 +79,6 @@ class Category const CAT_PARENT_TV = 5000; const CAT_PARENT_XXX = 6000; const CAT_PARENT_BOOK = 7000; - const CAT_PARENT_MISC = 8000; const CAT_NOT_DETERMINED = 7900; const STATUS_INACTIVE = 0; const STATUS_ACTIVE = 1; @@ -91,9 +92,9 @@ class Category self::CAT_MUSIC_OTHER, self::CAT_PC_MOBILEOTHER, self::CAT_TV_OTHER, - self::CAT_MISC_HASHED, + self::CAT_OTHER_HASHED, self::CAT_XXX_OTHER, - self::CAT_MISC_OTHER + self::CAT_OTHER_MISC ] ; diff --git a/newznab/MiscSorter.php b/newznab/MiscSorter.php index bcf6ea1e6..aaa6b3577 100644 --- a/newznab/MiscSorter.php +++ b/newznab/MiscSorter.php @@ -61,7 +61,7 @@ class MiscSorter public function nfosorter($category = 0, $id = 0) { $idarr = ($id != 0 ? sprintf('AND r.id = %d', $id) : ''); - $cat = ($category = 0 ? sprintf('AND r.categoryid = %d', Category::CAT_MISC_OTHER) : sprintf('AND r.categoryid = %d', $category)); + $cat = ($category = 0 ? sprintf('AND r.categoryid = %d', Category::CAT_OTHER_MISC) : sprintf('AND r.categoryid = %d', $category)); $res = $this->pdo->queryDirect( sprintf(" diff --git a/newznab/NameFixer.php b/newznab/NameFixer.php index 8662b1121..35ce321fa 100755 --- a/newznab/NameFixer.php +++ b/newznab/NameFixer.php @@ -151,9 +151,9 @@ class NameFixer $this->echooutput = ($options['Echo'] && NN_ECHOCLI); $this->relid = $this->fixed = $this->checked = 0; $this->pdo = ($options['Settings'] instanceof Settings ? $options['Settings'] : new Settings()); - $this->timeother = ' AND rel.adddate > (NOW() - INTERVAL 6 HOUR) AND rel.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 8010, 8020) GROUP BY rel.id ORDER BY postdate DESC'; + $this->timeother = ' AND rel.adddate > (NOW() - INTERVAL 6 HOUR) AND rel.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 0010, 0020) GROUP BY rel.id ORDER BY postdate DESC'; $this->timeall = ' AND rel.adddate > (NOW() - INTERVAL 6 HOUR) GROUP BY rel.id ORDER BY postdate DESC'; - $this->fullother = ' AND rel.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 8010, 8020) GROUP BY rel.id'; + $this->fullother = ' AND rel.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 0010, 0020) GROUP BY rel.id'; $this->fullall = ''; $this->_fileName = ''; $this->done = $this->matched = false; @@ -199,7 +199,7 @@ class NameFixer WHERE (rel.isrenamed = %d OR rel.categoryid = %d) AND rel.proc_nfo = %d', self::IS_RENAMED_NONE, - Category::CAT_MISC_OTHER, + Category::CAT_OTHER_MISC, self::PROC_NFO_NONE ); } diff --git a/newznab/PreDb.php b/newznab/PreDb.php index f4a6628fd..845b6d765 100644 --- a/newznab/PreDb.php +++ b/newznab/PreDb.php @@ -175,7 +175,7 @@ Class PreDb } $ct = ''; if ($cats == 1) { - $ct = 'AND r.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 8010)'; + $ct = 'AND r.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 0010)'; } if ($this->echooutput) { diff --git a/newznab/Regexes.php b/newznab/Regexes.php index 0bb25a38a..a02d85824 100644 --- a/newznab/Regexes.php +++ b/newznab/Regexes.php @@ -23,7 +23,7 @@ class Regexes /** * @var int */ - protected $_categoryID = Category::CAT_MISC_OTHER; + protected $_categoryID = Category::CAT_OTHER_MISC; /** * @param array $options diff --git a/newznab/ReleaseRemover.php b/newznab/ReleaseRemover.php index 7577626b3..099884961 100644 --- a/newznab/ReleaseRemover.php +++ b/newznab/ReleaseRemover.php @@ -350,7 +350,7 @@ class ReleaseRemover AND r.categoryid NOT IN (%d) AND r.searchname REGEXP '^[a-zA-Z0-9]{15,}$' %s", - Category::CAT_MISC_HASHED, + Category::CAT_OTHER_HASHED, $this->crapTime ); @@ -378,7 +378,7 @@ class ReleaseRemover AND r.categoryid NOT IN (%d, %d) AND r.searchname REGEXP '[a-zA-Z0-9]{25,}' %s", - Category::CAT_MISC_OTHER, Category::CAT_MISC_HASHED, $this->crapTime + Category::CAT_OTHER_MISC, Category::CAT_OTHER_HASHED, $this->crapTime ); if ($this->checkSelectQuery() === false) { @@ -405,7 +405,7 @@ class ReleaseRemover AND r.categoryid NOT IN (%d) AND r.searchname REGEXP '^[a-zA-Z0-9]{0,5}$' %s", - Category::CAT_MISC_OTHER, $this->crapTime + Category::CAT_OTHER_MISC, $this->crapTime ); if ($this->checkSelectQuery() === false) { @@ -457,8 +457,8 @@ class ReleaseRemover Category::CAT_PC_GAMES, Category::CAT_PC_ISO, Category::CAT_PC_MAC, - Category::CAT_MISC_OTHER, - Category::CAT_MISC_HASHED, + Category::CAT_OTHER_MISC, + Category::CAT_OTHER_HASHED, $execFT, $this->crapTime ); @@ -594,8 +594,8 @@ class ReleaseRemover Category::CAT_PC_MOBILEANDROID, Category::CAT_PC_MOBILEIOS, Category::CAT_PC_MOBILEOTHER, - Category::CAT_MISC_OTHER, - Category::CAT_MISC_HASHED, + Category::CAT_OTHER_MISC, + Category::CAT_OTHER_HASHED, $passFT, $this->crapTime ); @@ -630,8 +630,8 @@ class ReleaseRemover Category::CAT_BOOK_OTHER, Category::CAT_PC_0DAY, Category::CAT_PC_GAMES, - Category::CAT_MISC_OTHER, - Category::CAT_MISC_HASHED, + Category::CAT_OTHER_MISC, + Category::CAT_OTHER_HASHED, $this->crapTime ); diff --git a/newznab/Releases.php b/newznab/Releases.php index 0a5da1f4f..c9f9c5ed0 100755 --- a/newznab/Releases.php +++ b/newznab/Releases.php @@ -1552,7 +1552,7 @@ class Releases b.url, b.cover, b.title as booktitle, b.author FROM releases r INNER JOIN bookinfo b ON r.bookinfoid = b.id - WHERE r.categoryid BETWEEN 8000 AND 8999 + WHERE r.categoryid BETWEEN 0000 AND 0999 OR r.categoryid = 3030 AND b.id > 0 AND b.cover > 0 diff --git a/newznab/processing/ProcessReleases.php b/newznab/processing/ProcessReleases.php index 65cc600fa..1c554fe31 100644 --- a/newznab/processing/ProcessReleases.php +++ b/newznab/processing/ProcessReleases.php @@ -256,7 +256,7 @@ class ProcessReleases public function resetCategorize($where = '') { $this->pdo->queryExec( - sprintf('UPDATE releases SET categoryid = %d, iscategorized = 0 %s', \Category::CAT_MISC_OTHER, $where) + sprintf('UPDATE releases SET categoryid = %d, iscategorized = 0 %s', \Category::CAT_OTHER_MISC, $where) ); } @@ -822,8 +822,8 @@ class ProcessReleases $this->categorizeRelease( $type, (!empty($groupID) - ? 'WHERE categoryid = ' . Category::CAT_MISC_OTHER . ' AND iscategorized = 0 AND groupid = ' . $groupID - : 'WHERE categoryid = ' . Category::CAT_MISC_OTHER . ' AND iscategorized = 0') + ? 'WHERE categoryid = ' . Category::CAT_OTHER_MISC . ' AND iscategorized = 0 AND groupid = ' . $groupID + : 'WHERE categoryid = ' . Category::CAT_OTHER_MISC . ' AND iscategorized = 0') ); if ($this->echoCLI) { @@ -1340,7 +1340,7 @@ class ProcessReleases FROM releases WHERE categoryid = %d AND adddate <= NOW() - INTERVAL %d HOUR', - Category::CAT_MISC_OTHER, + Category::CAT_OTHER_MISC, $this->pdo->getSetting('miscotherretentionhours') ) ); @@ -1360,7 +1360,7 @@ class ProcessReleases FROM releases WHERE categoryid = %d AND adddate <= NOW() - INTERVAL %d HOUR', - Category::CAT_MISC_HASHED, + Category::CAT_OTHER_HASHED, $this->pdo->getSetting('mischashedretentionhours') ) ); diff --git a/newznab/processing/post/ProcessAdditional.php b/newznab/processing/post/ProcessAdditional.php index 64230edd4..bca2a2e94 100644 --- a/newznab/processing/post/ProcessAdditional.php +++ b/newznab/processing/post/ProcessAdditional.php @@ -1358,7 +1358,7 @@ class ProcessAdditional } // Check if it's alt.binaries.u4e file. else if (in_array($this->_releaseGroupName, ['alt.binaries.u4e', 'alt.binaries.mom']) && preg_match('/Linux_2rename\.sh/i', $file) && - ($this->_release['categoryid'] == Category::CAT_MISC_HASHED || $this->_release['categoryid'] == Category::CAT_MISC_OTHER) + ($this->_release['categoryid'] == Category::CAT_OTHER_HASHED || $this->_release['categoryid'] == Category::CAT_OTHER_MISC) ) { $this->_processU4ETitle($file); } @@ -1779,7 +1779,7 @@ class ProcessAdditional sprintf( '/%d\d{3}|%d|%d|%d/', $musicParent[0], - Category::CAT_MISC_OTHER, + Category::CAT_OTHER_MISC, Category::CAT_MOVIE_OTHER, Category::CAT_TV_OTHER ), diff --git a/resources/db/schema/nntmux_fi_schema.sql b/resources/db/schema/nntmux_fi_schema.sql index 618c1756f..dd7d96ec9 100644 --- a/resources/db/schema/nntmux_fi_schema.sql +++ b/resources/db/schema/nntmux_fi_schema.sql @@ -145,6 +145,9 @@ CREATE TABLE IF NOT EXISTS category ( AUTO_INCREMENT = 1000001; INSERT INTO category (id, title, parentid, status, minsizetoformrelease, maxsizetoformrelease, description, disablepreview) VALUES +(0000, 'Other', NULL, 1, 0, 0, NULL, 0), +(0010, 'Misc', 0000, 1, 0, 0, NULL, 0), +(0020, 'Hashed', 0000, 1, 0, 0, NULL, 0), (1000, 'Console', NULL, 1, 0, 0, NULL, 0), (1010, 'NDS', 1000, 1, 0, 0, NULL, 0), (1020, 'PSP', 1000, 1, 0, 0, NULL, 0), @@ -211,10 +214,7 @@ INSERT INTO category (id, title, parentid, status, minsizetoformrelease, maxsize (7030, 'Comics', 7000, 1, 0, 0, NULL, 0), (7040, 'Technical', 7000, 1, 0, 0, NULL, 0), (7050, 'Other', 7000, 1, 0, 0, NULL, 0), -(7060, 'Foreign', 7000, 1, 0, 0, NULL, 0), -(8000, 'Other', NULL, 1, 0, 0, NULL, 0), -(8010, 'Misc', 8000, 1, 0, 0, NULL, 0), -(8020, 'Hashed', 8000, 1, 0, 0, NULL, 0); +(7060, 'Foreign', 7000, 1, 0, 0, NULL, 0); DROP TABLE IF EXISTS category_regexes; CREATE TABLE IF NOT EXISTS category_regexes ( @@ -3924,7 +3924,7 @@ INSERT INTO settings (setting, value, section, subsection, name, hint) VALUES ('dereferrer_link', 'http://derefer.me/?','', '', 'dereferrer_link', ''), ('disablebackfillgroup', '1', '', '', 'disablebackfillgroup', 'Whether to disable backfill on a group if the target DATE has been reached.'), ('email', '', '', '', 'email', ''), -('exepermittedcategories', '4000,4010,4020,4030,4040,4050,4060,4070,8010','', '', 'exepermittedcategories', ''), +('exepermittedcategories', '4000,4010,4020,4030,4040,4050,4060,4070,0010','', '', 'exepermittedcategories', ''), ('extractusingrarinfo', '0','', '', 'extractusingrarinfo', ''), ('fanarttvkey', '', '', '', 'fanarttvkey', ''), ('ffmpeg_duration', '5','', '', 'ffmpeg_duration', ''), diff --git a/resources/db/schema/schema.sql b/resources/db/schema/schema.sql index aaa7f4619..bf6a019f7 100644 --- a/resources/db/schema/schema.sql +++ b/resources/db/schema/schema.sql @@ -513,6 +513,7 @@ CREATE TABLE category COLLATE utf8_unicode_ci AUTO_INCREMENT =100000; +INSERT INTO category (id, title) VALUES (0000, 'Other'); INSERT INTO category (id, title) VALUES (1000, 'Console'); INSERT INTO category (id, title) VALUES (2000, 'Movies'); INSERT INTO category (id, title) VALUES (3000, 'Audio'); @@ -520,7 +521,9 @@ INSERT INTO category (id, title) VALUES (4000, 'PC'); INSERT INTO category (id, title) VALUES (5000, 'TV'); INSERT INTO category (id, title) VALUES (6000, 'XXX'); INSERT INTO category (id, title) VALUES (7000, 'Books'); -INSERT INTO category (id, title) VALUES (8000, 'Other'); + +INSERT INTO category (id, title, parentid) VALUES (0010, 'Misc', 0000); +INSERT INTO category (id, title, parentid) VALUES (0020, 'Hashed', 0000); INSERT INTO category (id, title, parentid) VALUES (1010, 'NDS', 1000); INSERT INTO category (id, title, parentid) VALUES (1020, 'PSP', 1000); @@ -585,9 +588,6 @@ INSERT INTO category (id, title, parentid) VALUES (7040, 'Technical', 7000); INSERT INTO category (id, title, parentid) VALUES (7050, 'Other', 7000); INSERT INTO category (id, title, parentid) VALUES (7060, 'Foreign', 7000); -INSERT INTO category (id, title, parentid) VALUES (8010, 'Misc', 8000); -INSERT INTO category (id, title, parentid) VALUES (8020, 'Hashed', 8000); - DROP TABLE IF EXISTS sharing_sites; CREATE TABLE sharing_sites ( id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, diff --git a/www/themes/Charisma/templates/headermenu.tpl b/www/themes/Charisma/templates/headermenu.tpl index b873f9743..15ebe8bdf 100755 --- a/www/themes/Charisma/templates/headermenu.tpl +++ b/www/themes/Charisma/templates/headermenu.tpl @@ -180,9 +180,9 @@ Misc