From: <mo...@us...> - 2005-08-29 03:14:58
|
Update of /cvsroot/tikiwiki/tiki/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15308/db Modified Files: tiki-secdb_1.9_mysql.sql tiki.sql tiki_1.8to1.9.sql Added Files: tiki_1.9to1.9.1.sql Log Message: Instant-Auto-Merge from BRANCH-1-9 to HEAD Index: tiki-secdb_1.9_mysql.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-secdb_1.9_mysql.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- tiki-secdb_1.9_mysql.sql 26 Jun 2005 14:28:29 -0000 1.2 +++ tiki-secdb_1.9_mysql.sql 29 Aug 2005 03:14:44 -0000 1.3 @@ -1450,3 +1450,1471 @@ INSERT INTO tiki_secdb VALUES ('01a7df9a754489980a254d84c3212419','./whelp/index.php','1.9',0); INSERT INTO tiki_secdb VALUES ('129894fc4014eb3b12e2abf9f81d29b4','./xmlrpc.php','1.9',0); +-- MySQL dump 8.23 +-- +-- Host: localhost Database: tikileer +--------------------------------------------------------- +-- Server version 3.23.58-log + +-- +-- Table structure for table `tiki_secdb` [...1440 lines suppressed...] +INSERT INTO tiki_secdb VALUES ('5bcb6b2ecae13eb9c146e8d86acd2da9','./templates/modules/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('034bf638296f5cf7ab72a3987ffc236d','./templates/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('a6fc0ab0cc39993785a849fba79bf453','./templates/tables/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('3593b207e8cd9c3aa2ab6eb52f4549eb','./templates/styles/geo/modules/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('6028fe6a9ccdbcdc07cc6218995bea28','./templates/styles/geo/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('fdd6ffc07b7a5d1a2019ba16171cee08','./templates/styles/neat/modules/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('06cf0ace372876bf84023ceba10e2859','./templates/styles/neat/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('b605c30d41e43d596c4bde7f9e03874d','./templates/styles/mose/modules/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('2d36a9b31ab160323fcbeddb7bdb8bb2','./templates/styles/mose/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('4e3c59b9ba566a10165cf48097f172ab','./templates/styles/tiki/modules/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('460669264d68a1f348bd42efce6191a3','./templates/styles/tiki/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('933ede7203047304f239756a2d4dddec','./templates/styles/codex/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('bc958664117d79c80f92719027555d5e','./templates/styles/moreneat/modules/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('598a0ea2c83a07460cc79d06a5eded12','./templates/styles/moreneat/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('4a5f3f0793e8e68dc111ade1b6a46fdb','./templates/styles/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('018b2ba569d68905156f7eca4f229b23','./templates/styles/notheme/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('cc543ed92581b7e50c50540d3b45ed80','./templates/styles/simple/modules/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('a25b5510162a87f8e571ddab7219f1aa','./templates/styles/simple/index.php','1.9.1',0); +INSERT INTO tiki_secdb VALUES ('9105b1eff96d7243273b4b408ef507f3','./tiki-pagination.php','1.9.1',0); + Index: tiki.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki.sql,v retrieving revision 1.269 retrieving revision 1.270 diff -u -d -r1.269 -r1.270 --- tiki.sql 26 Aug 2005 16:24:25 -0000 1.269 +++ tiki.sql 29 Aug 2005 03:14:44 -0000 1.270 @@ -369,6 +369,7 @@ KEY heading (heading(255)), KEY body (body(255)), KEY reads (reads), + KEY author (author(32)), FULLTEXT KEY ft (title,heading,body) ) TYPE=MyISAM AUTO_INCREMENT=1 ; # -------------------------------------------------------- @@ -2069,7 +2070,7 @@ INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'s','Articles','tiki-view_articles.php',350,'feature_articles','tiki_p_read_article',''); INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Articles home','tiki-view_articles.php',355,'feature_articles','tiki_p_read_article',''); INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','List articles','tiki-list_articles.php',360,'feature_articles','tiki_p_read_article',''); -INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Rankings','tiki-cms_rankings.php',365,'feature_cms_rankings','tiki_p_read_article',''); +INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Rankings','tiki-cms_rankings.php',365,'feature_articles,feature_cms_rankings','tiki_p_read_article',''); INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Submit article','tiki-edit_submission.php',370,'feature_articles,feature_submissions','tiki_p_read_article,tiki_p_submit_article',''); INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','View submissions','tiki-list_submissions.php',375,'feature_articles,feature_submissions','tiki_p_read_article,tiki_p_submit_article',''); INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','View submissions','tiki-list_submissions.php',375,'feature_articles,feature_submissions','tiki_p_read_article,tiki_p_approve_submission',''); Index: tiki_1.8to1.9.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki_1.8to1.9.sql,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- tiki_1.8to1.9.sql 12 Aug 2005 13:01:58 -0000 1.101 +++ tiki_1.8to1.9.sql 29 Aug 2005 03:14:44 -0000 1.102 @@ -1094,70 +1094,4 @@ # 2005-04-25 ohertel: switch for (dis/en)abling tiki-mobile INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_mobile', 'n'); -# 2005-04-28 get synchronised with tiki.sql -ALTER TABLE tiki_newsletter_groups modify code varchar(32) default NULL; - -# 2005-04-29 rv540 -INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('trk_with_mirror_tables', 'n'); - -# 2005-05-03 -UPDATE tiki_menu_options SET perm="tiki_p_view_trackers" WHERE url="tiki-list_trackers.php"; - -#2005-05-04 sg -INSERT INTO users_permissions (permName, permDesc, level, type) VALUES ('tiki_p_view_tiki_calendar', 'Can view TikiWiki tools calendar', 'basic', 'calendar'); -DROP TABLE IF EXISTS temp_users_grouppermissions; -CREATE TABLE temp_users_grouppermissions ( - groupName varchar(255) NOT NULL default '', - permName varchar(30) NOT NULL default '', - value char(1) default '', - PRIMARY KEY (groupName(30),permName) -) TYPE=MyISAM; -INSERT into temp_users_grouppermissions SELECT groupName, 'tiki_p_view_tiki_calendar', value FROM users_grouppermissions WHERE permName='tiki_p_view_calendar'; -INSERT into users_grouppermissions SELECT * FROM temp_users_grouppermissions; -DROP TABLE temp_users_grouppermissions; - -# 2005-05-10 redflo -alter table tiki_sessions add tikihost varchar(200) default NULL; - -#2005-06-08 sylvieg -UPDATE users_objectpermissions set permName='tiki_p_add_events' where permName='tiki_p_add_calendar'; -UPDATE users_objectpermissions set permName='tiki_p_change_events' where permName='tiki_p_edit_calendar'; - -# 2005-06-14 rv540 -alter table tiki_referer_stats change referer referer varchar(255) not null; - -#2005-06-20 amette: added on request of toggg(currently without CVS-access) -ALTER TABLE `tiki_pages` ADD created int(14); -ALTER TABLE `tiki_cookies` CHANGE cookie cookie text; - -#2005-07-14 avgasse: these tables appeared to be missing when comparing a fresh and an upgraded database -CREATE TABLE `tiki_features` ( - `featureId` int(11) NOT NULL auto_increment, - `Name` varchar(200) NOT NULL default '', - `Description` text, - `Helplink` varchar(200) NOT NULL default '', - `Variable` varchar(200) NOT NULL default '', - PRIMARY KEY (`featureId`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; -CREATE TABLE `tiki_object_ratings` ( - `catObjectId` int(12) NOT NULL default '0', - `pollId` int(12) NOT NULL default '0', - PRIMARY KEY (`catObjectId`,`pollId`) -) TYPE=MyISAM; -INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_bot_bar_icons', 'y'); -INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_bot_bar_debug', 'y'); - -ALTER TABLE tiki_articles DROP COLUMN `bibliographical_references`; -ALTER TABLE tiki_articles DROP COLUMN `resume`; -#2005-07-28 gg: added preference for file gallery to have duplicates -INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('fgal_allow_duplicates', 'n'); - -#2005-08-05 franck: New table to handle statistics per object -CREATE TABLE `tiki_stats` ( - `object` varchar(255) NOT NULL default '', - `type` varchar(20) NOT NULL default '', - `day` int(14) NOT NULL default '0', - `hits` int(14) NOT NULL default '0', - PRIMARY KEY (`object`,`type`,`day`) -) TYPE=MyISAM; |