Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1892) +++ branches/2.8.x/CHANGELOG (revision 1893) @@ -13,6 +13,8 @@ +19 Mar-2013 Build 1893 Dietmar Woellbrink (Luisehahne) + 19 Mar-2013 Build 1892 Dietmar Woellbrink (Luisehahne) ! update output_filter module set version to 0.4.1 19 Mar-2013 Build 1891 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1892) +++ branches/2.8.x/wb/upgrade-script.php (revision 1893) @@ -702,7 +702,7 @@ * Modify Administrator on groups table */ echo '
'; - echo "

Update group Administrator on table groups

"; + echo "

Updating Administrator group permissions on table groups

"; $aDebugMessage[] = "Modify Administrator on groups table"; $sModulePermissions = ''; $sTemplatePermissions = ''; @@ -726,7 +726,7 @@ echo implode(PHP_EOL,$aDebugMessage); } echo '
'; - + $aDebugMessage = array(); /********************************************************** $aDebugMessage = array(); /********************************************************** @@ -749,13 +749,13 @@ echo implode(PHP_EOL,$aDebugMessage); } echo ''; + $aDebugMessage = array(); - /********************************************************** * Updating group_id in table users */ echo '
'; - echo "

Change field structure on table users

"; + echo "

Updating users groups permissions on table groups

"; $aUsers = array(); // Get existing values $sql = 'SELECT * FROM `'.TABLE_PREFIX.'users` ' ; @@ -791,7 +791,7 @@ // $aDebugMessage[] = echo implode(PHP_EOL,$aDebugMessage); }else { - echo ''.$iTotalUsers.' users updating the group_id'." $OK
"; + echo ''.$iTotalUsers.' users updating the groups'." $OK
"; echo '
'; } } Index: branches/2.8.x/wb/admin/pages/sections_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections_save.php (revision 1892) +++ branches/2.8.x/wb/admin/pages/sections_save.php (revision 1893) @@ -102,11 +102,9 @@ $section_id = $section['section_id']; $sid = 'wb'.$section_id; $dst = date('I') ? ' UTC' : ''; // daylight saving time? date('P') - $iBlock = $admin->get_post_escaped('block'.$section_id); -// be sure it's numeric, can failed if block is disabled - $iBlock = (is_numeric($iBlock) ? $iBlock : $section['block']); -//workout set block to default if you add a section - $iBlock = ( ( $iBlock!==0 ) ? $iBlock : '1'); + $iBlock = intval($admin->get_post('block'.$section_id)); + $iBlock = ($iBlock==0) ? $section['block'] : $iBlock; + $sStartDate = $admin->get_post_escaped('start_date'.$section_id); $sStartDate = ($sStartDate==null)||($sStartDate=='') ? 0 : jscalendar_to_timestamp($sStartDate)-TIMEZONE; $sEndDate = $admin->get_post_escaped('end_date'.$section_id); Index: branches/2.8.x/wb/admin/pages/sections.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections.php (revision 1892) +++ branches/2.8.x/wb/admin/pages/sections.php (revision 1893) @@ -213,13 +213,21 @@ { require($template_location); } - // Check if $menu is set - if(!isset($block[1]) || $block[1] == '') - { - // Make our own menu list - $block[1] = $TEXT['MAIN']; + // check block settings from template/info.php + if(isset($block) && is_array($block) && sizeof($block) > 0) { + if(isset($block[0])) { + throw new AppException('Invalid index 0 for $block[] in '.str_replace(WB_PATH,'',$template_location).'. ' + . 'The list must start with $block[1]. Please correct it!'); } - + foreach($block as $iIndex=>$sBlockTitle) { + if(trim($sBlockTitle) == '' ) { + $block[$iIndex] = $TEXT['BLOCK'].'_'.$iIndex; + } + } + }else { + // Make our own menu list + $block = array(1, $TEXT['MAIN']); + } /*-- load css files with jquery --*/ // include jscalendar-setup $jscal_use_time = true; // whether to use a clock, too Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1892) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1893) @@ -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', '1892'); +if(!defined('REVISION')) define('REVISION', '1893'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/TranslationTable.php =================================================================== --- branches/2.8.x/wb/framework/TranslationTable.php (revision 1892) +++ branches/2.8.x/wb/framework/TranslationTable.php (revision 1893) @@ -80,11 +80,14 @@ */ public function load($sAdaptor) { - $sCachePath = $this->getCachePath(); - $sCacheFile = $sCachePath.md5($this->sAddon.$this->sSystemLang. - $this->sDefaultLang.$this->sUserLang).'.php'; + $sCacheFile = ''; + if($this->bUseCache) { + $sCachePath = $this->getCachePath(); + $sCacheFile = $sCachePath.md5($this->sAddon.$this->sSystemLang. + $this->sDefaultLang.$this->sUserLang).'.php'; + } if($this->bUseCache && is_readable($sCacheFile)) { - $this->aTranslations = $this->loadCacheFile($sCacheFile); + $this->aTranslations = $this->loadCacheFile($sCacheFile); }else { $bLanguageFound = false; $oAdaptor= new $sAdaptor($this->sAddon); @@ -147,9 +150,7 @@ $this->aLanguages['system'], $this->aLanguages['default'], $this->aLanguages['user']); - if($this->bUseCache) { - $this->writeCacheFile($sCacheFile); - } + $this->writeCacheFile($sCacheFile); } } return $this; @@ -242,10 +243,12 @@ */ protected function writeCacheFile($sCacheFile) { - $sOutput = 'aTranslations)) { - $sOutput .= '$aTranslation[\''.$key.'\'] = \''.addslashes($value).'\';'."\n"; + if($this->bUseCache) { + $sOutput = 'aTranslations)) { + $sOutput .= '$aTranslation[\''.$key.'\'] = \''.addslashes($value).'\';'."\n"; + } + file_put_contents($sCacheFile, $sOutput, LOCK_EX); } - file_put_contents($sCacheFile, $sOutput, LOCK_EX); } } // end of class TranslationTable \ No newline at end of file Index: branches/2.8.x/wb/framework/globalExceptionHandler.php =================================================================== --- branches/2.8.x/wb/framework/globalExceptionHandler.php (revision 1892) +++ branches/2.8.x/wb/framework/globalExceptionHandler.php (revision 1893) @@ -36,7 +36,7 @@ $result .= print_r($trace, true)."\n"; $result .= ''."\n"; }else { - $result = 'Exception: "'.$this->getMessage().'" in ['.$file.']
'."\n"; + $result = 'Exception: "'.$this->getMessage().'" >> Exception detected in: ['.$file.']
'."\n"; } return $result; }