Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1358) +++ branches/2.8.x/CHANGELOG (revision 1359) @@ -12,6 +12,8 @@ ------------------------------------- 2.8.2 ------------------------------------- 28 Dec-2010 Build 1358 Dietmar Woellbrink (Luisehahne) +! upgrade FCKeditor to Version 2.6.6 +28 Dec-2010 Build 1358 Dietmar Woellbrink (Luisehahne) ! validation fixes in pages backend theme 27 Dec-2010 Build 1357 Frank Heyne (FrankH) # security fix: in path admin/pages/ - added FTAN check Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1358) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1359) @@ -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.2.RC2'); -if(!defined('REVISION')) define('REVISION', '1358'); +if(!defined('REVISION')) define('REVISION', '1359'); ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/uninstall.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/uninstall.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/uninstall.php (revision 1359) @@ -1,32 +1,23 @@ - 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 - -*/ - // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } // Delete the editor directory rm_full_dir(WB_PATH.'/modules/fckeditor/fckeditor'); - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/info.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/info.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/info.php (revision 1359) @@ -1,31 +1,27 @@ -FCKeditor v2.6.5.'; - -?> \ No newline at end of file +FCKeditor v2.6.6.'; Index: branches/2.8.x/wb/modules/fckeditor/languages/NL.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/languages/NL.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/languages/NL.php (revision 1359) @@ -27,6 +27,6 @@ */ // Nederlandstalige beschrijving van de module -$module_description = 'Met deze FCKeditor v2.6.5 module kunt u de inhoud van een pagina wijzigen.'; +$module_description = 'Met deze FCKeditor v2.6.6 module kunt u de inhoud van een pagina wijzigen.'; ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/languages/NO.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/languages/NO.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/languages/NO.php (revision 1359) @@ -27,6 +27,6 @@ */ //Module Description -$module_description = 'Med denne modulen kan du redigere innholdet på sidene dine ved å benytte redigeringsverktøyet FCKeditor v2.6.5.'; +$module_description = 'Med denne modulen kan du redigere innholdet på sidene dine ved å benytte redigeringsverktøyet FCKeditor v2.6.6.'; ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/languages/DA.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/languages/DA.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/languages/DA.php (revision 1359) @@ -27,6 +27,6 @@ */ // Dansk modulbeskrivelse -$module_description = 'Dette modul muliggør redigering af sideindhold ved hjælp af FCKeditor v2.6.5.'; +$module_description = 'Dette modul muliggør redigering af sideindhold ved hjælp af FCKeditor v2.6.6.'; ?> Index: branches/2.8.x/wb/modules/fckeditor/languages/FR.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/languages/FR.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/languages/FR.php (revision 1359) @@ -27,6 +27,6 @@ ----------------------------------------------------------------------------------------- */ //Module Description -$module_description = 'Ce module permet de modifier le contenu de la page avec FCKeditor v2.6.5.'; +$module_description = 'Ce module permet de modifier le contenu de la page avec FCKeditor v2.6.6.'; ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/languages/DE.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/languages/DE.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/languages/DE.php (revision 1359) @@ -27,6 +27,6 @@ */ // Deutsche Modulbeschreibung -$module_description = 'Dieses Modul erlaubt das bearbeiten von Seiteninhalten mit dem FCKeditor v2.6.5.'; +$module_description = 'Dieses Modul erlaubt das bearbeiten von Seiteninhalten mit dem FCKeditor v2.6.6.'; ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/include.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/include.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/include.php (revision 1359) @@ -2,10 +2,10 @@ /** * * @category modules - * @package fckeditor + * @package wysiwyg * @author WebsiteBaker Project * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2010, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -22,11 +22,11 @@ } function get_template_name() { + global $database; // returns the template name of the current displayed page // Loading config.php is not needed here, it is loaded before. It breaks the module when the editor is called form another dir as WB_PATH/modules/mymodule // require_once('../../config.php'); - require_once(WB_PATH. '/framework/class.database.php'); // work out default editor.css file for CKeditor if(file_exists(WB_PATH .'/templates/' .DEFAULT_TEMPLATE .'/editor.css')) { @@ -40,9 +40,6 @@ $pageid = (int) $_GET["page_id"]; // obtain template folder of current page from the database - if(!isset($admin)) { - $database = new database(); - } $query_page = "SELECT template FROM " .TABLE_PREFIX ."pages WHERE page_id =$pageid"; $pagetpl = $database->get_one($query_page); // if empty, default template is used @@ -114,5 +111,3 @@ $oFCKeditor->Height = $height; $oFCKeditor->Create(); } - -?> \ No newline at end of file Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/fckeditor.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/fckeditor.php (revision 1358) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/fckeditor.php (revision 1359) @@ -1,7 +1,7 @@