Revision 1315
Added by Dietmar over 14 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
12 | 12 |
|
13 | 13 |
------------------------------------- 2.8.1 ------------------------------------- |
14 | 14 |
11-Apr-2010 Dietmar Woellbrink (Luisehahne) |
15 |
# fix ticket #975 some weird /pages/ header infos |
|
16 |
11-Apr-2010 Dietmar Woellbrink (Luisehahne) |
|
15 | 17 |
! little fixes for backwards compatible PHP4, pls test |
16 | 18 |
11-Apr-2010 Dietmar Woellbrink (Luisehahne) |
17 | 19 |
! show_menu2 remove unneeded code for WB < 2.7 |
branches/2.8.x/wb/admin/interface/version.php | ||
---|---|---|
52 | 52 |
|
53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.x'); |
55 |
if(!defined('REVISION')) define('REVISION', '1314');
|
|
55 |
if(!defined('REVISION')) define('REVISION', '1315');
|
|
56 | 56 |
|
57 | 57 |
?> |
branches/2.8.x/wb/admin/preferences/save.php | ||
---|---|---|
47 | 47 |
$timezone = ( ($timezone >= -12 && $timezone <= 13) ? $timezone : -20 ) * 3600; |
48 | 48 |
// date_format must be a key from /interface/date_formats |
49 | 49 |
$date_format = $admin->get_post('date_format'); |
50 |
$date_format_key = str_replace(' ', '|', $date_format); |
|
50 | 51 |
$user_time = true; |
51 | 52 |
include( ADMIN_PATH.'/interface/date_formats.php' ); |
52 |
$date_format = (array_key_exists($date_format, $DATE_FORMATS) ? $date_format : $DATE_FORMATS['system_default']);
|
|
53 |
$date_format = ($DATE_FORMATS['system_default'] == $date_format ? '' : $date_format);
|
|
53 |
$date_format = (array_key_exists($date_format_key, $DATE_FORMATS) ? $date_format : 'system_default');
|
|
54 |
$date_format = ($date_format == 'system_default' ? '' : $date_format);
|
|
54 | 55 |
unset($DATE_FORMATS); |
55 | 56 |
// time_format must be a key from /interface/time_formats |
56 | 57 |
$time_format = $admin->get_post('time_format'); |
58 |
$time_format_key = str_replace(' ', '|', $time_format); |
|
57 | 59 |
$user_time = true; |
58 | 60 |
include( ADMIN_PATH.'/interface/time_formats.php' ); |
59 |
$time_format = (array_key_exists($time_format, $TIME_FORMATS) ? $time_format : $TIME_FORMATS['system_default']);
|
|
60 |
$time_format = ($TIME_FORMATS['system_default'] == $time_format ? '' : $time_format);
|
|
61 |
$time_format = (array_key_exists($time_format_key, $TIME_FORMATS) ? $time_format : 'system_default');
|
|
62 |
$time_format = ($time_format == 'system_default' ? '' : $time_format);
|
|
61 | 63 |
unset($TIME_FORMATS); |
62 | 64 |
// email should be validatet by core |
63 | 65 |
$email = ( $admin->get_post('email') == null ? '' : $admin->get_post('email') ); |
branches/2.8.x/wb/admin/preferences/index.php | ||
---|---|---|
9 | 9 |
* @link http://www.websitebaker2.org/ |
10 | 10 |
* @license http://www.gnu.org/licenses/gpl.html |
11 | 11 |
* @platform WebsiteBaker 2.8.x |
12 |
* @requirements PHP 4.4.9 and higher
|
|
12 |
* @requirements PHP 4.4.9 && higher
|
|
13 | 13 |
* @version $Id$ |
14 | 14 |
* @filesource $HeadURL$ |
15 | 15 |
* @lastmodified $Date$ |
... | ... | |
23 | 23 |
// put all inside a function to prevent global vars |
24 | 24 |
function build_page( &$admin, &$database ) |
25 | 25 |
{ |
26 |
global $HEADING, $TEXT; |
|
26 | 27 |
include_once(WB_PATH.'/framework/functions-utf8.php'); |
27 | 28 |
// Create new template object, assign template file, start main-block |
28 | 29 |
$template = new Template( THEME_PATH.'/templates' ); |
29 | 30 |
$template->set_file( 'page', 'preferences.htt' ); |
30 | 31 |
$template->set_block( 'page', 'main_block', 'main' ); |
31 |
// read user-info from table users and assign it to template
|
|
32 |
// read user-info from table users && assign it to template
|
|
32 | 33 |
$sql = 'SELECT `display_name`, `username`, `email` FROM `'.TABLE_PREFIX.'users` '; |
33 | 34 |
$sql .= 'WHERE `user_id` = '.(int)$admin->get_user_id(); |
34 | 35 |
if( $res_user = $database->query($sql) ) |
... | ... | |
41 | 42 |
$template->set_var('ADMIN_URL', ADMIN_URL); |
42 | 43 |
} |
43 | 44 |
} |
44 |
// read available languages from table addons and assign it to the template
|
|
45 |
// read available languages from table addons && assign it to the template
|
|
45 | 46 |
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` '; |
46 | 47 |
$sql .= 'WHERE `type` = "language" ORDER BY `directory`'; |
47 | 48 |
if( $res_lang = $database->query($sql) ) |
... | ... | |
75 | 76 |
$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) |
76 | 77 |
$template->set_var( 'VALUE', ($format != 'system_default' ? $format : 'system_default') ); |
77 | 78 |
$template->set_var( 'NAME', $title ); |
78 |
if( (DATE_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) OR
|
|
79 |
('system_default' == $format AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) )
|
|
79 |
if( (DATE_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) ||
|
|
80 |
('system_default' == $format && isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) )
|
|
80 | 81 |
{ |
81 | 82 |
$template->set_var('SELECTED', ' selected="selected"'); |
82 | 83 |
}else { |
... | ... | |
90 | 91 |
foreach( $TIME_FORMATS AS $format => $title ) |
91 | 92 |
{ |
92 | 93 |
$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) |
93 |
$template->set_var('VALUE', $format != 'system_default' ? $format : '' ); |
|
94 |
$template->set_var('VALUE', $format != 'system_default' ? $format : 'system_default' );
|
|
94 | 95 |
$template->set_var('NAME', $title); |
95 |
if( (TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) OR
|
|
96 |
('system_default' == $format AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) )
|
|
96 |
if( (TIME_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) ||
|
|
97 |
('system_default' == $format && isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) )
|
|
97 | 98 |
{ |
98 | 99 |
$template->set_var('SELECTED', ' selected="selected"'); |
99 | 100 |
} else { |
... | ... | |
113 | 114 |
$template->set_var('FTAN', $admin->getFTAN()); |
114 | 115 |
$template->set_var('FORM_NAME', 'preferences_save'); |
115 | 116 |
// assign language vars |
116 |
global $HEADING, $TEXT; |
|
117 | 117 |
$template->set_var(array( 'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'], |
118 | 118 |
'HEADING_MY_EMAIL' => $HEADING['MY_EMAIL'], |
119 | 119 |
'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD'], |
branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js | ||
---|---|---|
21 | 21 |
return this.hostname && this.hostname == location.hostname; |
22 | 22 |
}).addClass("internal"); |
23 | 23 |
|
24 |
$('form').attr('autocomplete', 'off'); |
|
25 |
|
|
24 | 26 |
}); |
branches/2.8.x/wb/templates/argos_theme/jquery/jquery-plugins.js | ||
---|---|---|
20 | 20 |
return this.hostname && this.hostname == location.hostname; |
21 | 21 |
}).addClass("internal"); |
22 | 22 |
|
23 |
$('form').attr('autocomplete', 'off'); |
|
24 |
|
|
23 | 25 |
}); |
branches/2.8.x/wb/languages/EN.php | ||
---|---|---|
62 | 62 |
$OVERVIEW['SETTINGS'] = 'Changes settings for WebsiteBaker...'; |
63 | 63 |
$OVERVIEW['USERS'] = 'Manage users who can log-in to WebsiteBaker...'; |
64 | 64 |
$OVERVIEW['GROUPS'] = 'Manage user groups and their system permissions...'; |
65 |
$OVERVIEW['HELP'] = 'Got a questions? Find your answer...';
|
|
65 |
$OVERVIEW['HELP'] = 'Got a question? Find your answer...'; |
|
66 | 66 |
$OVERVIEW['VIEW'] = 'Quickly view and browse your website in a new window...'; |
67 | 67 |
$OVERVIEW['ADMINTOOLS'] = 'Access the WebsiteBaker administration tools...'; |
68 | 68 |
|
... | ... | |
153 | 153 |
$TEXT['MODIFY_CONTENT'] = 'Modify Content'; |
154 | 154 |
$TEXT['VIEW'] = 'View'; |
155 | 155 |
$TEXT['UP'] = 'Up'; |
156 |
$TEXT['FORGOTTEN_DETAILS'] = 'Forgotten your details?';
|
|
156 |
$TEXT['FORGOTTEN_DETAILS'] = 'Forget your details?';
|
|
157 | 157 |
$TEXT['NEED_TO_LOGIN'] = 'Need to log-in?'; |
158 | 158 |
$TEXT['SEND_DETAILS'] = 'Send Details'; |
159 | 159 |
$TEXT['USERNAME'] = 'Username'; |
... | ... | |
218 | 218 |
$TEXT['TABLE_PREFIX'] = 'Table Prefix'; |
219 | 219 |
$TEXT['CHANGES'] = 'Changes'; |
220 | 220 |
$TEXT['ADMINISTRATION'] = 'Administration'; |
221 |
$TEXT['FORGOT_DETAILS'] = 'Forgot Details?';
|
|
221 |
$TEXT['FORGOT_DETAILS'] = 'Forget Details?';
|
|
222 | 222 |
$TEXT['LOGGED_IN'] = 'Logged-In'; |
223 | 223 |
$TEXT['WELCOME_BACK'] = 'Welcome back'; |
224 | 224 |
$TEXT['FULL_NAME'] = 'Full Name'; |
... | ... | |
407 | 407 |
$TEXT['PUBL_END_DATE'] = 'End date'; |
408 | 408 |
$TEXT['CALENDAR'] = 'Calendar'; |
409 | 409 |
$TEXT['DELETE_DATE'] = 'Delete date'; |
410 |
$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Please specify a default "FROM" address and "SENDER" name below. It is recommended to use a FROM address like: <strong>admin@yourdomain.com</strong>. Some mail provider (e.g. <em>mail.com</em>) may reject mails with a FROM: address like <em>name@mail.com</em> sent via a foreign relay to avoid spam.<br /><br />The default values are only used if no other values are specified by WebsiteBaker. If your server supports <acronym title="Simple mail transfer protocol">SMTP</acronym>, you may want use this option for outgoing mails.'; |
|
410 |
$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Please specify a default "FROM" address and "SENDER" name below. It is recommended to use a FROM address like: <strong>admin@yourdomain.com</strong>. Some mail providers (e.g. <em>mail.com</em>) may reject mails with a FROM: address like <em>name@mail.com</em> sent via a foreign relay to avoid spam.<br /><br />The default values are only used if no other values are specified by WebsiteBaker. If your server supports <acronym title="Simple mail transfer protocol">SMTP</acronym>, you may want use this option for outgoing mails.';
|
|
411 | 411 |
$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Default From Mail'; |
412 | 412 |
$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Default Sender Name'; |
413 | 413 |
$TEXT['WBMAILER_NOTICE'] = '<strong>SMTP Mailer Settings:</strong><br />The settings below are only required if you want to send mails via <acronym title="Simple mail transfer protocol">SMTP</acronym>. 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 | 416 |
$TEXT['WBMAILER_PHP'] = 'PHP MAIL'; |
417 | 417 |
$TEXT['WBMAILER_SMTP'] = 'SMTP'; |
418 | 418 |
$TEXT['WBMAILER_SMTP_AUTH'] = 'SMTP Authentification'; |
419 |
$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'only activate if your SMTP host requires authentification';
|
|
419 |
$TEXT['WBMAILER_SMTP_AUTH_NOTICE'] = 'only activate if your SMTP host requires authentication'; |
|
420 | 420 |
$TEXT['WBMAILER_SMTP_USERNAME'] = 'SMTP Username'; |
421 | 421 |
$TEXT['WBMAILER_SMTP_PASSWORD'] = 'SMTP Password'; |
422 | 422 |
$TEXT['PLEASE_LOGIN'] = 'Please login'; |
... | ... | |
435 | 435 |
// Success/error messages |
436 | 436 |
$MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'] = 'Sorry, you do not have permissions to view this page'; |
437 | 437 |
$MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'] = 'Sorry, no active content to display'; |
438 |
// NOTE THE MESSAGE CALL PHRASE IS KEPT MIS-SPELLED (DUE TO CODE IMPACT), BUT THE MESSAGE HAS BEEN FIXED |
|
439 |
$MESSAGE['ADMIN']['INSUFFICIENT_PRIVELLIGES'] = 'Insufficient privileges to be here'; |
|
438 | 440 |
|
439 |
$MESSAGE['ADMIN']['INSUFFICIENT_PRIVELLIGES'] = 'Insufficient privelliges to be here'; |
|
440 |
|
|
441 | 441 |
$MESSAGE['LOGIN']['BOTH_BLANK'] = 'Please enter your username and password below'; |
442 | 442 |
$MESSAGE['LOGIN']['USERNAME_BLANK'] = 'Please enter a username'; |
443 | 443 |
$MESSAGE['LOGIN']['PASSWORD_BLANK'] = 'Please enter a password'; |
444 |
$MESSAGE['LOGIN']['USERNAME_TOO_SHORT'] = 'Supplied username to short'; |
|
445 |
$MESSAGE['LOGIN']['PASSWORD_TOO_SHORT'] = 'Supplied password to short'; |
|
446 |
$MESSAGE['LOGIN']['USERNAME_TOO_LONG'] = 'Supplied username to long'; |
|
447 |
$MESSAGE['LOGIN']['PASSWORD_TOO_LONG'] = 'Supplied password to long'; |
|
444 |
$MESSAGE['LOGIN']['USERNAME_TOO_SHORT'] = 'Supplied username too short';
|
|
445 |
$MESSAGE['LOGIN']['PASSWORD_TOO_SHORT'] = 'Supplied password too short';
|
|
446 |
$MESSAGE['LOGIN']['USERNAME_TOO_LONG'] = 'Supplied username too long';
|
|
447 |
$MESSAGE['LOGIN']['PASSWORD_TOO_LONG'] = 'Supplied password too long';
|
|
448 | 448 |
$MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Username or password incorrect'; |
449 | 449 |
|
450 | 450 |
$MESSAGE['SIGNUP']['NO_EMAIL'] = 'You must enter an email address'; |
... | ... | |
488 | 488 |
$MESSAGE['USERS']['INVALID_EMAIL'] = 'The email address you entered is invalid'; |
489 | 489 |
$MESSAGE['USERS']['EMAIL_TAKEN'] = 'The email you entered is already in use'; |
490 | 490 |
$MESSAGE['USERS']['USERNAME_TAKEN'] = 'The username you entered is already taken'; |
491 |
$MESSAGE['USERS']['CHANGING_PASSWORD'] = 'Please note: You should only enter values in the above fields if you wish to change this users password'; |
|
491 |
// NOTE THE DOUBLE QUOTES USED TO ENTER AN APOSTROPHE HERE - OK? OTHERWISE CAN RE-PHRASE THE MESSAGE |
|
492 |
$MESSAGE['USERS']['CHANGING_PASSWORD'] = "Please note: You should only enter values in the above fields if you wish to change this user's password"; |
|
492 | 493 |
$MESSAGE['USERS']['CONFIRM_DELETE'] = 'Are you sure you want to delete the selected user?'; |
493 | 494 |
|
494 | 495 |
$MESSAGE['GROUPS']['ADDED'] = 'Group added successfully'; |
... | ... | |
589 | 590 |
$MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules reloaded successfully'; |
590 | 591 |
$MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; |
591 | 592 |
$MESSAGE['ADDON']['LANGUAGES_RELOADED'] = 'Languages reloaded successfully'; |
592 |
$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.';
|
|
593 |
$MESSAGE['ADDON']['MANUAL_INSTALLATION'] = 'When modules are uploaded via FTP (not recommended), the module installation files <tt>install.php</tt>, <tt>upgrade.php</tt> or <tt>uninstall.php</tt> will not be executed automatically. Those modules may not work correct or do not uninstall properly.<br /><br />You can execute the module files manually for modules uploaded via FTP below.';
|
|
593 |
$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.'; |
|
594 |
$MESSAGE['ADDON']['MANUAL_INSTALLATION'] = 'When modules are uploaded via FTP (not recommended), the module installation files <tt>install.php</tt>, <tt>upgrade.php</tt> or <tt>uninstall.php</tt> will not be executed automatically. Those modules may not work correctly or uninstall properly.<br /><br />You can execute the module files manually for modules uploaded via FTP below.';
|
|
594 | 595 |
$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.'; |
595 | 596 |
|
596 |
?> |
|
597 |
?> |
Also available in: Unified diff
fix ticket #975 some weird /pages/ header infos