|
From: Jon O. <jon...@us...> - 2005-04-01 14:13:33
|
Update of /cvsroot/mxbb/kb_076_mxaddon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12929/modules/kb_076_mxaddon Modified Files: install_kb_tables.php upgrade_kb_tables.php Log Message: minor fixes...sprung from the phpbb dev thread Index: install_kb_tables.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/install_kb_tables.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install_kb_tables.php 30 Mar 2005 10:40:47 -0000 1.5 --- install_kb_tables.php 1 Apr 2005 14:12:24 -0000 1.6 *************** *** 287,392 **** case 'mssql': case 'mssql-odbc': ! $sql[] = "CREATE TABLE " . KB_ARTICLES_TABLE . " ( ! article_id int IDENTITY (1, 1) NOT NULL, ! article_category_id int default 0, ! article_title char(255) default 0, ! article_description char(255) , ! article_date char(255) , ! article_author_id int default 2, ! username char(255), ! bbcode_uid char(10), ! article_body text, ! article_type int default 0, ! article_keywords char(255), ! approved tinyint default 0, ! topic_id bigint default 0, ! views BIGINT DEFAULT 0, ! article_rating double(6,4) NOT NULL default 0.0000, ! article_totalvotes int(255) NOT NULL default 0, ! );"; ! ! $sql[] = "INSERT INTO " . KB_ARTICLES_TABLE . " (article_category_id, article_title, article_description, article_date, article_author_id, bbcode_uid, article_body, article_type, approved, topic_id, views) VALUES (1, 'Test Article', 'This is a test article for your KB', '1057791220', 2, '93074f48a9', 'This is a test article for your Knowledge Base programmed by [b:93074f48a9]wGEric < er...@eg... > (Eric Faerber) - http://eric.best-1.biz/[/b:93074f48a9]\r\n\r\nBe sure you add categories and article types in the ACP and also change the Configuration to your liking.\r\n\r\nHave fun and enjoy your new Knowledge Base! :D', 1, 1, 1, 0,0,0);"; ! ! $sql[] = "CREATE TABLE " . KB_CATEGORIES_TABLE . " ( ! category_id int IDENTITY NOT NULL, ! category_name char(255) NOT NULL, ! category_details char(255) NOT NULL, ! number_articles int NOT NULL, ! parent int, ! cat_order int NOT NULL ! );"; ! ! $sql[] = "INSERT INTO " . KB_CATEGORIES_TABLE . " (category_name, category_details, number_articles, parent, cat_order) VALUES ('Test Category 1', 'This is a test category', '1', '0', '10')"; ! ! $sql[] = "CREATE TABLE ".KB_CONFIG_TABLE." ( ! config_name varchar(255), ! config_value varchar(255) ! );"; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("approve_new", "1")'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("approve_edit", "1")'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_new", "1")'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_edit", "1")'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("notify", "1")'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("admin_id", "2")'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) values("show_pretext",0);'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) values("pt_header","Article Submission Instructions");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) values("pt_body","Please check your references and include as much information as you can.");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("forum_id", "1");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("comments", "1");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_anon", "0");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("del_topic", "1");'; ! ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_rating", "0");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_anonymos_rating", "0");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("comments_show", "1");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("mod_group", "0");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("bump_post", "1");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("stats_list", "1");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("header_banner", "1");'; ! ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("votes_check_userid", "1");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("votes_check_ip", "1");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("art_pagination", "5");'; ! ! $sql[] ="INSERT INTO ".$mx_table_prefix."kb_config VALUES ('comments_pagination', '5')"; ! $sql[] ="INSERT INTO ".$mx_table_prefix."kb_config VALUES ('news_sort', 'Alphabetic')"; ! $sql[] ="INSERT INTO ".$mx_table_prefix."kb_config VALUES ('news_sort_par', 'ASC')"; ! ! $sql[] = "CREATE TABLE ".KB_TYPES_TABLE." ( ! id int IDENTITY NOT NULL, ! type char(255), ! );"; ! ! $sql[] = "INSERT INTO ".KB_TYPES_TABLE." (type) VALUES ('Test Type 1');"; ! ! $sql[] = "CREATE TABLE " . KB_VOTES_TABLE . " ( ! votes_ip varchar(50) NOT NULL default 0, ! votes_userid int(50) NOT NULL default 0, ! votes_file int(50) NOT NULL default 0, ! );"; ! ! $sql[] = "CREATE TABLE " . KB_SEARCH_TABLE . " ( ! search_id int NOT NULL, ! session_id char(32) NOT NULL , ! search_array text NOT NULL, ! );"; ! $sql[] = "create index session_id ON " . KB_SEARCH_TABLE . " (session_id);"; ! ! $sql[] = "CREATE TABLE ".KB_WORD_TABLE." ( ! word_text char(50) NOT NULL PRIMARY KEY, ! word_id int IDENTITY (1, 1) NOT NULL, ! word_common tinyint NOT NULL, ! );"; ! $sql[] = "CREATE INDEX word_id ON ".KB_WORD_TABLE." (word_id);"; ! ! $sql[] = "CREATE TABLE ".KB_MATCH_TABLE." ( ! article_id int NOT NULL, ! word_id int NOT NULL, ! title_match tinyint NOT NULL ! );"; ! $sql[] = "CREATE INDEX post_id_index ON ".KB_MATCH_TABLE." (article_id);"; ! $sql[] = "CREATE INDEX word_id_index ON ".KB_MATCH_TABLE." (word_id);"; ! break; ! default: die("/!\ No Database Abstraction Layer (DBAL) found /!\\"); --- 287,291 ---- case 'mssql': case 'mssql-odbc': ! default: die("/!\ No Database Abstraction Layer (DBAL) found /!\\"); Index: upgrade_kb_tables.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/upgrade_kb_tables.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** upgrade_kb_tables.php 30 Mar 2005 10:40:47 -0000 1.4 --- upgrade_kb_tables.php 1 Apr 2005 14:12:27 -0000 1.5 *************** *** 190,194 **** --- 190,199 ---- $sql[] = 'ALTER TABLE ' . KB_ARTICLES_TABLE . ' ADD article_rating double(6,4) NOT NULL default "0.0000" ;'; $sql[] = 'ALTER TABLE ' . KB_ARTICLES_TABLE . ' ADD article_totalvotes int(255) NOT NULL default "0" ;'; + + // Upgrade the config table to avoid duplicate entries + $sql[] = 'ALTER TABLE '. KB_CONFIG_TABLE.' MODIFY config_name VARCHAR(255) NOT NULL default "" ;'; + $sql[] = 'ALTER TABLE '. KB_CONFIG_TABLE.' MODIFY config_value VARCHAR(255) NOT NULL default "" ;'; $sql[] = 'ALTER TABLE '. KB_CONFIG_TABLE.' DROP PRIMARY KEY, ADD PRIMARY KEY (config_name) ;'; + $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_rating", "0") ;'; $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_anonymos_rating", "0") ;'; *************** *** 211,215 **** $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("votes_check_ip", "1");'; $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("art_pagination", "5");'; ! $sql[] = 'ALTER TABLE ' . KB_VOTES_TABLE . ' ADD votes_userid int(50) NOT NULL default "0" AFTER votes_ip'; } --- 216,220 ---- $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("votes_check_ip", "1");'; $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("art_pagination", "5");'; ! // $sql[] = 'ALTER TABLE ' . KB_VOTES_TABLE . ' ADD votes_userid int(50) NOT NULL default "0" AFTER votes_ip'; } *************** *** 284,323 **** case 'mssql': case 'mssql-odbc': - if ( $upgrade_101 == 1 ) - { - $sql[] = 'ALTER TABLE ' . KB_ARTICLES_TABLE . ' ADD article_rating double(6,4) NOT NULL default "0.0000" ;'; - $sql[] = 'ALTER TABLE ' . KB_ARTICLES_TABLE . ' ADD article_totalvotes int(255) NOT NULL default "0" ;'; - $sql[] = 'ALTER TABLE '. KB_CONFIG_TABLE.' DROP PRIMARY KEY, ADD PRIMARY KEY (config_name) ;'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_rating", "0") ;'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_anonymos_rating", "0") ;'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("comments_show", "1") ;'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("mod_group", "0") ;'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("bump_post", "1") ;'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("stats_list", "1") ;'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("header_banner", "1") ;'; - $sql[] = 'CREATE TABLE '.KB_VOTES_TABLE.' ( - votes_ip varchar(50) NOT NULL default "0", - votes_file int(50) NOT NULL default "0" - ) TYPE=MyISAM'; - } - - if ( $upgrade_102 == 1 ) - { - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("votes_check_userid", "1");'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("votes_check_ip", "1");'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("art_pagination", "5");'; - $sql[] = 'ALTER TABLE ' . KB_VOTES_TABLE . ' ADD votes_userid int(50) NOT NULL default "0" AFTER votes_ip'; - } - - - if ( $upgrade_103 == 1 ) - { - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("comments_pagination", "5");'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("news_sort", "Alphabetic");'; - $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("news_sort_par", "ASC");'; - } - break; - - break; default: --- 289,292 ---- |