Index: branches/2.8.x/wb/admin/groups/index.php =================================================================== --- branches/2.8.x/wb/admin/groups/index.php (revision 1280) +++ branches/2.8.x/wb/admin/groups/index.php (revision 1281) @@ -1,32 +1,4 @@ \ No newline at end of file Index: branches/2.8.x/wb/admin/settings/save.php =================================================================== --- branches/2.8.x/wb/admin/settings/save.php (revision 1280) +++ branches/2.8.x/wb/admin/settings/save.php (revision 1281) @@ -1,32 +1,4 @@ - 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 - -*/ - -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Access', 'access'); - -// Setup template object -$template = new Template(THEME_PATH.'/templates'); -$template->set_file('page', 'access.htt'); - -$template->set_block('page', 'main_block', 'main'); -$template->set_block('main_block', 'users_block', 'user'); -$template->set_block('main_block', 'groups_block', 'group'); - -// Insert values into the template object -$template->set_var(array( - 'ADMIN_URL' => ADMIN_URL, - 'THEME_URL' => THEME_URL, - 'WB_URL' => WB_URL - ) -); - -/** - * Insert permission values into the template object - * Deprecated - as we are using blocks. - */ -$display_none = "style=\"display: none;\""; -if($admin->get_permission('users') != true) $template->set_var('DISPLAY_USERS', $display_none); -if($admin->get_permission('groups') != true) $template->set_var('DISPLAY_GROUPS', $display_none); - -// Insert section names and descriptions -$template->set_var(array( - 'USERS' => $MENU['USERS'], - 'GROUPS' => $MENU['GROUPS'], - 'ACCESS' => $MENU['ACCESS'], - 'USERS_OVERVIEW' => $OVERVIEW['USERS'], - 'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'], - ) -); - -if ( $admin->get_permission('users') == true ) $template->parse('main_block', "users_block", true); -if ( $admin->get_permission('groups') == true ) $template->parse('main_block', "groups_block", true); - -// Parse template object -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); - -// Print admin footer -$admin->print_footer(); - +set_file('page', 'access.htt'); + +$template->set_block('page', 'main_block', 'main'); +$template->set_block('main_block', 'users_block', 'user'); +$template->set_block('main_block', 'groups_block', 'group'); + +// Insert values into the template object +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'THEME_URL' => THEME_URL, + 'WB_URL' => WB_URL + ) +); + +/** + * Insert permission values into the template object + * Deprecated - as we are using blocks. + */ +$display_none = "style=\"display: none;\""; +if($admin->get_permission('users') != true) $template->set_var('DISPLAY_USERS', $display_none); +if($admin->get_permission('groups') != true) $template->set_var('DISPLAY_GROUPS', $display_none); + +// Insert section names and descriptions +$template->set_var(array( + 'USERS' => $MENU['USERS'], + 'GROUPS' => $MENU['GROUPS'], + 'ACCESS' => $MENU['ACCESS'], + 'USERS_OVERVIEW' => $OVERVIEW['USERS'], + 'GROUPS_OVERVIEW' => $OVERVIEW['GROUPS'], + ) +); + +if ( $admin->get_permission('users') == true ) $template->parse('main_block', "users_block", true); +if ( $admin->get_permission('groups') == true ) $template->parse('main_block', "groups_block", true); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + ?> \ No newline at end of file Index: branches/2.8.x/wb/admin/addons/reload.php =================================================================== --- branches/2.8.x/wb/admin/addons/reload.php (revision 1280) +++ branches/2.8.x/wb/admin/addons/reload.php (revision 1281) @@ -1,153 +1,138 @@ - - * 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 -*/ - -/** - * check if there is anything to do - */ -$post_check = array('reload_modules', 'reload_templates', 'reload_languages'); -foreach ($post_check as $index => $key) { - if (!isset($_POST[$key])) unset($post_check[$index]); -} -if (count($post_check) == 0) die(header('Location: index.php?advanced')); - -/** - * check if user has permissions to access this file - */ -// include WB configuration file and WB admin class -require_once('../../config.php'); -require_once('../../framework/class.admin.php'); - -// check user permissions for admintools (redirect users with wrong permissions) -$admin = new admin('Admintools', 'admintools', false, false); -if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php')); - -// check if the referer URL if available -$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : - (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); - -// if referer is set, check if script was invoked from "admin/modules/index.php" -$required_url = ADMIN_URL . '/addons/index.php'; -if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) - die(header('Location: ../../index.php')); - -// include WB functions file -require_once(WB_PATH . '/framework/functions.php'); - -// load WB language file -require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); - -// create Admin object with admin header -$admin = new admin('Addons', '', true, false); -$js_back = ADMIN_URL . '/addons/index.php?advanced'; - -/** - * Reload all specified Addons - */ -$msg = array(); -$table = TABLE_PREFIX . 'addons'; - -foreach ($post_check as $key) { - switch ($key) { - case 'reload_modules': - if ($handle = opendir(WB_PATH . '/modules')) { - // delete modules from database - $sql = "DELETE FROM `$table` WHERE `type` = 'module'"; - $database->query($sql); - - // loop over all modules - while(false !== ($file = readdir($handle))) { - if ($file != '' && substr($file, 0, 1) != '.' && $file != 'admin.php' && $file != 'index.php') { - load_module(WB_PATH . '/modules/' . $file); - } - } - closedir($handle); - // add success message - $msg[] = $MESSAGE['ADDON']['MODULES_RELOADED']; - - } else { - // provide error message and stop - $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); - } - break; - - case 'reload_templates': - if ($handle = opendir(WB_PATH . '/templates')) { - // delete templates from database - $sql = "DELETE FROM `$table` WHERE `type` = 'template'"; - $database->query($sql); - - // loop over all templates - while(false !== ($file = readdir($handle))) { - if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { - load_template(WB_PATH . '/templates/' . $file); - } - } - closedir($handle); - // add success message - $msg[] = $MESSAGE['ADDON']['TEMPLATES_RELOADED']; - - } else { - // provide error message and stop - $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); - } - break; - - case 'reload_languages': - if ($handle = opendir(WB_PATH . '/languages/')) { - // delete languages from database - $sql = "DELETE FROM `$table` WHERE `type` = 'language'"; - $database->query($sql); - - // loop over all languages - while(false !== ($file = readdir($handle))) { - if ($file != '' && substr($file, 0, 1) != '.' && $file != 'index.php') { - load_language(WB_PATH . '/languages/' . $file); - } - } - closedir($handle); - // add success message - $msg[] = $MESSAGE['ADDON']['LANGUAGES_RELOADED']; - - } else { - // provide error message and stop - $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); - } - break; - } -} - -// output success message -$admin->print_success(implode($msg, '
'), $js_back); - + $key) { + if (!isset($_POST[$key])) unset($post_check[$index]); +} +if (count($post_check) == 0) die(header('Location: index.php?advanced')); + +/** + * check if user has permissions to access this file + */ +// include WB configuration file and WB admin class +require_once('../../config.php'); +require_once('../../framework/class.admin.php'); + +// check user permissions for admintools (redirect users with wrong permissions) +$admin = new admin('Admintools', 'admintools', false, false); +if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php')); + +// check if the referer URL if available +$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : + (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); + +// if referer is set, check if script was invoked from "admin/modules/index.php" +$required_url = ADMIN_URL . '/addons/index.php'; +if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) + die(header('Location: ../../index.php')); + +// include WB functions file +require_once(WB_PATH . '/framework/functions.php'); + +// load WB language file +require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); + +// create Admin object with admin header +$admin = new admin('Addons', '', true, false); +$js_back = ADMIN_URL . '/addons/index.php?advanced'; + +/** + * Reload all specified Addons + */ +$msg = array(); +$table = TABLE_PREFIX . 'addons'; + +foreach ($post_check as $key) { + switch ($key) { + case 'reload_modules': + if ($handle = opendir(WB_PATH . '/modules')) { + // delete modules from database + $sql = "DELETE FROM `$table` WHERE `type` = 'module'"; + $database->query($sql); + + // loop over all modules + while(false !== ($file = readdir($handle))) { + if ($file != '' && substr($file, 0, 1) != '.' && $file != 'admin.php' && $file != 'index.php') { + load_module(WB_PATH . '/modules/' . $file); + } + } + closedir($handle); + // add success message + $msg[] = $MESSAGE['ADDON']['MODULES_RELOADED']; + + } else { + // provide error message and stop + $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); + } + break; + + case 'reload_templates': + if ($handle = opendir(WB_PATH . '/templates')) { + // delete templates from database + $sql = "DELETE FROM `$table` WHERE `type` = 'template'"; + $database->query($sql); + + // loop over all templates + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { + load_template(WB_PATH . '/templates/' . $file); + } + } + closedir($handle); + // add success message + $msg[] = $MESSAGE['ADDON']['TEMPLATES_RELOADED']; + + } else { + // provide error message and stop + $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); + } + break; + + case 'reload_languages': + if ($handle = opendir(WB_PATH . '/languages/')) { + // delete languages from database + $sql = "DELETE FROM `$table` WHERE `type` = 'language'"; + $database->query($sql); + + // loop over all languages + while(false !== ($file = readdir($handle))) { + if ($file != '' && substr($file, 0, 1) != '.' && $file != 'index.php') { + load_language(WB_PATH . '/languages/' . $file); + } + } + closedir($handle); + // add success message + $msg[] = $MESSAGE['ADDON']['LANGUAGES_RELOADED']; + + } else { + // provide error message and stop + $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); + } + break; + } +} + +// output success message +$admin->print_success(implode($msg, '
'), $js_back); +$admin->print_footer(); + ?> \ No newline at end of file Index: branches/2.8.x/wb/admin/addons/index.php =================================================================== --- branches/2.8.x/wb/admin/addons/index.php (revision 1280) +++ branches/2.8.x/wb/admin/addons/index.php (revision 1281) @@ -1,101 +1,99 @@ - - 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 - -*/ - -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Addons', 'addons'); - -// Setup template object -$template = new Template(THEME_PATH.'/templates'); -$template->set_file('page', 'addons.htt'); -$template->set_block('page', 'main_block', 'main'); - -// Insert values into the template object -$template->set_var(array( - 'ADMIN_URL' => ADMIN_URL, - 'THEME_URL' => THEME_URL, - 'WB_URL' => WB_URL - ) -); - -/** - * Setting up the blocks - */ -$template->set_block('main_block', "modules_block", "modules"); -$template->set_block('main_block', "templates_block", "templates"); -$template->set_block('main_block', "languages_block", "languages"); -$template->set_block('main_block', "reload_block", "reload"); - -/** - * Insert permission values into the template object - * Obsolete as we are using blocks ... see "parsing the blocks" section - */ -$display_none = "style=\"display: none;\""; -if($admin->get_permission('modules') != true) $template->set_var('DISPLAY_MODULES', $display_none); -if($admin->get_permission('templates') != true) $template->set_var('DISPLAY_TEMPLATES', $display_none); -if($admin->get_permission('languages') != true) $template->set_var('DISPLAY_LANGUAGES', $display_none); -if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true) - $template->set_var('DISPLAY_RELOAD', $display_none); - -/** - * Insert section names and descriptions - */ -$template->set_var(array( - 'ADDONS_OVERVIEW' => $MENU['ADDONS'], - 'MODULES' => $MENU['MODULES'], - 'TEMPLATES' => $MENU['TEMPLATES'], - 'LANGUAGES' => $MENU['LANGUAGES'], - 'MODULES_OVERVIEW' => $OVERVIEW['MODULES'], - 'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'], - 'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'], - 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . ' ' . $TEXT['SETTINGS'], - 'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON']['RELOAD'], - 'TEXT_RELOAD' => $TEXT['RELOAD'], - 'RELOAD_URL' => ADMIN_URL . '/addons/reload.php', - 'URL_ADVANCED' => $admin->get_permission('admintools') ? - '' . $TEXT['ADVANCED'] . '' : '' - ) -); - -/** - * Parsing the blocks ... - */ -if ( $admin->get_permission('modules') == true) $template->parse('main_block', "modules_block", true); -if ( $admin->get_permission('templates') == true) $template->parse('main_block', "templates_block", true); -if ( $admin->get_permission('languages') == true) $template->parse('main_block', "languages_block", true); -if ( isset($_GET['advanced']) AND $admin->get_permission('admintools') == true) $template->parse('main_block', "reload_block", true); - -/** - * Parse template object - */ -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); - -/** - * Print admin footer - */ -$admin->print_footer(); - +set_file('page', 'addons.htt'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into the template object +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'THEME_URL' => THEME_URL, + 'WB_URL' => WB_URL + ) +); + +/** + * Setting up the blocks + */ +$template->set_block('main_block', "modules_block", "modules"); +$template->set_block('main_block', "templates_block", "templates"); +$template->set_block('main_block', "languages_block", "languages"); +$template->set_block('main_block', "reload_block", "reload"); + +/** + * Insert permission values into the template object + * Obsolete as we are using blocks ... see "parsing the blocks" section + */ +$display_none = "style=\"display: none;\""; +if($admin->get_permission('modules') != true) $template->set_var('DISPLAY_MODULES', $display_none); +if($admin->get_permission('templates') != true) $template->set_var('DISPLAY_TEMPLATES', $display_none); +if($admin->get_permission('languages') != true) $template->set_var('DISPLAY_LANGUAGES', $display_none); +if($admin->get_permission('admintools') != true) $template->set_var('DISPLAY_ADVANCED', $display_none); + +if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true) + $template->set_var('DISPLAY_RELOAD', $display_none); + +/** + * Insert section names and descriptions + */ +$template->set_var(array( + 'ADDONS_OVERVIEW' => $MENU['ADDONS'], + 'MODULES' => $MENU['MODULES'], + 'TEMPLATES' => $MENU['TEMPLATES'], + 'LANGUAGES' => $MENU['LANGUAGES'], + 'MODULES_OVERVIEW' => $OVERVIEW['MODULES'], + 'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'], + 'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'], + 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . ' ' . $TEXT['SETTINGS'], + 'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON']['RELOAD'], + 'TEXT_RELOAD' => $TEXT['RELOAD'], + 'RELOAD_URL' => ADMIN_URL . '/addons/reload.php', + 'URL_ADVANCED' => $admin->get_permission('admintools') + ? '' . $TEXT['ADVANCED'] . '' : '', + 'ADVANCED_URL' => $admin->get_permission('admintools') ? ADMIN_URL . '/addons/index.php' : '', + 'TEXT_ADVANCED' => $TEXT['ADVANCED'], + + ) +); + +/** + * Parsing the blocks ... + */ +if ( $admin->get_permission('modules') == true) $template->parse('main_block', "modules_block", true); +if ( $admin->get_permission('templates') == true) $template->parse('main_block', "templates_block", true); +if ( $admin->get_permission('languages') == true) $template->parse('main_block', "languages_block", true); +if ( isset($_GET['advanced']) AND $admin->get_permission('admintools') == true) $template->parse('main_block', "reload_block", true); + +/** + * Parse template object + */ +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +/** + * Print admin footer + */ +$admin->print_footer(); + ?> \ No newline at end of file Index: branches/2.8.x/wb/admin/login/forgot/index.php =================================================================== --- branches/2.8.x/wb/admin/login/forgot/index.php (revision 1280) +++ branches/2.8.x/wb/admin/login/forgot/index.php (revision 1281) @@ -1,32 +1,4 @@ $MENU['HELP'], 'TITLE_LOGOUT' => $MENU['LOGOUT'], 'URL_VIEW' => $view_url, - 'URL_HELP' => 'http://help.websitebaker.org/', + 'URL_HELP' => 'http://www.websitebaker.org/', 'BACKEND_MODULE_CSS' => $this->register_backend_modfiles('css'), // adds backend.css 'BACKEND_MODULE_JS' => $this->register_backend_modfiles('js') // adds backend.js ) Index: branches/2.8.x/wb/search/search.php =================================================================== --- branches/2.8.x/wb/search/search.php (revision 1280) +++ branches/2.8.x/wb/search/search.php (revision 1281) @@ -1,32 +1,4 @@ page_is_visible() only available in WB 2.7) - - v2.84 (doc.. Christian Sommer; Apr 7, 2008) - + update to FCKEditor release v2.6 - - v2.83 (doc.. Christian Sommer; Mar 12, 2008) - + added the WB home folder fix found by the forum member spawnferkel - (see forum thread: http://forum.websitebaker2.org/index.php/topic,8978.msg53107.html#msg53107) - + defined and instead of and per default - - v2.82 (doc.. Christian Sommer; Feb 20, 2008) - + added the connector fix found by the forum member Luisehahne - (see forum thread: http://forum.websitebaker2.org/index.php/topic,8240.msg51675.html#msg51675) - - v2.81 (ruebenwurzel.. Matthias Gallas; Dez 24, 2007) - + update to FCKEditor release v2.51 - - v2.80 (doc.. Christian Sommer; Dec 05, 2007) - + update to FCKEditor release v2.50 (according to the developers, the most important release since v2.0) - + entire PHP connector stuff rewritten from scratch - + permissions to view media, upload files and to create folders are now controlled by WB group access rights - + included WBLinkPlugin fix from melisa (http://forum.websitebaker.org/index.php/topic,1670.msg45948.html#msg45948) - (Note: removed text field to specify the link title; function creates errors in IE and seems not to work in FF either) - + added text file "CHANGELOG" which contains all changes since Mar 27, 2007 - - v2.77 (doc.. Christian Sommer; Oct 30, 2007) - + re-introduced fix from v2.74a to solve issues with wb_fcktemplates.xml - - v2.76 (doc.. Christian Sommer; Oct 29, 2007) - + v2.75 was released as hotfix to prevent major damage to WB hosted sites using FCKEditor - (users loged in the WB backend can upload files and create folders regardless of their WB permissions) - + the following additional security measures were applied with the v2.76 release: - o possibility to upload files / create folders via FCKEditor disabled by default - o PHP connector only active for users authentificated via WB backend and permissions to view the MEDIA folder - o buttons to search the server (e.g. image/flash/link browser) only enabled if user has permission to view MEDIA folder - o buttons to upload files from FCKEditor always disabled (users settings will be overwritten) - + it is no longer possible to upload files or to create folder by the FCKEditor dialogues - + file uploads and creation of folders needs to be done via the WB MEDIA center - - v2.75 (doc.. Christian Sommer; Oct 20, 2007) HOTFIX TO PREVENT THE WORST CASE SCENARIOUS - + implemented the slightly modified security patch provided by the forum member sogua (thanks man) - Note: all older versions of the FCKEditor module allow file uploads and creation of folders from any - browser, no matter if you have access to the Website Baker backend or not!!! - Upload of PHP files is and was not possible with earlier version. However, images, textfiles, movies... - could be uploaded and overwritten within the WB /MEDIA folder. - - v2.7.4a (ruebenwurzel; 05.07.2007) - + fixed issue in include.php with wb_fcktemplates.xml - - v2.7.4 (ruebenwurzel; 14.06.2007) - + update to FCKEditor release v2.4.3 - - v2.7.3 (ruebenwurzel; 10.04.2007) - + update to FCKEditor release v2.4.2 - - v2.7.2 (ruebenwurzel, doc; 29.03.2007) - + update to FCKEditor release v2.4.1 (added UTF8-BOM fix from http://dev.fckeditor.net/ticket/279) - + removed two test.html files from fckeditor/editor/filemanager/browser and .../upload which could be used - to upload any files from outside to the WB media directory if the exact URL is known (thanks to Funky_MF) - + changed the following default settings in the wb_fckconfig.js files: - FCKConfig.EnterMode = 'p'; - FCKConfig.ShiftEnterMode = 'br'; - FCKConfig.FlashBrowser = true; - - v2.7.1 (doc; 06.02.2007) - + fixed issues with CSS and XML handling - + moved FCK Javascript settings to external file: /wb_config/wb_fckconfig.js - - v2.7.0 (ruebenwurzel; 05.02.2007) - + update to FCKEditor release v2.4.0 - - CREDITS: - o Thanks to tallyce for the php-connector patch which enables file upload to WB media folder - o all other members who contributed to the FCKEditor module and are not mentioned here - ----------------------------------------------------------------------------------------------------------- -*/ /** * * @category modules Index: branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fckconfig.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fckconfig.js (revision 1280) +++ branches/2.8.x/wb/modules/fckeditor/wb_config/wb_fckconfig.js (revision 1281) @@ -102,7 +102,7 @@ FCKConfig.ToolbarSets["WBToolbar"] = [ ['Source','DocProps','-','NewPage','Preview','-','Templates'], ['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'], - ['FitWindow','ShowBlocks', '-', 'SyntaxHighLight2', /* 'flvPlayer', */ '-','About'], + ['FitWindow','ShowBlocks', '-', /* 'SyntaxHighLight2', */ /* 'flvPlayer', */ '-','About'], '/', ['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'], ['TextColor','BGColor'], Index: branches/2.8.x/wb/modules/news/view.php =================================================================== --- branches/2.8.x/wb/modules/news/view.php (revision 1280) +++ branches/2.8.x/wb/modules/news/view.php (revision 1281) @@ -1,32 +1,4 @@