Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1314) +++ branches/2.8.x/CHANGELOG (revision 1315) @@ -12,6 +12,8 @@ ------------------------------------- 2.8.1 ------------------------------------- 11-Apr-2010 Dietmar Woellbrink (Luisehahne) +# fix ticket #975 some weird /pages/ header infos +11-Apr-2010 Dietmar Woellbrink (Luisehahne) ! little fixes for backwards compatible PHP4, pls test 11-Apr-2010 Dietmar Woellbrink (Luisehahne) ! show_menu2 remove unneeded code for WB < 2.7 Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1314) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1315) @@ -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.x'); -if(!defined('REVISION')) define('REVISION', '1314'); +if(!defined('REVISION')) define('REVISION', '1315'); ?> \ No newline at end of file Index: branches/2.8.x/wb/admin/preferences/save.php =================================================================== --- branches/2.8.x/wb/admin/preferences/save.php (revision 1314) +++ branches/2.8.x/wb/admin/preferences/save.php (revision 1315) @@ -47,17 +47,19 @@ $timezone = ( ($timezone >= -12 && $timezone <= 13) ? $timezone : -20 ) * 3600; // date_format must be a key from /interface/date_formats $date_format = $admin->get_post('date_format'); + $date_format_key = str_replace(' ', '|', $date_format); $user_time = true; include( ADMIN_PATH.'/interface/date_formats.php' ); - $date_format = (array_key_exists($date_format, $DATE_FORMATS) ? $date_format : $DATE_FORMATS['system_default']); - $date_format = ($DATE_FORMATS['system_default'] == $date_format ? '' : $date_format); + $date_format = (array_key_exists($date_format_key, $DATE_FORMATS) ? $date_format : 'system_default'); + $date_format = ($date_format == 'system_default' ? '' : $date_format); unset($DATE_FORMATS); // time_format must be a key from /interface/time_formats $time_format = $admin->get_post('time_format'); + $time_format_key = str_replace(' ', '|', $time_format); $user_time = true; include( ADMIN_PATH.'/interface/time_formats.php' ); - $time_format = (array_key_exists($time_format, $TIME_FORMATS) ? $time_format : $TIME_FORMATS['system_default']); - $time_format = ($TIME_FORMATS['system_default'] == $time_format ? '' : $time_format); + $time_format = (array_key_exists($time_format_key, $TIME_FORMATS) ? $time_format : 'system_default'); + $time_format = ($time_format == 'system_default' ? '' : $time_format); unset($TIME_FORMATS); // email should be validatet by core $email = ( $admin->get_post('email') == null ? '' : $admin->get_post('email') ); Index: branches/2.8.x/wb/admin/preferences/index.php =================================================================== --- branches/2.8.x/wb/admin/preferences/index.php (revision 1314) +++ branches/2.8.x/wb/admin/preferences/index.php (revision 1315) @@ -9,7 +9,7 @@ * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x - * @requirements PHP 4.4.9 and higher + * @requirements PHP 4.4.9 && higher * @version $Id$ * @filesource $HeadURL$ * @lastmodified $Date$ @@ -23,12 +23,13 @@ // put all inside a function to prevent global vars function build_page( &$admin, &$database ) { + global $HEADING, $TEXT; include_once(WB_PATH.'/framework/functions-utf8.php'); // Create new template object, assign template file, start main-block $template = new Template( THEME_PATH.'/templates' ); $template->set_file( 'page', 'preferences.htt' ); $template->set_block( 'page', 'main_block', 'main' ); -// read user-info from table users and assign it to template +// read user-info from table users && assign it to template $sql = 'SELECT `display_name`, `username`, `email` FROM `'.TABLE_PREFIX.'users` '; $sql .= 'WHERE `user_id` = '.(int)$admin->get_user_id(); if( $res_user = $database->query($sql) ) @@ -41,7 +42,7 @@ $template->set_var('ADMIN_URL', ADMIN_URL); } } -// read available languages from table addons and assign it to the template +// read available languages from table addons && assign it to the template $sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` '; $sql .= 'WHERE `type` = "language" ORDER BY `directory`'; if( $res_lang = $database->query($sql) ) @@ -75,8 +76,8 @@ $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) $template->set_var( 'VALUE', ($format != 'system_default' ? $format : 'system_default') ); $template->set_var( 'NAME', $title ); - if( (DATE_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) OR - ('system_default' == $format AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) ) + if( (DATE_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) || + ('system_default' == $format && isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) ) { $template->set_var('SELECTED', ' selected="selected"'); }else { @@ -90,10 +91,10 @@ foreach( $TIME_FORMATS AS $format => $title ) { $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) - $template->set_var('VALUE', $format != 'system_default' ? $format : '' ); + $template->set_var('VALUE', $format != 'system_default' ? $format : 'system_default' ); $template->set_var('NAME', $title); - if( (TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) OR - ('system_default' == $format AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) ) + if( (TIME_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) || + ('system_default' == $format && isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) ) { $template->set_var('SELECTED', ' selected="selected"'); } else { @@ -113,7 +114,6 @@ $template->set_var('FTAN', $admin->getFTAN()); $template->set_var('FORM_NAME', 'preferences_save'); // assign language vars - global $HEADING, $TEXT; $template->set_var(array( 'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'], 'HEADING_MY_EMAIL' => $HEADING['MY_EMAIL'], 'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD'], Index: branches/2.8.x/wb/admin/preferences =================================================================== --- branches/2.8.x/wb/admin/preferences (revision 1314) +++ branches/2.8.x/wb/admin/preferences (revision 1315) Property changes on: branches/2.8.x/wb/admin/preferences ___________________________________________________________________ Modified: svn:ignore ## -1,4 +1,3 ## details.php email.php index.php -password.php Index: branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js =================================================================== --- branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js (revision 1314) +++ branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js (revision 1315) @@ -21,4 +21,6 @@ return this.hostname && this.hostname == location.hostname; }).addClass("internal"); + $('form').attr('autocomplete', 'off'); + }); \ No newline at end of file Index: branches/2.8.x/wb/templates/argos_theme/jquery/jquery-plugins.js =================================================================== --- branches/2.8.x/wb/templates/argos_theme/jquery/jquery-plugins.js (revision 1314) +++ branches/2.8.x/wb/templates/argos_theme/jquery/jquery-plugins.js (revision 1315) @@ -20,4 +20,6 @@ return this.hostname && this.hostname == location.hostname; }).addClass("internal"); + $('form').attr('autocomplete', 'off'); + }); \ No newline at end of file Index: branches/2.8.x/wb/languages/EN.php =================================================================== --- branches/2.8.x/wb/languages/EN.php (revision 1314) +++ branches/2.8.x/wb/languages/EN.php (revision 1315) @@ -62,7 +62,7 @@ $OVERVIEW['SETTINGS'] = 'Changes settings for WebsiteBaker...'; $OVERVIEW['USERS'] = 'Manage users who can log-in to WebsiteBaker...'; $OVERVIEW['GROUPS'] = 'Manage user groups and their system permissions...'; -$OVERVIEW['HELP'] = 'Got a questions? Find your answer...'; +$OVERVIEW['HELP'] = 'Got a question? Find your answer...'; $OVERVIEW['VIEW'] = 'Quickly view and browse your website in a new window...'; $OVERVIEW['ADMINTOOLS'] = 'Access the WebsiteBaker administration tools...'; @@ -153,7 +153,7 @@ $TEXT['MODIFY_CONTENT'] = 'Modify Content'; $TEXT['VIEW'] = 'View'; $TEXT['UP'] = 'Up'; -$TEXT['FORGOTTEN_DETAILS'] = 'Forgotten your details?'; +$TEXT['FORGOTTEN_DETAILS'] = 'Forget your details?'; $TEXT['NEED_TO_LOGIN'] = 'Need to log-in?'; $TEXT['SEND_DETAILS'] = 'Send Details'; $TEXT['USERNAME'] = 'Username'; @@ -218,7 +218,7 @@ $TEXT['TABLE_PREFIX'] = 'Table Prefix'; $TEXT['CHANGES'] = 'Changes'; $TEXT['ADMINISTRATION'] = 'Administration'; -$TEXT['FORGOT_DETAILS'] = 'Forgot Details?'; +$TEXT['FORGOT_DETAILS'] = 'Forget Details?'; $TEXT['LOGGED_IN'] = 'Logged-In'; $TEXT['WELCOME_BACK'] = 'Welcome back'; $TEXT['FULL_NAME'] = 'Full Name'; @@ -407,7 +407,7 @@ $TEXT['PUBL_END_DATE'] = 'End date'; $TEXT['CALENDAR'] = 'Calendar'; $TEXT['DELETE_DATE'] = 'Delete date'; -$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Please specify a default "FROM" address and "SENDER" name below. It is recommended to use a FROM address like: admin@yourdomain.com. Some mail provider (e.g. mail.com) may reject mails with a FROM: address like name@mail.com sent via a foreign relay to avoid spam.

