Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1848) +++ branches/2.8.x/CHANGELOG (revision 1849) @@ -11,6 +11,11 @@ ! = Update/Change =============================================================================== + + +06 Jan-2013 Build 1849 Dietmar Woellbrink (Luisehahne) +# typofix page_extended in admin/settings and admin/pages/ +! Fill empty option modules dropdown in admin/pages/sections.php 05 Jan-2013 Build 1848 Werner v.d.Decken(DarkViper) # fixed reinitialisation of class frontend in /index.php 05 Jan-2013 Build 1847 Werner v.d.Decken(DarkViper) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1848) +++ branches/2.8.x/wb/upgrade-script.php (revision 1849) @@ -507,9 +507,9 @@ /********************************************************** * - Adding page_extended to settings table */ - $aDebugMessage[] = "Adding/updating page_extended to settings table"; + $aDebugMessage[] = "Adding/updating page_extendet to settings table"; $cfg = array( - 'page_extended' => (defined('PAGE_EXTENDED') ? PAGE_EXTENDED : 'true'), + 'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'), ); $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); Index: branches/2.8.x/wb/admin/skel/themes/htt/settings.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/settings.htt (revision 1848) +++ branches/2.8.x/wb/admin/skel/themes/htt/settings.htt (revision 1849) @@ -78,12 +78,12 @@
- - + + - - + +
Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1848) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1849) @@ -112,7 +112,7 @@ -
+
TEXT_PAGE_ICON
-
+
TEXT_MENU_ICON_0
-
+
TEXT_MENU_ICON_1 - +
Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1848) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1849) @@ -137,11 +137,11 @@ $oTpl->set_block('page', 'main_block', 'main'); $oTpl->set_var('FTAN', $admin->getFTAN()); // $sShowIconDirText = $TEXT['EXPAND'].' '; - $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_exented\''; - if($page_extend = $database->get_one($sql)) {} + $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_extendet\''; +// if($page_extend = $database->get_one($sql)) {} + $page_extend = (defined('PAGE_EXTENDET') ? filter_var(PAGE_EXTENDET, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : false); + $sShowIconDirText = ($page_extend==true) ? $TEXT['HIDE_ADVANCED'] : $TEXT['SHOW_ADVANCED']; - $sShowIconDirText = ($page_extend=='1') ? $TEXT['HIDE_ADVANCED'] : $TEXT['SHOW_ADVANCED']; - $oTpl->set_var(array( 'PAGE_ID' => $aCurrentPage['page_id'], 'PAGE_IDKEY' => $admin->getIDKEY($aCurrentPage['page_id']), @@ -207,7 +207,7 @@ $sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']); $sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY)); $sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir); - $bIconDirHide = ($page_extend=='1') ? '' : 'hide'; + $bIconDirHide = ($page_extend==true) ? '' : 'hide'; // $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); $sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) ); @@ -216,7 +216,7 @@ $sAccesFile = (($database->get_one($sql))); $sFilename = replaceVars($mLang->HELP_SEO_TITLE, array('filename'=>PAGES_DIRECTORY.$sAccesFile.PAGE_EXTENSION ) ); - $oTpl->set_var('PAGE_EXTENDED_HIDE', $bIconDirHide); + $oTpl->set_var('PAGE_EXTENDET_HIDE', $bIconDirHide); $oTpl->set_var('p_page_icon_dir', p($sHelp,$mLang->TEXT_PAGE_ICON_DIR)); $oTpl->set_var('p_menu_icon0_dir', p($sHelp,$mLang->TEXT_MENU_ICON_0_DIR)); $oTpl->set_var('p_menu_icon1_dir', p($sHelp,$mLang->TEXT_MENU_ICON_1_DIR)); Index: branches/2.8.x/wb/admin/pages/settings_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings_save.php (revision 1848) +++ branches/2.8.x/wb/admin/pages/settings_save.php (revision 1849) @@ -66,21 +66,13 @@ // After check print the header $admin->print_header(); -if(isset($_POST['extended_submit'])) { - $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_exented\''; - if( ($page_exented = $database->get_one($sql)) != '' ) { - $sql = 'UPDATE '; - $sql_where = 'WHERE `name` = \'page_exented\''; - } else { - $sql = 'INSERT INTO '; - $sql_where = ''; - } - $val = (((($page_exented=='1') ? $page_exented : 0)) + 1) % 2; - - $sql .= '`'.TABLE_PREFIX.'settings` '; - $sql .= 'SET `name` = \'page_exented\', '; - $sql .= '`value` = \''.$val.'\' '.$sql_where; - +if(isset($_POST['extendet_submit'])) { +// $val = (((($page_exented=='1') ? $page_exented : 0)) + 1) % 2; + $val = (defined('PAGE_EXTENDET') ? filter_var(PAGE_EXTENDET, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : false); + $sql = (defined('PAGE_EXTENDET') ? 'UPDATE `' : 'INSERT INTO `') . TABLE_PREFIX . 'settings` SET '; + $sql .= '`name`=\'page_extendet\', '; + $sql .= '`value`=\''.($val ? 'false' : 'true').'\' '; + $sql .= (defined('PAGE_EXTENDET') ? 'WHERE `name`=\'page_extendet\'' : ''); if($database->query($sql)) { // redirect to backend echo "

