/ - Diff - WB 2.08.x - Tracking

     ! = Update/Change
     ===============================================================================
 Feb-2014 Build 2096 Manuela v.d.Decken(DarkViper)
     + Translate::enablePrivateTable() allows to add more private language definitions
     + Translate::disablePrivateTable()
     ! TranslateAdaptorWbOldStyle move hardcoded foldername into a variable
 Feb-2014 Build 2095 Manuela v.d.Decken(DarkViper)
     ! /functions::make_thumb() set JPG-compression to 100%
     ! /database::showError() output text corrected

branches/2.8.x/wb/admin/interface/version.php
51	51
52	52	// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53	53	if(!defined('VERSION')) define('VERSION', '2.8.4');
54		if(!defined('REVISION')) define('REVISION', '2095');
	54	if(!defined('REVISION')) define('REVISION', '2096');
55	55	if(!defined('SP')) define('SP', '');

     	protected $aLoadedAddons       = array();
     /** TranslationTable object of the core and additional one activated addon */
     	protected $aActiveTranslations = array();
     // **  */
         protected $aPrivatePriorities = array();
     /** possible option flags */
     	const CACHE_DISABLED = 1; // ( 2^0 )
     	const KEEP_MISSING   = 2; // ( 2^1 )
     /** types of translation tables */
         const TABLE_CORE               = 0;
         const TABLE_ADDON              = 1;
         const TABLE_THEME              = 2;
         const TABLE_TEMPLATE           = 2;
         const FIRST_USER_DEFINED_TABLE = 10;
         const STEP_USER_DEFINED_TABLES = 5;
     /** prevent class from public instancing and get an object to hold extensions */
     	protected function  __construct() {}
     /** prevent from cloning existing instance */
-...
     			                             $this->sUserLanguage,
     			                             $this->bUseCache);
     			$this->aLoadedAddons['core'] = $oTmp->load($this->sAdaptor);
     			$this->aActiveTranslations[0] = $this->aLoadedAddons['core'];
     			$this->aActiveTranslations[self::TABLE_CORE] = $this->aLoadedAddons['core'];
     			if(sizeof($this->aLoadedAddons['core']) == 0) {
     			// throw an exception for missing translations
     				throw new TranslationException('missing core translations');
-...
     			if(!isset($this->aLoadedAddons[$sAddon])) {
     				$this->addAddon($sAddon, $sAdaptor);
+    			}
     			$this->aActiveTranslations[1] = $this->aLoadedAddons[$sAddon];
     			$this->aActiveTranslations[self::TABLE_ADDON] = $this->aLoadedAddons[$sAddon];
+    		}
+    	}
-...
      */
     	public function disableAddon()
+    	{
     		if(isset($this->aActiveTranslations[1])) {
     			unset($this->aActiveTranslations[1]);
     		if(isset($this->aActiveTranslations[self::TABLE_ADDON])) {
     			unset($this->aActiveTranslations[self::TABLE_ADDON]);
+    		}
+    	}
     /**
      * Activate additional translation table
      * @param string $sAddon    Addon descriptor (i.e. 'modules\myAddon')
      * @param int    $iPriority (default: self::FIRST_USER_DEFINED_TABLE)
      * @param string $sAdaptor  (optional)Adaptor name (default: $this->sAdaptor)
      */
     	public function enablePrivateTable($sAddon, $iPriority = self::FIRST_USER_DEFINED_TABLE, $sAdaptor = null)
+    	{
             switch (($iPriority = intval($iPriority))) :
                 case self::TABLE_THEME:
                 case self::TABLE_TEMPLATE:
                     break;
                 default:
                     $iPriority = ($iPriority < self::FIRST_USER_DEFINED_TABLE ? self::FIRST_USER_DEFINED_TABLE : $iPriority);
                 // search for first free priority position
                     while (array_key_exists($iPriority, $this->aActiveTranslations)) {
                         $iPriority += self::STEP_USER_DEFINED_TABLES;
+                    }
                     break;
             endswitch;
         // sanitize Addon descriptor
     		$sAddon = str_replace('/', '\\', $sAddon);
     		if(!(strtolower($sAddon) == 'core' || $sAddon == '')) {
             // if addon is not already in list then add it now
     			if(!isset($this->aLoadedAddons[$sAddon])) {
     				$this->addAddon($sAddon, $sAdaptor);
+    			}
                 // copy table into activate list
     			$this->aActiveTranslations[$iPriority] = $this->aLoadedAddons[$sAddon];
                 // save dependency of addon<->priority
                 $this->aPrivatePriorities[$sAddon] = $iPriority;
                 // sort active list ascending by priority
                 ksort($this->aActiveTranslations);
+    		}
+    	}
     /**
      * Remove private table from ActiveTranslations table
      * @param string $sAddon    Addon descriptor (i.e. 'modules\myAddon')
      */
     	public function disablePrivateTable($sAddon)
+        {
         // sanitize addon descriptor
     		$sAddon = str_replace('/', '\\', $sAddon);
             if (isset($this->aPrivatePriorities[$sAddon])) {
             // get priority for this addon if it's loaded
                 $iPriority = $this->aPrivatePriorities[$sAddon];
             // check if addon is activated
                 if (isset($this->aActiveTranslations[$iPriority]) && $iPriority >= self::FIRST_USER_DEFINED_TABLE) {
                 // deactivate addon and remove it from priority list
                     unset($this->aActiveTranslations[$iPriority]);
                     unset($this->aPrivatePriorities[$sAddon]);
                 // sort active translation list for ascending priority
                     ksort($this->aActiveTranslations);
+                }
+            }
+        }
     /**
      * Is key available
      * @param string Language key
      * @return bool

     class TranslateAdaptorWbOldStyle implements TranslateAdaptorInterface {
     	protected $sAddon     = '';
         protected $sTransDir  = 'languages/';
     	protected $sFilePath  = '';
     /**
      * Constructor
-...
     	private function _getAddonPath()
+    	{
     	// set environment
     		$sAddon   = trim(str_replace('\\', '/', $this->sAddon), '/');
     		$sAddon   = trim(str_replace('\\', '/', $this->sAddon), '/').'/';
     		$sAppDirname = str_replace('\\', '/', dirname(dirname(__FILE__))).'/';
     		$sLanguagePath = $sAppDirname.$sAddon.'/languages/';
     		$sLanguagePath = $sAppDirname.$sAddon.$this->sTransDir;
     		if(is_dir($sLanguagePath) && is_readable($sLanguagePath)) {
     		// valid directory found
     			return $sLanguagePath;
-...
+    		{
     		// get used acp dirname
     			$sTmp = trim(WbAdaptor::getInstance()->AcpDir, '/');
     		// if path starts with 'admin/' then replace with used acp dirname
     			$sLanguagePath = $sAppDirname.preg_replace('/^admin/sU', $sTmp, $sAddon).'/languages/';
     		// if path starts with 'admin/' then replace with used real acp dirname
     			$sLanguagePath = $sAppDirname.preg_replace('/^admin/sU', $sTmp, $sAddon).$this->sTransDir;
     			if(is_dir($sLanguagePath) && is_readable($sLanguagePath)) {
     			// valid directory found
     				return $sLanguagePath;

Project

General

Profile

WB 2.08.x

Revision 2096

Added by darkviper almost 11 years ago