The default values are only used if no other values are specified by WebsiteBaker. If your server supports SMTP, you may want use this option for outgoing mails.'; +$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Please specify a default "FROM" address and "SENDER" name below. It is recommended to use a FROM address like: admin@yourdomain.com. Some mail providers (e.g. mail.com) may reject mails with a FROM: address like name@mail.com sent via a foreign relay to avoid spam.

The default values are only used if no other values are specified by WebsiteBaker. If your server supports SMTP, you may want use this option for outgoing mails.'; $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Default From Mail'; $TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Default Sender Name'; $TEXT['WBMAILER_NOTICE'] = 'SMTP Mailer Settings:
The settings below are only required if you want to send mails via SMTP. If you do not know your SMTP host or you are not sure about the required settings, simply stay with the default mail routine: PHP MAIL.'; @@ -416,7 +416,7 @@ $TEXT['WBMAILER_PHP'] = 'PHP MAIL'; $TEXT['WBMAILER_SMTP'] = 'SMTP'; $TEXT['WBMAILER_SMTP_AUTH'] = 'SMTP Authentification'; -$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'only activate if your SMTP host requires authentification'; +$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'only activate if your SMTP host requires authentication'; $TEXT['WBMAILER_SMTP_USERNAME'] = 'SMTP Username'; $TEXT['WBMAILER_SMTP_PASSWORD'] = 'SMTP Password'; $TEXT['PLEASE_LOGIN'] = 'Please login'; @@ -435,16 +435,16 @@ // Success/error messages $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'] = 'Sorry, you do not have permissions to view this page'; $MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'] = 'Sorry, no active content to display'; +// NOTE THE MESSAGE CALL PHRASE IS KEPT MIS-SPELLED (DUE TO CODE IMPACT), BUT THE MESSAGE HAS BEEN FIXED +$MESSAGE['ADMIN']['INSUFFICIENT_PRIVELLIGES'] = 'Insufficient privileges to be here'; -$MESSAGE['ADMIN']['INSUFFICIENT_PRIVELLIGES'] = 'Insufficient privelliges to be here'; - $MESSAGE['LOGIN']['BOTH_BLANK'] = 'Please enter your username and password below'; $MESSAGE['LOGIN']['USERNAME_BLANK'] = 'Please enter a username'; $MESSAGE['LOGIN']['PASSWORD_BLANK'] = 'Please enter a password'; -$MESSAGE['LOGIN']['USERNAME_TOO_SHORT'] = 'Supplied username to short'; -$MESSAGE['LOGIN']['PASSWORD_TOO_SHORT'] = 'Supplied password to short'; -$MESSAGE['LOGIN']['USERNAME_TOO_LONG'] = 'Supplied username to long'; -$MESSAGE['LOGIN']['PASSWORD_TOO_LONG'] = 'Supplied password to long'; +$MESSAGE['LOGIN']['USERNAME_TOO_SHORT'] = 'Supplied username too short'; +$MESSAGE['LOGIN']['PASSWORD_TOO_SHORT'] = 'Supplied password too short'; +$MESSAGE['LOGIN']['USERNAME_TOO_LONG'] = 'Supplied username too long'; +$MESSAGE['LOGIN']['PASSWORD_TOO_LONG'] = 'Supplied password too long'; $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Username or password incorrect'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'You must enter an email address'; @@ -488,7 +488,8 @@ $MESSAGE['USERS']['INVALID_EMAIL'] = 'The email address you entered is invalid'; $MESSAGE['USERS']['EMAIL_TAKEN'] = 'The email you entered is already in use'; $MESSAGE['USERS']['USERNAME_TAKEN'] = 'The username you entered is already taken'; -$MESSAGE['USERS']['CHANGING_PASSWORD'] = 'Please note: You should only enter values in the above fields if you wish to change this users password'; +// NOTE THE DOUBLE QUOTES USED TO ENTER AN APOSTROPHE HERE - OK? OTHERWISE CAN RE-PHRASE THE MESSAGE +$MESSAGE['USERS']['CHANGING_PASSWORD'] = "Please note: You should only enter values in the above fields if you wish to change this user's password"; $MESSAGE['USERS']['CONFIRM_DELETE'] = 'Are you sure you want to delete the selected user?'; $MESSAGE['GROUPS']['ADDED'] = 'Group added successfully'; @@ -589,8 +590,8 @@ $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules reloaded successfully'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; $MESSAGE['ADDON']['LANGUAGES_RELOADED'] = 'Languages reloaded successfully'; -$MESSAGE['ADDON']['PRECHECK_FAILED'] = 'Add-on installation failed. Your system does not fulfill the requirements of this Add-on. To make this Add-on working on your system, please fix the issues summarized below.'; -$MESSAGE['ADDON']['MANUAL_INSTALLATION'] = 'When modules are uploaded via FTP (not recommended), the module installation files install.php, upgrade.php or uninstall.php will not be executed automatically. Those modules may not work correct or do not uninstall properly.

You can execute the module files manually for modules uploaded via FTP below.'; +$MESSAGE['ADDON']['PRECHECK_FAILED'] = 'Add-on installation failed. Your system does not fulfill the requirements of this Add-on. To make this Add-on work on your system, please fix the issues summarized below.'; +$MESSAGE['ADDON']['MANUAL_INSTALLATION'] = 'When modules are uploaded via FTP (not recommended), the module installation files install.php, upgrade.php or uninstall.php will not be executed automatically. Those modules may not work correctly or uninstall properly.

You can execute the module files manually for modules uploaded via FTP below.'; $MESSAGE['ADDON']['MANUAL_INSTALLATION_WARNING'] = 'Warning: Existing module database entries will get lost. Only use this option if you experience problems with modules uploaded via FTP.'; -?> \ No newline at end of file +?>