pradosoft / prado

framework/Security/TUserManager.php

Spacing +17 added lines, -17 removed lines

@@ -111,7 +111,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$userFile = include $this->_userFile;
+				$userFile=include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
 			}
 			else
@@ -146,13 +146,13 @@ 
 		{
 			foreach($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
-				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
+				$name=trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password=isset($user['password']) ? $user['password'] : '';
+				$this->_users[$name]=$password;
+				$roles=isset($user['roles']) ? $user['roles'] : '';
 				if($roles!=='')
 				{
-					foreach(explode(',',$roles) as $role)
+					foreach(explode(',', $roles) as $role)
 					{
 						if(($role=trim($role))!=='')
 							$this->_roles[$name][]=$role;
@@ -164,9 +164,9 @@ 
 		{
 			foreach($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
-				foreach(explode(',',$users) as $user)
+				$name=isset($role['name']) ? $role['name'] : '';
+				$users=isset($role['users']) ? $role['users'] : '';
+				foreach(explode(',', $users) as $user)
 				{
 					if(($user=trim($user))!=='')
 						$this->_roles[strtolower($user)][]=$name;
@@ -187,7 +187,7 @@ 
 			$this->_users[$name]=$node->getAttribute('password');
 			if(($roles=trim($node->getAttribute('roles')))!=='')
 			{
-				foreach(explode(',',$roles) as $role)
+				foreach(explode(',', $roles) as $role)
 				{
 					if(($role=trim($role))!=='')
 						$this->_roles[$name][]=$role;
@@ -196,7 +196,7 @@ 
 		}
 		foreach($xmlNode->getElementsByTagName('role') as $node)
 		{
-			foreach(explode(',',$node->getAttribute('users')) as $user)
+			foreach(explode(',', $node->getAttribute('users')) as $user)
 			{
 				if(($user=trim($user))!=='')
 					$this->_roles[strtolower($user)][]=$node->getAttribute('name');
@@ -246,8 +246,8 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		else if(($this->_userFile=Prado::getPathOfNamespace($value,self::USER_FILE_EXT))===null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid',$value);
+		else if(($this->_userFile=Prado::getPathOfNamespace($value, self::USER_FILE_EXT))===null || !is_file($this->_userFile))
+			throw new TConfigurationException('usermanager_userfile_invalid', $value);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setPasswordMode($value)
 	{
-		$this->_passwordMode=TPropertyValue::ensureEnum($value,'TUserManagerPasswordMode');
+		$this->_passwordMode=TPropertyValue::ensureEnum($value, 'TUserManagerPasswordMode');
 	}
 
 	/**
@@ -288,7 +288,7 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
 		if($this->_passwordMode===TUserManagerPasswordMode::MD5)
 			$password=md5($password);
@@ -341,7 +341,7 @@ 
 			$data=unserialize($data);
 			if(is_array($data) && count($data)===2)
 			{
-				list($username,$token)=$data;
+				list($username, $token)=$data;
 				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username]))
 					return $this->getUser($username);
 			}
@@ -360,7 +360,7 @@ 
 		$username=strtolower($user->getName());
 		if(isset($this->_users[$username]))
 		{
-			$data=array($username,md5($username.$this->_users[$username]));
+			$data=array($username, md5($username.$this->_users[$username]));
 			$cookie->setValue(serialize($data));
 		}
 	}

framework/I18N/TTranslateParameter.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 	 * To trim or not to trim the contents.
 	 * @var boolean
 	 */
-	protected $trim = true;
+	protected $trim=true;
 
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setKey($value)
 	{
-		$this->key = $value;
+		$this->key=$value;
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setTrim($value)
 	{
-		$this->trim = TPropertyValue::ensureBoolean($value);
+		$this->trim=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -106,10 +106,10 @@ 
 	 */
 	public function getParameter()
 	{
-		$value = $this->getValue();
+		$value=$this->getValue();
 		if(strlen($value) > 0)
 			return $value;
-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+		$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 		$this->renderControl($htmlWriter);
 		return $this->getTrim() ?
 			trim($htmlWriter->flush()) : $htmlWriter->flush();

framework/I18N/core/MessageFormat.php

Spacing +23 added lines, -23 removed lines

@@ -63,25 +63,25 @@ 
 	 * A list of loaded message catalogues.
 	 * @var array 
 	 */
-	protected $catagloues = array();
+	protected $catagloues=array();
 	
 	/**
 	 * The translation messages.
 	 * @var array 
 	 */
-	protected $messages = array();
+	protected $messages=array();
 	
 	/**
 	 * A list of untranslated messages.
 	 * @var array 
 	 */
-	protected $untranslated = array();
+	protected $untranslated=array();
 	
 	/**
 	 * The prefix and suffix to append to untranslated messages.
 	 * @var array 
 	 */
-	protected $postscript = array('','');
+	protected $postscript=array('', '');
 	
 	/**
 	 * Set the default catalogue.
@@ -93,7 +93,7 @@ 
 	 * Output encoding charset
 	 * @var string
 	 */
-	protected $charset = 'UTF-8'; 
+	protected $charset='UTF-8'; 
 
 	/**
 	 * Constructor.
@@ -104,7 +104,7 @@ 
 	 */
 	function __construct(IMessageSource $source, $charset='UTF-8')
 	{
-		$this->source = $source;	
+		$this->source=$source;	
 		$this->setCharset($charset);
 	}
 
@@ -114,7 +114,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -135,13 +135,13 @@ 
 	 */
 	protected function loadCatalogue($catalogue)
 	{
-		if(in_array($catalogue,$this->catagloues))
+		if(in_array($catalogue, $this->catagloues))
 			return;
 			
 		if($this->source->load($catalogue))
 		{
-			$this->messages[$catalogue] = $this->source->read();
-			$this->catagloues[] = $catalogue;						
+			$this->messages[$catalogue]=$this->source->read();
+			$this->catagloues[]=$catalogue;						
 		}
 	}
 
@@ -158,14 +158,14 @@ 
 	 * catalogue.
 	 * @return string translated string.
 	 */
-	public function format($string,$args=array(), $catalogue=null, $charset=null) 
+	public function format($string, $args=array(), $catalogue=null, $charset=null) 
 	{
-		if(empty($charset)) $charset = $this->getCharset();
+		if(empty($charset)) $charset=$this->getCharset();
 		
 		//force args as UTF-8
 		foreach($args as $k => $v)
-			$args[$k] = I18N_toUTF8($v, $charset);
-		$s = $this->formatString(I18N_toUTF8($string, $charset),$args,$catalogue);
+			$args[$k]=I18N_toUTF8($v, $charset);
+		$s=$this->formatString(I18N_toUTF8($string, $charset), $args, $catalogue);
 		return I18N_toEncoding($s, $charset);
 	}
 
@@ -182,15 +182,15 @@ 
 		if(empty($catalogue))
 		{
 			if(empty($this->Catalogue))
-				$catalogue = 'messages';
+				$catalogue='messages';
 			else 
-				$catalogue = $this->Catalogue;
+				$catalogue=$this->Catalogue;
 		}
 				
 		$this->loadCatalogue($catalogue);
 		
 		if(empty($args))
-			$args = array();		
+			$args=array();		
 		
 		foreach($this->messages[$catalogue] as $variant)
 		{
@@ -198,14 +198,14 @@ 
 			foreach($variant as $source => $result)
 			{ 
 				// we found it, so return the target translation
-				if($source == $string)
+				if($source==$string)
 				{
 					//check if it contains only strings.
 					if(is_string($result))
-						$target = $result;
+						$target=$result;
 					else
 					{
-						$target = $result[0];
+						$target=$result[0];
 					}
 					//found, but untranslated
 					if(empty($target))
@@ -245,10 +245,10 @@ 
 	 */
 	function setUntranslatedPS($postscript)
 	{
-		if(is_array($postscript) && count($postscript)>=2)
+		if(is_array($postscript) && count($postscript) >= 2)
 		{
-			$this->postscript[0] = $postscript[0];
-			$this->postscript[1] = $postscript[1];
+			$this->postscript[0]=$postscript[0];
+			$this->postscript[1]=$postscript[1];
 		}
 	}
 }

framework/I18N/core/DateFormat.php

Spacing +82 added lines, -82 removed lines

@@ -51,7 +51,7 @@ 
 	 * A list of tokens and their function call.
 	 * @var array
 	 */
-	protected $tokens = array(
+	protected $tokens=array(
 			'G'=>'Era',
 			'y'=>'Year',
 			'M'=>'Month',
@@ -75,7 +75,7 @@ 
 	 * A list of methods, to be used by the token function calls.
 	 * @var array
 	 */
-	protected $methods = array();
+	protected $methods=array();
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
@@ -91,16 +91,16 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=DateTimeFormatInfo::getInvariantInfo();
 		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->DateTimeFormat;
+			$this->formatInfo=$formatInfo->DateTimeFormat;
 		else if($formatInfo instanceof DateTimeFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo = DateTimeFormatInfo::getInstance($formatInfo);
+			$this->formatInfo=DateTimeFormatInfo::getInstance($formatInfo);
 
-		$this->methods = get_class_methods($this);
+		$this->methods=get_class_methods($this);
 	}
 
 	/**
@@ -110,45 +110,45 @@ 
 	 */
 	public function format($time, $pattern='F', $charset='UTF-8')
 	{
-		if (is_numeric($time)) //assumes unix epoch
-			$time = floatval($time);
+		if(is_numeric($time)) //assumes unix epoch
+			$time=floatval($time);
 		else if(is_string($time))
-			$time = @strtotime($time);
+			$time=@strtotime($time);
 
-		if($pattern === null)
-			$pattern = 'F';
+		if($pattern===null)
+			$pattern='F';
 
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
 
-		$date = $s->getDate($time);
+		$date=$s->getDate($time);
 
-		$pattern = $this->getPattern($pattern);
+		$pattern=$this->getPattern($pattern);
 
-		$tokens = $this->getTokens($pattern);
+		$tokens=$this->getTokens($pattern);
 
-		for($i = 0, $k = count($tokens); $i<$k; ++$i)
+		for($i=0, $k=count($tokens); $i < $k; ++$i)
 		{
-			$pattern = $tokens[$i];
-			if($pattern{0} == "'"
-				&& $pattern{strlen($pattern)-1} == "'")
+			$pattern=$tokens[$i];
+			if($pattern{0}=="'"
+				&& $pattern{strlen($pattern) - 1}=="'")
 			{
-				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
-				$tokens[$i] =  str_replace('``````','\'',$sub);
+				$sub=preg_replace('/(^\')|(\'$)/', '', $pattern);
+				$tokens[$i]=str_replace('``````', '\'', $sub);
 			}
-			else if($pattern == '``````')
+			else if($pattern=='``````')
 			{
-				$tokens[$i] = '\'';
+				$tokens[$i]='\'';
 			}
 			else
 			{
-				$function = $this->getFunctionName($pattern);
-				if($function != null)
+				$function=$this->getFunctionName($pattern);
+				if($function!=null)
 				{
-					$fName = 'get'.$function;
+					$fName='get'.$function;
 					if(in_array($fName, $this->methods))
 					{
-						$rs = $this->$fName($date, $pattern);
-						$tokens[$i] = $rs;
+						$rs=$this->$fName($date, $pattern);
+						$tokens[$i]=$rs;
 					}
 					else
 						throw new
@@ -157,7 +157,7 @@ 
 			}			
 		}
 
-		return I18N_toEncoding(implode('',$tokens), $charset);
+		return I18N_toEncoding(implode('', $tokens), $charset);
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	protected function getPattern($pattern)
 	{
-		if(is_array($pattern) && count($pattern) == 2)
+		if(is_array($pattern) && count($pattern)==2)
 		{
 			return $this->formatInfo->formatDateTime(
 							$this->getPattern($pattern[0]),
@@ -273,36 +273,36 @@ 
 	 */
 	protected function getTokens($pattern)
 	{
-		$char = null;
-		$tokens = array();
-		$token = null;
+		$char=null;
+		$tokens=array();
+		$token=null;
 
-		$text = false;
-		$pattern = preg_replace("/''/", '``````', $pattern);
+		$text=false;
+		$pattern=preg_replace("/''/", '``````', $pattern);
 
-		for($i = 0; $i < strlen($pattern); $i++)
+		for($i=0; $i < strlen($pattern); $i++)
 		{
-			if($char==null || $pattern{$i} == $char || $text)
+			if($char==null || $pattern{$i}==$char || $text)
 			{
-				$token .= $pattern{$i};
+				$token.=$pattern{$i};
 			}
 			else
 			{
-				$tokens[] = str_replace("","'",$token);
-				$token = $pattern{$i};
+				$tokens[]=str_replace("", "'", $token);
+				$token=$pattern{$i};
 			}
 
-			if($pattern{$i} == "'" && $text == false)
-				$text = true;
-			else if($text && $pattern{$i} == "'" && $char == "'")
-				$text = true;
-			else if($text && $char != "'" && $pattern{$i} == "'")
-				$text = false;
+			if($pattern{$i}=="'" && $text==false)
+				$text=true;
+			else if($text && $pattern{$i}=="'" && $char=="'")
+				$text=true;
+			else if($text && $char!="'" && $pattern{$i}=="'")
+				$text=false;
 
-			$char = $pattern{$i};
+			$char=$pattern{$i};
 
 		}
-		$tokens[] = $token;
+		$tokens[]=$token;
 		return $tokens;
 	}
 
@@ -316,11 +316,11 @@ 
 	 */
 	protected function getYear($date, $pattern='yyyy')
 	{
-		$year = $date['year'];
+		$year=$date['year'];
 		switch($pattern)
 		{
 			case 'yy':
-				return substr($year,2);
+				return substr($year, 2);
 			case 'yyyy':
 				return $year;
 			default:
@@ -340,19 +340,19 @@ 
 	 */
 	protected function getMonth($date, $pattern='M')
 	{
-		$month = $date['mon'];
+		$month=$date['mon'];
 
 		switch($pattern)
 		{
 			case 'M':
 				return $month;
 			case 'MM':
-				return str_pad($month, 2,'0',STR_PAD_LEFT);
+				return str_pad($month, 2, '0', STR_PAD_LEFT);
 			case 'MMM':
-				return $this->formatInfo->AbbreviatedMonthNames[$month-1];
+				return $this->formatInfo->AbbreviatedMonthNames[$month - 1];
 				break;
 			case 'MMMM':
-				return $this->formatInfo->MonthNames[$month-1];
+				return $this->formatInfo->MonthNames[$month - 1];
 			default:
 				throw new Exception('The pattern for month '.
 						'is "M", "MM", "MMM", or "MMMM".');
@@ -371,7 +371,7 @@ 
 	 */
 	protected function getDayInWeek($date, $pattern='EEEE')
 	{
-		$day = $date['wday'];
+		$day=$date['wday'];
 
 		switch($pattern)
 		{
@@ -401,14 +401,14 @@ 
 	 */
 	protected function getDay($date, $pattern='d')
 	{
-		$day = $date['mday'];
+		$day=$date['mday'];
 
 		switch($pattern)
 		{
 			case 'd':
 				return $day;
 			case 'dd':
-				return str_pad($day, 2,'0',STR_PAD_LEFT);
+				return str_pad($day, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for day of '.
 						'the month is "d" or "dd".');
@@ -426,10 +426,10 @@ 
 	protected function getEra($date, $pattern='G')
 	{
 
-		if($pattern != 'G')
+		if($pattern!='G')
 			throw new Exception('The pattern for era is "G".');
 
-		$year = $date['year'];
+		$year=$date['year'];
 		if($year > 0)
 			return $this->formatInfo->getEra(1);
 		else
@@ -445,14 +445,14 @@ 
 	 */
 	protected function getHour24($date, $pattern='H')
 	{
-		$hour = $date['hours'];
+		$hour=$date['hours'];
 
 		switch($pattern)
 		{
 			case 'H':
 				return $hour;
 			case 'HH':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for 24 hour '.
 						'format is "H" or "HH".');
@@ -467,11 +467,11 @@ 
 	 */
 	protected function getAMPM($date, $pattern='a')
 	{
-		if($pattern != 'a')
+		if($pattern!='a')
 			throw new Exception('The pattern for AM/PM marker is "a".');
 
-		$hour = $date['hours'];
-		$ampm = (int)($hour/12);
+		$hour=$date['hours'];
+		$ampm=(int) ($hour / 12);
 		return $this->formatInfo->AMPMMarkers[$ampm];
 	}
 
@@ -484,15 +484,15 @@ 
 	 */
 	protected function getHour12($date, $pattern='h')
 	{
-		$hour = $date['hours'];
-		$hour = ($hour==12|$hour==0)?12:($hour)%12;
+		$hour=$date['hours'];
+		$hour=($hour==12 | $hour==0) ? 12 : ($hour) % 12;
 
 		switch($pattern)
 		{
 			case 'h':
 				return $hour;
 			case 'hh':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for 24 hour '.
 						'format is "H" or "HH".');
@@ -508,14 +508,14 @@ 
 	 */
 	protected function getMinutes($date, $pattern='m')
 	{
-		$minutes = $date['minutes'];
+		$minutes=$date['minutes'];
 
 		switch($pattern)
 		{
 			case 'm':
 				return $minutes;
 			case 'mm':
-				return str_pad($minutes, 2,'0',STR_PAD_LEFT);
+				return str_pad($minutes, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for minutes is "m" or "mm".');
 		}
@@ -530,14 +530,14 @@ 
 	 */
 	protected function getSeconds($date, $pattern='s')
 	{
-		$seconds = $date['seconds'];
+		$seconds=$date['seconds'];
 
 		switch($pattern)
 		{
 			case 's':
 				return $seconds;
 			case 'ss':
-				return str_pad($seconds, 2,'0',STR_PAD_LEFT);
+				return str_pad($seconds, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for seconds is "s" or "ss".');
 		}
@@ -552,7 +552,7 @@ 
 	 */
 	protected function getTimeZone($date, $pattern='z')
 	{
-		if($pattern != 'z')
+		if($pattern!='z')
 			throw new Exception('The pattern for time zone is "z".');
 
 		return @date('T', @mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
@@ -566,7 +566,7 @@ 
 	 */
 	protected function getDayInYear($date, $pattern='D')
 	{
-		if($pattern != 'D')
+		if($pattern!='D')
 			throw new Exception('The pattern for day in year is "D".');
 
 		return $date['yday'];
@@ -580,7 +580,7 @@ 
 	 */
 	protected function getDayInMonth($date, $pattern='FF')
 	{
-		switch ($pattern) {
+		switch($pattern) {
 		    case 'F':
 		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
 		      break;
@@ -600,7 +600,7 @@ 
 	 */
 	protected function getWeekInYear($date, $pattern='w')
 	{
-		if($pattern != 'w')
+		if($pattern!='w')
 			throw new Exception('The pattern for week in year is "w".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
@@ -613,7 +613,7 @@ 
 	 */
 	protected function getWeekInMonth($date, $pattern='W')
 	{
-		if($pattern != 'W')
+		if($pattern!='W')
 			throw new Exception('The pattern for week in month is "W".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year'])) - date('W', mktime(0, 0, 0, $date['mon'], 1, $date['year']));
@@ -627,10 +627,10 @@ 
 	 */
 	protected function getHourInDay($date, $pattern='k')
 	{
-		if($pattern != 'k')
+		if($pattern!='k')
 			throw new Exception('The pattern for hour in day is "k".');
 
-		return $date['hours']+1;
+		return $date['hours'] + 1;
 	}
 
 	/**
@@ -641,10 +641,10 @@ 
 	 */
 	protected function getHourInAMPM($date, $pattern='K')
 	{
-		if($pattern != 'K')
+		if($pattern!='K')
 			throw new Exception('The pattern for hour in AM/PM is "K".');
 
-		return ($date['hours']+1)%12;
+		return ($date['hours'] + 1) % 12;
 	}
 
 }

framework/I18N/core/MessageSource_Database.php

Spacing +50 added lines, -50 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->_connID= (string)$source;
+		$this->_connID=(string) $source;
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 			if($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
-				throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
+				throw new TConfigurationException('messagesource_connectionid_invalid', $connectionID);
 		}
 		else
 			throw new TConfigurationException('messagesource_connectionid_required');
@@ -91,13 +91,13 @@ 
 				WHERE c.cat_id =  t.cat_id
 					AND c.name = :variant
 				ORDER BY id ASC');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		$dataReader=$command->query();
 
-		$result = array();
+		$result=array();
 
-		foreach ($dataReader as $row)
-			$result[$row['source']] = array($row['target'],$row['id'],$row['comments']);
+		foreach($dataReader as $row)
+			$result[$row['source']]=array($row['target'], $row['id'], $row['comments']);
 
 		return $result;
 	}
@@ -112,7 +112,7 @@ 
 	{
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT date_modified FROM catalogue WHERE name = :source');
-		$command->bindParameter(':source',$source,PDO::PARAM_STR);
+		$command->bindParameter(':source', $source, PDO::PARAM_STR);
 		$result=$command->queryScalar();
 		return $result ? $result : 0;
 	}
@@ -128,7 +128,7 @@ 
 	{
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT COUNT(*) FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		return $command->queryScalar()==1;
 	}
 
@@ -139,18 +139,18 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants=explode('_', $this->culture);
 
-		$catalogues = array($catalogue);
+		$catalogues=array($catalogue);
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.'.'.$variant;
 			}
 		}
 		return array_reverse($catalogues);
@@ -164,20 +164,20 @@ 
 	private function getCatalogueDetails($catalogue='messages')
 	{
 		if(empty($catalogue))
-			$catalogue = 'messages';
+			$catalogue='messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant=$catalogue.'.'.$this->culture;
 
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT cat_id FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		$cat_id=$command->queryScalar();
 
-		if ($cat_id===null) return false;
+		if($cat_id===null) return false;
 
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT COUNT(msg_id) FROM trans_unit WHERE cat_id = :catid ');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
 		$count=$command->queryScalar();
 
 		return array($cat_id, $variant, $count);
@@ -189,11 +189,11 @@ 
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{
-		$time = time();
+		$time=time();
 		$command=$this->getDBConnection()->createCommand(
 			'UPDATE catalogue SET date_modified = :moddate WHERE cat_id = :catid');
-		$command->bindParameter(':moddate',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
+		$command->bindParameter(':moddate', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
 		$result=$command->execute();
 
 		if(!empty($this->cache))
@@ -211,31 +211,31 @@ 
 	 */
 	function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
 		if($cat_id <= 0) return false;
-		$inserted = 0;
+		$inserted=0;
 
-		$time = time();
+		$time=time();
 
 		$command=$this->getDBConnection()->createCommand(
 			'INSERT INTO trans_unit (cat_id,id,source,date_added) VALUES (:catid,:id,:source,:dateadded)');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':id',$count,PDO::PARAM_INT);
-		$command->bindParameter(':source',$message,PDO::PARAM_STR);
-		$command->bindParameter(':dateadded',$time,PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':id', $count, PDO::PARAM_INT);
+		$command->bindParameter(':source', $message, PDO::PARAM_STR);
+		$command->bindParameter(':dateadded', $time, PDO::PARAM_INT);
 		foreach($messages as $message)
 		{
-			if (empty($message)) continue;
+			if(empty($message)) continue;
 			$count++; $inserted++;
 			$command->execute();
 		}
@@ -253,16 +253,16 @@ 
 	 */
 	function delete($message, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
 		$command=$this->getDBConnection()->createCommand(
 			'DELETE FROM trans_unit WHERE cat_id = :catid AND source = :message');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':message',$message,PDO::PARAM_STR);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':message', $message, PDO::PARAM_STR);
 
 		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 
@@ -278,21 +278,21 @@ 
 	 */
 	function update($text, $target, $comments, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
-		$time = time();
+		$time=time();
 		$command=$this->getDBConnection()->createCommand(
 			'UPDATE trans_unit SET target = :target, comments = :comments, date_modified = :datemod
 					WHERE cat_id = :catid AND source = :source');
-		$command->bindParameter(':target',$target,PDO::PARAM_STR);
-		$command->bindParameter(':comments',$comments,PDO::PARAM_STR);
-		$command->bindParameter(':datemod',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':source',$text,PDO::PARAM_STR);
+		$command->bindParameter(':target', $target, PDO::PARAM_STR);
+		$command->bindParameter(':comments', $comments, PDO::PARAM_STR);
+		$command->bindParameter(':datemod', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':source', $text, PDO::PARAM_STR);
 
 		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 	}
@@ -303,17 +303,17 @@ 
 	 */
 	function catalogues()
 	{
-		$command=$this->getDBConnection()->createCommand( 'SELECT name FROM catalogue ORDER BY name');
+		$command=$this->getDBConnection()->createCommand('SELECT name FROM catalogue ORDER BY name');
 		$dataReader=$command->query();
 
-		$result = array();
+		$result=array();
 
-		foreach ($dataReader as $row)
+		foreach($dataReader as $row)
 		{
-			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			$details=explode('.', $row[0]);
+			if(!isset($details[1])) $details[1]=null;
 
-			$result[] = $details;
+			$result[]=$details;
 		}
 
 		return $result;

framework/I18N/core/Gettext/TGettext.php

Spacing +33 added lines, -33 removed lines

@@ -66,7 +66,7 @@ 
      * @access  protected
      * @var     array
     */
-    protected $strings = array();
+    protected $strings=array();
 
     /**
      * meta
@@ -77,7 +77,7 @@ 
      * @access  protected
      * @var     array
      */
-    protected $meta = array();
+    protected $meta=array();
 
     /**
      * file path
@@ -85,7 +85,7 @@ 
      * @access  protected
      * @var     string
      */
-    protected $file = '';
+    protected $file='';
 
     /**
      * Factory
@@ -97,15 +97,15 @@ 
      * @param   string  $format MO or PO
      * @param   string  $file   path to GNU gettext file
      */
-    static function factory($format, $file = '')
+    static function factory($format, $file='')
     {
-        $format = strToUpper($format);
-        $filename = dirname(__FILE__).'/'.$format.'.php';
-        if(is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+        $format=strToUpper($format);
+        $filename=dirname(__FILE__).'/'.$format.'.php';
+        if(is_file($filename)==false)
+        	throw new Exception("Class file $file not found");
 
         include_once $filename;
-        $class = 'TGettext_' . $format;
+        $class='TGettext_'.$format;
 
         return new $class($file);
     }
@@ -124,19 +124,19 @@ 
      */
     static function poFile2moFile($pofile, $mofile)
     {
-        if (!is_file($pofile)) {
+        if(!is_file($pofile)) {
             throw new Exception("File $pofile doesn't exist.");
         }
 
         include_once dirname(__FILE__).'/PO.php';
 
-        $PO = new TGettext_PO($pofile);
-        if (true !== ($e = $PO->load())) {
+        $PO=new TGettext_PO($pofile);
+        if(true!==($e=$PO->load())) {
             return $e;
         }
 
-        $MO = $PO->toMO();
-        if (true !== ($e = $MO->save($mofile))) {
+        $MO=$PO->toMO();
+        if(true!==($e=$MO->save($mofile))) {
             return $e;
         }
         unset($PO, $MO);
@@ -153,16 +153,16 @@ 
      * @param   string  $string
      * @param   bool    $reverse
      */
-    static function prepare($string, $reverse = false)
+    static function prepare($string, $reverse=false)
     {
-        if ($reverse) {
-            $smap = array('"', "\n", "\t", "\r");
-            $rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
+        if($reverse) {
+            $smap=array('"', "\n", "\t", "\r");
+            $rmap=array('\"', '\\n"'."\n".'"', '\\t', '\\r');
             return (string) str_replace($smap, $rmap, $string);
         } else {
-        	$string = preg_replace('/"\s+"/', '', $string);
-            $smap = array('\\n', '\\r', '\\t', '\"');
-            $rmap = array("\n", "\r", "\t", '"');
+        	$string=preg_replace('/"\s+"/', '', $string);
+            $smap=array('\\n', '\\r', '\\t', '\"');
+            $rmap=array("\n", "\r", "\t", '"');
             return (string) str_replace($smap, $rmap, $string);
         }
     }
@@ -177,11 +177,11 @@ 
      */
     static function meta2array($meta)
     {
-        $array = array();
-        foreach (explode("\n", $meta) as $info) {
-            if ($info = trim($info)) {
-                list($key, $value) = explode(':', $info, 2);
-                $array[trim($key)] = trim($value);
+        $array=array();
+        foreach(explode("\n", $meta) as $info) {
+            if($info=trim($info)) {
+                list($key, $value)=explode(':', $info, 2);
+                $array[trim($key)]=trim($value);
             }
         }
         return $array;
@@ -243,15 +243,15 @@ 
      */
     function fromArray($array)
     {
-    	if (!array_key_exists('strings', $array)) {
-    	    if (count($array) != 2) {
+    	if(!array_key_exists('strings', $array)) {
+    	    if(count($array)!=2) {
                 return false;
     	    } else {
-    	        list($this->meta, $this->strings) = $array;
+    	        list($this->meta, $this->strings)=$array;
             }
     	} else {
-            $this->meta = @$array['meta'];
-            $this->strings = @$array['strings'];
+            $this->meta=@$array['meta'];
+            $this->strings=@$array['strings'];
         }
         return true;
     }
@@ -265,7 +265,7 @@ 
     function toMO()
     {
         include_once dirname(__FILE__).'/MO.php';
-        $MO = new TGettext_MO;
+        $MO=new TGettext_MO;
         $MO->fromArray($this->toArray());
         return $MO;
     }
@@ -279,7 +279,7 @@ 
     function toPO()
     {
         include_once dirname(__FILE__).'/PO.php';
-        $PO = new TGettext_PO;
+        $PO=new TGettext_PO;
         $PO->fromArray($this->toArray());
         return $PO;
     }

framework/I18N/core/DateTimeFormatInfo.php

Spacing +29 added lines, -29 removed lines

@@ -81,13 +81,13 @@ 
 	 * ICU date time formatting data.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * Allow functions that begins with 'set' to be called directly
@@ -96,7 +96,7 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -109,7 +109,7 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -127,12 +127,12 @@ 
 	 */
 	function __construct($data=array())
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
-		$this->data = $data;
+		$this->data=$data;
 	}
 
 	/**
@@ -152,10 +152,10 @@ 
     static function getInvariantInfo()
     {
         static $invariant;
-		if($invariant === null)
+		if($invariant===null)
         {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->getDateTimeFormat();
+            $culture=CultureInfo::getInvariantCulture();
+            $invariant=$culture->getDateTimeFormat();
         }
 		return $invariant;
     }
@@ -169,16 +169,16 @@ 
     static function getInstance($culture=null)
     {
 
-        if ($culture instanceof CultureInfo)
+        if($culture instanceof CultureInfo)
             return $culture->getDateTimeFormat();
        	else if(is_string($culture))
        	{
-       		$cultureInfo = CultureInfo::getInstance($culture);
+       		$cultureInfo=CultureInfo::getInstance($culture);
        		return $cultureInfo->getDateTimeFormat();
        	}
        	else
        	{
-			$cultureInfo = CultureInfo::getInvariantCulture();
+			$cultureInfo=CultureInfo::getInvariantCulture();
             return $cultureInfo->getDateTimeFormat();
        	}
     }
@@ -205,7 +205,7 @@ 
      */
     function setAbbreviatedDayNames($value)
     {
-    	$this->data['dayNames']['format']['abbreviated'] = $value;
+    	$this->data['dayNames']['format']['abbreviated']=$value;
     }
 
 	/**
@@ -229,7 +229,7 @@ 
      */
 	function setNarrowDayNames($value)
 	{
-		$this->data['dayNames']['format']['narrow'] = $value;
+		$this->data['dayNames']['format']['narrow']=$value;
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
      */
 	function setDayNames($value)
 	{
-		$this->data['dayNames']['format']['wide'] = $value;
+		$this->data['dayNames']['format']['wide']=$value;
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
      */
     function setNarrowMonthNames($value)
     {
-        $this->data['monthNames']['format']['narrow'] = $value;
+        $this->data['monthNames']['format']['narrow']=$value;
     }
 
 	/**
@@ -292,7 +292,7 @@ 
 	 */
 	function getAbbreviatedMonthNames()
 	{
-		if (isset($this->data['monthNames']['format']['abbreviated']))
+		if(isset($this->data['monthNames']['format']['abbreviated']))
 			return $this->data['monthNames']['format']['abbreviated'];
 		else
 			return $this->data['monthNames']['format']['wide'];
@@ -308,7 +308,7 @@ 
      */
     function setAbbreviatedMonthNames($value)
     {
-        $this->data['monthNames']['format']['abbreviated'] = $value;
+        $this->data['monthNames']['format']['abbreviated']=$value;
     }
 
 	/**
@@ -334,7 +334,7 @@ 
      */
     function setMonthNames($value)
     {
-    	$this->data['monthNames']['format']['wide'] = $value;
+    	$this->data['monthNames']['format']['wide']=$value;
     }
 
 	/**
@@ -344,7 +344,7 @@ 
 	 */
 	function getEra($era)
 	{
-		$eraName = $this->data['eras']['abbreviated'];
+		$eraName=$this->data['eras']['abbreviated'];
 		return $eraName[$era];
 	}
 
@@ -355,7 +355,7 @@ 
 	 */
 	function getAMDesignator()
 	{
-		$result = $this->getAMPMMarkers();
+		$result=$this->getAMPMMarkers();
 		return $result[0];
 	}
 
@@ -365,8 +365,8 @@ 
      */
     function setAMDesignator($value)
     {
-        $markers = $this->getAMPMMarkers();
-        $markers[0] = $value;
+        $markers=$this->getAMPMMarkers();
+        $markers[0]=$value;
         $this->setAMPMMarkers($markers);
     }
 
@@ -377,7 +377,7 @@ 
 	 */
 	function getPMDesignator()
 	{
-		$result = $this->getAMPMMarkers();
+		$result=$this->getAMPMMarkers();
 		return $result[1];
 	}
 
@@ -387,8 +387,8 @@ 
      */
     function setPMDesignator($value)
     {
-        $markers = $this->getAMPMMarkers();
-        $markers[1] = $value;
+        $markers=$this->getAMPMMarkers();
+        $markers[1]=$value;
         $this->setAMPMMarkers($markers);
     }
 
@@ -409,7 +409,7 @@ 
      */
     function setAMPMMarkers($value)
     {
-        $this->data['AmPmMarkers'] = $value;
+        $this->data['AmPmMarkers']=$value;
     }
 
 	/**
@@ -509,8 +509,8 @@ 
 	 */
 	function formatDateTime($date, $time)
 	{
-		$pattern = $this->getDateTimeOrderPattern();
-		return str_replace(array('{0}','{1}'), array($time, $date), $pattern);
+		$pattern=$this->getDateTimeOrderPattern();
+		return str_replace(array('{0}', '{1}'), array($time, $date), $pattern);
 	}
 
 }

framework/I18N/core/MessageSource_XLIFF.php

Spacing +103 added lines, -103 removed lines

@@ -43,13 +43,13 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.xml';
+	protected $dataExt='.xml';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	/**
 	 * Constructor.
@@ -58,7 +58,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 	/**
@@ -69,20 +69,20 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($XML = simplexml_load_file($filename))) {
+		if(false===($XML=simplexml_load_file($filename))) {
 			return false;
 		}
 
-		$translationUnit = $XML->xpath('//trans-unit');
+		$translationUnit=$XML->xpath('//trans-unit');
 
-		$translations = array();
+		$translations=array();
 
 		foreach($translationUnit as $unit)
 		{
-			$source = (string)$unit->source;
-			$translations[$source][] = (string)$unit->target;
-			$translations[$source][] = (string)$unit['id'];
-			$translations[$source][] = (string)$unit->note;
+			$source=(string) $unit->source;
+			$translations[$source][]=(string) $unit->target;
+			$translations[$source][]=(string) $unit['id'];
+			$translations[$source][]=(string) $unit->note;
 		}
 
 		return $translations;
@@ -127,28 +127,28 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
-		$catalogues = array($source);
-		$variant = null;
+		$variants=explode('_', $this->culture);
+		$source=$catalogue.$this->dataExt;
+		$catalogues=array($source);
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.$this->dataSeparator.$variant.$this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.$this->dataSeparator.$variant.$this->dataExt;
 			}
 		}
 
-		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir,array_reverse($catalogues));
-		$files = array();
+		$byDir=$this->getCatalogueByDir($catalogue);
+		$catalogues=array_merge($byDir, array_reverse($catalogues));
+		$files=array();
 
 		foreach($catalogues as $file)
 		{
-			$files[] = $file;
-			$files[] = preg_replace('/\.xml$/', '.xlf', $file);
+			$files[]=$file;
+			$files[]=preg_replace('/\.xml$/', '.xlf', $file);
 		}
 
 		return $files;
@@ -163,16 +163,16 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$catalogues = array();
-		$variant = null;
+		$variants=explode('_', $this->culture);
+		$catalogues=array();
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 
@@ -196,38 +196,38 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir=null,$variant=null)
+	protected function getCatalogues($dir=null, $variant=null)
 	{
-		$dir = $dir?$dir:$this->source;
-		$files = scandir($dir);
-		$catalogue = array();
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
+		$catalogue=array();
 
 		foreach($files as $file)
 		{
-			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file)) {
-				$catalogue = array_merge(
+			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+				$catalogue=array_merge(
 					$catalogue,
 					$this->getCatalogues($dir.'/'.$file, $file)
 				);
 			}
 
-			$pos = strpos($file,$this->dataExt);
-			if($pos >0 && substr($file, -1*strlen($this->dataExt)) == $this->dataExt)
+			$pos=strpos($file, $this->dataExt);
+			if($pos > 0 && substr($file, -1 * strlen($this->dataExt))==$this->dataExt)
 			{
-				$name = substr($file,0,$pos);
-				$dot = strrpos($name,$this->dataSeparator);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 
 				if(is_int($dot))
 				{
-					$culture = substr($name, $dot+1, strlen($name));
-					$cat = substr($name, 0, $dot);
+					$culture=substr($name, $dot + 1, strlen($name));
+					$cat=substr($name, 0, $dot);
 				}
 
-				$details[0] = $cat;
-				$details[1] = $culture;
-				$catalogue[] = $details;
+				$details[0]=$cat;
+				$details[1]=$culture;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -244,13 +244,13 @@ 
 	 */
 	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
+			$file=$this->getSource($variant);
 			if(is_file($file)) {
 				return array($variant, $file);
 			}
@@ -267,48 +267,48 @@ 
 	 */
 	public function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 		if(count($messages) <= 0) {
 			return false;
 		}
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
-			list($variant, $filename) = $this->createMessageTemplate($catalogue);
+			list($variant, $filename)=$this->createMessageTemplate($catalogue);
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = new DOMDocument();
+		$dom=new DOMDocument();
 		$dom->load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-    	$body = $xpath->query('//body')->item(0);
+		$xpath=new DomXPath($dom);
+    	$body=$xpath->query('//body')->item(0);
 
-		$lastNodes = $xpath->query('//trans-unit[last()]');
+		$lastNodes=$xpath->query('//trans-unit[last()]');
 		if(($last=$lastNodes->item(0))!==null) {
-			$count = (int)$last->getAttribute('id');
+			$count=(int) $last->getAttribute('id');
 		} else {
-			$count = 0;
+			$count=0;
 		}
 
 		//for each message add it to the XML file using DOM
 		foreach($messages as $message)
 		{
-			$unit = $dom->createElement('trans-unit');
-			$unit->setAttribute('id',++$count);
+			$unit=$dom->createElement('trans-unit');
+			$unit->setAttribute('id', ++$count);
 
-			$source = $dom->createElement('source');
+			$source=$dom->createElement('source');
 			$source->appendChild($dom->createCDATASection($message));
 
-			$target = $dom->createElement('target');
+			$target=$dom->createElement('target');
 			$target->appendChild($dom->createCDATASection(''));
 
 			$unit->appendChild($dom->createTextNode("\n"));
@@ -323,7 +323,7 @@ 
 		}
 
 
-		$fileNode = $xpath->query('//file')->item(0);
+		$fileNode=$xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
 		//save it and clear the cache for this variant
@@ -345,68 +345,68 @@ 
 	 */
 	public function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = DOMDocument::load($filename);
+		$dom=DOMDocument::load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-		$units = $xpath->query('//trans-unit');
+		$xpath=new DomXPath($dom);
+		$units=$xpath->query('//trans-unit');
 
 		//for each of the existin units
 		foreach($units as $unit)
 		{
-			$found = false;
-			$targetted = false;
-			$commented = false;
+			$found=false;
+			$targetted=false;
+			$commented=false;
 
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
 			foreach($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
-					$found = true;
+				if($node->nodeName=='source' && $node->firstChild->wholeText==$text) {
+					$found=true;
 				}
 
 				//found source, get the target and notes
 				if($found)
 				{
 					//set the new translated string
-					if($node->nodeName == 'target')
+					if($node->nodeName=='target')
 					{
-						$node->nodeValue = $target;
-						$targetted = true;
+						$node->nodeValue=$target;
+						$targetted=true;
 					}
 
 					//set the notes
-					if(!empty($comments) && $node->nodeName == 'note')
+					if(!empty($comments) && $node->nodeName=='note')
 					{
-						$node->nodeValue = $comments;
-						$commented = true;
+						$node->nodeValue=$comments;
+						$commented=true;
 					}
 				}
 			}
 
 			//append a target
 			if($found && !$targetted) {
-				$unit->appendChild($dom->createElement('target',$target));
+				$unit->appendChild($dom->createElement('target', $target));
 			}
 
 			//append a note
 			if($found && !$commented && !empty($comments)) {
-				$unit->appendChild($dom->createElement('note',$comments));
+				$unit->appendChild($dom->createElement('note', $comments));
 			}
 
 			//finished searching
@@ -415,10 +415,10 @@ 
 			}
 		}
 
-		$fileNode = $xpath->query('//file')->item(0);
+		$fileNode=$xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-		if($dom->save($filename) >0)
+		if($dom->save($filename) > 0)
 		{
 			if(!empty($this->cache)) {
 				$this->cache->clean($variant, $this->culture);
@@ -438,23 +438,23 @@ 
 	 */
 	public function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = DOMDocument::load($filename);
+		$dom=DOMDocument::load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-		$units = $xpath->query('//trans-unit');
+		$xpath=new DomXPath($dom);
+		$units=$xpath->query('//trans-unit');
 
 		//for each of the existin units
 		foreach($units as $unit)
@@ -464,14 +464,14 @@ 
 			foreach($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
+				if($node->nodeName=='source' && $node->firstChild->wholeText==$message)
 				{
 					//we found it, remove and save the xml file.
 					$unit->parentNode->removeChild($unit);
-					$fileNode = $xpath->query('//file')->item(0);
+					$fileNode=$xpath->query('//file')->item(0);
 					$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-					if(false !== $dom->save($filename)) {
+					if(false!==$dom->save($filename)) {
 						if(!empty($this->cache)) {
 							$this->cache->clean($variant, $this->culture);
 						}
@@ -488,18 +488,18 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 		
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$file = $this->getSource($variant);
-		$dir = dirname($file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$file=$this->getSource($variant);
+		$dir=dirname($file);
 
 		if(!is_dir($dir)) {
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
 
 		if(!is_dir($dir)) {
@@ -514,8 +514,8 @@ 
 
 	protected function getTemplate($catalogue)
 	{
-		$date = @date('c');
-		$xml = <<<EOD
+		$date=@date('c');
+		$xml=<<<EOD
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.0">
  <file source-language="EN" target-language="{$this->culture}" datatype="plaintext" original="$catalogue" date="$date" product-name="$catalogue">

framework/I18N/core/MessageCache.php

Spacing +13 added lines, -13 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * Caceh life time, default is 1 year.
 	 */
-	protected $lifetime = 3153600;
+	protected $lifetime=3153600;
 
 
 	/**
@@ -37,7 +37,7 @@ 
 	 */
 	public function __construct($cacheDir)
 	{
-		$cacheDir = $cacheDir.'/';
+		$cacheDir=$cacheDir.'/';
 
 		if(!is_dir($cacheDir))
 			throw new Exception(
@@ -48,13 +48,13 @@ 
 				'The cache directory '.$cacheDir.' must be writable '.
 				'by the server.');
 
-		$options = array(
+		$options=array(
 			'cacheDir' => $cacheDir,
 			'lifeTime' => $this->getLifeTime(),
 			'automaticSerialization' => true
 		);
 
-		$this->cache = new TCache_Lite($options);
+		$this->cache=new TCache_Lite($options);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function setLifeTime($time)
 	{
-		$this->lifetime = (int)$time;
+		$this->lifetime=(int) $time;
 	}
 
 	/**
@@ -106,18 +106,18 @@ 
 	 */
 	public function get($catalogue, $culture, $lastmodified=0)
 	{
-		$ID = $this->getID($catalogue, $culture);
-		$group = $this->getGroup($catalogue, $culture);
+		$ID=$this->getID($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 
 		$this->cache->_setFileName($ID, $group);
 
-		$cache = $this->cache->getCacheFile();
+		$cache=$this->cache->getCacheFile();
 
-		if(is_file($cache) == false)
+		if(is_file($cache)==false)
 			return false;
 
 
-		$lastmodified = (int)$lastmodified;
+		$lastmodified=(int) $lastmodified;
 
 		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
 			return false;
@@ -136,8 +136,8 @@ 
 	 */
 	public function save($data, $catalogue, $culture)
 	{
-		$ID = $this->getID($catalogue, $culture);
-		$group = $this->getGroup($catalogue, $culture);
+		$ID=$this->getID($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 
 		//echo '## Cache save: "'.$ID.'" : "'.$group.'"';
 		//echo "<br>\n";
@@ -152,7 +152,7 @@ 
 	 */
 	public function clean($catalogue, $culture)
 	{
-		$group = $this->getGroup($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 		$this->cache->clean($group);
 	}