pradosoft / prado

framework/Wsat/pages/TWsatLogin.php

Spacing +6 added lines, -6 removed lines

@@ -18,19 +18,19 @@
 
 		public function login()
 		{
-				if ($this->IsValid)
+				if($this->IsValid)
 				{
-						$this->Session["wsat_password"] = $this->getService()->getPassword();
-						$url = $this->Service->constructUrl('TWsatHome');
+						$this->Session["wsat_password"]=$this->getService()->getPassword();
+						$url=$this->Service->constructUrl('TWsatHome');
 						$this->Response->redirect($url);
 				}
 		}
 
 		public function validatePassword($sender, $param)
 		{
-				$config_pass = $this->Service->Password;
-				$user_pass = $this->password->Text;
-				$param->IsValid = $user_pass === $config_pass;
+				$config_pass=$this->Service->Password;
+				$user_pass=$this->password->Text;
+				$param->IsValid=$user_pass===$config_pass;
 		}
 
 }
\ No newline at end of file

framework/Wsat/TWsatService.php

Spacing +10 added lines, -10 removed lines

@@ -43,15 +43,15 @@ 
  */
 class TWsatService extends TPageService
 {
-		const PAGE_NAMESPACE_PREFIX = 'Prado\\Wsat\\pages\\';
-		private $_pass = '';
+		const PAGE_NAMESPACE_PREFIX='Prado\\Wsat\\pages\\';
+		private $_pass='';
 
 		public function init($config)
 		{
-				if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
+				if($this->getApplication()->getMode()===TApplicationMode::Performance || $this->getApplication()->getMode()===TApplicationMode::Normal)
 						throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
 
-				if (empty($this->_pass))
+				if(empty($this->_pass))
 						throw new TConfigurationException("You need to specify the Password attribute.");
 
 				$this->setDefaultPage("TWsatHome");
@@ -61,16 +61,16 @@ 
 
 		public function getBasePath()
 		{
-				$basePath = Prado::getPathOfNamespace("System.Wsat.pages");
+				$basePath=Prado::getPathOfNamespace("System.Wsat.pages");
 				return realpath($basePath);
 		}
 
 		private function _startThemeManager()
 		{
-				$themeManager = new TThemeManager;
-				$themeManager->BasePath = "System.Wsat.themes";
-				$url = Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
-				$themeManager->BaseUrl = "$url/themes";
+				$themeManager=new TThemeManager;
+				$themeManager->BasePath="System.Wsat.themes";
+				$url=Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
+				$themeManager->BaseUrl="$url/themes";
 
 				$themeManager->init(null);
 				$this->setThemeManager($themeManager);
@@ -83,7 +83,7 @@ 
 
 		public function setPassword($_pass)
 		{
-				$this->_pass = $_pass;
+				$this->_pass=$_pass;
 		}
 
 }
\ No newline at end of file

framework/Wsat/TWsatBaseGenerator.php

Spacing +17 added lines, -17 removed lines

@@ -33,31 +33,31 @@ 
 
 	public function __construct()
 	{
-		if (!class_exists("TActiveRecordManager", false))
+		if(!class_exists("TActiveRecordManager", false))
 			throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
-		$ar_manager = TActiveRecordManager::getInstance();
-		$_conn = $ar_manager->getDbConnection();
-		$_conn->Active = true;
-		$this->_dbMetaData = TDbMetaData::getInstance($_conn);
+		$ar_manager=TActiveRecordManager::getInstance();
+		$_conn=$ar_manager->getDbConnection();
+		$_conn->Active=true;
+		$this->_dbMetaData=TDbMetaData::getInstance($_conn);
 	}
 
 	public function setOpFile($op_file_namespace)
 	{
-		$op_file = Prado::getPathOfNamespace($op_file_namespace);
-		if (empty($op_file))
+		$op_file=Prado::getPathOfNamespace($op_file_namespace);
+		if(empty($op_file))
 			throw new Exception("You need to fix your output folder namespace.");
-		if (!is_dir($op_file))
+		if(!is_dir($op_file))
 			mkdir($op_file, 0777, true);
-		$this->_opFile = $op_file;
+		$this->_opFile=$op_file;
 	}
 
 	public function renderAllTablesInformation()
 	{
-		foreach ($this->getAllTableNames() as $table_name)
+		foreach($this->getAllTableNames() as $table_name)
 		{
-			echo $table_name . "<br>";
-			$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-			echo "Table info:" . "<br>";
+			echo $table_name."<br>";
+			$tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+			echo "Table info:"."<br>";
 			echo "<pre>";
 			print_r($tableInfo);
 			echo "</pre>";
@@ -66,9 +66,9 @@ 
 
 	public function getAllTableNames()
 	{
-		$tableNames = $this->_dbMetaData->findTableNames();
-		$index = array_search('pradocache', $tableNames);
-		if ($index)
+		$tableNames=$this->_dbMetaData->findTableNames();
+		$index=array_search('pradocache', $tableNames);
+		if($index)
 			array_splice($tableNames, $index, 1);
 		return $tableNames;
 	}
@@ -82,6 +82,6 @@ 
 
 	protected function eq($data)
 	{
-		return '"' . $data . '"';
+		return '"'.$data.'"';
 	}
 }

framework/Wsat/TWsatARGenerator.php

Spacing +59 added lines, -59 removed lines

@@ -38,7 +38,7 @@ 
 		 * unquote chars
 		 * @var array
 		 */
-		private $uqChars = ['[', ']', '"', '`', "'"];
+		private $uqChars=['[', ']', '"', '`', "'"];
 
 		public function __construct()
 		{
@@ -47,31 +47,31 @@ 
 
 		public function setClasPrefix($_clas_prefix)
 		{
-				$this->_clasPrefix = $_clas_prefix;
+				$this->_clasPrefix=$_clas_prefix;
 		}
 
 		public function setClassSufix($_clas_sufix)
 		{
-				$this->_classSufix = $_clas_sufix;
+				$this->_classSufix=$_clas_sufix;
 		}
 
 //-----------------------------------------------------------------------------
 		// <editor-fold defaultstate="collapsed" desc="Main APIs">
 		public function generate($tableName)
 		{
-				$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+				$tableInfo=$this->_dbMetaData->getTableInfo($tableName);
 				$this->_commonGenerate($tableName, $tableInfo);
 		}
 
 		public function generateAll()
 		{
-				foreach ($this->getAllTableNames() as $tableName)
+				foreach($this->getAllTableNames() as $tableName)
 				{
-						$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-						if (!empty($this->_relations))
+						$tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+						if(!empty($this->_relations))
 						{
 								// Cancel generation of M-M relationships middle table
-								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+								if(count($tableInfo->getPrimaryKeys())===2 && count($tableInfo->getColumns())===2)//M-M relationships
 										continue;
 						}
 						$this->_commonGenerate($tableName, $tableInfo);
@@ -80,26 +80,26 @@ 
 
 		public function buildRelations()
 		{
-				$this->_relations = [];
-				foreach ($this->getAllTableNames() as $table_name)
+				$this->_relations=[];
+				foreach($this->getAllTableNames() as $table_name)
 				{
-						$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-						$pks = $tableInfo->getPrimaryKeys();
-						$fks = $tableInfo->getForeignKeys();
+						$tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+						$pks=$tableInfo->getPrimaryKeys();
+						$fks=$tableInfo->getForeignKeys();
 
-						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+						if(count($pks)===2 && count($tableInfo->getColumns())===2)//M-M relationships
 						{
-								$table_name_mm = $fks[0]["table"];
-								$table_name_mm2 = $fks[1]["table"];
+								$table_name_mm=$fks[0]["table"];
+								$table_name_mm2=$fks[1]["table"];
 
-								$this->_relations[$table_name_mm][] = [
+								$this->_relations[$table_name_mm][]=[
 										"prop_name" => strtolower($table_name_mm2),
 										"rel_type" => "self::MANY_TO_MANY",
 										"ref_class_name" => $this->_getProperClassName($table_name_mm2),
 										"prop_ref" => $table_name
 								];
 
-								$this->_relations[$table_name_mm2][] = [
+								$this->_relations[$table_name_mm2][]=[
 										"prop_name" => strtolower($table_name_mm),
 										"rel_type" => "self::MANY_TO_MANY",
 										"ref_class_name" => $this->_getProperClassName($table_name_mm),
@@ -107,20 +107,20 @@ 
 								];
 								continue;
 						}
-						foreach ($fks as $fk_data)//1-M relationships
+						foreach($fks as $fk_data)//1-M relationships
 						{
-								$owner_table = $fk_data["table"];
-								$slave_table = $table_name;
-								$fk_prop = key($fk_data["keys"]);
+								$owner_table=$fk_data["table"];
+								$slave_table=$table_name;
+								$fk_prop=key($fk_data["keys"]);
 
-								$this->_relations[$owner_table][] = [
+								$this->_relations[$owner_table][]=[
 										"prop_name" => strtolower($slave_table),
 										"rel_type" => "self::HAS_MANY",
 										"ref_class_name" => $this->_getProperClassName($slave_table),
 										"prop_ref" => $fk_prop
 								];
 
-								$this->_relations[$slave_table][] = [
+								$this->_relations[$slave_table][]=[
 										"prop_name" => strtolower($owner_table),
 										"rel_type" => "self::BELONGS_TO",
 										"ref_class_name" => $this->_getProperClassName($owner_table),
@@ -136,88 +136,88 @@ 
 
 		private function _commonGenerate($tableName, $tableInfo)
 		{
-				if (count($tableInfo->getColumns()) === 0)
-						throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+				if(count($tableInfo->getColumns())===0)
+						throw new Exception("Unable to find table or view $tableName in ".$this->_dbMetaData->getDbConnection()->getConnectionString().".");
 				else
 				{
-						$properties = [];
-						foreach ($tableInfo->getColumns() as $field => $metadata)
-								$properties[] = $this->generateProperty($field, $metadata);
-						$toString = $this->_buildSmartToString($tableInfo);
+						$properties=[];
+						foreach($tableInfo->getColumns() as $field => $metadata)
+								$properties[]=$this->generateProperty($field, $metadata);
+						$toString=$this->_buildSmartToString($tableInfo);
 				}
 
-				$clasName = $this->_getProperClassName($tableName);
-				$class = $this->generateClass($properties, $tableName, $clasName, $toString);
-				$output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+				$clasName=$this->_getProperClassName($tableName);
+				$class=$this->generateClass($properties, $tableName, $clasName, $toString);
+				$output=$this->_opFile.DIRECTORY_SEPARATOR.$clasName.".php";
 				file_put_contents($output, $class);
 		}
 
 		private function _getProperClassName($tableName)
 		{
-				$table_name_words = str_replace("_", " ", strtolower($tableName));
-				$final_conversion = str_replace(" ", "", ucwords($table_name_words));
-				return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+				$table_name_words=str_replace("_", " ", strtolower($tableName));
+				$final_conversion=str_replace(" ", "", ucwords($table_name_words));
+				return $this->_clasPrefix.$final_conversion.$this->_classSufix;
 		}
 
 //-----------------------------------------------------------------------------
 
 		protected function generateProperty($field, $metadata)
 		{
-				$prop = '';
-				$name = '$' . $field;
+				$prop='';
+				$name='$'.$field;
 
 				/* TODO use in version 2.0 */
 				// $type = $column->getPHPType();
 
-				$prop .= "\tpublic $name;";
+				$prop.="\tpublic $name;";
 				return $prop;
 		}
 
 		private function _renderRelations($tablename)
 		{
-				if (!isset($this->_relations[$tablename]))
+				if(!isset($this->_relations[$tablename]))
 						return "";
 
-				$code = "\tpublic static \$RELATIONS = array (";
-				foreach ($this->_relations[$tablename] as $rel_data)
-						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+				$code="\tpublic static \$RELATIONS = array (";
+				foreach($this->_relations[$tablename] as $rel_data)
+						$code.="\n\t\t'".$rel_data["prop_name"]."' => array(".$rel_data["rel_type"].", '".$rel_data["ref_class_name"]."', '".$rel_data["prop_ref"]."'),";
 
-				$code = substr($code, 0, -1);
-				$code .= "\n\t);";
+				$code=substr($code, 0, -1);
+				$code.="\n\t);";
 				return $code;
 		}
 
 		private function _buildSmartToString($tableInfo)
 		{
-				$code = "\tpublic function __toString() {";
-				$property = "throw new THttpException(500, 'Not implemented yet.');";
+				$code="\tpublic function __toString() {";
+				$property="throw new THttpException(500, 'Not implemented yet.');";
 				try
 				{
-						foreach ($tableInfo->getColumns() as $column)
+						foreach($tableInfo->getColumns() as $column)
 						{
-								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-										$property = str_replace($this->uqChars, "", $column->ColumnName);
-								elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+								if(isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+										$property=str_replace($this->uqChars, "", $column->ColumnName);
+								elseif($column->PdoType==PDO::PARAM_STR && $column->DBType!="date")
 								{
-										$property = str_replace($this->uqChars, "", $column->ColumnName);
+										$property=str_replace($this->uqChars, "", $column->ColumnName);
 										break;
 								}
 						}
-				} catch (Exception $ex)
+				} catch(Exception $ex)
 				{
 						Prado::trace($ex->getMessage());
 				}
-				$code .= "\n\t\treturn \$this->$property;";
-				$code .= "\n\t}";
+				$code.="\n\t\treturn \$this->$property;";
+				$code.="\n\t}";
 				return $code;
 		}
 
 		protected function generateClass($properties, $tablename, $classname, $toString)
 		{
-				$props = implode("\n", $properties);
-				$relations = $this->_renderRelations($tablename);
-				$date = date('Y-m-d h:i:s');
-				$env_user = getenv("username");
+				$props=implode("\n", $properties);
+				$relations=$this->_renderRelations($tablename);
+				$date=date('Y-m-d h:i:s');
+				$env_user=getenv("username");
 				return <<<EOD
 <?php
 /**

framework/Util/TRpcClient.php

Spacing +10 added lines, -10 removed lines

@@ -58,7 +58,7 @@ 
 	/**
 	 * @var boolean whether the request is a notification and therefore should not care about the result (default: false)
 	 */
-	private $_isNotification = false;
+	private $_isNotification=false;
 
 	// magics
 
@@ -66,10 +66,10 @@ 
 	 * @param string url to RPC server
 	 * @param boolean whether requests are considered to be notifications (completely ignoring the response) (default: false)
 	 */
-	public function __construct($serverUrl, $isNotification = false)
+	public function __construct($serverUrl, $isNotification=false)
 	{
-		$this->_serverUrl = $serverUrl;
-		$this->_isNotification = TPropertyValue::ensureBoolean($isNotification);
+		$this->_serverUrl=$serverUrl;
+		$this->_isNotification=TPropertyValue::ensureBoolean($isNotification);
 	}
 
 	// methods
@@ -79,9 +79,9 @@ 
 	 * @return TRpcClient instance
 	 * @throws TApplicationException if an unsupported RPC client type was specified
 	 */
-	public static function create($type, $serverUrl, $isNotification = false)
+	public static function create($type, $serverUrl, $isNotification=false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::' . strtoupper($type))) === null)
+		if(($_handler=constant('TRpcClientTypesEnumerable::'.strtoupper($type)))===null)
 			throw new TApplicationException('rpcclient_unsupported_handler');
 
 		return new $_handler($serverUrl, $isNotification);
@@ -111,8 +111,8 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
-			throw new TRpcClientRequestException('Request failed ("' . $http_response_header[0] . '")');
+		if(($_response=@file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType)))===false)
+			throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
 
 		return $_response;
 	}
@@ -132,7 +132,7 @@ 
 	 */
 	public function setIsNotification($bool)
 	{
-		$this->_isNotification = TPropertyValue::ensureBoolean($bool);
+		$this->_isNotification=TPropertyValue::ensureBoolean($bool);
 	}
 
 	/**
@@ -148,6 +148,6 @@ 
 	 */
 	public function setServerUrl($value)
 	{
-		$this->_serverUrl = $value;
+		$this->_serverUrl=$value;
 	}
 }
\ No newline at end of file

framework/Util/TJsonRpcClient.php

Spacing +5 added lines, -5 removed lines

@@ -43,18 +43,18 @@ 
 	public function __call($method, $parameters)
 	{
 		// send request
-		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'application/json');
+		$_response=$this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'application/json');
 
 		// skip response handling if the request was just a notification request
 		if($this->isNotification)
 			return true;
 
 		// decode response
-		if(($_response = json_decode($_response, true)) === null)
+		if(($_response=json_decode($_response, true))===null)
 			throw new TRpcClientResponseException('Empty response received');
 
 		// handle error response
-		if(null !== $_response['error'])
+		if(null!==$_response['error'])
 			throw new TRpcClientResponseException($_response['error']);
 
 		return $_response['result'];
@@ -69,7 +69,7 @@ 
 	public function encodeRequest($method, $parameters)
 	{
 		static $_requestId;
-		$_requestId = ($_requestId === null) ? 1 : $_requestId + 1;
+		$_requestId=($_requestId===null) ? 1 : $_requestId + 1;
 
 		return json_encode([
 			'method' => $method,
@@ -83,7 +83,7 @@ 
 	 * @param string url of the rpc server
 	 * @param boolean whether the requests are considered to be notifications (completely ignoring the response) (default: false)
 	 */
-	public static function create($type, $serverUrl, $isNotification = false)
+	public static function create($type, $serverUrl, $isNotification=false)
 	{
 		return new self($serverUrl, $isNotification);
 	}

framework/Util/TFirebugLogRoute.php

Spacing +13 added lines, -13 removed lines

@@ -24,9 +24,9 @@ 
  */
 class TFirebugLogRoute extends TBrowserLogRoute
 {
-	protected function renderHeader ()
+	protected function renderHeader()
 	{
-		$string = <<<EOD
+		$string=<<<EOD
 
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -39,23 +39,23 @@ 
 		return $string;
 	}
 
-	protected function renderMessage ($log, $info)
+	protected function renderMessage($log, $info)
 	{
-		$logfunc = $this->getFirebugLoggingFunction($log[1]);
-		$total = sprintf('%0.6f', $info['total']);
-		$delta = sprintf('%0.6f', $info['delta']);
-		$msg = trim($this->formatLogMessage($log[0], $log[1], $log[2], ''));
-		$msg = preg_replace('/\(line[^\)]+\)$/', '', $msg); //remove line number info
-		$msg = "[{$total}] [{$delta}] " . $msg; // Add time spent and cumulated time spent
-		$string = $logfunc . '(\'' . addslashes($msg) . '\');' . "\n";
+		$logfunc=$this->getFirebugLoggingFunction($log[1]);
+		$total=sprintf('%0.6f', $info['total']);
+		$delta=sprintf('%0.6f', $info['delta']);
+		$msg=trim($this->formatLogMessage($log[0], $log[1], $log[2], ''));
+		$msg=preg_replace('/\(line[^\)]+\)$/', '', $msg); //remove line number info
+		$msg="[{$total}] [{$delta}] ".$msg; // Add time spent and cumulated time spent
+		$string=$logfunc.'(\''.addslashes($msg).'\');'."\n";
 
 		return $string;
 	}
 
 
-	protected function renderFooter ()
+	protected function renderFooter()
 	{
-		$string = <<<EOD
+		$string=<<<EOD
 
 }
 </script>
@@ -67,7 +67,7 @@ 
 
 	protected function getFirebugLoggingFunction($level)
 	{
-		switch ($level)
+		switch($level)
 		{
 			case TLogger::DEBUG:
 			case TLogger::INFO:

framework/Data/Common/Sqlite/TSqliteTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 	/**
 	 * @TODO add sqlite types.
 	 */
-	private static $types = [];
+	private static $types=[];
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.
@@ -38,7 +38,7 @@ 
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

framework/Data/Common/Sqlite/TSqliteTableInfo.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	 */
 	public function getTableFullName()
 	{
-		return "'" . $this->getTableName() . "'";
+		return "'".$this->getTableName()."'";
 	}
 }