pradosoft / prado

framework/Security/TAuthManager.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 
 		// check for authentication expiration
 		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))

Spacing +24 added lines, -24 removed lines

@@ -94,14 +94,14 @@ 
 		if(is_string($this->_userManager))
 		{
 			if(($users=$application->getModule($this->_userManager))===null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
 			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 			$this->_userManager=$users;
 		}
-		$application->attachEventHandler('OnAuthentication',array($this,'doAuthentication'));
-		$application->attachEventHandler('OnEndRequest',array($this,'leave'));
-		$application->attachEventHandler('OnAuthorization',array($this,'doAuthorization'));
+		$application->attachEventHandler('OnAuthentication', array($this, 'doAuthentication'));
+		$application->attachEventHandler('OnEndRequest', array($this, 'leave'));
+		$application->attachEventHandler('OnAuthorization', array($this, 'doAuthorization'));
 		$this->_initialized=true;
 	}
 
@@ -122,7 +122,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
 		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 		$this->_userManager=$provider;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param mixed sender of the Authentication event
 	 * @param mixed event parameter
 	 */
-	public function doAuthentication($sender,$param)
+	public function doAuthentication($sender, $param)
 	{
 		$this->onAuthenticate($param);
 
@@ -168,7 +168,7 @@ 
 	 * @param mixed sender of the Authorization event
 	 * @param mixed event parameter
 	 */
-	public function doAuthorization($sender,$param)
+	public function doAuthorization($sender, $param)
 	{
 		if(!$this->_skipAuthorization)
 		{
@@ -183,7 +183,7 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter
 	 */
-	public function leave($sender,$param)
+	public function leave($sender, $param)
 	{
 		$application=$this->getApplication();
 		if($application->getResponse()->getStatusCode()===401)
@@ -229,7 +229,7 @@ 
 	 */
 	public function setReturnUrl($value)
 	{
-		$this->getSession()->add($this->getReturnUrlVarName(),$value);
+		$this->getSession()->add($this->getReturnUrlVarName(), $value);
 	}
 
 	/**
@@ -288,8 +288,8 @@ 
 		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		$isAuthExpired=$this->_authExpire > 0 && !$user->getIsGuest() &&
+        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
@@ -302,7 +302,7 @@ 
 					$user=$user2;
 					$this->updateSessionUser($user);
 					// user is restored from cookie, auth may not expire
-					$isAuthExpired = false;
+					$isAuthExpired=false;
 				}
 			}
 		}
@@ -317,7 +317,7 @@ 
 
 		// event handler gets a chance to do further auth work
 		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate',$this,$application);
+			$this->raiseEvent('OnAuthenticate', $this, $application);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	{
 		$this->logout();
 		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire',$this,$param);
+			$this->raiseEvent('OnAuthExpire', $this, $param);
 	}
 
 	/**
@@ -343,8 +343,8 @@ 
 	{
 		$application=$this->getApplication();
 		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize',$this,$application);
-		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(),$application->getRequest()->getRequestType(),$application->getRequest()->getUserHostAddress()))
+			$this->raiseEvent('OnAuthorize', $this, $application);
+		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
 			$application->completeRequest();
@@ -383,7 +383,7 @@ 
 			if(($session=$this->getSession())===null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
-				$session->add($this->getUserKey(),$user->saveToString());
+				$session->add($this->getUserKey(), $user->saveToString());
 		}
 	}
 
@@ -411,19 +411,19 @@ 
 	 * @param integer number of seconds that automatic login will remain effective. If 0, it means user logs out when session ends. This parameter is added since 3.1.1.
 	 * @return boolean if login is successful
 	 */
-	public function login($username,$password,$expire=0)
+	public function login($username, $password, $expire=0)
 	{
-		if($this->_userManager->validateUser($username,$password))
+		if($this->_userManager->validateUser($username, $password))
 		{
 			if(($user=$this->_userManager->getUser($username))===null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
-			if($expire>0)
+			if($expire > 0)
 			{
-				$cookie=new THttpCookie($this->getUserKey(),'');
-				$cookie->setExpire(time()+$expire);
+				$cookie=new THttpCookie($this->getUserKey(), '');
+				$cookie->setExpire(time() + $expire);
 				$this->_userManager->saveUserToCookie($cookie);
 				$this->getResponse()->getCookies()->add($cookie);
 			}
@@ -446,7 +446,7 @@ 
 		$session->destroy();
 		if($this->getAllowAutoLogin())
 		{
-			$cookie=new THttpCookie($this->getUserKey(),'');
+			$cookie=new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);
 		}
 	}

framework/I18N/core/DateFormat.php

Indentation +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -308,8 +308,8 @@ 
 
 	/**
 	 * Get the year.
- 	 * "yy" will return the last two digits of year.
- 	 * "yyyy" will return the full integer year.
+	 * "yy" will return the last two digits of year.
+	 * "yyyy" will return the full integer year.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string year
@@ -330,10 +330,10 @@ 
 
 	/**
 	 * Get the month.
- 	 * "M" will return integer 1 through 12
- 	 * "MM" will return the narrow month name, e.g. "J"
- 	 * "MMM" will return the abrreviated month name, e.g. "Jan"
- 	 * "MMMM" will return the month name, e.g. "January"
+	 * "M" will return integer 1 through 12
+	 * "MM" will return the narrow month name, e.g. "J"
+	 * "MMM" will return the abrreviated month name, e.g. "Jan"
+	 * "MMMM" will return the month name, e.g. "January"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string month name
@@ -361,10 +361,10 @@ 
 
 	/**
 	 * Get the day of the week.
- 	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
- 	 * "EE" will return the narrow day of the week, e.g. "M"
- 	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
- 	 * "EEEE" will return the day of the week, e.g. "Monday"
+	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
+	 * "EE" will return the narrow day of the week, e.g. "M"
+	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
+	 * "EEEE" will return the day of the week, e.g. "Monday"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the week.
@@ -394,7 +394,7 @@ 
 
 	/**
 	 * Get the day of the month.
- 	 * "d" for non-padding, "dd" will always return 2 characters.
+	 * "d" for non-padding, "dd" will always return 2 characters.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the month
@@ -581,14 +581,14 @@ 
 	protected function getDayInMonth($date, $pattern='FF')
 	{
 		switch ($pattern) {
-		    case 'F':
-		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    case 'FF':
-		      return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    default:
-		      throw new Exception('The pattern for day in month is "F" or "FF".');
+			case 'F':
+			  return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			case 'FF':
+			  return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			default:
+			  throw new Exception('The pattern for day in month is "F" or "FF".');
 		}
 	}
 

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/NumberFormat.php

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -116,7 +116,7 @@ 
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
 	{
 		$oldLocale=setLocale(LC_NUMERIC, '0');
-	    setlocale(LC_NUMERIC, 'C');
+		setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 

Spacing +60 added lines, -60 removed lines

@@ -90,14 +90,14 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = NumberFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=NumberFormatInfo::getInvariantInfo();
 		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->NumberFormat;
+			$this->formatInfo=$formatInfo->NumberFormat;
 		else if($formatInfo instanceof NumberFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo =
+			$this->formatInfo=
 				NumberFormatInfo::getInstance($formatInfo);
 	}
 
@@ -120,37 +120,37 @@ 
 
 		$this->setPattern($pattern);
 
-		if(strtolower($pattern) == 'p')
-			$number = $number * 100;
+		if(strtolower($pattern)=='p')
+			$number=$number * 100;
 
-		$string = (string)$number;
+		$string=(string) $number;
 
-		$decimal = $this->formatDecimal($string);
-		$integer = $this->formatInteger(abs($number));
+		$decimal=$this->formatDecimal($string);
+		$integer=$this->formatInteger(abs($number));
 
-		if(strlen($decimal)>0)
-			$result = $integer.$decimal;
+		if(strlen($decimal) > 0)
+			$result=$integer.$decimal;
 		else
-			$result = $integer;
+			$result=$integer;
 
 		//get the suffix
 		if($number >= 0)
-			$suffix = $this->formatInfo->PositivePattern;
+			$suffix=$this->formatInfo->PositivePattern;
 		else if($number < 0)
-			$suffix = $this->formatInfo->NegativePattern;
+			$suffix=$this->formatInfo->NegativePattern;
 		else
-			$suffix = array("","");
+			$suffix=array("", "");
 
 		//append and prepend suffix
-		$result = $suffix[0].$result.$suffix[1];
+		$result=$suffix[0].$result.$suffix[1];
 
 		//replace currency sign
-		$symbol = @$this->formatInfo->getCurrencySymbol($currency);
-		if($symbol === null) {
-			$symbol = $currency;
+		$symbol=@$this->formatInfo->getCurrencySymbol($currency);
+		if($symbol===null) {
+			$symbol=$currency;
 		}
 
-		$result = str_replace('¤',$symbol, $result);
+		$result=str_replace('¤', $symbol, $result);
 
 		setlocale(LC_NUMERIC, $oldLocale);
 
@@ -164,68 +164,68 @@ 
 	 */
 	protected function formatInteger($string)
 	{
-		$string = (string)$string;
+		$string=(string) $string;
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
 		//if not decimal digits, assume 0 decimal points.
 		if(is_int($decimalDigits) && $decimalDigits > 0)
-			$string = (string)round(floatval($string),$decimalDigits);
-		$dp = strpos($string, '.');
+			$string=(string) round(floatval($string), $decimalDigits);
+		$dp=strpos($string, '.');
 		if(is_int($dp))
-			$string = substr($string, 0, $dp);
-		$integer = '';
+			$string=substr($string, 0, $dp);
+		$integer='';
 
-		$digitSize = $this->formatInfo->getDigitSize();
+		$digitSize=$this->formatInfo->getDigitSize();
 
-		$string = str_pad($string, $digitSize, '0',STR_PAD_LEFT);
+		$string=str_pad($string, $digitSize, '0', STR_PAD_LEFT);
 
-		$len = strlen($string);
+		$len=strlen($string);
 
-		$groupSeparator = $this->formatInfo->GroupSeparator;
-		$groupSize = $this->formatInfo->GroupSizes;
+		$groupSeparator=$this->formatInfo->GroupSeparator;
+		$groupSize=$this->formatInfo->GroupSizes;
 
 
-		$firstGroup = true;
-		$multiGroup = is_int($groupSize[1]);
-		$count = 0;
+		$firstGroup=true;
+		$multiGroup=is_int($groupSize[1]);
+		$count=0;
 
 		if(is_int($groupSize[0]))
 		{
 			//now for the integer groupings
-			for($i=0; $i<$len; $i++)
+			for($i=0; $i < $len; $i++)
 			{
-				$char = $string{$len-$i-1};
+				$char=$string{$len - $i - 1};
 
-				if($multiGroup && $count == 0)
+				if($multiGroup && $count==0)
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				else if($multiGroup && $count >= 1)
 				{
-					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
+					if($i!=0 && ($i - $groupSize[0]) % $groupSize[1]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				else
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 
-				$integer = $char . $integer;
+				$integer=$char.$integer;
 			}
 		}
 		else
-			$integer = $string;
+			$integer=$string;
 
 		return $integer;
 	}
@@ -237,32 +237,32 @@ 
 	 */
 	protected function formatDecimal($string)
 	{
-		$dp = strpos($string, '.');
-		$decimal = '';
+		$dp=strpos($string, '.');
+		$decimal='';
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
-		$decimalSeparator = $this->formatInfo->DecimalSeparator;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
+		$decimalSeparator=$this->formatInfo->DecimalSeparator;
 
 		//do the correct rounding here
 		//$string = round(floatval($string), $decimalDigits);
 		if(is_int($dp))
 		{
-			if($decimalDigits == -1)
+			if($decimalDigits==-1)
 			{
-				$decimal = substr($string, $dp+1);
+				$decimal=substr($string, $dp + 1);
 			}
 			else if(is_int($decimalDigits))
 			{
-				$float = round((float)$string, $decimalDigits);
-				if(strpos((string)$float, '.') === false)
+				$float=round((float) $string, $decimalDigits);
+				if(strpos((string) $float, '.')===false)
 				{
-					$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 				else
 				{
-					$decimal = substr($float, strpos($float,'.')+1);
-					if(strlen($decimal)<$decimalDigits)
-						$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal=substr($float, strpos($float, '.') + 1);
+					if(strlen($decimal) < $decimalDigits)
+						$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 			}
 			else
@@ -270,8 +270,8 @@ 
 
 			return $decimalSeparator.$decimal;
 		}
-		else if ($decimalDigits > 0)
-			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
+		else if($decimalDigits > 0)
+			return $decimalSeparator.str_pad($decimal, $decimalDigits, '0');
 
 		return $decimal;
 	}

framework/I18N/core/MessageSource_XLIFF.php

Indentation +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
 
 		//find the body element
 		$xpath = new DomXPath($dom);
-    	$body = $xpath->query('//body')->item(0);
+		$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
 		if(($last=$lastNodes->item(0))!==null) {

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/CultureInfo.php

Indentation +3 added lines, -3 removed lines

@@ -199,9 +199,9 @@
 	}
 
 	/**
-	* Gets the CultureInfo that for this culture string
-	* @return CultureInfo invariant culture info is "en".
-	*/
+	 * Gets the CultureInfo that for this culture string
+	 * @return CultureInfo invariant culture info is "en".
+	 */
 	public static function getInstance($culture)
 	{
 		static $instances = array();

Spacing +76 added lines, -76 removed lines

@@ -56,7 +56,7 @@ 
 	 * The ICU data array.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * The current culture.
@@ -68,13 +68,13 @@ 
 	 * A list of CLDR resource bundles loaded
 	 * @var array
 	 */
-	private $resourceBundles = array();
+	private $resourceBundles=array();
 
 	/**
 	 * A list of resource bundles keys
 	 * @var array
 	 */
-	protected static $bundleNames = array(
+	protected static $bundleNames=array(
 		'Core' => null,
 		'Currencies' => 'ICUDATA-curr',
 		'Languages' => 'ICUDATA-lang',
@@ -98,28 +98,28 @@ 
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * Culture type, all.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const ALL = 0;
+	const ALL=0;
 
 	/**
 	 * Culture type, neutral.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const NEUTRAL = 1;
+	const NEUTRAL=1;
 
 	/**
 	 * Culture type, specific.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const SPECIFIC = 2;
+	const SPECIFIC=2;
 
 	/**
 	 * Display the culture name.
@@ -139,7 +139,7 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -152,7 +152,7 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -170,10 +170,10 @@ 
 	 */
 	function __construct($culture='en')
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($culture))
-			$culture = 'en';
+			$culture='en';
 
 		$this->setCulture($culture);
 
@@ -187,9 +187,9 @@ 
 	*/
 	public static function getInstance($culture)
 	{
-		static $instances = array();
+		static $instances=array();
 		if(!isset($instances[$culture]))
-			$instances[$culture] = new CultureInfo($culture);
+			$instances[$culture]=new CultureInfo($culture);
 		return $instances[$culture];
 	}
 
@@ -213,11 +213,11 @@ 
 	{
 		if(!empty($culture))
 		{
-			if (!preg_match('/^[_\\w]+$/', $culture))
-				throw new Exception('Invalid culture supplied: ' . $culture);
+			if(!preg_match('/^[_\\w]+$/', $culture))
+				throw new Exception('Invalid culture supplied: '.$culture);
 		}
 
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}
 
 	/**
@@ -226,20 +226,20 @@ 
 	 */
 	protected function loadCultureData($cultureName)
 	{
-		$culture_parts = explode('_', $cultureName);
-		$current_part = $culture_parts[0];
+		$culture_parts=explode('_', $cultureName);
+		$current_part=$culture_parts[0];
 
-		$culturesToLoad = array($current_part);
-		for($i = 1, $k = count($culture_parts); $i < $k; ++$i)
+		$culturesToLoad=array($current_part);
+		for($i=1, $k=count($culture_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$culture_parts[$i];
-			$culturesToLoad[] = $current_part;
+			$current_part.='_'.$culture_parts[$i];
+			$culturesToLoad[]=$current_part;
 		}
 
 		foreach(self::$bundleNames as $key => $bundleName)
 		{
 			if(!array_key_exists($key, $this->data))
-				$this->data[$key] = array();
+				$this->data[$key]=array();
 		}
 		foreach($culturesToLoad as $culture)
 		{
@@ -249,7 +249,7 @@ 
 			array_unshift($this->resourceBundles, $culture);
 			foreach(self::$bundleNames as $key => $bundleName)
 			{
-				$this->data[$key][$culture] = \ResourceBundle::create($culture, $bundleName, false);
+				$this->data[$key][$culture]=\ResourceBundle::create($culture, $bundleName, false);
 			}
 		}
 	}
@@ -268,19 +268,19 @@ 
 	 * @param boolean merge the data from its parents.
 	 * @return mixed the specific ICU data.
 	 */
-	public function findInfo($path='/', $merge=false, $key = null)
+	public function findInfo($path='/', $merge=false, $key=null)
 	{
-		$result = array();
+		$result=array();
 
-		if($key === null)
+		if($key===null)
 		{
 			// try to guess the bundle from the path. Always defaults to "Core".
-			$key = 'Core';
+			$key='Core';
 			foreach(self::$bundleNames as $bundleName => $icuBundleName)
 			{
-				if(strpos($path, $bundleName) === 0)
+				if(strpos($path, $bundleName)===0)
 				{
-					$key = $bundleName;
+					$key=$bundleName;
 					break;
 				}
 			}
@@ -290,14 +290,14 @@ 
 			return $result;
 		foreach($this->resourceBundles as $culture)
 		{
-			$res = $this->data[$key][$culture];
-			if($res === null)
+			$res=$this->data[$key][$culture];
+			if($res===null)
 				continue;
-			$info = $this->searchResources($res, $path);
+			$info=$this->searchResources($res, $path);
 			if($info)
 			{
 				if($merge)
-					$result = array_merge($result, $info);
+					$result=array_merge($result, $info);
 				else
 					return $info;
 			}
@@ -316,14 +316,14 @@ 
 	 */
 	private function searchResources($info, $path='/')
 	{
-		$index = explode('/',$path);
+		$index=explode('/', $path);
 
-		$resource = $info;
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		$resource=$info;
+		for($i=0, $k=count($index); $i < $k; ++$i)
 		{
 
-			$resource = $resource->get($index[$i], false);
-			if($resource === null)
+			$resource=$resource->get($index[$i], false);
+			if($resource===null)
 				return null;
 		}
 
@@ -347,7 +347,7 @@ 
 	 */
 	public function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if($this->dateTimeFormat===null)
 		{
 			$this->setDateTimeFormat(new DateTimeFormatInfo($this));
 		}
@@ -361,7 +361,7 @@ 
 	 */
 	public function setDateTimeFormat($dateTimeFormat)
 	{
-		$this->dateTimeFormat = $dateTimeFormat;
+		$this->dateTimeFormat=$dateTimeFormat;
 	}
 
 	/**
@@ -381,10 +381,10 @@ 
 	 */
 	public function getNativeName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$language = $this->findInfo("Languages/{$lang}");
-		$region = $this->findInfo("Countries/{$reg}");
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$language=$this->findInfo("Languages/{$lang}");
+		$region=$this->findInfo("Countries/{$reg}");
 		if($region)
 			return $language.' ('.$region.')';
 		else
@@ -399,15 +399,15 @@ 
 	 */
 	public function getEnglishName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$culture = $this->getInvariantCulture();
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$culture=$this->getInvariantCulture();
 
-		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		$language=$culture->findInfo("Languages/{$lang}");
+		if(count($language)==0)
 			return $this->culture;
 
-		$region = $culture->findInfo("Countries/{$reg}");
+		$region=$culture->findInfo("Countries/{$reg}");
 		if($region)
 			return $language.' ('.$region.')';
 		else
@@ -424,8 +424,8 @@ 
 	static public function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
-			$invariant = new CultureInfo();
+		if($invariant===null)
+			$invariant=new CultureInfo();
 		return $invariant;
 	}
 
@@ -437,7 +437,7 @@ 
 	 */
 	public function getIsNeutralCulture()
 	{
-		return strlen($this->culture) == 2;
+		return strlen($this->culture)==2;
 	}
 
 	/**
@@ -447,7 +447,7 @@ 
 	 */
 	public function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if($this->numberFormat===null)
 		{
 			$this->setNumberFormat(new NumberFormatInfo($this));
 		}
@@ -460,7 +460,7 @@ 
 	 */
 	public function setNumberFormat($numberFormat)
 	{
-		$this->numberFormat = $numberFormat;
+		$this->numberFormat=$numberFormat;
 	}
 
 	/**
@@ -479,10 +479,10 @@ 
 	 */
 	public function getParent()
 	{
-		if(strlen($this->culture) == 2)
+		if(strlen($this->culture)==2)
 			return $this->getInvariantCulture();
 
-		$lang = substr($this->culture,0,2);
+		$lang=substr($this->culture, 0, 2);
 			return new CultureInfo($lang);
 	}
 
@@ -497,7 +497,7 @@ 
 	 */
 	static public function getCultures($type=CultureInfo::ALL)
 	{
-		$all = \ResourceBundle::getLocales('');
+		$all=\ResourceBundle::getLocales('');
 
 		switch($type)
 		{
@@ -506,14 +506,14 @@ 
 			case CultureInfo::NEUTRAL :
 				foreach($all as $key => $culture)
 				{
-					if(strlen($culture) != 2)
+					if(strlen($culture)!=2)
 						unset($all[$key]);
 				}
 				return $all;
 			case CultureInfo::SPECIFIC :
 				foreach($all as $key => $culture)
 				{
-					if(strlen($culture) == 2)
+					if(strlen($culture)==2)
 						unset($all[$key]);
 				}
 				return $all;
@@ -532,19 +532,19 @@ 
 		if(is_scalar($obj)) {
 			return $obj;
 		} elseif($obj instanceof \ResourceBundle) {
-			$array = array();
+			$array=array();
 			foreach($obj as $k => $v)
-				$array[$k] = $v;
+				$array[$k]=$v;
 		} else {
-			$array = $obj;
+			$array=$obj;
 		}
 
-		for($i = 0, $k = count($array); $i<$k; ++$i)
+		for($i=0, $k=count($array); $i < $k; ++$i)
 		{
-			$key = key($array);
+			$key=key($array);
 			if(is_array($array[$key])
-				&& count($array[$key]) == 1)
-				$array[$key] = $array[$key][0];
+				&& count($array[$key])==1)
+				$array[$key]=$array[$key][0];
 			next($array);
 		}
 		return $array;
@@ -566,11 +566,11 @@ 
 	public function getCurrencies()
 	{
 		static $arr;
-		if($arr === null)
+		if($arr===null)
 		{
-			$arr = $this->findInfo('Currencies', true, 'Currencies');
+			$arr=$this->findInfo('Currencies', true, 'Currencies');
 			foreach($arr as $k => $v)
-				$arr[$k] = $this->simplify($v);
+				$arr[$k]=$this->simplify($v);
 		}
 		return $arr;
 	}
@@ -600,17 +600,17 @@ 
 	public function getTimeZones()
 	{
 		static $arr;
-		if($arr === null)
+		if($arr===null)
 		{
-			$validPrefixes = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Etc', 'Europe', 'Indian', 'Pacific');
-			$tmp = $this->findInfo('zoneStrings', true, 'zoneStrings');
+			$validPrefixes=array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Etc', 'Europe', 'Indian', 'Pacific');
+			$tmp=$this->findInfo('zoneStrings', true, 'zoneStrings');
 			foreach($tmp as $k => $v)
 			{
 				foreach($validPrefixes as $prefix)
 				{
-					if(strpos($k, $prefix) === 0)
+					if(strpos($k, $prefix)===0)
 					{
-						$arr[] = str_replace(':', '/', $k);
+						$arr[]=str_replace(':', '/', $k);
 						break;
 					}
 				}

framework/I18N/core/Gettext/TGettext.php

Indentation +209 added lines, -209 removed lines

@@ -58,229 +58,229 @@
  */
 class TGettext
 {
-    /**
-     * strings
-     *
-     * associative array with all [msgid => msgstr] entries
-     *
-     * @access  protected
-     * @var     array
-    */
-    protected $strings = array();
+	/**
+	 * strings
+	 *
+	 * associative array with all [msgid => msgstr] entries
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $strings = array();
 
-    /**
-     * meta
-     *
-     * associative array containing meta
-     * information like project name or content type
-     *
-     * @access  protected
-     * @var     array
-     */
-    protected $meta = array();
+	/**
+	 * meta
+	 *
+	 * associative array containing meta
+	 * information like project name or content type
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $meta = array();
 
-    /**
-     * file path
-     *
-     * @access  protected
-     * @var     string
-     */
-    protected $file = '';
+	/**
+	 * file path
+	 *
+	 * @access  protected
+	 * @var     string
+	 */
+	protected $file = '';
 
-    /**
-     * Factory
-     *
-     * @static
-     * @access  public
-     * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
-     *                  or PEAR_Error on failure.
-     * @param   string  $format MO or PO
-     * @param   string  $file   path to GNU gettext 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");
+	/**
+	 * Factory
+	 *
+	 * @static
+	 * @access  public
+	 * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
+	 *                  or PEAR_Error on failure.
+	 * @param   string  $format MO or PO
+	 * @param   string  $file   path to GNU gettext 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");
 
-        include_once $filename;
-        $class = 'TGettext_' . $format;
+		include_once $filename;
+		$class = 'TGettext_' . $format;
 
-        return new $class($file);
-    }
+		return new $class($file);
+	}
 
-    /**
-     * poFile2moFile
-     *
-     * That's a simple fake of the 'msgfmt' console command.  It reads the
-     * contents of a GNU PO file and saves them to a GNU MO file.
-     *
-     * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $pofile path to GNU PO file
-     * @param   string  $mofile path to GNU MO file
-     */
-    static function poFile2moFile($pofile, $mofile)
-    {
-        if (!is_file($pofile)) {
-            throw new Exception("File $pofile doesn't exist.");
-        }
+	/**
+	 * poFile2moFile
+	 *
+	 * That's a simple fake of the 'msgfmt' console command.  It reads the
+	 * contents of a GNU PO file and saves them to a GNU MO file.
+	 *
+	 * @static
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $pofile path to GNU PO file
+	 * @param   string  $mofile path to GNU MO file
+	 */
+	static function poFile2moFile($pofile, $mofile)
+	{
+		if (!is_file($pofile)) {
+			throw new Exception("File $pofile doesn't exist.");
+		}
 
-        include_once dirname(__FILE__).'/PO.php';
+		include_once dirname(__FILE__).'/PO.php';
 
-        $PO = new TGettext_PO($pofile);
-        if (true !== ($e = $PO->load())) {
-            return $e;
-        }
+		$PO = new TGettext_PO($pofile);
+		if (true !== ($e = $PO->load())) {
+			return $e;
+		}
 
-        $MO = $PO->toMO();
-        if (true !== ($e = $MO->save($mofile))) {
-            return $e;
-        }
-        unset($PO, $MO);
+		$MO = $PO->toMO();
+		if (true !== ($e = $MO->save($mofile))) {
+			return $e;
+		}
+		unset($PO, $MO);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * prepare
-     *
-     * @static
-     * @access  protected
-     * @return  string
-     * @param   string  $string
-     * @param   bool    $reverse
-     */
-    static function prepare($string, $reverse = false)
-    {
-        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", '"');
-            return (string) str_replace($smap, $rmap, $string);
-        }
-    }
+	/**
+	 * prepare
+	 *
+	 * @static
+	 * @access  protected
+	 * @return  string
+	 * @param   string  $string
+	 * @param   bool    $reverse
+	 */
+	static function prepare($string, $reverse = false)
+	{
+		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", '"');
+			return (string) str_replace($smap, $rmap, $string);
+		}
+	}
 
-    /**
-     * meta2array
-     *
-     * @static
-     * @access  public
-     * @return  array
-     * @param   string  $meta
-     */
-    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);
-            }
-        }
-        return $array;
-    }
+	/**
+	 * meta2array
+	 *
+	 * @static
+	 * @access  public
+	 * @return  array
+	 * @param   string  $meta
+	 */
+	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);
+			}
+		}
+		return $array;
+	}
 
-    /**
-     * toArray
-     *
-     * Returns meta info and strings as an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     fromArray()
-     * @access  protected
-     * @return  array
-     */
-    function toArray()
-    {
-    	return array('meta' => $this->meta, 'strings' => $this->strings);
-    }
+	/**
+	 * toArray
+	 *
+	 * Returns meta info and strings as an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     fromArray()
+	 * @access  protected
+	 * @return  array
+	 */
+	function toArray()
+	{
+		return array('meta' => $this->meta, 'strings' => $this->strings);
+	}
 
-    /**
-     * fromArray
-     *
-     * Assigns meta info and strings from an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     toArray()
-     * @access  protected
-     * @return  bool
-     * @param   array       $array
-     */
-    function fromArray($array)
-    {
-    	if (!array_key_exists('strings', $array)) {
-    	    if (count($array) != 2) {
-                return false;
-    	    } else {
-    	        list($this->meta, $this->strings) = $array;
-            }
-    	} else {
-            $this->meta = @$array['meta'];
-            $this->strings = @$array['strings'];
-        }
-        return true;
-    }
+	/**
+	 * fromArray
+	 *
+	 * Assigns meta info and strings from an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     toArray()
+	 * @access  protected
+	 * @return  bool
+	 * @param   array       $array
+	 */
+	function fromArray($array)
+	{
+		if (!array_key_exists('strings', $array)) {
+			if (count($array) != 2) {
+				return false;
+			} else {
+				list($this->meta, $this->strings) = $array;
+			}
+		} else {
+			$this->meta = @$array['meta'];
+			$this->strings = @$array['strings'];
+		}
+		return true;
+	}
 
-    /**
-     * toMO
-     *
-     * @access  protected
-     * @return  object  File_Gettext_MO
-     */
-    function toMO()
-    {
-        include_once dirname(__FILE__).'/MO.php';
-        $MO = new TGettext_MO;
-        $MO->fromArray($this->toArray());
-        return $MO;
-    }
+	/**
+	 * toMO
+	 *
+	 * @access  protected
+	 * @return  object  File_Gettext_MO
+	 */
+	function toMO()
+	{
+		include_once dirname(__FILE__).'/MO.php';
+		$MO = new TGettext_MO;
+		$MO->fromArray($this->toArray());
+		return $MO;
+	}
 
-    /**
-     * toPO
-     *
-     * @access  protected
-     * @return  object      File_Gettext_PO
-     */
-    function toPO()
-    {
-        include_once dirname(__FILE__).'/PO.php';
-        $PO = new TGettext_PO;
-        $PO->fromArray($this->toArray());
-        return $PO;
-    }
+	/**
+	 * toPO
+	 *
+	 * @access  protected
+	 * @return  object      File_Gettext_PO
+	 */
+	function toPO()
+	{
+		include_once dirname(__FILE__).'/PO.php';
+		$PO = new TGettext_PO;
+		$PO->fromArray($this->toArray());
+		return $PO;
+	}
 }

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/MessageSource_MySQL.php

Indentation +36 added lines, -36 removed lines

@@ -92,43 +92,43 @@
 		*/
 		$dsninfo = $this->dns;
 
-     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-            $dbhost = ':' . $dsninfo['socket'];
-        else
-        {
+	 	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
+			$dbhost = ':' . $dsninfo['socket'];
+		else
+		{
 			$dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-            if (!empty($dsninfo['port']))
-                $dbhost .= ':' . $dsninfo['port'];
-        }
-        $user = $dsninfo['username'];
-        $pw = $dsninfo['password'];
-
-        $connect_function = 'mysql_connect';
-
-        if ($dbhost && $user && $pw)
-            $conn = @$connect_function($dbhost, $user, $pw);
-        elseif ($dbhost && $user)
-            $conn = @$connect_function($dbhost, $user);
-        elseif ($dbhost)
-            $conn = @$connect_function($dbhost);
-        else
-            $conn = false;
-
-        if (empty($conn))
-        {
-        	throw new Exception('Error in connecting to '.$dsninfo);
-        }
-
-        if ($dsninfo['database'])
-        {
-        	if (!@mysql_select_db($dsninfo['database'], $conn))
-        		throw new Exception('Error in connecting database, dns:'.
-        							$dsninfo);
-        }
-        else
-        	throw new Exception('Please provide a database for message'.
-        						' translation.');
-       return $conn;
+			if (!empty($dsninfo['port']))
+				$dbhost .= ':' . $dsninfo['port'];
+		}
+		$user = $dsninfo['username'];
+		$pw = $dsninfo['password'];
+
+		$connect_function = 'mysql_connect';
+
+		if ($dbhost && $user && $pw)
+			$conn = @$connect_function($dbhost, $user, $pw);
+		elseif ($dbhost && $user)
+			$conn = @$connect_function($dbhost, $user);
+		elseif ($dbhost)
+			$conn = @$connect_function($dbhost);
+		else
+			$conn = false;
+
+		if (empty($conn))
+		{
+			throw new Exception('Error in connecting to '.$dsninfo);
+		}
+
+		if ($dsninfo['database'])
+		{
+			if (!@mysql_select_db($dsninfo['database'], $conn))
+				throw new Exception('Error in connecting database, dns:'.
+									$dsninfo);
+		}
+		else
+			throw new Exception('Please provide a database for message'.
+								' translation.');
+	   return $conn;
 	}
 
 	/**

Spacing +85 added lines, -85 removed lines

@@ -65,9 +65,9 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->source = (string)$source;
-		$this->dns = parseDSN($this->source);
-		$this->db = $this->connect();
+		$this->source=(string) $source;
+		$this->dns=parseDSN($this->source);
+		$this->db=$this->connect();
 	}
 
 	/**
@@ -90,38 +90,38 @@ 
 		if($conn!==null)
 			return $conn;
 		*/
-		$dsninfo = $this->dns;
+		$dsninfo=$this->dns;
 
-     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-            $dbhost = ':' . $dsninfo['socket'];
+     	if(isset($dsninfo['protocol']) && $dsninfo['protocol']=='unix')
+            $dbhost=':'.$dsninfo['socket'];
         else
         {
-			$dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-            if (!empty($dsninfo['port']))
-                $dbhost .= ':' . $dsninfo['port'];
+			$dbhost=$dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
+            if(!empty($dsninfo['port']))
+                $dbhost.=':'.$dsninfo['port'];
         }
-        $user = $dsninfo['username'];
-        $pw = $dsninfo['password'];
+        $user=$dsninfo['username'];
+        $pw=$dsninfo['password'];
 
-        $connect_function = 'mysql_connect';
+        $connect_function='mysql_connect';
 
-        if ($dbhost && $user && $pw)
-            $conn = @$connect_function($dbhost, $user, $pw);
-        elseif ($dbhost && $user)
-            $conn = @$connect_function($dbhost, $user);
-        elseif ($dbhost)
-            $conn = @$connect_function($dbhost);
+        if($dbhost && $user && $pw)
+            $conn=@$connect_function($dbhost, $user, $pw);
+        elseif($dbhost && $user)
+            $conn=@$connect_function($dbhost, $user);
+        elseif($dbhost)
+            $conn=@$connect_function($dbhost);
         else
-            $conn = false;
+            $conn=false;
 
-        if (empty($conn))
+        if(empty($conn))
         {
         	throw new Exception('Error in connecting to '.$dsninfo);
         }
 
-        if ($dsninfo['database'])
+        if($dsninfo['database'])
         {
-        	if (!@mysql_select_db($dsninfo['database'], $conn))
+        	if(!@mysql_select_db($dsninfo['database'], $conn))
         		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
         }
@@ -148,25 +148,25 @@ 
 	 */
 	protected function &loadData($variant)
 	{
-		$variant = mysql_real_escape_string($variant);
+		$variant=mysql_real_escape_string($variant);
 
-		$statement =
+		$statement=
 			"SELECT t.id, t.source, t.target, t.comments
 				FROM trans_unit t, catalogue c
  				WHERE c.cat_id =  t.cat_id
 					AND c.name = '{$variant}'
 				ORDER BY id ASC";
 
-		$rs = mysql_query($statement,$this->db);
+		$rs=mysql_query($statement, $this->db);
 
-		$result = array();
+		$result=array();
 
-		while($row = mysql_fetch_array($rs,MYSQL_NUM))
+		while($row=mysql_fetch_array($rs, MYSQL_NUM))
 		{
-			$source = $row[1];
-			$result[$source][] = $row[2]; //target
-			$result[$source][] = $row[0]; //id
-			$result[$source][] = $row[3]; //comments
+			$source=$row[1];
+			$result[$source][]=$row[2]; //target
+			$result[$source][]=$row[0]; //id
+			$result[$source][]=$row[3]; //comments
 		}
 
 		return $result;
@@ -180,13 +180,13 @@ 
 	 */
 	protected function getLastModified($source)
 	{
-		$source = mysql_real_escape_string($source);
+		$source=mysql_real_escape_string($source);
 
-		$rs = mysql_query(
+		$rs=mysql_query(
 			"SELECT date_modified FROM catalogue WHERE name = '{$source}'",
 			$this->db);
 
-		$result = $rs ? (int)mysql_result($rs,0) : 0;
+		$result=$rs ? (int) mysql_result($rs, 0) : 0;
 
 		return $result;
 	}
@@ -199,15 +199,15 @@ 
 	 */
 	protected function isValidSource($variant)
 	{
-		$variant = mysql_real_escape_string ($variant);
+		$variant=mysql_real_escape_string($variant);
 
-		$rs = mysql_query(
+		$rs=mysql_query(
 			"SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'",
 			$this->db);
 
-		$row = mysql_fetch_array($rs,MYSQL_NUM);
+		$row=mysql_fetch_array($rs, MYSQL_NUM);
 
-		$result = $row && $row[0] == '1';
+		$result=$row && $row[0]=='1';
 
 		return $result;
 	}
@@ -219,18 +219,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);
@@ -244,27 +244,27 @@ 
 	private function getCatalogueDetails($catalogue='messages')
 	{
 		if(empty($catalogue))
-			$catalogue = 'messages';
+			$catalogue='messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant=$catalogue.'.'.$this->culture;
 
-		$name = mysql_real_escape_string($this->getSource($variant));
+		$name=mysql_real_escape_string($this->getSource($variant));
 
-		$rs = mysql_query("SELECT cat_id
+		$rs=mysql_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $this->db);
 
-		if(mysql_num_rows($rs) != 1)
+		if(mysql_num_rows($rs)!=1)
 			return false;
 
-		$cat_id = (int)mysql_result($rs,0);
+		$cat_id=(int) mysql_result($rs, 0);
 
 		//first get the catalogue ID
-		$rs = mysql_query(
+		$rs=mysql_query(
 			"SELECT count(msg_id)
 				FROM trans_unit
 				WHERE cat_id = {$cat_id}", $this->db);
 
-		$count = (int)mysql_result($rs,0);
+		$count=(int) mysql_result($rs, 0);
 
 		return array($cat_id, $variant, $count);
 	}
@@ -275,9 +275,9 @@ 
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{
-		$time = time();
+		$time=time();
 
-		$result = mysql_query("UPDATE catalogue
+		$result=mysql_query("UPDATE catalogue
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $this->db);
 
@@ -296,27 +296,27 @@ 
 	 */
 	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();
 
 		foreach($messages as $message)
 		{
 			$count++; $inserted++;
-			$message = mysql_real_escape_string($message);
-			$statement = "INSERT INTO trans_unit
+			$message=mysql_real_escape_string($message);
+			$statement="INSERT INTO trans_unit
 				(cat_id,id,source,date_added) VALUES
 				({$cat_id}, {$count},'{$message}',$time)";
 			mysql_query($statement, $this->db);
@@ -335,22 +335,22 @@ 
 	 */
 	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;
 
-		$text = mysql_real_escape_string($message);
+		$text=mysql_real_escape_string($message);
 
-		$statement = "DELETE FROM trans_unit WHERE
+		$statement="DELETE FROM trans_unit WHERE
 						cat_id = {$cat_id} AND source = '{$message}'";
-		$deleted = false;
+		$deleted=false;
 
 		mysql_query($statement, $this->db);
 
-		if(mysql_affected_rows($this->db) == 1)
-			$deleted = $this->updateCatalogueTime($cat_id, $variant);
+		if(mysql_affected_rows($this->db)==1)
+			$deleted=$this->updateCatalogueTime($cat_id, $variant);
 
 		return $deleted;
 
@@ -366,30 +366,30 @@ 
 	 */
 	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;
 
-		$comments = mysql_real_escape_string($comments);
-		$target = mysql_real_escape_string($target);
-		$text = mysql_real_escape_string($text);
+		$comments=mysql_real_escape_string($comments);
+		$target=mysql_real_escape_string($target);
+		$text=mysql_real_escape_string($text);
 
-		$time = time();
+		$time=time();
 
-		$statement = "UPDATE trans_unit SET
+		$statement="UPDATE trans_unit SET
 						target = '{$target}',
 						comments = '{$comments}',
 						date_modified = '{$time}'
 					WHERE cat_id = {$cat_id}
 						AND source = '{$text}'";
 
-		$updated = false;
+		$updated=false;
 
 		mysql_query($statement, $this->db);
-		if(mysql_affected_rows($this->db) == 1)
-			$updated = $this->updateCatalogueTime($cat_id, $variant);
+		if(mysql_affected_rows($this->db)==1)
+			$updated=$this->updateCatalogueTime($cat_id, $variant);
 
 		return $updated;
 	}
@@ -400,15 +400,15 @@ 
 	 */
 	function catalogues()
 	{
-		$statement = 'SELECT name FROM catalogue ORDER BY name';
-		$rs = mysql_query($statement, $this->db);
-		$result = array();
-		while($row = mysql_fetch_array($rs,MYSQL_NUM))
+		$statement='SELECT name FROM catalogue ORDER BY name';
+		$rs=mysql_query($statement, $this->db);
+		$result=array();
+		while($row=mysql_fetch_array($rs, MYSQL_NUM))
 		{
-			$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/Util/TDataFieldAccessor.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 				$tmp = $data;
 				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+					$tmp = $tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))

Spacing +10 added lines, -10 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return mixed value at the specified field
 	 * @throws TInvalidDataValueException if field or data is invalid
 	 */
-	public static function getDataFieldValue($data,$field)
+	public static function getDataFieldValue($data, $field)
 	{
 		try
 		{
@@ -57,33 +57,33 @@ 
 				if(isset($data[$field]))
 					return $data[$field];
 
-				$tmp = $data;
-				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+				$tmp=$data;
+				foreach(explode(".", $field) as $f)
+				    $tmp=$tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))
 			{
-				if(strpos($field,'.')===false)  // simple field
+				if(strpos($field, '.')===false)  // simple field
 				{
 					if(method_exists($data, 'get'.$field))
-						return call_user_func(array($data,'get'.$field));
+						return call_user_func(array($data, 'get'.$field));
 					else
 						return $data->{$field};
 				}
 				else // field in the format of xxx.yyy.zzz
 				{
 					$object=$data;
-					foreach(explode('.',$field) as $f)
-						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					foreach(explode('.', $field) as $f)
+						$object=TDataFieldAccessor::getDataFieldValue($object, $f);
 					return $object;
 				}
 			}
 		}
 		catch(Exception $e)
 		{
-			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field,$e->getMessage());
+			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}
-		throw new TInvalidDataValueException('datafieldaccessor_data_invalid',$field);
+		throw new TInvalidDataValueException('datafieldaccessor_data_invalid', $field);
 	}
 }

framework/Web/Services/TFeedService.php

Indentation +3 added lines, -3 removed lines

@@ -139,9 +139,9 @@
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
-		    //$this->getResponse()->setContentType('application/rss+xml');
-		    $this->getResponse()->setContentType($feed->getContentType());
-		    $this->getResponse()->write($content);
+			//$this->getResponse()->setContentType('application/rss+xml');
+			$this->getResponse()->setContentType($feed->getContentType());
+			$this->getResponse()->write($content);
 		}
 		else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);

Spacing +10 added lines, -10 removed lines

@@ -77,7 +77,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+					$this->_feeds[$id]=$feed;
 			}
 		}
 		else
@@ -110,20 +110,20 @@ 
 		if(isset($this->_feeds[$id]))
 		{
 			$feedConfig=$this->_feeds[$id];
-			$properties = array();
-			$feed = null;
+			$properties=array();
+			$feed=null;
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($feedConfig['class']))
 				{
 					$feed=Prado::createComponent($feedConfig['class']);
 					if($service instanceof IFeedContentProvider)
-						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
+						$properties=isset($feedConfig['properties']) ? $feedConfig['properties'] : array();
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 			else
 			{
@@ -132,15 +132,15 @@ 
 				{
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
-						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
+						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('feedservice_class_required',$id);
+					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
 			// init feed properties
 			foreach($properties as $name=>$value)
-				$feed->setSubproperty($name,$value);
+				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
@@ -149,6 +149,6 @@ 
 		    $this->getResponse()->write($content);
 		}
 		else
-			throw new THttpException(404,'feedservice_feed_unknown',$id);
+			throw new THttpException(404, 'feedservice_feed_unknown', $id);
 	}
 }
\ No newline at end of file