Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1466) +++ branches/2.8.x/CHANGELOG (revision 1467) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------ +02 Jul-2011 Build 1465 Dietmar Woellbrink (Luisehahne) +! update some headerinfos +# fix missing header for some error messages 01 Jul-2011 Build 1465 Dietmar Woellbrink (Luisehahne) # fix form modul (tks to our Tester) 01 Jul-2011 Build 1465 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/templates/uninstall.php =================================================================== --- branches/2.8.x/wb/admin/templates/uninstall.php (revision 1466) +++ branches/2.8.x/wb/admin/templates/uninstall.php (revision 1467) @@ -23,6 +23,7 @@ $admin = new admin('Addons', 'templates_uninstall', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header Index: branches/2.8.x/wb/admin/templates/details.php =================================================================== --- branches/2.8.x/wb/admin/templates/details.php (revision 1466) +++ branches/2.8.x/wb/admin/templates/details.php (revision 1467) @@ -24,6 +24,7 @@ $admin = new admin('Addons', 'templates_view', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } Index: branches/2.8.x/wb/admin/templates/install.php =================================================================== --- branches/2.8.x/wb/admin/templates/install.php (revision 1466) +++ branches/2.8.x/wb/admin/templates/install.php (revision 1467) @@ -26,6 +26,7 @@ $admin = new admin('Addons', 'templates_install', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header Index: branches/2.8.x/wb/admin/templates/index.php =================================================================== --- branches/2.8.x/wb/admin/templates/index.php (revision 1466) +++ branches/2.8.x/wb/admin/templates/index.php (revision 1467) @@ -1,28 +1,21 @@ - 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 - -*/ - // Print admin header require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1466) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1467) @@ -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.RC6'); -if(!defined('REVISION')) define('REVISION', '1466'); +if(!defined('REVISION')) define('REVISION', '1467'); ?> Index: branches/2.8.x/wb/admin/preferences/save.php =================================================================== --- branches/2.8.x/wb/admin/preferences/save.php (revision 1466) +++ branches/2.8.x/wb/admin/preferences/save.php (revision 1467) @@ -171,13 +171,15 @@ } return ( (sizeof($err_msg) > 0) ? implode('
', $err_msg) : '' ); } -// print the header -$admin->print_header(); $retval = save_preferences($admin, $database); if( $retval == '') { + // print the header + $admin->print_header(); $admin->print_success($MESSAGE['PREFERENCES']['DETAILS_SAVED']); $admin->print_footer(); }else { + // print the header + $admin->print_header(); $admin->print_error($retval); } Index: branches/2.8.x/wb/admin/languages/uninstall.php =================================================================== --- branches/2.8.x/wb/admin/languages/uninstall.php (revision 1466) +++ branches/2.8.x/wb/admin/languages/uninstall.php (revision 1467) @@ -1,28 +1,22 @@ - 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 - -*/ - // Setup admin object require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); @@ -29,6 +23,7 @@ $admin = new admin('Addons', 'languages_uninstall', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header Index: branches/2.8.x/wb/admin/languages/details.php =================================================================== --- branches/2.8.x/wb/admin/languages/details.php (revision 1466) +++ branches/2.8.x/wb/admin/languages/details.php (revision 1467) @@ -1,28 +1,22 @@ - 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 - -*/ - // Include the config code require('../../config.php'); @@ -31,6 +25,7 @@ $admin = new admin('Addons', 'languages_view', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header @@ -100,5 +95,3 @@ // Print admin footer $admin->print_footer(); - -?> \ No newline at end of file Index: branches/2.8.x/wb/admin/languages/install.php =================================================================== --- branches/2.8.x/wb/admin/languages/install.php (revision 1466) +++ branches/2.8.x/wb/admin/languages/install.php (revision 1467) @@ -1,28 +1,22 @@ - 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 - -*/ - // do not display notices and warnings during installation error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING); @@ -32,6 +26,7 @@ $admin = new admin('Addons', 'languages_install', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header Index: branches/2.8.x/wb/admin/languages/index.php =================================================================== --- branches/2.8.x/wb/admin/languages/index.php (revision 1466) +++ branches/2.8.x/wb/admin/languages/index.php (revision 1467) @@ -1,28 +1,22 @@ - 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 - -*/ - // Print admin header require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); Index: branches/2.8.x/wb/admin/modules/uninstall.php =================================================================== --- branches/2.8.x/wb/admin/modules/uninstall.php (revision 1466) +++ branches/2.8.x/wb/admin/modules/uninstall.php (revision 1467) @@ -22,6 +22,7 @@ $admin = new admin('Addons', 'modules_uninstall', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header Index: branches/2.8.x/wb/admin/modules/details.php =================================================================== --- branches/2.8.x/wb/admin/modules/details.php (revision 1466) +++ branches/2.8.x/wb/admin/modules/details.php (revision 1467) @@ -24,6 +24,7 @@ $admin = new admin('Addons', 'modules_view', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header Index: branches/2.8.x/wb/admin/modules/install.php =================================================================== --- branches/2.8.x/wb/admin/modules/install.php (revision 1466) +++ branches/2.8.x/wb/admin/modules/install.php (revision 1467) @@ -25,6 +25,7 @@ $admin = new admin('Addons', 'modules_install', false); if( !$admin->checkFTAN() ) { + $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); } // After check print the header Index: branches/2.8.x/wb/templates/argos_theme/templates/languages.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/languages.htt (revision 1466) +++ branches/2.8.x/wb/templates/argos_theme/templates/languages.htt (revision 1467) @@ -14,6 +14,7 @@
+{FTAN}

{HEADING_INSTALL_LANGUAGE}

@@ -31,6 +32,7 @@
+{FTAN}

{HEADING_UNINSTALL_LANGUAGE}

@@ -50,6 +52,7 @@
+{FTAN}

{HEADING_LANGUAGE_DETAILS}