Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1283) +++ branches/2.8.x/CHANGELOG (revision 1284) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- +01-Feb-2010 Dietmar Woellbrink (Luisehahne) +! to hold content, install don't drop existing tables (code, form, menu_link, news, wrapper, wysiwyg) +! otherwise do it with uninstall 30-Jan-2010 Dietmar Woellbrink (Luisehahne) # Ticket #931 bug in admin/access/index.php 30-Jan-2010 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1283) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1284) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.1'); -if(!defined('REVISION')) define('REVISION', '1283'); +if(!defined('REVISION')) define('REVISION', '1284'); ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/wrapper/install.php =================================================================== --- branches/2.8.x/wb/modules/wrapper/install.php (revision 1283) +++ branches/2.8.x/wb/modules/wrapper/install.php (revision 1284) @@ -1,41 +1,33 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -if(defined('WB_URL')) { - - // Create table - $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wrapper`"); - $mod_wrapper = 'CREATE TABLE `'.TABLE_PREFIX.'mod_wrapper` (' - . ' `section_id` INT NOT NULL DEFAULT \'0\',' - . ' `page_id` INT NOT NULL DEFAULT \'0\',' - . ' `url` TEXT NOT NULL,' - . ' `height` INT NOT NULL DEFAULT \'0\',' - . ' PRIMARY KEY ( `section_id` ) ' - . ' )'; - $database->query($mod_wrapper); - -} - +query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wrapper`"); + $mod_wrapper = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wrapper` (' + . ' `section_id` INT NOT NULL DEFAULT \'0\',' + . ' `page_id` INT NOT NULL DEFAULT \'0\',' + . ' `url` TEXT NOT NULL,' + . ' `height` INT NOT NULL DEFAULT \'0\',' + . ' PRIMARY KEY ( `section_id` ) ' + . ' )'; + $database->query($mod_wrapper); +} + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/wrapper/install.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/menu_link/install.php =================================================================== --- branches/2.8.x/wb/modules/menu_link/install.php (revision 1283) +++ branches/2.8.x/wb/modules/menu_link/install.php (revision 1284) @@ -1,46 +1,39 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -// prevent this file from being accessed directly -if(defined('WB_PATH') == false) { - exit("Cannot access this file directly"); -} - -$table = TABLE_PREFIX ."mod_menu_link"; -$database->query("DROP TABLE IF EXISTS `$table`"); - -$database->query(" - CREATE TABLE `$table` ( - `section_id` INT(11) NOT NULL DEFAULT '0', - `page_id` INT(11) NOT NULL DEFAULT '0', - `target_page_id` INT(11) NOT NULL DEFAULT '0', - `redirect_type` INT NOT NULL DEFAULT '302', - `anchor` VARCHAR(255) NOT NULL DEFAULT '0' , - `extern` VARCHAR(255) NOT NULL DEFAULT '' , - PRIMARY KEY (`section_id`) - ) -"); - -?> +query("DROP TABLE IF EXISTS `$table`"); + +$database->query(" + CREATE TABLE IF NOT EXISTS `$table` ( + `section_id` INT(11) NOT NULL DEFAULT '0', + `page_id` INT(11) NOT NULL DEFAULT '0', + `target_page_id` INT(11) NOT NULL DEFAULT '0', + `redirect_type` INT NOT NULL DEFAULT '302', + `anchor` VARCHAR(255) NOT NULL DEFAULT '0' , + `extern` VARCHAR(255) NOT NULL DEFAULT '' , + PRIMARY KEY (`section_id`) + ) +"); + +?> Property changes on: branches/2.8.x/wb/modules/menu_link/install.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/wysiwyg/install.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/install.php (revision 1283) +++ branches/2.8.x/wb/modules/wysiwyg/install.php (revision 1284) @@ -1,65 +1,66 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -if(defined('WB_URL')) { - - // Create table - $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wysiwyg`"); - $mod_wysiwyg = 'CREATE TABLE `'.TABLE_PREFIX.'mod_wysiwyg` ( ' - . ' `section_id` INT NOT NULL DEFAULT \'0\',' - . ' `page_id` INT NOT NULL DEFAULT \'0\',' - . ' `content` LONGTEXT NOT NULL ,' - . ' `text` LONGTEXT NOT NULL ,' - . ' PRIMARY KEY ( `section_id` ) ' - . ' )'; - $database->query($mod_wysiwyg); - - // Insert info into the search table - // Module query info - $field_info = array(); - $field_info['page_id'] = 'page_id'; - $field_info['title'] = 'page_title'; - $field_info['link'] = 'link'; - $field_info['description'] = 'description'; - $field_info['modified_when'] = 'modified_when'; - $field_info['modified_by'] = 'modified_by'; - $field_info = serialize($field_info); - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')"); - // Query start - $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_wysiwyg, [TP]pages WHERE "; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')"); - // Query body - $query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')"); - // Query end - $query_end_code = ""; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')"); - - // Insert blank row (there needs to be at least on row for the search to work) - $database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')"); - -} - +query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wysiwyg`"); + $mod_wysiwyg = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wysiwyg` ( ' + . ' `section_id` INT NOT NULL DEFAULT \'0\',' + . ' `page_id` INT NOT NULL DEFAULT \'0\',' + . ' `content` LONGTEXT NOT NULL ,' + . ' `text` LONGTEXT NOT NULL ,' + . ' PRIMARY KEY ( `section_id` ) ' + . ' )'; + $database->query($mod_wysiwyg); + + + $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'wysiwyg'"; + $insert_search = $database->query($mod_search); + if( $insert_search->numRows() == 0 ) + { + // Insert info into the search table + // Module query info + $field_info = array(); + $field_info['page_id'] = 'page_id'; + $field_info['title'] = 'page_title'; + $field_info['link'] = 'link'; + $field_info['description'] = 'description'; + $field_info['modified_when'] = 'modified_when'; + $field_info['modified_by'] = 'modified_by'; + $field_info = serialize($field_info); + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')"); + // Query start + $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_wysiwyg, [TP]pages WHERE "; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')"); + // Query body + $query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')"); + // Query end + $query_end_code = ""; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')"); + + // Insert blank row (there needs to be at least on row for the search to work) + $database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')"); + + + } +} + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/wysiwyg/install.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/form/install.php =================================================================== --- branches/2.8.x/wb/modules/form/install.php (revision 1283) +++ branches/2.8.x/wb/modules/form/install.php (revision 1284) @@ -1,111 +1,107 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -/* -The Website Baker Project would like to thank Rudolph Lartey -for his contributions to this module - adding extra field types -*/ - -if(defined('WB_URL')) { - - // Create tables - $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_fields`"); - $mod_form = 'CREATE TABLE `'.TABLE_PREFIX.'mod_form_fields` ( `field_id` INT NOT NULL AUTO_INCREMENT,' - . ' `section_id` INT NOT NULL DEFAULT \'0\' ,' - . ' `page_id` INT NOT NULL DEFAULT \'0\' ,' - . ' `position` INT NOT NULL DEFAULT \'0\' ,' - . ' `title` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `type` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `required` INT NOT NULL DEFAULT \'0\' ,' - . ' `value` TEXT NOT NULL ,' - . ' `extra` TEXT NOT NULL ,' - . ' PRIMARY KEY ( `field_id` ) ' - . ' )'; - $database->query($mod_form); - $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_settings`"); - $mod_form = 'CREATE TABLE `'.TABLE_PREFIX.'mod_form_settings` (' - . ' `section_id` INT NOT NULL DEFAULT \'0\' ,' - . ' `page_id` INT NOT NULL DEFAULT \'0\' ,' - . ' `header` TEXT NOT NULL ,' - . ' `field_loop` TEXT NOT NULL ,' - . ' `footer` TEXT NOT NULL ,' - . ' `email_to` TEXT NOT NULL ,' - . ' `email_from` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `email_fromname` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `email_subject` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `success_page` TEXT NOT NULL ,' - . ' `success_email_to` TEXT NOT NULL ,' - . ' `success_email_from` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `success_email_fromname` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `success_email_text` TEXT NOT NULL ,' - . ' `success_email_subject` VARCHAR(255) NOT NULL DEFAULT \'\' ,' - . ' `stored_submissions` INT NOT NULL DEFAULT \'0\' ,' - . ' `max_submissions` INT NOT NULL DEFAULT \'0\' ,' - . ' `use_captcha` INT NOT NULL DEFAULT \'0\' ,' - . ' PRIMARY KEY ( `section_id` ) ' - . ' )'; - $database->query($mod_form); - - $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_submissions`"); - $mod_form = 'CREATE TABLE `'.TABLE_PREFIX.'mod_form_submissions` ( `submission_id` INT NOT NULL AUTO_INCREMENT,' - . ' `section_id` INT NOT NULL DEFAULT \'0\' ,' - . ' `page_id` INT NOT NULL DEFAULT \'0\' ,' - . ' `submitted_when` INT NOT NULL DEFAULT \'0\' ,' - . ' `submitted_by` INT NOT NULL DEFAULT \'0\',' - . ' `body` TEXT NOT NULL,' - . ' PRIMARY KEY ( `submission_id` ) ' - . ' )'; - $database->query($mod_form); - - // Insert info into the search table - // Module query info - $field_info = array(); - $field_info['page_id'] = 'page_id'; - $field_info['title'] = 'page_title'; - $field_info['link'] = 'link'; - $field_info['description'] = 'description'; - $field_info['modified_when'] = 'modified_when'; - $field_info['modified_by'] = 'modified_by'; - $field_info = serialize($field_info); - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'form', '$field_info')"); - // Query start - $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_form_fields, [TP]mod_form_settings, [TP]pages WHERE "; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'form')"); - // Query body - $query_body_code = " [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.header LIKE \'%[STRING]%\' - OR [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.footer LIKE \'%[STRING]%\' - OR [TP]pages.page_id = [TP]mod_form_fields.page_id AND [TP]mod_form_fields.title LIKE \'%[STRING]%\' "; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'form')"); - // Query end - $query_end_code = ""; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'form')"); - - // Insert blank row (there needs to be at least on row for the search to work) - $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_fields (page_id,section_id) VALUES ('0','0')"); - $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id) VALUES ('0','0')"); - -} - +query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_fields`"); + // $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_submissions`"); + // $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_form_settings`"); + + // Create tables + $mod_form = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_form_fields` ( `field_id` INT NOT NULL AUTO_INCREMENT,' + . ' `section_id` INT NOT NULL DEFAULT \'0\' ,' + . ' `page_id` INT NOT NULL DEFAULT \'0\' ,' + . ' `position` INT NOT NULL DEFAULT \'0\' ,' + . ' `title` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `type` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `required` INT NOT NULL DEFAULT \'0\' ,' + . ' `value` TEXT NOT NULL ,' + . ' `extra` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `field_id` ) ' + . ' )'; + $database->query($mod_form); + + $mod_form = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_form_settings` (' + . ' `section_id` INT NOT NULL DEFAULT \'0\' ,' + . ' `page_id` INT NOT NULL DEFAULT \'0\' ,' + . ' `header` TEXT NOT NULL ,' + . ' `field_loop` TEXT NOT NULL ,' + . ' `footer` TEXT NOT NULL ,' + . ' `email_to` TEXT NOT NULL ,' + . ' `email_from` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `email_fromname` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `email_subject` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `success_page` TEXT NOT NULL ,' + . ' `success_email_to` TEXT NOT NULL ,' + . ' `success_email_from` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `success_email_fromname` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `success_email_text` TEXT NOT NULL ,' + . ' `success_email_subject` VARCHAR(255) NOT NULL DEFAULT \'\' ,' + . ' `stored_submissions` INT NOT NULL DEFAULT \'0\' ,' + . ' `max_submissions` INT NOT NULL DEFAULT \'0\' ,' + . ' `use_captcha` INT NOT NULL DEFAULT \'0\' ,' + . ' PRIMARY KEY ( `section_id` ) ' + . ' )'; + $database->query($mod_form); + + $mod_form = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_form_submissions` ( `submission_id` INT NOT NULL AUTO_INCREMENT,' + . ' `section_id` INT NOT NULL DEFAULT \'0\' ,' + . ' `page_id` INT NOT NULL DEFAULT \'0\' ,' + . ' `submitted_when` INT NOT NULL DEFAULT \'0\' ,' + . ' `submitted_by` INT NOT NULL DEFAULT \'0\',' + . ' `body` TEXT NOT NULL,' + . ' PRIMARY KEY ( `submission_id` ) ' + . ' )'; + $database->query($mod_form); + + $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'form'"; + $insert_search = $database->query($mod_search); + if( $insert_search->numRows() == 0 ) + { + // Insert info into the search table + // Module query info + $field_info = array(); + $field_info['page_id'] = 'page_id'; + $field_info['title'] = 'page_title'; + $field_info['link'] = 'link'; + $field_info['description'] = 'description'; + $field_info['modified_when'] = 'modified_when'; + $field_info['modified_by'] = 'modified_by'; + $field_info = serialize($field_info); + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'form', '$field_info')"); + // Query start + $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_form_fields, [TP]mod_form_settings, [TP]pages WHERE "; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'form')"); + // Query body + $query_body_code = " [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.header LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_form_settings.page_id AND [TP]mod_form_settings.footer LIKE \'%[STRING]%\' + OR [TP]pages.page_id = [TP]mod_form_fields.page_id AND [TP]mod_form_fields.title LIKE \'%[STRING]%\' "; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'form')"); + // Query end + $query_end_code = ""; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'form')"); + + // Insert blank row (there needs to be at least on row for the search to work) + $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_fields (page_id,section_id) VALUES ('0','0')"); + $database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id) VALUES ('0','0')"); + + } +} + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/form/install.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/code/install.php =================================================================== --- branches/2.8.x/wb/modules/code/install.php (revision 1283) +++ branches/2.8.x/wb/modules/code/install.php (revision 1284) @@ -1,64 +1,63 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -if(defined('WB_URL')) { - - // Create table - $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_code`"); - $mod_code = 'CREATE TABLE `'.TABLE_PREFIX.'mod_code` (' - . ' `section_id` INT NOT NULL DEFAULT \'0\',' - . ' `page_id` INT NOT NULL DEFAULT \'0\',' - . ' `content` TEXT NOT NULL,' - . ' PRIMARY KEY ( `section_id` )' - . ' )'; - $database->query($mod_code); - - // Insert info into the search table - // Module query info - $field_info = array(); - $field_info['page_id'] = 'page_id'; - $field_info['title'] = 'page_title'; - $field_info['link'] = 'link'; - $field_info['description'] = 'description'; - $field_info['modified_when'] = 'modified_when'; - $field_info['modified_by'] = 'modified_by'; - $field_info = serialize($field_info); - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'code', '$field_info')"); - // Query start - $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_code, [TP]pages WHERE "; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'code')"); - // Query body - $query_body_code = " [TP]pages.page_id = [TP]mod_code.page_id AND [TP]mod_code.content [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'code')"); - // Query end - $query_end_code = ""; - $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'code')"); - - // Insert blank row (there needs to be at least on row for the search to work) - $database->query("INSERT INTO ".TABLE_PREFIX."mod_code (page_id,section_id) VALUES ('0','0')"); - -} - +query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_code`"); + $mod_code = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_code` (' + . ' `section_id` INT NOT NULL DEFAULT \'0\',' + . ' `page_id` INT NOT NULL DEFAULT \'0\',' + . ' `content` TEXT NOT NULL,' + . ' PRIMARY KEY ( `section_id` )' + . ' )'; + $database->query($mod_code); + + $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'code'"; + $insert_search = $database->query($mod_search); + if( $insert_search->numRows() == 0 ) + { + // Insert info into the search table + // Module query info + $field_info = array(); + $field_info['page_id'] = 'page_id'; + $field_info['title'] = 'page_title'; + $field_info['link'] = 'link'; + $field_info['description'] = 'description'; + $field_info['modified_when'] = 'modified_when'; + $field_info['modified_by'] = 'modified_by'; + $field_info = serialize($field_info); + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'code', '$field_info')"); + // Query start + $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_code, [TP]pages WHERE "; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'code')"); + // Query body + $query_body_code = " [TP]pages.page_id = [TP]mod_code.page_id AND [TP]mod_code.content [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'code')"); + // Query end + $query_end_code = ""; + $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'code')"); + + // Insert blank row (there needs to be at least on row for the search to work) + $database->query("INSERT INTO ".TABLE_PREFIX."mod_code (page_id,section_id) VALUES ('0','0')"); + + } +} + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/code/install.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/modules/news/install.php =================================================================== --- branches/2.8.x/wb/modules/news/install.php (revision 1283) +++ branches/2.8.x/wb/modules/news/install.php (revision 1284) @@ -89,11 +89,9 @@ $database->query($mod_news); - $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'mod_wysiwyg_query'"; - $database->query($mod_search); - $insert_search = $database->is_error(); - - if( $insert_search ) + $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'news'"; + $insert_search = $database->query($mod_search); + if( $insert_search->numRows() == 0 ) { // Insert info into the search table // Module query info