Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1536) +++ branches/2.8.x/CHANGELOG (revision 1537) @@ -11,7 +11,9 @@ ! = Update/Change =========================== add small Features 2.8.2 ========================== -10 Dez-2011 Build 1535 Dietmar Woellbrink (Luisehahne) +10 Dez-2011 Build 1537 Dietmar Woellbrink (Luisehahne) +! continue updating headerinfos, adding upgrade scripts to module +10 Dez-2011 Build 1536 Dietmar Woellbrink (Luisehahne) + add upgrade.php to captcha_control and small changes + add FolderProtectFile to quickskin 10 Dez-2011 Build 1535 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1536) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1537) @@ -52,5 +52,5 @@ // 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.2'); -if(!defined('REVISION')) define('REVISION', '1536'); +if(!defined('REVISION')) define('REVISION', '1537'); if(!defined('SP')) define('SP', 'SP2'); Index: branches/2.8.x/wb/modules/menu_link/save.php =================================================================== --- branches/2.8.x/wb/modules/menu_link/save.php (revision 1536) +++ branches/2.8.x/wb/modules/menu_link/save.php (revision 1537) @@ -4,7 +4,6 @@ * @category modules * @package menu_link * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -57,5 +56,3 @@ // Print admin footer $admin->print_footer(); - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/menu_link/install.php =================================================================== --- branches/2.8.x/wb/modules/menu_link/install.php (revision 1536) +++ branches/2.8.x/wb/modules/menu_link/install.php (revision 1537) @@ -1,39 +1,41 @@ -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`) - ) -"); - -?> +Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ + +$table = TABLE_PREFIX ."mod_menu_link"; +$database->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`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci +"); Index: branches/2.8.x/wb/modules/menu_link/modify.php =================================================================== --- branches/2.8.x/wb/modules/menu_link/modify.php (revision 1536) +++ branches/2.8.x/wb/modules/menu_link/modify.php (revision 1537) @@ -4,7 +4,6 @@ * @category modules * @package menu_link * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -16,8 +15,14 @@ * */ -// Must include code to stop this file being accessed directly -if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } +// Must include code to stop this file being access directly +/* -------------------------------------------------------- */ +if(defined('WB_PATH') == false) +{ + // Stop this file being access directly + die('Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ // check if module language file exists for the language set by the user (e.g. DE, EN) if(!file_exists(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php')) { Index: branches/2.8.x/wb/modules/menu_link/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/menu_link/upgrade.php (nonexistent) +++ branches/2.8.x/wb/modules/menu_link/upgrade.php (revision 1537) @@ -0,0 +1,37 @@ +Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ + +$msg = ''; +$sTable = TABLE_PREFIX.'mod_menu_link'; +if(($sOldType = $database->getTableEngine($sTable))) { + if(('myisam' != strtolower($sOldType))) { + if(!$database->query('ALTER TABLE `'.$sTable.'` Engine = \'MyISAM\' ')) { + $msg = $database->get_error(); + } + } +} else { + $msg = $database->get_error(); +} +// ------------------------------------ \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/menu_link/upgrade.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/modules/jsadmin/uninstall.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/uninstall.php (revision 1536) +++ branches/2.8.x/wb/modules/jsadmin/uninstall.php (revision 1537) @@ -4,8 +4,7 @@ * @category modules * @package JsAdmin * @author WebsiteBaker Project, modified by Swen Uth for Website Baker 2.7 - * @copyright (C) 2006, Stepan Riha - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright (C) 2006, Stepan Riha, 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -17,7 +16,13 @@ */ // prevent this file from being accessed directly -if(!defined('WB_PATH')) { exit('Cannot access this file directly'); } +/* -------------------------------------------------------- */ +if(defined('WB_PATH') == false) +{ + // Stop this file being access directly + die('Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ $table = TABLE_PREFIX ."mod_jsadmin"; $database->query("DROP TABLE `$table`"); Index: branches/2.8.x/wb/modules/jsadmin/info.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/info.php (revision 1536) +++ branches/2.8.x/wb/modules/jsadmin/info.php (revision 1537) @@ -3,9 +3,7 @@ * * @category modules * @package jsadmin - * @author Independend-Software-Team * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -18,9 +16,9 @@ */ $module_directory = 'jsadmin'; -$module_name = 'Javascript Admin'; +$module_name = 'Javascript Admin 1.4.0'; $module_function = 'tool'; -$module_version = '1.3.0'; +$module_version = '1.4.0'; $module_platform = '2.7 | 2.8.x'; $module_author = 'Stepan Riha, Swen Uth'; $module_license = 'BSD License'; Index: branches/2.8.x/wb/modules/jsadmin/tool.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/tool.php (revision 1536) +++ branches/2.8.x/wb/modules/jsadmin/tool.php (revision 1537) @@ -4,7 +4,6 @@ * @category modules * @package JsAdmin * @author WebsiteBaker Project, modified by Swen Uth for Website Baker 2.7 - * @copyright (C) 2006, Stepan Riha * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -16,8 +15,14 @@ * */ -// Must include code to stop this file being access directly -if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } +// prevent this file from being accessed directly +/* -------------------------------------------------------- */ +if(defined('WB_PATH') == false) +{ + // Stop this file being access directly + die('Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ // check if module language file exists for the language set by the user (e.g. DE, EN) if(!file_exists(WB_PATH .'/modules/jsadmin/languages/'.LANGUAGE .'.php')) { Index: branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php (revision 1536) +++ branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php (revision 1537) @@ -4,7 +4,6 @@ * @category modules * @package JsAdmin * @author WebsiteBaker Project, modified by Swen Uth for Website Baker 2.7 - * @copyright (C) 2006, Stepan Riha * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -117,6 +116,3 @@ print_r( $page_type.'/'.$buttonCell ); print ''; // die(); */ } - - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/jsadmin/jsadmin.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/jsadmin.php (revision 1536) +++ branches/2.8.x/wb/modules/jsadmin/jsadmin.php (revision 1537) @@ -4,7 +4,6 @@ * @category modules * @package JsAdmin * @author WebsiteBaker Project, modified by Swen Uth for Website Baker 2.7 - * @copyright (C) 2006, Stepan Riha * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -16,8 +15,14 @@ * */ -// Must include code to stop this file being access directly -if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } +// prevent this file from being accessed directly +/* -------------------------------------------------------- */ +if(defined('WB_PATH') == false) +{ + // Stop this file being access directly + die('Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ function get_setting($name, $default = '') { global $database; @@ -50,5 +55,3 @@ $js_yui_scripts[] = $YUI_PATH.'/dom/dom'.$js_yui_min.'.js'; $js_yui_scripts[] = $YUI_PATH.'/connection/connection'.$js_yui_min.'.js'; $js_yui_scripts[] = $YUI_PATH.'/dragdrop/dragdrop'.$js_yui_min.'.js'; - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/jsadmin/install.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/install.php (revision 1536) +++ branches/2.8.x/wb/modules/jsadmin/install.php (revision 1537) @@ -4,8 +4,7 @@ * @category modules * @package JsAdmin * @author WebsiteBaker Project, modified by Swen Uth for Website Baker 2.7 - * @copyright (C) 2006, Stepan Riha - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright (C) 2006, Stepan Riha, 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -17,25 +16,42 @@ */ // prevent this file from being accessed directly -if(!defined('WB_PATH')) { exit('Cannot access this file directly'); } +/* -------------------------------------------------------- */ +if(defined('WB_PATH') == false) +{ + // Stop this file being access directly + die('Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ // add new rows to table "settings" +$msg = array (); $table = TABLE_PREFIX ."mod_jsadmin"; +$jsadminDefault = array ( + array ( 'id' => '1','name' => 'mod_jsadmin_persist_order','value' => '1' ), + array ( 'id' => '2','name' => 'mod_jsadmin_ajax_order_pages','value' => '1' ), + array ( 'id' => '3','name' => 'mod_jsadmin_ajax_order_sections','value' => '1' ), +); + $database->query("DROP TABLE IF EXISTS `$table`"); +$sql = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_jsadmin` (' + . ' `id` INT(11) NOT NULL DEFAULT \'0\',' + . ' `name` VARCHAR(255) NOT NULL DEFAULT \'0\',' + . ' `value` INT(11) NOT NULL DEFAULT \'0\',' + . ' PRIMARY KEY ( `id` )' + . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; -$database->query(" - CREATE TABLE `$table` ( - `id` INT(11) NOT NULL DEFAULT '0', - `name` VARCHAR(255) NOT NULL DEFAULT '0', - `value` INT(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) - ) -"); +if($database->query($sql) ) { -global $database; -$database->query("INSERT INTO ".$table." (id,name,value) VALUES ('1','mod_jsadmin_persist_order','1')"); -$database->query("INSERT INTO ".$table." (id,name,value) VALUES ('2','mod_jsadmin_ajax_order_pages','1')"); -$database->query("INSERT INTO ".$table." (id,name,value) VALUES ('3','mod_jsadmin_ajax_order_sections','1')"); + for($x=0;$xquery($sql) ) { $msg[] = $database->get_error();} + } +} else { + $msg[] = $database->get_error(); +} -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/jsadmin/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/upgrade.php (nonexistent) +++ branches/2.8.x/wb/modules/jsadmin/upgrade.php (revision 1537) @@ -0,0 +1,37 @@ +Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ + +$msg = ''; +$sTable = TABLE_PREFIX.'mod_jsadmin'; +if(($sOldType = $database->getTableEngine($sTable))) { + if(('myisam' != strtolower($sOldType))) { + if(!$database->query('ALTER TABLE `'.$sTable.'` Engine = \'MyISAM\' ')) { + $msg = $database->get_error(); + } + } +} else { + $msg = $database->get_error(); +} +// ------------------------------------ \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/jsadmin/upgrade.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property