Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1325) +++ branches/2.8.x/CHANGELOG (revision 1326) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- +15-Apr-2010 Dietmar Woellbrink (Luisehahne) +! Update headerinfos admin/interface 14-Apr-2010 Dietmar Woellbrink (Luisehahne) # changed e-mail notification for backend login ! styling in preference.htt in themes Index: branches/2.8.x/wb/admin/interface/time_formats.php =================================================================== --- branches/2.8.x/wb/admin/interface/time_formats.php (revision 1325) +++ branches/2.8.x/wb/admin/interface/time_formats.php (revision 1326) @@ -1,68 +1,56 @@ - - 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 - -*/ - -/* - -Time format list file - -This file is used to generate a list of time formats for the user to select - -*/ - -if(!defined('WB_URL')) { - header('Location: ../../../index.php'); - exit(0); -} - -// Define that this file is loaded -if(!defined('TIME_FORMATS_LOADED')) { - define('TIME_FORMATS_LOADED', true); -} - -// Create array -$TIME_FORMATS = array(); - -// Get the current time (in the users timezone if required) -$actual_time = time()+ ((isset($user_time) AND $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE); - -// Add values to list -$TIME_FORMATS['g:i|A'] = gmdate('g:i A', $actual_time); -$TIME_FORMATS['g:i|a'] = gmdate('g:i a', $actual_time); -$TIME_FORMATS['H:i:s'] = gmdate('H:i:s', $actual_time); -$TIME_FORMATS['H:i'] = gmdate('H:i', $actual_time); - -// Add "System Default" to list (if we need to) -if(isset($user_time) AND $user_time == true) { - if(isset($TEXT['SYSTEM_DEFAULT'])) { - $TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')'; - } else { - $TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' (System Default)'; - } -} - -// Reverse array so "System Default" is at the top -$TIME_FORMATS = array_reverse($TIME_FORMATS, true); - + \ No newline at end of file Property changes on: branches/2.8.x/wb/admin/interface/time_formats.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/admin/interface/charsets.php =================================================================== --- branches/2.8.x/wb/admin/interface/charsets.php (revision 1325) +++ branches/2.8.x/wb/admin/interface/charsets.php (revision 1326) @@ -1,58 +1,46 @@ - - 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 - -*/ - -/* - -Charset list file - -This file is used to generate a list of charsets for the user to select - -*/ - -if(!defined('WB_URL')) { - header('Location: ../index.php'); - exit(0); -} - -// Create array -$CHARSETS = array(); -$CHARSETS['utf-8'] = 'Unicode (utf-8)'; -$CHARSETS['iso-8859-1'] = 'Latin-1 Western European (iso-8859-1)'; -$CHARSETS['iso-8859-2'] = 'Latin-2 Central European (iso-8859-2)'; -$CHARSETS['iso-8859-3'] = 'Latin-3 Southern European (iso-8859-3)'; -$CHARSETS['iso-8859-4'] = 'Latin-4 Baltic (iso-8859-4)'; -$CHARSETS['iso-8859-5'] = 'Cyrillic (iso-8859-5)'; -$CHARSETS['iso-8859-6'] = 'Arabic (iso-8859-6)'; -$CHARSETS['iso-8859-7'] = 'Greek (iso-8859-7)'; -$CHARSETS['iso-8859-8'] = 'Hebrew (iso-8859-8)'; -$CHARSETS['iso-8859-9'] = 'Latin-5 Turkish (iso-8859-9)'; -$CHARSETS['iso-8859-10'] = 'Latin-6 Nordic (iso-8859-10)'; -$CHARSETS['iso-8859-11'] = 'Thai (iso-8859-11)'; -$CHARSETS['gb2312'] = 'Chinese Simplified (gb2312)'; -$CHARSETS['big5'] = 'Chinese Traditional (big5)'; -$CHARSETS['iso-2022-jp'] = 'Japanese (iso-2022-jp)'; -$CHARSETS['iso-2022-kr'] = 'Korean (iso-2022-kr)'; - + \ No newline at end of file Property changes on: branches/2.8.x/wb/admin/interface/charsets.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/admin/interface/timezones.php =================================================================== --- branches/2.8.x/wb/admin/interface/timezones.php (revision 1325) +++ branches/2.8.x/wb/admin/interface/timezones.php (revision 1326) @@ -1,82 +1,78 @@ - - 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 - -*/ - -/* - -Timezone list file - -This file is used to generate a list of timezones for the user to select - -*/ - -if(!defined('WB_URL')) { - header('Location: ../index.php'); - exit(0); -} - -// Create array -$TIMEZONES = array(); - -// Add "System Default" to top of list -if(isset($TEXT['SYSTEM_DEFAULT'])) { - $TIMEZONES['-20'] = $TEXT['SYSTEM_DEFAULT']; -} else { - $TIMEZONES['-20'] = 'System Default'; -} - -$TIMEZONES['-12'] = 'GMT - 12 Hours'; -$TIMEZONES['-11'] = 'GMT -11 Hours'; -$TIMEZONES['-10'] = 'GMT -10 Hours'; -$TIMEZONES['-9'] = 'GMT -9 Hours'; -$TIMEZONES['-8'] = 'GMT -8 Hours'; -$TIMEZONES['-7'] = 'GMT -7 Hours'; -$TIMEZONES['-6'] = 'GMT -6 Hours'; -$TIMEZONES['-5'] = 'GMT -5 Hours'; -$TIMEZONES['-4'] = 'GMT -4 Hours'; -$TIMEZONES['-3.5'] = 'GMT -3.5 Hours'; -$TIMEZONES['-3'] = 'GMT -3 Hours'; -$TIMEZONES['-2'] = 'GMT -2 Hours'; -$TIMEZONES['-1'] = 'GMT -1 Hour'; -$TIMEZONES['0'] = 'GMT'; -$TIMEZONES['1'] = 'GMT +1 Hour'; -$TIMEZONES['2'] = 'GMT +2 Hours'; -$TIMEZONES['3'] = 'GMT +3 Hours'; -$TIMEZONES['3.5'] = 'GMT +3.5 Hours'; -$TIMEZONES['4'] = 'GMT +4 Hours'; -$TIMEZONES['4.5'] = 'GMT +4.5 Hours'; -$TIMEZONES['5'] = 'GMT +5 Hours'; -$TIMEZONES['5.5'] = 'GMT +5.5 Hours'; -$TIMEZONES['6'] = 'GMT +6 Hours'; -$TIMEZONES['6.5'] = 'GMT +6.5 Hours'; -$TIMEZONES['7'] = 'GMT +7 Hours'; -$TIMEZONES['8'] = 'GMT +8 Hours'; -$TIMEZONES['9'] = 'GMT +9 Hours'; -$TIMEZONES['9.5'] = 'GMT +9.5 Hours'; -$TIMEZONES['10'] = 'GMT +10 Hours'; -$TIMEZONES['11'] = 'GMT +11 Hours'; -$TIMEZONES['12'] = 'GMT +12 Hours'; -$TIMEZONES['13'] = 'GMT +13 Hours'; - + 0 ) ? DEFAULT_TIMEZONE/3600 : 0; + +$TIMEZONES['-12'] = 'GMT - 12 Hours'; +$TIMEZONES['-11'] = 'GMT -11 Hours'; +$TIMEZONES['-10'] = 'GMT -10 Hours'; +$TIMEZONES['-9'] = 'GMT -9 Hours'; +$TIMEZONES['-8'] = 'GMT -8 Hours'; +$TIMEZONES['-7'] = 'GMT -7 Hours'; +$TIMEZONES['-6'] = 'GMT -6 Hours'; +$TIMEZONES['-5'] = 'GMT -5 Hours'; +$TIMEZONES['-4'] = 'GMT -4 Hours'; +$TIMEZONES['-3.5'] = 'GMT -3.5 Hours'; +$TIMEZONES['-3'] = 'GMT -3 Hours'; +$TIMEZONES['-2'] = 'GMT -2 Hours'; +$TIMEZONES['-1'] = 'GMT -1 Hour'; +$TIMEZONES['0'] = 'GMT'; +$TIMEZONES['1'] = 'GMT +1 Hour'; +$TIMEZONES['2'] = 'GMT +2 Hours'; +$TIMEZONES['3'] = 'GMT +3 Hours'; +$TIMEZONES['3.5'] = 'GMT +3.5 Hours'; +$TIMEZONES['4'] = 'GMT +4 Hours'; +$TIMEZONES['4.5'] = 'GMT +4.5 Hours'; +$TIMEZONES['5'] = 'GMT +5 Hours'; +$TIMEZONES['5.5'] = 'GMT +5.5 Hours'; +$TIMEZONES['6'] = 'GMT +6 Hours'; +$TIMEZONES['6.5'] = 'GMT +6.5 Hours'; +$TIMEZONES['7'] = 'GMT +7 Hours'; +$TIMEZONES['8'] = 'GMT +8 Hours'; +$TIMEZONES['9'] = 'GMT +9 Hours'; +$TIMEZONES['9.5'] = 'GMT +9.5 Hours'; +$TIMEZONES['10'] = 'GMT +10 Hours'; +$TIMEZONES['11'] = 'GMT +11 Hours'; +$TIMEZONES['12'] = 'GMT +12 Hours'; +$TIMEZONES['13'] = 'GMT +13 Hours'; + +// Add "System Default" to list (if we need to) +if(isset($user_time) && $user_time == true) +{ + if(isset($TEXT['SYSTEM_DEFAULT'])) + { + $TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' ('.$TEXT['SYSTEM_DEFAULT'].')'; + } else { + $TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' (System Default)'; + } +} + +// Reverse array so "System Default" is at the top +$TIMEZONES = array_reverse($TIMEZONES, true); + ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/admin/interface/timezones.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/admin/interface/er_levels.php =================================================================== --- branches/2.8.x/wb/admin/interface/er_levels.php (revision 1325) +++ branches/2.8.x/wb/admin/interface/er_levels.php (revision 1326) @@ -1,59 +1,47 @@ - - 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 - -*/ - -/* - -Error Reporting Level's list file - -This file is used to generate a list of PHP -Error Reporting Level's for the user to select - -*/ - -if(!defined('WB_URL')) { - header('Location: ../index.php'); - exit(0); -} - -// Define that this file is loaded -if(!defined('ERROR_REPORTING_LEVELS_LOADED')) { - define('ERROR_REPORTING_LEVELS_LOADED', true); -} - -// Create array -$ER_LEVELS = array(); - -// Add values to list -if(isset($TEXT['SYSTEM_DEFAULT'])) { - $ER_LEVELS[''] = $TEXT['SYSTEM_DEFAULT']; -} else { - $ER_LEVELS[''] = 'System Default'; -} -$ER_LEVELS['6135'] = 'E_ALL^E_NOTICE'; // standard: E_ALL without E_NOTICE -$ER_LEVELS['0'] = 'E_NONE'; -$ER_LEVELS['6143'] = 'E_ALL'; -$ER_LEVELS['8191'] = htmlentities('E_ALL&E_STRICT'); // for programmers - + \ No newline at end of file Property changes on: branches/2.8.x/wb/admin/interface/er_levels.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1325) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1326) @@ -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', '1325'); +if(!defined('REVISION')) define('REVISION', '1326'); ?> \ No newline at end of file Index: branches/2.8.x/wb/admin/interface/index.php =================================================================== --- branches/2.8.x/wb/admin/interface/index.php (revision 1325) +++ branches/2.8.x/wb/admin/interface/index.php (revision 1326) @@ -1,29 +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 - -*/ - -require('../../config.php'); -header('Location: '.ADMIN_URL.'/start/index.php'); - + \ No newline at end of file Property changes on: branches/2.8.x/wb/admin/interface/index.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/admin/interface/date_formats.php =================================================================== --- branches/2.8.x/wb/admin/interface/date_formats.php (revision 1325) +++ branches/2.8.x/wb/admin/interface/date_formats.php (revision 1326) @@ -1,75 +1,65 @@ - - 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 - -*/ - -/* - -Date format list file - -This file is used to generate a list of date formats for the user to select - -*/ - -if(!defined('WB_URL')) { - header('Location: ../../../index.php'); - exit(0); -} - -// Define that this file is loaded -if(!defined('DATE_FORMATS_LOADED')) { - define('DATE_FORMATS_LOADED', true); -} - -// Create array -$DATE_FORMATS = array(); - -// Get the current time (in the users timezone if required) -$actual_time = time()+ ((isset($user_time) AND $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE); - -// Add values to list -$DATE_FORMATS['l,|jS|F,|Y'] = gmdate('l, jS F, Y', $actual_time); -$DATE_FORMATS['jS|F,|Y'] = gmdate('jS F, Y', $actual_time); -$DATE_FORMATS['d|M|Y'] = gmdate('d M Y', $actual_time); -$DATE_FORMATS['M|d|Y'] = gmdate('M d Y', $actual_time); -$DATE_FORMATS['D|M|d,|Y'] = gmdate('D M d, Y', $actual_time); -$DATE_FORMATS['d-m-Y'] = gmdate('d-m-Y', $actual_time).' (D-M-Y)'; -$DATE_FORMATS['m-d-Y'] = gmdate('m-d-Y', $actual_time).' (M-D-Y)'; -$DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $actual_time).' (D.M.Y)'; -$DATE_FORMATS['m.d.Y'] = gmdate('m.d.Y', $actual_time).' (M.D.Y)'; -$DATE_FORMATS['d/m/Y'] = gmdate('d/m/Y', $actual_time).' (D/M/Y)'; -$DATE_FORMATS['m/d/Y'] = gmdate('m/d/Y', $actual_time).' (M/D/Y)'; - -// Add "System Default" to list (if we need to) -if(isset($user_time) AND $user_time == true) { - if(isset($TEXT['SYSTEM_DEFAULT'])) { - $DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')'; - } else { - $DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' (System Default)'; - } -} - -// Reverse array so "System Default" is at the top -$DATE_FORMATS = array_reverse($DATE_FORMATS, true); - + \ No newline at end of file Property changes on: branches/2.8.x/wb/admin/interface/date_formats.php ___________________________________________________________________ Modified: svn:keywords ## -1 +1,4 ## -Id \ No newline at end of property +Id +Revision +HeadURL +Date \ No newline at end of property