From: <ki...@us...> - 2009-08-08 13:14:48
|
Revision: 20696 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20696&view=rev Author: kissaki Date: 2009-08-08 13:14:39 +0000 (Sat, 08 Aug 2009) Log Message: ----------- work on pgsql conversion Modified Paths: -------------- trunk/db/convertscripts/mysql3topgsql72.php trunk/db/tiki-4.0-mysql.sql trunk/db/tiki-4.0-mysqli.sql trunk/db/tiki-4.0-pgsql.sql trunk/db/tiki-4.0-sqlite.sql trunk/db/tiki.sql Modified: trunk/db/convertscripts/mysql3topgsql72.php =================================================================== --- trunk/db/convertscripts/mysql3topgsql72.php 2009-08-08 13:09:15 UTC (rev 20695) +++ trunk/db/convertscripts/mysql3topgsql72.php 2009-08-08 13:14:39 UTC (rev 20696) @@ -67,16 +67,16 @@ $stmt = preg_replace('/(DROP TABLE IF EXISTS |DROP TABLE |CREATE TABLE )"?([a-zA-Z0-9_]+)"? \(/e', 'sprintf("%s \"%s\" (", "$1", record_tablename("$2"))', $stmt); // in key declarations, remove length if there - // PRIMARY KEY (`roleId`, `user`) $stmt = preg_replace( - "/ KEY \((.*)\)/e", - '\' KEY (\' . strip_paranthesisWithNumbers("$1") . \')\'', + "/ KEY (\"[a-zA-Z0-9_]+\" )?\((.*)\)/e", + '\' KEY (\' . strip_paranthesisWithNumbers("$2") . \')\'', $stmt); // drop ENGINE=MyISAM and AUTO_INCREMENT=1 - $stmt=preg_replace('/ ENGINE=MyISAM/', '', $stmt); + $stmt=preg_replace('/ ENGINE ?= ?MyISAM/', '', $stmt); $stmt=preg_replace('/ AUTO_INCREMENT=1/', '', $stmt); + //auto_increment things $stmt=preg_replace("/int(eger)? NOT NULL auto_increment/i", "bigserial", $stmt); $stmt=preg_replace("/int(eger)?\(\d\) (unsigned )*NOT NULL auto_increment/i","serial",$stmt); @@ -84,23 +84,23 @@ // integer types - $stmt=preg_replace("/tinyint\([1-4]\)/","smallint",$stmt); - $stmt=preg_replace("/int(eger)*\([1-4]\)( unsigned)*/","smallint",$stmt); - $stmt=preg_replace("/int(eger)*\([5-9]\)( unsigned)*/","integer",$stmt); - $stmt=preg_replace("/int(eger)*\(\d\d\)( unsigned)*/","bigint",$stmt); + $stmt=preg_replace("/tinyint\([1-4]\)( unsigned)?/", "smallint", $stmt); + $stmt=preg_replace("/int(eger)?\([1-4]\)( unsigned)?/","smallint",$stmt); + $stmt=preg_replace("/int(eger)?\([5-9]\)( unsigned)?/","integer",$stmt); + $stmt=preg_replace("/int(eger)?\(\d\d\)( unsigned)?/","bigint",$stmt); // timestamps $stmt=preg_replace("/timestamp\([^\)]+\)/","timestamp(3)",$stmt); // blobs - $stmt=preg_replace("/longblob|tinyblob|blob/","bytea",$stmt); + $stmt=preg_replace("/longblob|tinyblob|blob/", "bytea", $stmt); // text fields - $stmt=preg_replace("/longtext/","text",$stmt); + $stmt=preg_replace("/longtext/", "text", $stmt); // convert enums - $stmt=preg_replace("/\n[ \t]+([a-zA-Z0-9_]+) enum *\(([^\)]+)\)/e","convert_enums('$1','$2')",$stmt); + $stmt=preg_replace("/\n[ \t]+([a-zA-Z0-9_]+) enum *\(([^\)]+)\)/e", "convert_enums('$1','$2')", $stmt); // foreign keys // before: CONSTRAINT tablename \n FOREIGN KEY (colname) REFERENCES tablename(colname) \n ON UPDATE CASCADE ON DELETE SET NULL @@ -129,13 +129,14 @@ $stmt); // create indexes from KEY … - $stmt = preg_replace("/,\n[ \t]*KEY \"?([a-zA-Z0-9_]+)\"? \((.+)\)/e", 'create_index("$1", "$2")', $stmt); - $stmt = preg_replace("/,\n[ \t]*KEY ?\((.+)\)/e", 'create_index("", "$1")', $stmt); + $stmt = preg_replace("/,\n[ \t]*INDEX \"?([a-zA-Z0-9_]+)\"? ?\((.+)\)/e", 'create_index("$1", "$2")', $stmt); + $stmt = preg_replace("/,\n[ \t]*INDEX ?\((.+)\)/e", 'create_index("", "$1")', $stmt); + $stmt = preg_replace("/,\n[ \t]*KEY \"?([a-zA-Z0-9_]+)\"? ?\((.+)\)/e", 'create_index("$1", "$2")', $stmt); + $stmt = preg_replace("/,\n[ \t]*KEY ?\((.+)\)/e", 'create_index("", "$1")', $stmt); // convert inserts - $stmt=preg_replace("/INSERT INTO ([a-zA-Z0-9_]*).*\(([^\)]+)\) VALUES[ \t\n]*(.*)/ie", 'do_inserts("$1", "$2", "$3")', $stmt); - $stmt=preg_replace("/INSERT IGNORE INTO ([a-zA-Z0-9_]*).*\(([^\)]+)\) VALUES *(.*)/ie", "do_inserts('$1','$2','$3')", $stmt); + $stmt = preg_replace("/INSERT (IGNORE )?INTO \"?([a-zA-Z0-9_]*)\"? ?\((.*)\) ?VALUES ?\((.*)\)/ie", "do_inserts('$2', \"$3\", '$4')", $stmt); // convert updates $stmt=preg_replace("/update ([a-zA-Z0-9_]+) set (.*)/e","do_updates('$1','$2')",$stmt); @@ -206,14 +207,14 @@ // trim column names and add quotes $allvals = ''; - foreach ($cols as $col) { + foreach ($cols AS $col) { // strip whitespaces $col = trim($col); // add quotes if column is not quoted - if($col[0] != '"') + if(substr($col, 0, 1) != '"') { - $col = preg_replace('/([a-zA-Z0-9_]+)/', '"$1"', $col); + $col = preg_replace('/\"?([a-zA-Z0-9_]+)\"?/', '"$1"', $col); } // TODO: index textlengths were removed above. Is it possible to use it this way, with the pgsql substr method? Does it remember it's a fn and use it when building indices? @@ -223,8 +224,6 @@ } // Put commas between elements. $allvals = preg_replace('/""/', '","', $allvals); - //$allvals = preg_replace('/"substr/', '",substr', $allvals); - //$allvals = preg_replace("/(substr\(.*\))\"/", "$1,\",substr", $allvals); $poststmt .= 'CREATE ' . ( !empty($type)?$type.' ' : '' ) . 'INDEX "'.$table_name.'_'.$name.'" ON "'.$table_name.'" ('; $poststmt .= $allvals . ");\n"; @@ -235,30 +234,31 @@ $ret="UPDATE \"".$tab."\" SET "; $cols=split(",",$content); foreach ($cols as $vals) { - $vals=preg_replace("/([a-zA-Z0-9_]+)=([a-zA-Z0-9_]+)/","\"$1\"=\"$2\"",$vals); + $vals=preg_replace("/([a-zA-Z0-9_]+)=([a-zA-Z0-9_]+)/", "\"$1\"=\"$2\"", $vals); $ret.=$vals; } $ret=preg_replace("/\" *\"/","\",\"",$ret); return($ret); } -function do_inserts($tab, $content, $tail) +function do_inserts($tablename, $columnlist, $values) { // for some reason are the quotes in $tail addslashed. i dont know why - $tail = preg_replace('/\\\"/', '"', $tail); - $tail = preg_replace('/\\\'/', '\'', $tail); + //$tail = preg_replace('/\\\"/', '"', $tail); + //$tail = preg_replace('/\\\'/', '\'', $tail); - $ret="INSERT INTO \"".$tab."\" ("; - $cols=split(",",$content); - foreach ($cols as $vals) { - $vals=preg_replace("/ /","",$vals); - $ret.="\"$vals\""; + $ret = 'INSERT INTO "'.$tablename.'" ('; + //$ret .= $columnlist; + $cols = split(",", $columnlist); + foreach ($cols as $col) { + $col = trim($col); + $ret .= '"$col"'; } - $ret=preg_replace("/\"\"/","\",\"",$ret); - $ret.=")"; + //$ret = preg_replace("/\"\"/", "\",\"", $ret); + $ret .= ') VALUES (' . $values . ')'; - $tail=preg_replace("/md5\(\'(.+)\'\)/e","quotemd5('$1')",$tail); - return $ret." VALUES ".$tail; + //$tail = preg_replace("/md5\(\'(.+)\'\)/e", "quotemd5('$1')", $tail); // md5() does work, at least on pg 8.3 + return $ret; } function quotemd5($a) Modified: trunk/db/tiki-4.0-mysql.sql =================================================================== --- trunk/db/tiki-4.0-mysql.sql 2009-08-08 13:09:15 UTC (rev 20695) +++ trunk/db/tiki-4.0-mysql.sql 2009-08-08 13:14:39 UTC (rev 20696) @@ -3694,7 +3694,7 @@ ); DROP TABLE IF EXISTS `tiki_user_reports`; -CREATE TABLE IF NOT EXISTS `tiki_user_reports` ( +CREATE TABLE `tiki_user_reports` ( `id` int(11) NOT NULL AUTO_INCREMENT, `user` varchar(200) NOT NULL, `interval` varchar(20) NOT NULL, @@ -3707,7 +3707,7 @@ ) ENGINE=MyISAM; DROP TABLE IF EXISTS `tiki_user_reports_cache`; -CREATE TABLE IF NOT EXISTS `tiki_user_reports_cache` ( +CREATE TABLE `tiki_user_reports_cache` ( `id` int(11) NOT NULL AUTO_INCREMENT, `user` varchar(200) NOT NULL, `event` varchar(200) NOT NULL, Modified: trunk/db/tiki-4.0-mysqli.sql =================================================================== --- trunk/db/tiki-4.0-mysqli.sql 2009-08-08 13:09:15 UTC (rev 20695) +++ trunk/db/tiki-4.0-mysqli.sql 2009-08-08 13:14:39 UTC (rev 20696) @@ -3694,7 +3694,7 @@ ); DROP TABLE IF EXISTS `tiki_user_reports`; -CREATE TABLE IF NOT EXISTS `tiki_user_reports` ( +CREATE TABLE `tiki_user_reports` ( `id` int(11) NOT NULL AUTO_INCREMENT, `user` varchar(200) NOT NULL, `interval` varchar(20) NOT NULL, @@ -3707,7 +3707,7 @@ ) ENGINE=MyISAM; DROP TABLE IF EXISTS `tiki_user_reports_cache`; -CREATE TABLE IF NOT EXISTS `tiki_user_reports_cache` ( +CREATE TABLE `tiki_user_reports_cache` ( `id` int(11) NOT NULL AUTO_INCREMENT, `user` varchar(200) NOT NULL, `event` varchar(200) NOT NULL, Modified: trunk/db/tiki-4.0-pgsql.sql =================================================================== --- trunk/db/tiki-4.0-pgsql.sql 2009-08-08 13:09:15 UTC (rev 20695) +++ trunk/db/tiki-4.0-pgsql.sql 2009-08-08 13:14:39 UTC (rev 20696) @@ -157,7 +157,7 @@ "priority" smallint default NULL, PRIMARY KEY ("msgId") ) ; -CREATE INDEX "messu_messages_userIsRead" ON "messu_messages" ("user","isRead"); +CREATE INDEX "messu_messages_" ON "messu_messages" ("user","isRead"); DROP TABLE IF EXISTS "messu_archive"; @@ -213,7 +213,7 @@ "data" text NOT NULL, PRIMARY KEY ("sesskey") ); -CREATE INDEX "sessions_expiry" ON "sessions" ("expiry"); +CREATE INDEX "sessions_" ON "sessions" ("expiry"); DROP TABLE IF EXISTS "tiki_actionlog"; @@ -230,8 +230,8 @@ "categId" bigint NOT NULL default '0', PRIMARY KEY ("actionId") ); -CREATE INDEX "tiki_actionlog_lastModif" ON "tiki_actionlog" ("lastModif"); -CREATE INDEX "tiki_actionlog_object" ON "tiki_actionlog" ("object"(100)"objectType","action"(100)); +CREATE INDEX "tiki_actionlog_" ON "tiki_actionlog" ("lastModif"); +CREATE INDEX "tiki_actionlog_" ON "tiki_actionlog" ("object","objectType","action"); DROP TABLE IF EXISTS "tiki_actionlog_params"; @@ -241,8 +241,8 @@ "name" varchar(40) NOT NULL, "value" text ); -CREATE INDEX "tiki_actionlog_params_actionIDIndex" ON "tiki_actionlog_params" ("actionId"); -CREATE INDEX "tiki_actionlog_params_nameValue" ON "tiki_actionlog_params" ("name","value"(200)); +CREATE INDEX "tiki_actionlog_params_" ON "tiki_actionlog_params" ("actionId"); +CREATE INDEX "tiki_actionlog_params_" ON "tiki_actionlog_params" ("name","value"); DROP TABLE IF EXISTS "tiki_articles"; @@ -282,15 +282,15 @@ "isfloat" char(1) default NULL, PRIMARY KEY ("articleId") ) ; -CREATE INDEX "tiki_articles_title" ON "tiki_articles" ("title"); -CREATE INDEX "tiki_articles_heading" ON "tiki_articles" ("heading"(255)); -CREATE INDEX "tiki_articles_body" ON "tiki_articles" ("body"(255)); -CREATE INDEX "tiki_articles_nbreads" ON "tiki_articles" ("nbreads"); -CREATE INDEX "tiki_articles_author" ON "tiki_articles" ("author"(32)); -CREATE INDEX "tiki_articles_topicId" ON "tiki_articles" ("topicId"); -CREATE INDEX "tiki_articles_publishDate" ON "tiki_articles" ("publishDate"); -CREATE INDEX "tiki_articles_expireDate" ON "tiki_articles" ("expireDate"); -CREATE INDEX "tiki_articles_type" ON "tiki_articles" ("type"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("title"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("heading"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("body"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("nbreads"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("author"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("topicId"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("publishDate"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("expireDate"); +CREATE INDEX "tiki_articles_" ON "tiki_articles" ("type"); DROP TABLE IF EXISTS "tiki_article_types"; @@ -318,17 +318,17 @@ "comment_can_rate_article" char(1) default NULL, PRIMARY KEY ("type") ) ; -CREATE INDEX "tiki_article_types_show_pre_publ" ON "tiki_article_types" ("show_pre_publ"); -CREATE INDEX "tiki_article_types_show_post_expire" ON "tiki_article_types" ("show_post_expire"); +CREATE INDEX "tiki_article_types_" ON "tiki_article_types" ("show_pre_publ"); +CREATE INDEX "tiki_article_types_" ON "tiki_article_types" ("show_post_expire"); -INSERT INTO "tiki_article_types" ("type") VALUES ('Article'); +INSERT INTO "tiki_article_types" ("$col") VALUES ('Article'); -INSERT INTO "tiki_article_types" ("type","use_ratings") VALUES ('Review','y'); +INSERT INTO "tiki_article_types" ("$col""$col") VALUES ('Review','y'); -INSERT INTO "tiki_article_types" ("type","show_post_expire") VALUES ('Event','n'); +INSERT INTO "tiki_article_types" ("$col""$col") VALUES ('Event','n'); -INSERT INTO "tiki_article_types" ("type","show_post_expire","heading_only","allow_comments") VALUES ('Classified','n','y','n'); +INSERT INTO "tiki_article_types" ("$col""$col""$col""$col") VALUES ('Classified','n','y','n'); DROP TABLE IF EXISTS "tiki_banners"; @@ -365,9 +365,9 @@ "maxClicks" integer default NULL, "clicks" integer default NULL, "zone" varchar(40) default NULL, - PRIMARY KEY ("bannerId"), - INDEX ban1(zone,useDates,impressions,maxImpressions,hourFrom,hourTo,fromDate,toDate,mon,tue,wed,thu,fri,sat,sun) + PRIMARY KEY ("bannerId") ) ; +CREATE INDEX "tiki_banners_ban1" ON "tiki_banners" ("zone","useDates","impressions","maxImpressions","hourFrom","hourTo","fromDate","toDate","mon","tue","wed","thu","fri","sat","sun"); DROP TABLE IF EXISTS "tiki_banning"; @@ -424,9 +424,9 @@ "priv" varchar(1) default NULL, PRIMARY KEY ("postId") ) ; -CREATE INDEX "tiki_blog_posts_data" ON "tiki_blog_posts" ("data"(255)); -CREATE INDEX "tiki_blog_posts_blogId" ON "tiki_blog_posts" ("blogId"); -CREATE INDEX "tiki_blog_posts_created" ON "tiki_blog_posts" ("created"); +CREATE INDEX "tiki_blog_posts_" ON "tiki_blog_posts" ("data"); +CREATE INDEX "tiki_blog_posts_" ON "tiki_blog_posts" ("blogId"); +CREATE INDEX "tiki_blog_posts_" ON "tiki_blog_posts" ("created"); DROP TABLE IF EXISTS "tiki_blog_posts_images"; @@ -465,9 +465,9 @@ "show_avatar" char(1) default NULL, PRIMARY KEY ("blogId") ) ; -CREATE INDEX "tiki_blogs_title" ON "tiki_blogs" ("title"); -CREATE INDEX "tiki_blogs_description" ON "tiki_blogs" ("description"(255)); -CREATE INDEX "tiki_blogs_hits" ON "tiki_blogs" ("hits"); +CREATE INDEX "tiki_blogs_" ON "tiki_blogs" ("title"); +CREATE INDEX "tiki_blogs_" ON "tiki_blogs" ("description"); +CREATE INDEX "tiki_blogs_" ON "tiki_blogs" ("hits"); DROP TABLE IF EXISTS "tiki_calendar_categories"; @@ -512,7 +512,7 @@ "lastmodif" bigint NOT NULL default '0', PRIMARY KEY ("recurrenceId") ) ; -CREATE INDEX "tiki_calendar_recurrence_calendarId" ON "tiki_calendar_recurrence" ("calendarId"); +CREATE INDEX "tiki_calendar_recurrence_" ON "tiki_calendar_recurrence" ("calendarId"); DROP TABLE IF EXISTS "tiki_calendar_items"; @@ -542,7 +542,7 @@ FOREIGN KEY ("recurrenceId") REFERENCES "tiki_calendar_recurrence"("recurrenceId") ON UPDATE CASCADE ON DELETE SET NULL ) ; -CREATE INDEX "tiki_calendar_items_calendarId" ON "tiki_calendar_items" ("calendarId"); +CREATE INDEX "tiki_calendar_items_" ON "tiki_calendar_items" ("calendarId"); DROP TABLE IF EXISTS "tiki_calendar_locations"; @@ -729,13 +729,13 @@ PRIMARY KEY ("threadId"), UNIQUE (parentId, userName, title, commentDate, message_id, in_reply_to) ) ; -CREATE INDEX "tiki_comments_title" ON "tiki_comments" ("title"); -CREATE INDEX "tiki_comments_data" ON "tiki_comments" ("data"("255")); -CREATE INDEX "tiki_comments_hits" ON "tiki_comments" ("hits"); -CREATE INDEX "tiki_comments_tc_pi" ON "tiki_comments" ("parentId"); -CREATE INDEX "tiki_comments_objectType" ON "tiki_comments" ("object","objectType"); -CREATE INDEX "tiki_comments_commentDate" ON "tiki_comments" ("commentDate"); -CREATE INDEX "tiki_comments_threaded" ON "tiki_comments" ("message_id","in_reply_to","parentId"); +CREATE INDEX "tiki_comments_" ON "tiki_comments" ("title"); +CREATE INDEX "tiki_comments_" ON "tiki_comments" ("data"); +CREATE INDEX "tiki_comments_" ON "tiki_comments" ("hits"); +CREATE INDEX "tiki_comments_" ON "tiki_comments" ("parentId"); +CREATE INDEX "tiki_comments_" ON "tiki_comments" ("object","objectType"); +CREATE INDEX "tiki_comments_" ON "tiki_comments" ("commentDate"); +CREATE INDEX "tiki_comments_" ON "tiki_comments" ("message_id","in_reply_to","parentId"); DROP TABLE IF EXISTS "tiki_content"; @@ -877,9 +877,9 @@ "answer" text, PRIMARY KEY ("questionId") ) ; -CREATE INDEX "tiki_faq_questions_faqId" ON "tiki_faq_questions" ("faqId"); -CREATE INDEX "tiki_faq_questions_question" ON "tiki_faq_questions" ("question"("255")); -CREATE INDEX "tiki_faq_questions_answer" ON "tiki_faq_questions" ("answer"("255")); +CREATE INDEX "tiki_faq_questions_" ON "tiki_faq_questions" ("faqId"); +CREATE INDEX "tiki_faq_questions_" ON "tiki_faq_questions" ("question"); +CREATE INDEX "tiki_faq_questions_" ON "tiki_faq_questions" ("answer"); DROP TABLE IF EXISTS "tiki_faqs"; @@ -894,9 +894,9 @@ "canSuggest" char(1) default NULL, PRIMARY KEY ("faqId") ) ; -CREATE INDEX "tiki_faqs_title" ON "tiki_faqs" ("title"); -CREATE INDEX "tiki_faqs_description" ON "tiki_faqs" ("description"("255")); -CREATE INDEX "tiki_faqs_hits" ON "tiki_faqs" ("hits"); +CREATE INDEX "tiki_faqs_" ON "tiki_faqs" ("title"); +CREATE INDEX "tiki_faqs_" ON "tiki_faqs" ("description"); +CREATE INDEX "tiki_faqs_" ON "tiki_faqs" ("hits"); DROP TABLE IF EXISTS "tiki_featured_links"; @@ -985,12 +985,12 @@ "archiveId" bigint default 0, PRIMARY KEY ("fileId") ) ; -CREATE INDEX "tiki_files_name" ON "tiki_files" ("name"); -CREATE INDEX "tiki_files_description" ON "tiki_files" ("description"("255")); -CREATE INDEX "tiki_files_created" ON "tiki_files" ("created"); -CREATE INDEX "tiki_files_archiveId" ON "tiki_files" ("archiveId"); -CREATE INDEX "tiki_files_galleryId" ON "tiki_files" ("galleryId"); -CREATE INDEX "tiki_files_hits" ON "tiki_files" ("hits"); +CREATE INDEX "tiki_files_" ON "tiki_files" ("name"); +CREATE INDEX "tiki_files_" ON "tiki_files" ("description"); +CREATE INDEX "tiki_files_" ON "tiki_files" ("created"); +CREATE INDEX "tiki_files_" ON "tiki_files" ("archiveId"); +CREATE INDEX "tiki_files_" ON "tiki_files" ("galleryId"); +CREATE INDEX "tiki_files_" ON "tiki_files" ("hits"); DROP TABLE IF EXISTS "tiki_forum_attachments"; @@ -1009,7 +1009,7 @@ "path" varchar(250) default NULL, PRIMARY KEY ("attId") ) ; -CREATE INDEX "tiki_forum_attachments_threadId" ON "tiki_forum_attachments" ("threadId"); +CREATE INDEX "tiki_forum_attachments_" ON "tiki_forum_attachments" ("threadId"); DROP TABLE IF EXISTS "tiki_forum_reads"; @@ -1158,11 +1158,11 @@ "showcategories" char(1) NOT NULL default 'n', PRIMARY KEY ("galleryId") ) ; -CREATE INDEX "tiki_galleries_name" ON "tiki_galleries" ("name"); -CREATE INDEX "tiki_galleries_description" ON "tiki_galleries" ("description"("255")); -CREATE INDEX "tiki_galleries_hits" ON "tiki_galleries" ("hits"); -CREATE INDEX "tiki_galleries_parentgallery" ON "tiki_galleries" ("parentgallery"); -CREATE INDEX "tiki_galleries_visibleUser" ON "tiki_galleries" ("visible","user"); +CREATE INDEX "tiki_galleries_" ON "tiki_galleries" ("name"); +CREATE INDEX "tiki_galleries_" ON "tiki_galleries" ("description"); +CREATE INDEX "tiki_galleries_" ON "tiki_galleries" ("hits"); +CREATE INDEX "tiki_galleries_" ON "tiki_galleries" ("parentgallery"); +CREATE INDEX "tiki_galleries_" ON "tiki_galleries" ("visible","user"); DROP TABLE IF EXISTS "tiki_galleries_scales"; @@ -1195,7 +1195,7 @@ "url" varchar(250) default NULL, PRIMARY KEY ("group",event,object) ); -CREATE INDEX "tiki_group_watches_watchId" ON "tiki_group_watches" ("watchId"); +CREATE INDEX "tiki_group_watches_" ON "tiki_group_watches" ("watchId"); DROP TABLE IF EXISTS "tiki_history"; @@ -1215,7 +1215,7 @@ "is_html" TINYINT(1) NOT NULL DEFAULT 0, PRIMARY KEY ("pageName","version") ); -CREATE INDEX "tiki_history_user" ON "tiki_history" ("user"); +CREATE INDEX "tiki_history_" ON "tiki_history" ("user"); CREATE INDEX "tiki_history_" ON "tiki_history" ("historyId"); @@ -1266,12 +1266,12 @@ "path" varchar(255) default NULL, PRIMARY KEY ("imageId") ) ; -CREATE INDEX "tiki_images_name" ON "tiki_images" ("name"); -CREATE INDEX "tiki_images_description" ON "tiki_images" ("description"("255")); -CREATE INDEX "tiki_images_hits" ON "tiki_images" ("hits"); -CREATE INDEX "tiki_images_ti_gId" ON "tiki_images" ("galleryId"); -CREATE INDEX "tiki_images_ti_cr" ON "tiki_images" ("created"); -CREATE INDEX "tiki_images_ti_us" ON "tiki_images" ("user"); +CREATE INDEX "tiki_images_" ON "tiki_images" ("name"); +CREATE INDEX "tiki_images_" ON "tiki_images" ("description"); +CREATE INDEX "tiki_images_" ON "tiki_images" ("hits"); +CREATE INDEX "tiki_images_" ON "tiki_images" ("galleryId"); +CREATE INDEX "tiki_images_" ON "tiki_images" ("created"); +CREATE INDEX "tiki_images_" ON "tiki_images" ("user"); DROP TABLE IF EXISTS "tiki_images_data"; @@ -1288,7 +1288,7 @@ "etag" varchar(32) default NULL, PRIMARY KEY ("imageId","xsize","ysize","type") ); -CREATE INDEX "tiki_images_data_t_i_d_it" ON "tiki_images_data" ("imageId","type"); +CREATE INDEX "tiki_images_data_" ON "tiki_images_data" ("imageId","type"); DROP TABLE IF EXISTS "tiki_language"; @@ -1310,7 +1310,7 @@ ); -INSERT INTO "tiki_languages" ("lang","language") VALUES (\'en\',\'English\'); +INSERT INTO "tiki_languages" ("$col""$col") VALUES ('en','English'); DROP TABLE IF EXISTS "tiki_link_cache"; @@ -1322,7 +1322,7 @@ "refresh" bigint default NULL, PRIMARY KEY ("cacheId") ) ; -CREATE INDEX "tiki_link_cache_url" ON "tiki_link_cache" ("url"); +CREATE INDEX "tiki_link_cache_" ON "tiki_link_cache" ("url"); CREATE INDEX "urlindex" ON "tiki_link_cache" (substr("url", 0, 250)); ; @@ -1336,7 +1336,7 @@ "reltype" varchar(50), PRIMARY KEY ("fromPage","toPage") ); -CREATE INDEX "tiki_links_toPage" ON "tiki_links" ("toPage"); +CREATE INDEX "tiki_links_" ON "tiki_links" ("toPage"); DROP TABLE IF EXISTS "tiki_live_support_events"; @@ -1392,17 +1392,17 @@ ) ; -INSERT INTO "tiki_live_support_modules" ("name") VALUES (\'wiki\'); +INSERT INTO "tiki_live_support_modules" ("$col") VALUES ('wiki'); -INSERT INTO "tiki_live_support_modules" ("name") VALUES (\'forums\'); +INSERT INTO "tiki_live_support_modules" ("$col") VALUES ('forums'); -INSERT INTO "tiki_live_support_modules" ("name") VALUES (\'image galleries\'); +INSERT INTO "tiki_live_support_modules" ("$col") VALUES ('image galleries'); -INSERT INTO "tiki_live_support_modules" ("name") VALUES (\'file galleries\'); +INSERT INTO "tiki_live_support_modules" ("$col") VALUES ('file galleries'); -INSERT INTO "tiki_live_support_modules" ("name") VALUES (\'directory\'); +INSERT INTO "tiki_live_support_modules" ("$col") VALUES ('directory'); -INSERT INTO "tiki_live_support_modules" ("name") VALUES (\'workflow\'); +INSERT INTO "tiki_live_support_modules" ("$col") VALUES ('workflow'); DROP TABLE IF EXISTS "tiki_live_support_operators"; @@ -1456,7 +1456,7 @@ "logtime" bigint NOT NULL, PRIMARY KEY ("logId") ); -CREATE INDEX "tiki_logs_logtype" ON "tiki_logs" ("logtype"); +CREATE INDEX "tiki_logs_" ON "tiki_logs" ("logtype"); DROP TABLE IF EXISTS "tiki_mail_events"; @@ -1521,377 +1521,377 @@ -- when adding new inserts, order commands by position -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Home\',\'./\',10,\'\',\'\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Home','./',10,'','','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Search\',\'tiki-searchresults.php\',13,\'feature_search_fulltext\',\'tiki_p_search\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Search','tiki-searchresults.php',13,'feature_search_fulltext','tiki_p_search','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Search\',\'tiki-searchindex.php\',13,\'feature_search\',\'tiki_p_search\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Search','tiki-searchindex.php',13,'feature_search','tiki_p_search','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Contact Us\',\'tiki-contact.php\',20,\'feature_contact,feature_messages\',\'\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Contact Us','tiki-contact.php',20,'feature_contact,feature_messages','','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Stats\',\'tiki-stats.php\',23,\'feature_stats\',\'tiki_p_view_stats\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Stats','tiki-stats.php',23,'feature_stats','tiki_p_view_stats','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Categories\',\'tiki-browse_categories.php\',25,\'feature_categories\',\'tiki_p_view_categories\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_categories','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Freetags\',\'tiki-browse_freetags.php\',27,\'feature_freetags\',\'tiki_p_view_freetags\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Freetags','tiki-browse_freetags.php',27,'feature_freetags','tiki_p_view_freetags','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Calendar\',\'tiki-calendar.php\',35,\'feature_calendar\',\'tiki_p_view_calendar\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Calendar','tiki-calendar.php',35,'feature_calendar','tiki_p_view_calendar','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Users Map\',\'tiki-gmap_usermap.php\',36,\'feature_gmap\',\'\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Users Map','tiki-gmap_usermap.php',36,'feature_gmap','','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Tiki Calendar\',\'tiki-action_calendar.php\',37,\'feature_action_calendar\',\'tiki_p_view_tiki_calendar\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Tiki Calendar','tiki-action_calendar.php',37,'feature_action_calendar','tiki_p_view_tiki_calendar','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Mobile\',\'tiki-mobile.php\',37,\'feature_mobile\',\'\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Mobile','tiki-mobile.php',37,'feature_mobile','','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'(debug)\',\'javascript:toggle(\\'debugconsole\\')\',40,\'feature_debug_console\',\'tiki_p_admin\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','(debug)','javascript:toggle(\'debugconsole\')',40,'feature_debug_console','tiki_p_admin','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'MyTiki\',\'tiki-my_tiki.php\',50,\'feature_mytiki\',\'\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','MyTiki','tiki-my_tiki.php',50,'feature_mytiki','','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'MyTiki Home\',\'tiki-my_tiki.php\',51,\'feature_mytiki\',\'\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','MyTiki Home','tiki-my_tiki.php',51,'feature_mytiki','','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Preferences\',\'tiki-user_preferences.php\',55,\'feature_mytiki,feature_userPreferences\',\'\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Preferences','tiki-user_preferences.php',55,'feature_mytiki,feature_userPreferences','','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Messages\',\'messu-mailbox.php\',60,\'feature_mytiki,feature_messages\',\'tiki_p_messages\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Messages','messu-mailbox.php',60,'feature_mytiki,feature_messages','tiki_p_messages','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Tasks\',\'tiki-user_tasks.php\',65,\'feature_mytiki,feature_tasks\',\'tiki_p_tasks\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Tasks','tiki-user_tasks.php',65,'feature_mytiki,feature_tasks','tiki_p_tasks','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Bookmarks\',\'tiki-user_bookmarks.php\',70,\'feature_mytiki,feature_user_bookmarks\',\'tiki_p_create_bookmarks\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Bookmarks','tiki-user_bookmarks.php',70,'feature_mytiki,feature_user_bookmarks','tiki_p_create_bookmarks','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Modules\',\'tiki-user_assigned_modules.php\',75,\'feature_mytiki,user_assigned_modules\',\'tiki_p_configure_modules\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Modules','tiki-user_assigned_modules.php',75,'feature_mytiki,user_assigned_modules','tiki_p_configure_modules','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Webmail\',\'tiki-webmail.php\',85,\'feature_mytiki,feature_webmail\',\'tiki_p_use_webmail\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Webmail','tiki-webmail.php',85,'feature_mytiki,feature_webmail','tiki_p_use_webmail','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Contacts\',\'tiki-contacts.php\',87,\'feature_mytiki,feature_contacts\',\'\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Contacts','tiki-contacts.php',87,'feature_mytiki,feature_contacts','','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Notepad\',\'tiki-notepad_list.php\',90,\'feature_mytiki,feature_notepad\',\'tiki_p_notepad\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Notepad','tiki-notepad_list.php',90,'feature_mytiki,feature_notepad','tiki_p_notepad','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'My Files\',\'tiki-userfiles.php\',95,\'feature_mytiki,feature_userfiles\',\'tiki_p_userfiles\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','My Files','tiki-userfiles.php',95,'feature_mytiki,feature_userfiles','tiki_p_userfiles','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'User Menu\',\'tiki-usermenu.php\',100,\'feature_mytiki,feature_usermenu\',\'tiki_p_usermenu\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','User Menu','tiki-usermenu.php',100,'feature_mytiki,feature_usermenu','tiki_p_usermenu','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Mini Calendar\',\'tiki-minical.php\',105,\'feature_mytiki,feature_minical\',\'tiki_p_minical\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Mini Calendar','tiki-minical.php',105,'feature_mytiki,feature_minical','tiki_p_minical','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'My Watches\',\'tiki-user_watches.php\',110,\'feature_mytiki,feature_user_watches\',\'\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','My Watches','tiki-user_watches.php',110,'feature_mytiki,feature_user_watches','','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Workflow\',\'tiki-g-user_processes.php\',150,\'feature_workflow\',\'tiki_p_use_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Workflow','tiki-g-user_processes.php',150,'feature_workflow','tiki_p_use_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Admin Processes\',\'tiki-g-admin_processes.php\',155,\'feature_workflow\',\'tiki_p_admin_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Admin Processes','tiki-g-admin_processes.php',155,'feature_workflow','tiki_p_admin_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Monitor Processes\',\'tiki-g-monitor_processes.php\',160,\'feature_workflow\',\'tiki_p_admin_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Monitor Processes','tiki-g-monitor_processes.php',160,'feature_workflow','tiki_p_admin_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Monitor Activities\',\'tiki-g-monitor_activities.php\',165,\'feature_workflow\',\'tiki_p_admin_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Monitor Activities','tiki-g-monitor_activities.php',165,'feature_workflow','tiki_p_admin_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Monitor Instances\',\'tiki-g-monitor_instances.php\',170,\'feature_workflow\',\'tiki_p_admin_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Monitor Instances','tiki-g-monitor_instances.php',170,'feature_workflow','tiki_p_admin_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'User Processes\',\'tiki-g-user_processes.php\',175,\'feature_workflow\',\'tiki_p_use_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','User Processes','tiki-g-user_processes.php',175,'feature_workflow','tiki_p_use_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'User activities\',\'tiki-g-user_activities.php\',180,\'feature_workflow\',\'tiki_p_use_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','User activities','tiki-g-user_activities.php',180,'feature_workflow','tiki_p_use_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'User instances\',\'tiki-g-user_instances.php\',185,\'feature_workflow\',\'tiki_p_use_workflow\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','User instances','tiki-g-user_instances.php',185,'feature_workflow','tiki_p_use_workflow','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Community\',\'tiki-list_users.php\',187,\'feature_friends\',\'tiki_p_list_users\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Community','tiki-list_users.php',187,'feature_friends','tiki_p_list_users','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'User List\',\'tiki-list_users.php\',188,\'feature_friends\',\'tiki_p_list_users\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','User List','tiki-list_users.php',188,'feature_friends','tiki_p_list_users','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Friendship Network\',\'tiki-friends.php\',189,\'feature_friends\',\'\',\'Registered\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Friendship Network','tiki-friends.php',189,'feature_friends','','Registered',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Wiki\',\'tiki-index.php\',200,\'feature_wiki\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Wiki','tiki-index.php',200,'feature_wiki','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Wiki Home\',\'tiki-index.php\',202,\'feature_wiki\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Wiki Home','tiki-index.php',202,'feature_wiki','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Last Changes\',\'tiki-lastchanges.php\',205,\'feature_wiki,feature_lastChanges\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Last Changes','tiki-lastchanges.php',205,'feature_wiki,feature_lastChanges','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Dump\',\'dump/new.tar\',210,\'feature_wiki,feature_dump\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Dump','dump/new.tar',210,'feature_wiki,feature_dump','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Rankings\',\'tiki-wiki_rankings.php\',215,\'feature_wiki,feature_wiki_rankings\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Rankings','tiki-wiki_rankings.php',215,'feature_wiki,feature_wiki_rankings','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'List Pages\',\'tiki-listpages.php\',220,\'feature_wiki,feature_listPages\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','List Pages','tiki-listpages.php',220,'feature_wiki,feature_listPages','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Orphan Pages\',\'tiki-orphan_pages.php\',225,\'feature_wiki,feature_listorphanPages\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Orphan Pages','tiki-orphan_pages.php',225,'feature_wiki,feature_listorphanPages','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Sandbox\',\'tiki-editpage.php?page=sandbox\',230,\'feature_wiki,feature_sandbox\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Sandbox','tiki-editpage.php?page=sandbox',230,'feature_wiki,feature_sandbox','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Multiple Print\',\'tiki-print_pages.php\',235,\'feature_wiki,feature_wiki_multiprint\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Multiple Print','tiki-print_pages.php',235,'feature_wiki,feature_wiki_multiprint','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Send Pages\',\'tiki-send_objects.php\',240,\'feature_wiki,feature_comm\',\'tiki_p_view,tiki_p_send_pages\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Send Pages','tiki-send_objects.php',240,'feature_wiki,feature_comm','tiki_p_view,tiki_p_send_pages','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Received Pages\',\'tiki-received_pages.php\',245,\'feature_wiki,feature_comm\',\'tiki_p_view,tiki_p_admin_received_pages\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Received Pages','tiki-received_pages.php',245,'feature_wiki,feature_comm','tiki_p_view,tiki_p_admin_received_pages','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Structures\',\'tiki-admin_structures.php\',250,\'feature_wiki,feature_wiki_structure\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Structures','tiki-admin_structures.php',250,'feature_wiki,feature_wiki_structure','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Mind Map\',\'tiki-mindmap.php\',255,\'feature_wiki_mindmap\',\'tiki_p_view\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Mind Map','tiki-mindmap.php',255,'feature_wiki_mindmap','tiki_p_view','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Image Galleries\',\'tiki-galleries.php\',300,\'feature_galleries\',\'tiki_p_view_image_gallery\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Image Galleries','tiki-galleries.php',300,'feature_galleries','tiki_p_view_image_gallery','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Galleries\',\'tiki-galleries.php\',305,\'feature_galleries\',\'tiki_p_list_image_galleries\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Galleries','tiki-galleries.php',305,'feature_galleries','tiki_p_list_image_galleries','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Rankings\',\'tiki-galleries_rankings.php\',310,\'feature_galleries,feature_gal_rankings\',\'tiki_p_list_image_galleries\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Rankings','tiki-galleries_rankings.php',310,'feature_galleries,feature_gal_rankings','tiki_p_list_image_galleries','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Upload Image\',\'tiki-upload_image.php\',315,\'feature_galleries\',\'tiki_p_upload_images\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Upload Image','tiki-upload_image.php',315,'feature_galleries','tiki_p_upload_images','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Directory Batch\',\'tiki-batch_upload.php\',318,\'feature_galleries,feature_gal_batch\',\'tiki_p_batch_upload\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Directory Batch','tiki-batch_upload.php',318,'feature_galleries,feature_gal_batch','tiki_p_batch_upload','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'System Gallery\',\'tiki-list_gallery.php?galleryId=0\',320,\'feature_galleries\',\'tiki_p_admin_galleries\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','System Gallery','tiki-list_gallery.php?galleryId=0',320,'feature_galleries','tiki_p_admin_galleries','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Articles\',\'tiki-view_articles.php\',350,\'feature_articles\',\'tiki_p_read_article\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Articles','tiki-view_articles.php',350,'feature_articles','tiki_p_read_article','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Articles\',\'tiki-view_articles.php\',350,\'feature_articles\',\'tiki_p_articles_read_heading\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Articles','tiki-view_articles.php',350,'feature_articles','tiki_p_articles_read_heading','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Articles Home\',\'tiki-view_articles.php\',355,\'feature_articles\',\'tiki_p_read_article\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Articles Home','tiki-view_articles.php',355,'feature_articles','tiki_p_read_article','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Articles Home\',\'tiki-view_articles.php\',355,\'feature_articles\',\'tiki_p_articles_read_heading\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Articles Home','tiki-view_articles.php',355,'feature_articles','tiki_p_articles_read_heading','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'List Articles\',\'tiki-list_articles.php\',360,\'feature_articles\',\'tiki_p_read_article\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','List Articles','tiki-list_articles.php',360,'feature_articles','tiki_p_read_article','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'List Articles\',\'tiki-list_articles.php\',360,\'feature_articles\',\'tiki_p_articles_read_heading\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','List Articles','tiki-list_articles.php',360,'feature_articles','tiki_p_articles_read_heading','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Rankings\',\'tiki-cms_rankings.php\',365,\'feature_articles,feature_cms_rankings\',\'tiki_p_read_article\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Rankings','tiki-cms_rankings.php',365,'feature_articles,feature_cms_rankings','tiki_p_read_article','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Submit Article\',\'tiki-edit_submission.php\',370,\'feature_articles,feature_submissions\',\'tiki_p_read_article,tiki_p_submit_article\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Submit Article','tiki-edit_submission.php',370,'feature_articles,feature_submissions','tiki_p_read_article,tiki_p_submit_article','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'View submissions\',\'tiki-list_submissions.php\',375,\'feature_articles,feature_submissions\',\'tiki_p_read_article,tiki_p_submit_article\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','View submissions','tiki-list_submissions.php',375,'feature_articles,feature_submissions','tiki_p_read_article,tiki_p_submit_article','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'View submissions\',\'tiki-list_submissions.php\',375,\'feature_articles,feature_submissions\',\'tiki_p_read_article,tiki_p_approve_submission\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','View submissions','tiki-list_submissions.php',375,'feature_articles,feature_submissions','tiki_p_read_article,tiki_p_approve_submission','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'View Submissions\',\'tiki-list_submissions.php\',375,\'feature_articles,feature_submissions\',\'tiki_p_read_article,tiki_p_remove_submission\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','View Submissions','tiki-list_submissions.php',375,'feature_articles,feature_submissions','tiki_p_read_article,tiki_p_remove_submission','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'New Article\',\'tiki-edit_article.php\',380,\'feature_articles\',\'tiki_p_read_article,tiki_p_edit_article\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','New Article','tiki-edit_article.php',380,'feature_articles','tiki_p_read_article,tiki_p_edit_article','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Send Articles\',\'tiki-send_objects.php\',385,\'feature_articles,feature_comm\',\'tiki_p_read_article,tiki_p_send_articles\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Send Articles','tiki-send_objects.php',385,'feature_articles,feature_comm','tiki_p_read_article,tiki_p_send_articles','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Received Articles\',\'tiki-received_articles.php\',385,\'feature_articles,feature_comm\',\'tiki_p_read_article,tiki_p_admin_received_articles\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Received Articles','tiki-received_articles.php',385,'feature_articles,feature_comm','tiki_p_read_article,tiki_p_admin_received_articles','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Admin Types\',\'tiki-article_types.php\',395,\'feature_articles\',\'tiki_p_articles_admin_types\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Admin Types','tiki-article_types.php',395,'feature_articles','tiki_p_articles_admin_types','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Admin Topics\',\'tiki-admin_topics.php\',390,\'feature_articles\',\'tiki_p_articles_admin_topics\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Admin Topics','tiki-admin_topics.php',390,'feature_articles','tiki_p_articles_admin_topics','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Blogs\',\'tiki-list_blogs.php\',450,\'feature_blogs\',\'tiki_p_read_blog\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Blogs','tiki-list_blogs.php',450,'feature_blogs','tiki_p_read_blog','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'List Blogs\',\'tiki-list_blogs.php\',455,\'feature_blogs\',\'tiki_p_read_blog\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','List Blogs','tiki-list_blogs.php',455,'feature_blogs','tiki_p_read_blog','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Rankings\',\'tiki-blog_rankings.php\',460,\'feature_blogs,feature_blog_rankings\',\'tiki_p_read_blog\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Rankings','tiki-blog_rankings.php',460,'feature_blogs,feature_blog_rankings','tiki_p_read_blog','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Create/Edit Blog\',\'tiki-edit_blog.php\',465,\'feature_blogs\',\'tiki_p_read_blog,tiki_p_create_blogs\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Create/Edit Blog','tiki-edit_blog.php',465,'feature_blogs','tiki_p_read_blog,tiki_p_create_blogs','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Post\',\'tiki-blog_post.php\',470,\'feature_blogs\',\'tiki_p_read_blog,tiki_p_blog_post\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Post','tiki-blog_post.php',470,'feature_blogs','tiki_p_read_blog,tiki_p_blog_post','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Admin Posts\',\'tiki-list_posts.php\',475,\'feature_blogs\',\'tiki_p_read_blog,tiki_p_blog_admin\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Admin Posts','tiki-list_posts.php',475,'feature_blogs','tiki_p_read_blog,tiki_p_blog_admin','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Forums\',\'tiki-forums.php\',500,\'feature_forums\',\'tiki_p_forum_read\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'s','Forums','tiki-forums.php',500,'feature_forums','tiki_p_forum_read','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'List Forums\',\'tiki-forums.php\',505,\'feature_forums\',\'tiki_p_forum_read\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','List Forums','tiki-forums.php',505,'feature_forums','tiki_p_forum_read','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Rankings\',\'tiki-forum_rankings.php\',510,\'feature_forums,feature_forum_rankings\',\'tiki_p_forum_read\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Rankings','tiki-forum_rankings.php',510,'feature_forums,feature_forum_rankings','tiki_p_forum_read','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'o\',\'Admin Forums\',\'tiki-admin_forums.php\',515,\'feature_forums\',\'tiki_p_forum_read,tiki_p_admin_forum\',\'\',0); +INSERT INTO "tiki_menu_options" ("$col""$col""$col""$col""$col""$col""$col""$col""$col") VALUES (42,'o','Admin Forums','tiki-admin_forums.php',515,'feature_forums','tiki_p_forum_read,tiki_p_admin_forum','',0); -INSERT INTO "," (","menuId","","type","","name","","url","","position","","section","","perm","","groupname","","userlevel",") VALUES (42,\'s\',\'Directo... [truncated message content] |