pradosoft / prado

framework/Web/UI/WebControls/TWizard.php

Braces +13 added lines, -26 removed lines

@@ -806,8 +806,7 @@ 
 				$this->_navigation->renderControl($writer);
 				$writer->write("\n</td></tr></table>\n");
 				$this->renderEndTag($writer);
-			}
-			else
+			} else
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -905,8 +904,7 @@ 
 				{
 					$container->setVisible(true);
 					$showStandard=false;
-				}
-				else
+				} else
 					$container->setVisible(false);
 			}
 		}
@@ -1031,11 +1029,9 @@ 
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
-			}
-			else
+			} else
 				return $type;
-		}
-		else
+		} else
 			return $type;
 	}
 
@@ -1102,8 +1098,7 @@ 
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
 			}
-		}
-		else
+		} else
 		{
 			$this->_sideBar=new TPanel;
 			$this->getControls()->add($this->_sideBar);
@@ -1140,8 +1135,7 @@ 
 			{
 				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
 					$this->setActiveStepIndex($newStepIndex);
-			}
-			else
+			} else
 				$this->setActiveStepIndex($stepIndex);
 		}
 	}
@@ -1285,8 +1279,7 @@ 
 				$previousStepIndex=$history->pop();
 				if($activeStepIndex===$previousStepIndex && $history->getCount()>0)
 					$previousStepIndex=$history->pop();
-			}
-			else
+			} else
 			{
 				$previousStepIndex=$history->peek();
 				if($activeStepIndex===$previousStepIndex && $history->getCount()>1)
@@ -1297,8 +1290,7 @@ 
 				}
 			}
 			return $activeStepIndex===$previousStepIndex ? -1 : $previousStepIndex;
-		}
-		else
+		} else
 			return -1;
 	}
 
@@ -1362,8 +1354,7 @@ 
 					$navParam->setNextStepIndex($index+1);
 				$this->onNextButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
+			} else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
 			{
 				if($type!==TWizardStepType::Finish && $type!==TWizardStepType::Step)
 					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS);
@@ -1372,8 +1363,7 @@ 
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_COMPLETE)===0)
+			} else if(strcasecmp($command,self::CMD_COMPLETE)===0)
 			{
 				if($type!==TWizardStepType::Finish)
 					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE);
@@ -1381,8 +1371,7 @@ 
 					$navParam->setNextStepIndex($index+1);
 				$this->onCompleteButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_MOVETO)===0)
+			} else if(strcasecmp($command,self::CMD_MOVETO)===0)
 			{
 				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
@@ -1398,8 +1387,7 @@ 
 						}
 					if ($requestedIndex<0)
 						throw new TConfigurationException('wizard_step_invalid');
-				}
-				else
+				} else
 					$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
 				$handled=true;
@@ -1416,8 +1404,7 @@ 
 							$this->getPreviousStepIndex(true);  // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
-				}
-				else
+				} else
 					$this->setActiveStepIndex($index);
 				return true;
 			}

framework/I18N/core/MessageSource.php

Indentation +6 added lines, -6 removed lines

@@ -110,13 +110,13 @@
 	/**
 	 * Factory method to instantiate a new MessageSource depending on the
 	 * source type. The allowed source types are 'XLIFF', 'PHP', 'gettext' and
-     * 'Database'. The source parameter depends on the source type. 
-     * For 'gettext', 'PHP' and 'XLIFF', 'source' should point to the directory 
-     * where the messages are stored. 
-     * For 'Database', 'source' must be a valid connection id.
+	 * 'Database'. The source parameter depends on the source type. 
+	 * For 'gettext', 'PHP' and 'XLIFF', 'source' should point to the directory 
+	 * where the messages are stored. 
+	 * For 'Database', 'source' must be a valid connection id.
 	 *
- 	 * Custom message source are possible by supplying the a filename parameter
- 	 * in the factory method.
+	 * Custom message source are possible by supplying the a filename parameter
+	 * in the factory method.
 	 * 
 	 * @param string the message source type.
 	 * @param string the location of the resource or the ConnectionID.

framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 				$dt->format('j'),
 				$dt->format('Y')
 			);
-		}
-		else
+		} else
 			return parent::getDateTimeValue($container, $column, $record);
 	}
 }

framework/I18N/core/DateFormat.php

Indentation +18 added lines, -18 removed lines

@@ -82,7 +82,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -310,8 +310,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
@@ -331,10 +331,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
@@ -358,10 +358,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.
@@ -386,7 +386,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
@@ -558,12 +558,12 @@ 
 	protected function getDayInMonth($date, $pattern='FF')
 	{
 		switch ($pattern) {
-		    case 'F':
-		    	return $date->format('j');
-		    case 'FF':
-		    	return $date->format('d');
-		    default:
-		    	throw new Exception('The pattern for day in month is "F" or "FF".');
+			case 'F':
+				return $date->format('j');
+			case 'FF':
+				return $date->format('d');
+			default:
+				throw new Exception('The pattern for day in month is "F" or "FF".');
 		}
 	}
 

framework/Caching/TMemCache.php

Indentation +52 added lines, -52 removed lines

@@ -105,17 +105,17 @@ 
 	 */
 	private $_port=11211;
 