If the script could not be start automatically.\n" . Index: branches/2.8.x/wb/admin/pages/sections.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections.php (revision 1848) +++ branches/2.8.x/wb/admin/pages/sections.php (revision 1849) @@ -537,8 +537,10 @@ $sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` '; $sql .= 'WHERE `page_id` = '.$page_id.' AND `module` = "menu_link"'; $query_sections = $database->query($sql); + $tpl->set_var('TEXT_PLEASE_SELECT', $TEXT['NONE']); if($query_sections->numRows() == 0) { + $tpl->set_var('TEXT_PLEASE_SELECT', $TEXT['PLEASE_SELECT']); // Modules list $sql = 'SELECT `name`,`directory`,`type` FROM `'.TABLE_PREFIX.'addons` '; $sql .= 'WHERE `type` = "module" AND `function` = "page" AND `directory` != "menu_link" '; Index: branches/2.8.x/wb/admin/interface/timezones.php =================================================================== --- branches/2.8.x/wb/admin/interface/timezones.php (revision 1848) +++ branches/2.8.x/wb/admin/interface/timezones.php (revision 1849) @@ -1,78 +1,76 @@ - 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 + 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); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1848) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1849) @@ -51,5 +51,5 @@ // 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.3'); -if(!defined('REVISION')) define('REVISION', '1848'); +if(!defined('REVISION')) define('REVISION', '1849'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/settings/save.php =================================================================== --- branches/2.8.x/wb/admin/settings/save.php (revision 1848) +++ branches/2.8.x/wb/admin/settings/save.php (revision 1849) @@ -212,7 +212,7 @@ $settings = array(); $old_settings = array(); // Query current settings in the db, then loop through them to get old values -$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`'; +$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`'; $sql .= 'ORDER BY `name`'; if($res_settings = $database->query($sql)) { @@ -225,7 +225,8 @@ $value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ; switch ($setting_name) { case 'default_timezone': - $value=$value*60*60; + $value = (is_numeric($value) ? $value : 0); + $value = ( ($value >= -12 && $value <= 13) ? $value :0 ) * 3600; $passed = true; break; case 'string_dir_mode': Index: branches/2.8.x/wb/admin/settings/index.php =================================================================== --- branches/2.8.x/wb/admin/settings/index.php (revision 1848) +++ branches/2.8.x/wb/admin/settings/index.php (revision 1849) @@ -37,6 +37,7 @@ 'wbmail_signature' => defined('WBMAIL_SIGNATURE') ? WBMAIL_SIGNATURE : '', 'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0'), 'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : ''), + 'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'), ); db_update_key_value( 'settings', $cfg ); @@ -254,16 +255,16 @@ } // Work-out if page extended feature is enabled - if(defined('PAGE_EXTENDED') && PAGE_EXTENDED == true) + if(defined('PAGE_EXTENDET') && PAGE_EXTENDET == true) { $oTpl->set_var(array( - 'PAGE_EXTENDED_ENABLED' => $checked, - 'PAGE_EXTENDED_DISABLED' => '', + 'PAGE_EXTENDET_ENABLED' => $checked, + 'PAGE_EXTENDET_DISABLED' => '', )); } else { $oTpl->set_var(array( - 'PAGE_EXTENDED_DISABLED' => $checked, - 'PAGE_EXTENDED_ENABLED' => '', + 'PAGE_EXTENDET_DISABLED' => $checked, + 'PAGE_EXTENDET_ENABLED' => '', )); } Index: branches/2.8.x/wb/admin/preferences/index.php =================================================================== --- branches/2.8.x/wb/admin/preferences/index.php (revision 1848) +++ branches/2.8.x/wb/admin/preferences/index.php (revision 1849) @@ -60,7 +60,6 @@ } } // Insert default timezone values - $user_time = true; include_once( ADMIN_PATH.'/interface/timezones.php' ); $template->set_block('main_block', 'timezone_list_block', 'timezone_list'); foreach( $TIMEZONES AS $hour_offset => $title ) @@ -71,6 +70,7 @@ $template->parse('timezone_list', 'timezone_list_block', true); } // Insert date format list + $user_time = true; include_once( ADMIN_PATH.'/interface/date_formats.php' ); $template->set_block('main_block', 'date_format_list_block', 'date_format_list'); foreach( $DATE_FORMATS AS $format => $title ) Index: branches/2.8.x/wb/account/htt/preferences.htt =================================================================== --- branches/2.8.x/wb/account/htt/preferences.htt (revision 1848) +++ branches/2.8.x/wb/account/htt/preferences.htt (revision 1849) @@ -34,7 +34,7 @@ {TEXT_TIMEZONE}: