Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1936) +++ branches/2.8.x/CHANGELOG (revision 1937) @@ -11,7 +11,9 @@ ! = Update/Change =============================================================================== -24 Jul-2013 Build 1935 M.v.d.Decken(DarkViper) +25 Jul-2013 Build 1937 M.v.d.Decken(DarkViper) +- unneeded file /framework/Modlanguage.php removed +24 Jul-2013 Build 1936 M.v.d.Decken(DarkViper) # /wb_theme/jquery/jquery-plugins.js fixed uncheck function 24 Jul-2013 Build 1935 M.v.d.Decken(DarkViper) # /upgrade_script.php fixed headers_sent problem Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1936) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1937) @@ -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', '1936'); +if(!defined('REVISION')) define('REVISION', '1937'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/ModLanguage.php =================================================================== --- branches/2.8.x/wb/framework/ModLanguage.php (revision 1936) +++ branches/2.8.x/wb/framework/ModLanguage.php (nonexistent) @@ -1,207 +0,0 @@ -_bLoaded) { - $sRetval = (isset($this->_aLanguageTable[$sLanguageKey]) - ? $this->_aLanguageTable[$sLanguageKey] : '{missing: '.$sLanguageKey.'}'); - return $sRetval; - } - $msg = 'No translation table loaded'; - throw new TranslationException($msg); - } -/** - * returns the whoole language array for use in templateengine - * @return array - * @throws TranslationException - */ - public function getLangArray() - { - if($this->_bLoaded) { - return $this->_aLanguageTable; - } - $msg = 'No translation table loaded'; - throw new TranslationException($msg); - } -/** - * set language and load needed language file - * @param string $sDirectory full path to the language files - * @param string $sLanguage 2 chars current active language code - * @param string $sDefault 2 chars default fallback language code - * @throws SecDirectoryTraversalException [global exception] - * @throws TranslationException [private exception] - */ - public function setLanguage($sDirectory, $sCurrentLanguage, $sDefaultLanguage = 'EN') - { - // sanitize arguments - $sBasePath = realpath(dirname(dirname(__FILE__))); - $sLangDir = realpath($sDirectory); - if(preg_match('/^'.preg_quote($sBasePath, '/').'/', $sLangDir)) { - $sLangDir = rtrim(str_replace('\\', '/', $sLangDir), '/').'/'; - $sCurrentLanguage = strtoupper($sCurrentLanguage); - $sDefaultLanguage = strtoupper($sDefaultLanguage); - // check if the requested language is not already loaded - if($this->_sLanguageDirectory != $sLangDir || - $this->_sCurrentLanguage != $sCurrentLanguage || - $this->_sDefaultLanguage != $sDefaultLanguage) - { - // now load and merge the files in order SYSTEM - DEFAULT - CURRENT - $this->_aLanguageTable = array(); - // at first load DEFAULT_LANGUAGE - $this->_loadLanguage($sLangDir, $sDefaultLanguage); - // at second merge CURRENT_LANGUAGE to front if not already loaded - if(!in_array($sCurrentLanguage, $this->_aLoadedLanguages)) { - $this->_loadLanguage($sLangDir, $sCurrentLanguage); - } - // at last merge SYSTEM_LANGUAGE to background if not already loaded - if(!in_array($this->_sSystemLanguage, $this->_aLoadedLanguages)) { - $this->_loadLanguage($sLangDir, $this->_sSystemLanguage, true); - } - // if no predefined language was fond, search for first available language - if(sizeof($this->_aLanguageTable) == 0) { - // if absolutely no language was fond, throw an exception - if(false !== ($sRandomLanguage = $this->_findFirstLanguage($sLangDir))) { - $this->_loadLanguage($sLangDir, $sRandomLanguage); - } - } - // remember last settings - $this->_sLanguageDirectory = $sLangDir; - $this->_sCurrentLanguage = $sCurrentLanguage; - $this->_sDefaultLanguage = $sDefaultLanguage; - } - if(!($this->_bLoaded = (sizeof($this->_aLanguageTable) != 0))) { - $msg = 'unable to find valid language definition file in
'; - $msg .= '"'.str_replace($sBasePath, '', $this->_sLanguageDirectory).'"'; - throw new TranslationException($msg); - } - $this->_bLoaded = true; - }else { - throw new SecDirectoryTraversalException($sLangDir); - } - } -/** - * load language from given directory - * @param string $sLangDir - * @param string $sLanguage - */ - private function _loadLanguage($sLangDir, $sLanguage, $bLoadSystemLanguage = false) - { - if(is_readable($sLangDir.$sLanguage.'.php')) { - $aTemp = $this->_importArrays($sLangDir.$sLanguage.'.php'); - if($bLoadSystemLanguage) { - $this->_aLanguageTable = array_merge($aTemp, $this->_aLanguageTable); - }else { - $this->_aLanguageTable = array_merge($this->_aLanguageTable, $aTemp); - } - $this->_aLoadedLanguages[] = $sLanguage; - } - } -/** - * find first available language in given directory - * @param string $sLangDir the directory to scan for language files - * @return string returns the 2 char language code or FALSE if search fails - */ - private function _findFirstLanguage($sLangDir) - { - // search for first available and readable language file - $sRetval = false; - if(is_readable($sLangDir)) { - $iterator = new DirectoryIterator($sLangDir); - foreach ($iterator as $fileinfo) { - if(!preg_match('/^[A-Z]{2}\.php$/', $fileinfo->getBasename())) { continue; } - $sLanguageFile = $fileinfo->getPathname(); - if(is_readable($sLanguageFile)) { - $sRetval = basename($sLanguageFile, '.php'); - break; - } - } - } - return $sRetval; - } -/** - * import key-values from language file - * @param string $sLanguageFile - * @return array of language definitions - */ - private function _importArrays($sLanguageFile) - { - include($sLanguageFile); - $aAllVars = get_defined_vars(); - $aLangSections = array(); - $aLanguageTable = array(); - foreach($aAllVars as $key=>$value) { - // extract the names of arrays from language file - if(is_array($value)) { - $aLangSections[] = $key; - } - } - foreach($aLangSections as $sSection) { - // walk through all arrays - foreach(${$sSection} as $key => $value) { - // and import all found translations - $aLanguageTable[$sSection.'_'.$key] = $value; - } - } - return $aLanguageTable; - } -} // end class Translate -/** - * Exception class for Translation - */ -//class TranslationException extends AppException {} Property changes on: branches/2.8.x/wb/framework/ModLanguage.php ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Date Author Id Revision HeadURL \ No newline at end of property