-    private $_timeout = 360;
+	private $_timeout = 360;
 
 	/**
-	* @var integer Controls the minimum value length before attempting to compress automatically.
-	*/
-    private $_threshold=0;
+	 * @var integer Controls the minimum value length before attempting to compress automatically.
+	 */
+	private $_threshold=0;
 
 	/**
-	* @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
-	*/
-    private $_minSavings=0.0;
+	 * @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
+	 */
+	private $_minSavings=0.0;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -159,63 +159,63 @@ 
 		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
-        {
-            foreach($this->_servers as $server)
-            {
-                Prado::trace('Adding server '.$server['Host'].' from serverlist', '\Prado\Caching\TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
-            }
-        }
-        else
-        {
-            Prado::trace('Adding server '.$this->_host, '\Prado\Caching\TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
-        }
+		{
+			foreach($this->_servers as $server)
+			{
+				Prado::trace('Adding server '.$server['Host'].' from serverlist', '\Prado\Caching\TMemCache');
+				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
+					$server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
+					throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+			}
+		}
+		else
+		{
+			Prado::trace('Adding server '.$this->_host, '\Prado\Caching\TMemCache');
+			if($this->_cache->addServer($this->_host,$this->_port)===false)
+				throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+		}
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+			$this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
 
-    /**
+	/**
 	 * Loads configuration from an XML element
 	 * @param TXmlElement configuration node
 	 * @throws TConfigurationException if log route class or type is not specified
 	 */
 	private function loadConfig($xml)
 	{
-	    if($xml instanceof TXmlElement)
+		if($xml instanceof TXmlElement)
 		{
-    		foreach($xml->getElementsByTagName('server') as $serverConfig)
-    		{
-    			$properties=$serverConfig->getAttributes();
-    			if(($host=$properties->remove('Host'))===null)
-    				throw new TConfigurationException('memcache_serverhost_required');
-    			if(($port=$properties->remove('Port'))===null)
-        			throw new TConfigurationException('memcache_serverport_required');
-        		if(!is_numeric($port))
-        		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
-        		    'Weight'=>'memcache_serverweight_invalid',
-        		    'Timeout'=>'memcache_servertimeout_invalid',
-        		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
-        		);
-        		foreach($checks as $property=>$exception)
-        		{
-        		    $value=$properties->remove($property);
-        		    if($value!==null && is_numeric($value))
-        		        $server[$property]=$value;
-        		    else if($value!==null)
-        		        throw new TConfigurationException($exception);
-        		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
-    			$this->_servers[]=$server;
-    		}
-	    }
+			foreach($xml->getElementsByTagName('server') as $serverConfig)
+			{
+				$properties=$serverConfig->getAttributes();
+				if(($host=$properties->remove('Host'))===null)
+					throw new TConfigurationException('memcache_serverhost_required');
+				if(($port=$properties->remove('Port'))===null)
+					throw new TConfigurationException('memcache_serverport_required');
+				if(!is_numeric($port))
+					throw new TConfigurationException('memcache_serverport_invalid');
+				$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
+				$checks = array(
+					'Weight'=>'memcache_serverweight_invalid',
+					'Timeout'=>'memcache_servertimeout_invalid',
+					'RetryInterval'=>'memcach_serverretryinterval_invalid'
+				);
+				foreach($checks as $property=>$exception)
+				{
+					$value=$properties->remove($property);
+					if($value!==null && is_numeric($value))
+						$server[$property]=$value;
+					else if($value!==null)
+						throw new TConfigurationException($exception);
+				}
+				$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+				$this->_servers[]=$server;
+			}
+		}
 	}
 
 	/**