tnhfw / tnh-fw

core/classes/Url.php

Spacing +23 added lines, -23 removed lines

@@ -25,15 +25,15 @@ 
 	*/
 
 
-	class Url{
+	class Url {
 
 		/**
 		 * Return the link using base_url config without front controller "index.php"
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function base_url($path = ''){
-			if(is_url($path)){
+		public static function base_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			return get_config('base_url') . $path;
@@ -44,26 +44,26 @@ 
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function site_url($path = ''){
-			if(is_url($path)){
+		public static function site_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			$path = rtrim($path, '/');
 			$baseUrl = get_config('base_url');
 			$frontController = get_config('front_controller');
 			$url = $baseUrl;
-			if($frontController){
+			if ($frontController) {
 				$url .= $frontController . '/';
 			}
-			if(($suffix = get_config('url_suffix')) && $path){
-				if(strpos($path, '?') !== false){
+			if (($suffix = get_config('url_suffix')) && $path) {
+				if (strpos($path, '?') !== false) {
 					$query = explode('?', $path);
 					$query[0] = str_ireplace($suffix, '', $query[0]);
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
 				}
-				else{
+				else {
 					$path .= $suffix;
 				}
 			}
@@ -74,10 +74,10 @@ 
 		 * Return the current site URL
 		 * @return string
 		 */
-		public static function current(){
+		public static function current() {
 			$current = '/';
 			$requestUri = get_instance()->request->requestUri();
-			if($requestUri){
+			if ($requestUri) {
 				$current = $requestUri;
 			}
 			return static::domain() . $current;
@@ -90,18 +90,18 @@ 
 		 * @param  boolean $lowercase whether to set the final text to lowe case or not
 		 * @return string the friendly generated text
 		 */
-		public static function title($str = null, $separator = '-', $lowercase = true){
+		public static function title($str = null, $separator = '-', $lowercase = true) {
 			$str = trim($str);
-			$from = array('ç','À','Á','Â','Ã','Ä','Å','à','á','â','ã','ä','å','Ò','Ó','Ô','Õ','Ö','Ø','ò','ó','ô','õ','ö','ø','È','É','Ê','Ë','è','é','ê','ë','Ç','ç','Ì','Í','Î','Ï','ì','í','î','ï','Ù','Ú','Û','Ü','ù','ú','û','ü','ÿ','Ñ','ñ');
-			$to = array('c','a','a','a','a','a','a','a','a','a','a','a','a','o','o','o','o','o','o','o','o','o','o','o','o','e','e','e','e','e','e','e','e','e','e','i','i','i','i','i','i','i','i','u','u','u','u','u','u','u','u','y','n','n');
+			$from = array('ç', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'à', 'á', 'â', 'ã', 'ä', 'å', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'È', 'É', 'Ê', 'Ë', 'è', 'é', 'ê', 'ë', 'Ç', 'ç', 'Ì', 'Í', 'Î', 'Ï', 'ì', 'í', 'î', 'ï', 'Ù', 'Ú', 'Û', 'Ü', 'ù', 'ú', 'û', 'ü', 'ÿ', 'Ñ', 'ñ');
+			$to = array('c', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'y', 'n', 'n');
 			$str = str_replace($from, $to, $str);
 			$str = preg_replace('#([^a-z0-9]+)#i', $separator, $str);
 			$str = str_replace('--', $separator, $str);
 			//if after process we get something like one-two-three-, need truncate the last separator "-"
-			if(substr($str, -1) == $separator){
+			if (substr($str, -1) == $separator) {
 				$str = substr($str, 0, -1);
 			}
-			if($lowercase){
+			if ($lowercase) {
 				$str = strtolower($str);
 			}
 			return $str;
@@ -111,11 +111,11 @@ 
 		 * Get the current application domain with protocol
 		 * @return string the domain name
 		 */
-		public static function domain(){
+		public static function domain() {
 			$domain = 'localhost';
 			$port = get_instance()->request->server('SERVER_PORT');
 			$protocol = 'http';
-			if(is_https()){
+			if (is_https()) {
 				$protocol = 'https';
 			}
 
@@ -127,23 +127,23 @@ 
 
 			foreach ($domainserverVars as $var) {
 				$value = get_instance()->request->server($var);
-				if($value){
+				if ($value) {
 					$domain = $value;
 					break;
 				}
 			}
 			
-			if($port && ((is_https() && $port != 443) || (!is_https() && $port != 80))){
-				$domain .= ':'.$port;
+			if ($port && ((is_https() && $port != 443) || (!is_https() && $port != 80))) {
+				$domain .= ':' . $port;
 			}
-			return $protocol.'://'.$domain;
+			return $protocol . '://' . $domain;
 		}
 
 		/**
 		 * Get the current request query string
 		 * @return string
 		 */
-		public static function queryString(){
+		public static function queryString() {
 			return get_instance()->request->server('QUERY_STRING');
 		}
 	}

core/classes/database/Database.php

Spacing +94 added lines, -94 removed lines

@@ -23,105 +23,105 @@ 
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
-  class Database{
+  class Database {
 	
   	/**
   	 * The PDO instance
   	 * @var object
   	*/
-    private $pdo                 = null;
+    private $pdo = null;
     
   	/**
   	 * The database name used for the application
   	 * @var string
   	*/
-	  private $databaseName        = null;
+	  private $databaseName = null;
 	
   	/**
   	 * The number of rows returned by the last query
   	 * @var int
   	*/
-    private $numRows             = 0;
+    private $numRows = 0;
 	
   	/**
   	 * The last insert id for the primary key column that have auto increment or sequence
   	 * @var mixed
   	*/
-    private $insertId            = null;
+    private $insertId = null;
 	
   	/**
   	 * The full SQL query statment after build for each command
   	 * @var string
   	*/
-    private $query               = null;
+    private $query = null;
 	
   	/**
   	 * The result returned for the last query
   	 * @var mixed
   	*/
-    private $result              = array();
+    private $result = array();
 	
   	/**
   	 * The cache default time to live in second. 0 means no need to use the cache feature
   	 * @var int
   	*/
-  	private $cacheTtl             = 0;
+  	private $cacheTtl = 0;
 	
   	/**
   	 * The cache current time to live. 0 means no need to use the cache feature
   	 * @var int
   	*/
-    private $temporaryCacheTtl   = 0;
+    private $temporaryCacheTtl = 0;
 	
   	/**
   	 * The number of executed query for the current request
   	 * @var int
   	*/
-    private $queryCount          = 0;
+    private $queryCount = 0;
 	
   	/**
   	 * The default data to be used in the statments query INSERT, UPDATE
   	 * @var array
   	*/
-    private $data                = array();
+    private $data = array();
 	
   	/**
   	 * The database configuration
   	 * @var array
   	*/
-    private $config              = array();
+    private $config = array();
 	
   	/**
   	 * The logger instance
   	 * @var object
   	 */
-    private $logger              = null;
+    private $logger = null;
 
     /**
     * The cache instance
     * @var object
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
     
   	/**
     * The DatabaseQueryBuilder instance
     * @var object
     */
-    private $queryBuilder        = null;
+    private $queryBuilder = null;
     
     /**
     * The DatabaseQueryRunner instance
     * @var object
     */
-    private $queryRunner         = null;
+    private $queryRunner = null;
 
 
     /**
      * Construct new database
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      */
-    public function __construct($overwriteConfig = array()){
+    public function __construct($overwriteConfig = array()) {
         //Set Log instance to use
         $this->setLoggerFromParamOrCreateNewInstance(null);
 		
@@ -142,17 +142,17 @@ 
      * This is used to connect to database
      * @return bool 
      */
-    public function connect(){
+    public function connect() {
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        try{
+      if (!empty($config)) {
+        try {
             $this->pdo = new PDO($this->getDsnFromDriver(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
           }
-          catch (PDOException $e){
+          catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
@@ -166,7 +166,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -174,7 +174,7 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
@@ -185,10 +185,10 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function get($returnSQLQueryOrResultType = false){
+    public function get($returnSQLQueryOrResultType = false) {
       $this->getQueryBuilder()->limit(1);
       $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       } else {
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
@@ -201,9 +201,9 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function getAll($returnSQLQueryOrResultType = false){
+    public function getAll($returnSQLQueryOrResultType = false) {
 	   $query = $this->getQueryBuilder()->getQuery();
-	   if ($returnSQLQueryOrResultType === true){
+	   if ($returnSQLQueryOrResultType === true) {
       	return $query;
       }
       return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
@@ -215,18 +215,18 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the insert id of the new record or null
      */
-    public function insert($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+    public function insert($data = array(), $escape = true) {
+      if (empty($data) && $this->getData()) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
       }
       $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
       $result = $this->query($query);
-      if ($result){
+      if ($result) {
         $this->insertId = $this->pdo->lastInsertId();
 		    //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-        return ! $this->insertId() ? true : $this->insertId();
+        return !$this->insertId() ? true : $this->insertId();
       }
       return false;
     }
@@ -237,8 +237,8 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+    public function update($data = array(), $escape = true) {
+      if (empty($data) && $this->getData()) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
@@ -251,7 +251,7 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
 		$query = $this->getQueryBuilder()->delete()->getQuery();
     	return $this->query($query);
     }
@@ -261,8 +261,8 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
-      if ($ttl > 0){
+    public function setCache($ttl = 0) {
+      if ($ttl > 0) {
         $this->cacheTtl = $ttl;
         $this->temporaryCacheTtl = $ttl;
       }
@@ -274,8 +274,8 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-  	public function cached($ttl = 0){
-        if ($ttl > 0){
+  	public function cached($ttl = 0) {
+        if ($ttl > 0) {
           $this->temporaryCacheTtl = $ttl;
         }
         return $this;
@@ -287,7 +287,7 @@ 
      * @param boolean $escaped whether we can do escape of not 
      * @return mixed       the data after escaped or the same data if not
      */
-    public function escape($data, $escaped = true){
+    public function escape($data, $escaped = true) {
       return $escaped ? 
                       $this->pdo->quote(trim($data)) 
                       : $data; 
@@ -297,7 +297,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -305,7 +305,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -313,7 +313,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -321,7 +321,7 @@ 
      * Return the PDO instance
      * @return object
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -330,7 +330,7 @@ 
      * @param object $pdo the pdo object
 	 * @return object Database
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -340,7 +340,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -349,7 +349,7 @@ 
      * @param Log $logger the log object
 	 * @return object Database
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -358,7 +358,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -367,7 +367,7 @@ 
      * @param CacheInterface $cache the cache object
 	 * @return object Database
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -377,7 +377,7 @@ 
      * Return the DatabaseQueryBuilder instance
      * @return object DatabaseQueryBuilder
      */
-    public function getQueryBuilder(){
+    public function getQueryBuilder() {
       return $this->queryBuilder;
     }
 
@@ -385,7 +385,7 @@ 
      * Set the DatabaseQueryBuilder instance
      * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
      */
-    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
+    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder) {
       $this->queryBuilder = $queryBuilder;
       return $this;
     }
@@ -394,7 +394,7 @@ 
      * Return the DatabaseQueryRunner instance
      * @return object DatabaseQueryRunner
      */
-    public function getQueryRunner(){
+    public function getQueryRunner() {
       return $this->queryRunner;
     }
 
@@ -402,7 +402,7 @@ 
      * Set the DatabaseQueryRunner instance
      * @param object DatabaseQueryRunner $queryRunner the DatabaseQueryRunner object
      */
-    public function setQueryRunner(DatabaseQueryRunner $queryRunner){
+    public function setQueryRunner(DatabaseQueryRunner $queryRunner) {
       $this->queryRunner = $queryRunner;
       return $this;
     }
@@ -411,7 +411,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -422,9 +422,9 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value = null, $escape = true){
-  	  if(is_array($key)){
-    		foreach($key as $k => $v){
+    public function setData($key, $value = null, $escape = true) {
+  	  if (is_array($key)) {
+    		foreach ($key as $k => $v) {
     			$this->setData($k, $v, $escape);
     		}	
   	  } else {
@@ -440,7 +440,7 @@ 
      * @param  boolean $returnAsArray return the result as array or not
      * @return mixed         the query result
      */
-    public function query($query, $returnAsList = true, $returnAsArray = false){
+    public function query($query, $returnAsList = true, $returnAsArray = false) {
       $this->reset();
       $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
       //If is the SELECT query
@@ -461,12 +461,12 @@ 
       //if can use cache feature for this query
       $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
+      if ($dbCacheStatus && $isSqlSELECTQuery) {
           $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
           $cacheContent = $this->getCacheContentForQuery($query, $returnAsList, $returnAsArray);  
       }
       
-      if ( !$cacheContent){
+      if (!$cacheContent) {
   	   	//count the number of query execution to server
         $this->queryCount++;
         
@@ -475,19 +475,19 @@ 
                           ->setReturnAsArray($returnAsArray);
         
         $queryResult = $this->queryRunner->execute();
-        if (is_object($queryResult)){
+        if (is_object($queryResult)) {
             $this->result  = $queryResult->getResult();
             $this->numRows = $queryResult->getNumRows();
-            if ($isSqlSELECTQuery && $dbCacheStatus){
+            if ($isSqlSELECTQuery && $dbCacheStatus) {
                 $key = $this->getCacheKeyForQuery($this->query, $returnAsList, $returnAsArray);
                 $this->setCacheContentForQuery($this->query, $key, $this->result, $cacheExpire);
-            if (! $this->result){
+            if (!$this->result) {
               $this->logger->info('No result where found for the query [' . $query . ']');
             }
           }
         }
-      } else if ($isSqlSELECTQuery){
-          $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+      } else if ($isSqlSELECTQuery) {
+          $this->logger->info('The result for query [' . $this->query . '] already cached use it');
           $this->result = $cacheContent;
           $this->numRows = count($this->result);
       }
@@ -499,7 +499,7 @@ 
 	 * Return the database configuration
 	 * @return array
 	 */
-  	public  function getDatabaseConfiguration(){
+  	public  function getDatabaseConfiguration() {
   	  return $this->config;
   	}
 
@@ -509,9 +509,9 @@ 
     * @param boolean $useConfigFile whether to use database configuration file
 	  * @return object Database
     */
-    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
+    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
         $db = array();
-        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')) {
             //here don't use require_once because somewhere user can create database instance directly
             require CONFIG_PATH . 'database.php';
         }
@@ -536,7 +536,7 @@ 
     	//determine the port using the hostname like localhost:3307
       //hostname will be "localhost", and port "3307"
       $p = explode(':', $config['hostname']);
-  	  if (count($p) >= 2){
+  	  if (count($p) >= 2) {
   		  $config['hostname'] = $p[0];
   		  $config['port'] = $p[1];
   		}
@@ -563,7 +563,7 @@ 
     /**
      * Close the connexion
      */
-    public function close(){
+    public function close() {
       $this->pdo = null;
     }
 
@@ -571,16 +571,16 @@ 
      * Update the DatabaseQueryBuilder and DatabaseQueryRunner properties
      * @return void
      */
-    protected function updateQueryBuilderAndRunnerProperties(){
+    protected function updateQueryBuilderAndRunnerProperties() {
        //update queryBuilder with some properties needed
-     if(is_object($this->queryBuilder)){
+     if (is_object($this->queryBuilder)) {
         $this->queryBuilder->setDriver($this->config['driver'])
                            ->setPrefix($this->config['prefix'])
                            ->setPdo($this->pdo);
      }
 
       //update queryRunner with some properties needed
-     if(is_object($this->queryRunner)){
+     if (is_object($this->queryRunner)) {
         $this->queryRunner->setDriver($this->config['driver'])
                           ->setPdo($this->pdo);
      }
@@ -591,9 +591,9 @@ 
      * This method is used to get the PDO DSN string using the configured driver
      * @return string the DSN string
      */
-    protected function getDsnFromDriver(){
+    protected function getDsnFromDriver() {
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+      if (!empty($config)) {
         $driver = $config['driver'];
         $driverDsnMap = array(
                               'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
@@ -618,9 +618,9 @@ 
      *      
      * @return mixed
      */
-    protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray){
+    protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray) {
         $cacheKey = $this->getCacheKeyForQuery($query, $returnAsList, $returnAsArray);
-        if (! is_object($this->cacheInstance)){
+        if (!is_object($this->cacheInstance)) {
     			//can not call method with reference in argument
     			//like $this->setCacheInstance(& get_instance()->cache);
     			//use temporary variable
@@ -637,9 +637,9 @@ 
      * @param mixed $result the query result to save
      * @param int $expire the cache TTL
      */
-     protected function setCacheContentForQuery($query, $key, $result, $expire){
-        $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
-        if (! is_object($this->cacheInstance)){
+     protected function setCacheContentForQuery($query, $key, $result, $expire) {
+        $this->logger->info('Save the result for query [' . $query . '] into cache for future use');
+        if (!is_object($this->cacheInstance)) {
   				//can not call method with reference in argument
   				//like $this->setCacheInstance(& get_instance()->cache);
   				//use temporary variable
@@ -656,7 +656,7 @@ 
      * 
      *  @return string
      */
-    protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray){
+    protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray) {
       return md5($query . $returnAsList . $returnAsArray);
     }
     
@@ -664,12 +664,12 @@ 
      * Set the Log instance using argument or create new instance
      * @param object $logger the Log instance if not null
      */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
+    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+      if ($logger !== null) {
         $this->logger = $logger;
       }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
+      else {
+          $this->logger = & class_loader('Log', 'classes');
           $this->logger->setLogger('Library::Database');
       }
     }
@@ -678,12 +678,12 @@ 
    * Set the DatabaseQueryBuilder instance using argument or create new instance
    * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
    */
-	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
-	  if ($queryBuilder !== null){
+	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null) {
+	  if ($queryBuilder !== null) {
         $this->queryBuilder = $queryBuilder;
 	  }
-	  else{
-		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes/database');
+	  else {
+		  $this->queryBuilder = & class_loader('DatabaseQueryBuilder', 'classes/database');
 	  }
 	}
 
@@ -691,19 +691,19 @@ 
    * Set the DatabaseQueryRunner instance using argument or create new instance
    * @param object $queryRunner the DatabaseQueryRunner instance if not null
    */
-  protected function setQueryRunnerFromParamOrCreateNewInstance(DatabaseQueryRunner $queryRunner = null){
-    if ($queryRunner !== null){
+  protected function setQueryRunnerFromParamOrCreateNewInstance(DatabaseQueryRunner $queryRunner = null) {
+    if ($queryRunner !== null) {
         $this->queryRunner = $queryRunner;
     }
-    else{
-      $this->queryRunner =& class_loader('DatabaseQueryRunner', 'classes/database');
+    else {
+      $this->queryRunner = & class_loader('DatabaseQueryRunner', 'classes/database');
     }
   }
 
     /**
      * Reset the database class attributs to the initail values before each query.
      */
-    private function reset(){
+    private function reset() {
 	   //query builder reset
       $this->getQueryBuilder()->reset();
       $this->numRows  = 0;
@@ -716,7 +716,7 @@ 
     /**
      * The class destructor
      */
-    public function __destruct(){
+    public function __destruct() {
       $this->pdo = null;
     }
 

core/classes/Router.php

Spacing +77 added lines, -77 removed lines

@@ -96,13 +96,13 @@ 
 		/**
 		 * Construct the new Router instance
 		 */
-		public function __construct(){
+		public function __construct() {
 			$this->setLoggerFromParamOrCreateNewInstance(null);
 			
 			//loading routes for module
 			$moduleRouteList = array();
 			$modulesRoutes = Module::getModulesRoutes();
-			if($modulesRoutes && is_array($modulesRoutes)){
+			if ($modulesRoutes && is_array($modulesRoutes)) {
 				$moduleRouteList = $modulesRoutes;
 				unset($modulesRoutes);
 			}
@@ -117,7 +117,7 @@ 
 		 * Get the route patterns
 		 * @return array
 		 */
-		public function getPattern(){
+		public function getPattern() {
 			return $this->pattern;
 		}
 
@@ -125,7 +125,7 @@ 
 		 * Get the route callbacks
 		 * @return array
 		 */
-		public function getCallback(){
+		public function getCallback() {
 			return $this->callback;
 		}
 
@@ -133,7 +133,7 @@ 
 		 * Get the module name
 		 * @return string
 		 */
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		
@@ -141,7 +141,7 @@ 
 		 * Get the controller name
 		 * @return string
 		 */
-		public function getController(){
+		public function getController() {
 			return $this->controller;
 		}
 
@@ -149,7 +149,7 @@ 
 		 * Get the controller file path
 		 * @return string
 		 */
-		public function getControllerPath(){
+		public function getControllerPath() {
 			return $this->controllerPath;
 		}
 
@@ -157,7 +157,7 @@ 
 		 * Get the controller method
 		 * @return string
 		 */
-		public function getMethod(){
+		public function getMethod() {
 			return $this->method;
 		}
 
@@ -165,7 +165,7 @@ 
 		 * Get the request arguments
 		 * @return array
 		 */
-		public function getArgs(){
+		public function getArgs() {
 			return $this->args;
 		}
 
@@ -173,7 +173,7 @@ 
 		 * Get the URL segments array
 		 * @return array
 		 */
-		public function getSegments(){
+		public function getSegments() {
 			return $this->segments;
 		}
 
@@ -181,7 +181,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -190,7 +190,7 @@ 
 	     * @param Log $logger the log object
 		 * @return object
 	     */
-	    public function setLogger($logger){
+	    public function setLogger($logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -199,7 +199,7 @@ 
 		 * Get the route URI
 		 * @return string
 		 */
-		public function getRouteUri(){
+		public function getRouteUri() {
 			return $this->uri;
 		}
 
@@ -213,7 +213,7 @@ 
 		*/
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
-			if(in_array($uri, $this->pattern)){
+			if (in_array($uri, $this->pattern)) {
 				$this->logger->warning('The route [' . $uri . '] already added, may be adding again can have route conflict');
 			}
 			$this->pattern[] = $uri;
@@ -229,8 +229,8 @@ 
 		* @return object the current instance
 		*/
 		public function removeRoute($uri) {
-			$index  = array_search($uri, $this->pattern, true);
-			if($index !== false){
+			$index = array_search($uri, $this->pattern, true);
+			if ($index !== false) {
 				$this->logger->info('Remove route for uri [' . $uri . '] from the configuration');
 				unset($this->pattern[$index]);
 				unset($this->callback[$index]);
@@ -258,28 +258,28 @@ 
 	     * @param string $uri the route URI, if is empty will determine automatically
 	     * @return object
 	     */
-	    public function setRouteUri($uri = ''){
+	    public function setRouteUri($uri = '') {
 	    	$routeUri = '';
-	    	if(! empty($uri)){
+	    	if (!empty($uri)) {
 	    		$routeUri = $uri;
 	    	}
 	    	//if the application is running in CLI mode use the first argument
-			else if(IS_CLI){
-				if(isset($_SERVER['argv'][1])){
+			else if (IS_CLI) {
+				if (isset($_SERVER['argv'][1])) {
 					$routeUri = $_SERVER['argv'][1];
 				}
 			}
-			else if(isset($_SERVER['REQUEST_URI'])){
+			else if (isset($_SERVER['REQUEST_URI'])) {
 				$routeUri = $_SERVER['REQUEST_URI'];
 			}
 			$this->logger->debug('Check if URL suffix is enabled in the configuration');
 			//remove url suffix from the request URI
 			$suffix = get_config('url_suffix');
 			if ($suffix) {
-				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']' );
+				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']');
 				$routeUri = str_ireplace($suffix, '', $routeUri);
 			} 
-			if (strpos($routeUri, '?') !== false){
+			if (strpos($routeUri, '?') !== false) {
 				$routeUri = substr($routeUri, 0, strpos($routeUri, '?'));
 			}
 			$this->uri = trim($routeUri, $this->uriTrim);
@@ -292,8 +292,8 @@ 
 		 * 
 		 * @return object
 		 */
-		public function setRouteSegments(array $segments = array()){
-			if(! empty($segments)){
+		public function setRouteSegments(array $segments = array()) {
+			if (!empty($segments)) {
 				$this->segments = $segments;
 			} else if (!empty($this->uri)) {
 				$this->segments = explode('/', $this->uri);
@@ -301,12 +301,12 @@ 
 			$segment = $this->segments;
 			$baseUrl = get_config('base_url');
 			//check if the app is not in DOCUMENT_ROOT
-			if(isset($segment[0]) && stripos($baseUrl, $segment[0]) !== false){
+			if (isset($segment[0]) && stripos($baseUrl, $segment[0]) !== false) {
 				array_shift($segment);
 				$this->segments = $segment;
 			}
 			$this->logger->debug('Check if the request URI contains the front controller');
-			if(isset($segment[0]) && $segment[0] == SELF){
+			if (isset($segment[0]) && $segment[0] == SELF) {
 				$this->logger->info('The request URI contains the front controller');
 				array_shift($segment);
 				$this->segments = $segment;
@@ -326,7 +326,7 @@ 
 			
 			//if can not determine the module/controller/method via the defined routes configuration we will use
 			//the URL like http://domain.com/module/controller/method/arg1/arg2
-			if(! $this->controller){
+			if (!$this->controller) {
 				$this->logger->info('Cannot determine the routing information using the predefined routes configuration, will use the request URI parameters');
 				//determine route parameters using the REQUEST_URI param
 				$this->determineRouteParamsFromRequestUri();
@@ -342,14 +342,14 @@ 
 		 * Routing the request to the correspondant module/controller/method if exists
 		 * otherwise send 404 error.
 		 */
-	    public function processRequest(){
+	    public function processRequest() {
 	    	//Setting the route URI
 			$this->setRouteUri();
 
 			//setting route segments
 			$this->setRouteSegments();
 
-			$this->logger->info('The final Request URI is [' . implode('/', $this->segments) . ']' );
+			$this->logger->info('The final Request URI is [' . implode('/', $this->segments) . ']');
 
 	    	//determine the route parameters information
 	    	$this->determineRouteParamsInformation();
@@ -360,20 +360,20 @@ 
 	    	$this->logger->info('The routing information are: module [' . $this->module . '], controller [' . $controller . '], method [' . $this->method . '], args [' . stringfy_vars($this->args) . ']');
 	    	$this->logger->debug('Loading controller [' . $controller . '], the file path is [' . $classFilePath . ']...');
 	    	
-			if(file_exists($classFilePath)){
+			if (file_exists($classFilePath)) {
 				require_once $classFilePath;
-				if(! class_exists($controller, false)){
+				if (!class_exists($controller, false)) {
 					$e404 = true;
-					$this->logger->warning('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
+					$this->logger->warning('The controller file [' . $classFilePath . '] exists but does not contain the class [' . $controller . ']');
 				}
-				else{
+				else {
 					$controllerInstance = new $controller();
 					$controllerMethod = $this->getMethod();
-					if(! method_exists($controllerInstance, $controllerMethod)){
+					if (!method_exists($controllerInstance, $controllerMethod)) {
 						$e404 = true;
 						$this->logger->warning('The controller [' . $controller . '] exist but does not contain the method [' . $controllerMethod . ']');
 					}
-					else{
+					else {
 						$this->logger->info('Routing data is set correctly now GO!');
 						call_user_func_array(array($controllerInstance, $controllerMethod), $this->args);
 						//render the final page to user
@@ -382,16 +382,16 @@ 
 					}
 				}
 			}
-			else{
+			else {
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}
-			if($e404){
-				if(IS_CLI){
+			if ($e404) {
+				if (IS_CLI) {
 					set_http_status_header(404);
 					echo 'Error 404: page not found.';
 				} else {
-					$response =& class_loader('Response', 'classes');
+					$response = & class_loader('Response', 'classes');
 					$response->send404();
 				}
 			}
@@ -404,15 +404,15 @@ 
 	    * @param boolean $useConfigFile whether to use route configuration file
 		* @return object
 	    */
-	    public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
+	    public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
 	        $route = array();
-	        if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')){
+	        if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
 	            require_once CONFIG_PATH . 'routes.php';
 	        }
 	        $route = array_merge($route, $overwriteConfig);
 	        $this->routes = $route;
 	        //if route is empty remove all configuration
-	        if(empty($route)){
+	        if (empty($route)) {
 	        	$this->removeAllRoute();
 	        }
 			return $this;
@@ -422,7 +422,7 @@ 
 		 * Get the route configuration
 		 * @return array
 		 */
-		public function getRouteConfiguration(){
+		public function getRouteConfiguration() {
 			return $this->routes;
 		}
 
@@ -434,17 +434,17 @@ 
 	     *
 	     * @return object the current instance
 	     */
-	    public function setControllerFilePath($path = null){
-	    	if($path !== null){
+	    public function setControllerFilePath($path = null) {
+	    	if ($path !== null) {
 	    		$this->controllerPath = $path;
 	    		return $this;
 	    	}
 	    	//did we set the controller, so set the controller path
-			if($this->controller && ! $this->controllerPath){
+			if ($this->controller && !$this->controllerPath) {
 				$this->logger->debug('Setting the file path for the controller [' . $this->controller . ']');
 				$this->controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->controller) . '.php';
 				//if the controller is in module
-				if($this->module){
+				if ($this->module) {
 					$this->controllerPath = Module::findControllerFullPath(ucfirst($this->controller), $this->module);
 				}
 			}
@@ -455,7 +455,7 @@ 
 	     * Determine the route parameters from route configuration
 	     * @return void
 	     */
-	    protected function determineRouteParamsFromConfig(){
+	    protected function determineRouteParamsFromConfig() {
 	    	$uri = implode('/', $this->segments);
 	    	/*
 	   		* Generics routes patterns
@@ -480,20 +480,20 @@ 
 					array_shift($args);
 					//check if this contains an module
 					$moduleControllerMethod = explode('#', $this->callback[$index]);
-					if(is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2){
-						$this->logger->info('The current request use the module [' .$moduleControllerMethod[0]. ']');
+					if (is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2) {
+						$this->logger->info('The current request use the module [' . $moduleControllerMethod[0] . ']');
 						$this->module = $moduleControllerMethod[0];
 						$moduleControllerMethod = explode('@', $moduleControllerMethod[1]);
 					}
-					else{
+					else {
 						$this->logger->info('The current request does not use the module');
 						$moduleControllerMethod = explode('@', $this->callback[$index]);
 					}
-					if(is_array($moduleControllerMethod)){
-						if(isset($moduleControllerMethod[0])){
+					if (is_array($moduleControllerMethod)) {
+						if (isset($moduleControllerMethod[0])) {
 							$this->controller = $moduleControllerMethod[0];	
 						}
-						if(isset($moduleControllerMethod[1])){
+						if (isset($moduleControllerMethod[1])) {
 							$this->method = $moduleControllerMethod[1];
 						}
 						$this->args = $args;
@@ -504,7 +504,7 @@ 
 			}
 
 			//first if the controller is not set and the module is set use the module name as the controller
-			if(! $this->controller && $this->module){
+			if (!$this->controller && $this->module) {
 				$this->logger->info(
 									'After loop in predefined routes configuration, 
 									the module name is set but the controller is not set, 
@@ -518,67 +518,67 @@ 
 	     * Determine the route parameters using the server variable "REQUEST_URI"
 	     * @return void
 	     */
-	    protected function determineRouteParamsFromRequestUri(){
+	    protected function determineRouteParamsFromRequestUri() {
 	    	$segment = $this->segments;
 	    	$nbSegment = count($segment);
 			//if segment is null so means no need to perform
-			if($nbSegment > 0){
+			if ($nbSegment > 0) {
 				//get the module list
 				$modules = Module::getModuleList();
 				//first check if no module
-				if(empty($modules)){
+				if (empty($modules)) {
 					$this->logger->info('No module was loaded will skip the module checking');
 					//the application don't use module
 					//controller
-					if(isset($segment[0])){
+					if (isset($segment[0])) {
 						$this->controller = $segment[0];
 						array_shift($segment);
 					}
 					//method
-					if(isset($segment[0])){
+					if (isset($segment[0])) {
 						$this->method = $segment[0];
 						array_shift($segment);
 					}
 					//args
 					$this->args = $segment;
 				}
-				else{
+				else {
 					$this->logger->info('The application contains a loaded module will check if the current request is found in the module list');
-					if(in_array($segment[0], $modules)){
+					if (in_array($segment[0], $modules)) {
 						$this->logger->info('Found, the current request use the module [' . $segment[0] . ']');
 						$this->module = $segment[0];
 						array_shift($segment);
 						//check if the second arg is the controller from module
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->controller = $segment[0];
 							//check if the request use the same module name and controller
 							$path = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
-							if(! $path){
+							if (!$path) {
 								$this->logger->info('The controller [' . $this->getController() . '] not found in the module, may be will use the module [' . $this->getModule() . '] as controller');
 								$this->controller = $this->getModule();
 							}
-							else{
+							else {
 								$this->controllerPath = $path;
 								array_shift($segment);
 							}
 						}
 						//check for method
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->method = $segment[0];
 							array_shift($segment);
 						}
 						//the remaining is for args
 						$this->args = $segment;
 					}
-					else{
+					else {
 						$this->logger->info('The current request information is not found in the module list');
 						//controller
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->controller = $segment[0];
 							array_shift($segment);
 						}
 						//method
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->method = $segment[0];
 							array_shift($segment);
 						}
@@ -586,7 +586,7 @@ 
 						$this->args = $segment;
 					}
 				}
-				if(! $this->controller && $this->module){
+				if (!$this->controller && $this->module) {
 					$this->logger->info('After using the request URI the module name is set but the controller is not set so we will use module as the controller');
 					$this->controller = $this->module;
 				}
@@ -598,9 +598,9 @@ 
 	     *
 	     * @return object the current instance
 	     */
-	    protected function setRouteConfigurationInfos(){
+	    protected function setRouteConfigurationInfos() {
 	    	//adding route
-			foreach($this->routes as $pattern => $callback){
+			foreach ($this->routes as $pattern => $callback) {
 				$this->add($pattern, $callback);
 			}
 			return $this;
@@ -610,12 +610,12 @@ 
 	     * Set the Log instance using argument or create new instance
 	     * @param object $logger the Log instance if not null
 	     */
-	    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-	      if ($logger !== null){
+	    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+	      if ($logger !== null) {
 	        $this->logger = $logger;
 	      }
-	      else{
-	          $this->logger =& class_loader('Log', 'classes');
+	      else {
+	          $this->logger = & class_loader('Log', 'classes');
 	          $this->logger->setLogger('Library::Router');
 	      }
 	    }

core/classes/Config.php

Spacing +32 added lines, -32 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Config{
+	class Config {
 		
 		/**
 		 * The list of loaded configuration
@@ -42,10 +42,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
+		private static function getLogger() {
+			if (self::$logger == null) {
 				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
+				$logger[0] = & class_loader('Log', 'classes');
 				$logger[0]->setLogger('Library::Config');
 				self::$logger = $logger[0];
 			}
@@ -57,7 +57,7 @@ 
 		 * @param Log $logger the log object
 		 * @return Log the log instance
 		 */
-		public static function setLogger($logger){
+		public static function setLogger($logger) {
 			self::$logger = $logger;
 			return self::$logger;
 		}
@@ -65,12 +65,12 @@ 
 		/**
 		 * Initialize the configuration by loading all the configuration from config file
 		 */
-		public static function init(){
+		public static function init() {
 			$logger = static::getLogger();
 			$logger->debug('Initialization of the configuration');
 			self::$config = & load_configurations();
 			self::setBaseUrlUsingServerVar();
-			if(ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info','all'))){
+			if (ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info', 'all'))) {
 				$logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
 			}
 			$logger->info('Configuration initialized successfully');
@@ -83,12 +83,12 @@ 
 		 * @param  mixed $default the default value to use if can not find the config item in the list
 		 * @return mixed          the config value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = static::getLogger();
-			if(array_key_exists($item, self::$config)){
+			if (array_key_exists($item, self::$config)) {
 				return self::$config[$item];
 			}
-			$logger->warning('Cannot find config item ['.$item.'] using the default value ['.$default.']');
+			$logger->warning('Cannot find config item [' . $item . '] using the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -97,7 +97,7 @@ 
 		 * @param string $item  the config item name to set
 		 * @param mixed $value the config item value
 		 */
-		public static function set($item, $value){
+		public static function set($item, $value) {
 			self::$config[$item] = $value;
 		}
 
@@ -105,7 +105,7 @@ 
 		 * Get all the configuration values
 		 * @return array the config values
 		 */
-		public static function getAll(){
+		public static function getAll() {
 			return self::$config;
 		}
 
@@ -113,7 +113,7 @@ 
 		 * Set the configuration values bu merged with the existing configuration
 		 * @param array $config the config values to add in the configuration list
 		 */
-		public static function setAll(array $config = array()){
+		public static function setAll(array $config = array()) {
 			self::$config = array_merge(self::$config, $config);
 		}
 
@@ -122,15 +122,15 @@ 
 		 * @param  string $item the config item name to be deleted
 		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
 		 */
-		public static function delete($item){
+		public static function delete($item) {
 			$logger = static::getLogger();
-			if(array_key_exists($item, self::$config)){
-				$logger->info('Delete config item ['.$item.']');
+			if (array_key_exists($item, self::$config)) {
+				$logger->info('Delete config item [' . $item . ']');
 				unset(self::$config[$item]);
 				return true;
 			}
-			else{
-				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Config item [' . $item . '] to be deleted does not exists');
 				return false;
 			}
 		}
@@ -139,53 +139,53 @@ 
 		 * Load the configuration file. This an alias to Loader::config()
 		 * @param  string $config the config name to be loaded
 		 */
-		public static function load($config){
+		public static function load($config) {
 			Loader::config($config);
 		}
 
 		/**
 		 * Set the configuration for "base_url" if is not set in the configuration
 		 */
-		private static function setBaseUrlUsingServerVar(){
+		private static function setBaseUrlUsingServerVar() {
 			$logger = static::getLogger();
-			if (! isset(self::$config['base_url']) || ! is_url(self::$config['base_url'])){
-				if(ENVIRONMENT == 'production'){
+			if (!isset(self::$config['base_url']) || !is_url(self::$config['base_url'])) {
+				if (ENVIRONMENT == 'production') {
 					$logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
 				}
 				$baseUrl = null;
 				$protocol = 'http';
-				if(is_https()){
+				if (is_https()) {
 					$protocol = 'https';
 				}
-				$protocol .='://';
+				$protocol .= '://';
 
-				if (isset($_SERVER['SERVER_ADDR'])){
+				if (isset($_SERVER['SERVER_ADDR'])) {
 					$baseUrl = $_SERVER['SERVER_ADDR'];
 					//check if the server is running under IPv6
-					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
-						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
+					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE) {
+						$baseUrl = '[' . $_SERVER['SERVER_ADDR'] . ']';
 					}
 					$serverPort = 80;
 					if (isset($_SERVER['SERVER_PORT'])) {
 						$serverPort = $_SERVER['SERVER_PORT'];
 					}
 					$port = '';
-					if($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))){
-						$port = ':'.$serverPort;
+					if ($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))) {
+						$port = ':' . $serverPort;
 					}
-					$port = ((($serverPort != '80' && ! is_https()) || ($serverPort != '443' && is_https())) ? ':' . $serverPort : '');
+					$port = ((($serverPort != '80' && !is_https()) || ($serverPort != '443' && is_https())) ? ':' . $serverPort : '');
 					$baseUrl = $protocol . $baseUrl . $port . substr(
 																		$_SERVER['SCRIPT_NAME'], 
 																		0, 
 																		strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
 																	);
 				}
-				else{
+				else {
 					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
 					$baseUrl = 'http://localhost/';
 				}
 				self::set('base_url', $baseUrl);
 			}
-			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
+			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') . '/';
 		}
 	}

core/libraries/FormValidation.php

Spacing +56 added lines, -56 removed lines

@@ -25,13 +25,13 @@ 
     */
 
 
-     class FormValidation{
+     class FormValidation {
 		 
         /**
          * The form validation status
          * @var boolean
          */
-        protected $_success  = false;
+        protected $_success = false;
 
         /**
          * The list of errors messages
@@ -40,31 +40,31 @@ 
         protected $_errorsMessages = array();
         
         // Array of rule sets, fieldName => PIPE seperated ruleString
-        protected $_rules             = array();
+        protected $_rules = array();
         
         // Array of errors, niceName => Error Message
-        protected $_errors             = array();
+        protected $_errors = array();
         
         // Array of post Key => Nice name labels
-        protected $_labels          = array();
+        protected $_labels = array();
         
         /**
          * The errors delimiters
          * @var array
          */
-        protected $_allErrorsDelimiter   = array('<div class="error">', '</div>');
+        protected $_allErrorsDelimiter = array('<div class="error">', '</div>');
 
         /**
          * The each error delimiter
          * @var array
          */
-        protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
+        protected $_eachErrorDelimiter = array('<p class="error">', '</p>');
         
 		/**
          * Indicated if need force the validation to be failed
          * @var boolean
          */
-        protected $_forceFail            = false;
+        protected $_forceFail = false;
 
         /**
          * The list of the error messages overrides by the original
@@ -97,13 +97,13 @@ 
          * @return void
          */
         public function __construct() {
-            $this->logger =& class_loader('Log', 'classes');
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::FormValidation');
            
 		   //Load form validation language message
             Loader::lang('form_validation');
             $obj = & get_instance();
-            $this->_errorsMessages  = array(
+            $this->_errorsMessages = array(
                         'required'         => $obj->lang->get('fv_required'),
                         'min_length'       => $obj->lang->get('fv_min_length'),
                         'max_length'       => $obj->lang->get('fv_max_length'),
@@ -133,7 +133,7 @@ 
          * Set the database instance
          * @param object $database the database instance
          */
-        public function setDatabase(Database $database){
+        public function setDatabase(Database $database) {
             $this->databaseInstance = $database;
             return $this;
         }
@@ -142,7 +142,7 @@ 
          * Get the database instance
          * @return object the database instance
          */
-        public function getDatabase(){
+        public function getDatabase() {
             return $this->databaseInstance;
         }
 
@@ -165,7 +165,7 @@ 
 		 *
          * @return FormValidation Current instance of object.
          */
-        public function setData(array $data){
+        public function setData(array $data) {
             $this->logger->debug('Setting the form validation data, the values are: ' . stringfy_vars($data));
             $this->data = $data;
 			return $this;
@@ -175,7 +175,7 @@ 
          * Get the form validation data
          * @return array the form validation data to be validated
          */
-        public function getData(){
+        public function getData() {
             return $this->data;
         }
 
@@ -184,7 +184,7 @@ 
 		*
 		* @return string the function name
 		*/
-        protected function _toCallCase($funcName, $prefix='_validate') {
+        protected function _toCallCase($funcName, $prefix = '_validate') {
             $funcName = strtolower($funcName);
             $finalFuncName = $prefix;
             foreach (explode('_', $funcName) as $funcNamePart) {
@@ -208,7 +208,7 @@ 
          * @return boolean Whether or not the form has been submitted or the data is available for validation.
          */
         public function canDoValidation() {
-            return get_instance()->request->method() === 'POST' || ! empty($this->data);
+            return get_instance()->request->method() === 'POST' || !empty($this->data);
         }
 
         /**
@@ -228,14 +228,14 @@ 
          * Validate the CSRF 
          * @return void 
          */
-        protected function validateCSRF(){
-            if(get_instance()->request->method() == 'POST'){
+        protected function validateCSRF() {
+            if (get_instance()->request->method() == 'POST') {
                 $this->logger->debug('Check if CSRF is enabled in configuration');
                 //first check for CSRF
-                if (get_config('csrf_enable', false) && ! Security::validateCSRF()){
+                if (get_config('csrf_enable', false) && !Security::validateCSRF()) {
                     show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
                 }
-                else{
+                else {
                     $this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
                 }
             }
@@ -253,10 +253,10 @@ 
             $this->_forceFail = false;
 
             foreach ($this->getData() as $inputName => $inputVal) {
-    			if(is_array($this->data[$inputName])){
+    			if (is_array($this->data[$inputName])) {
     				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
     			}
-    			else{
+    			else {
     				$this->data[$inputName] = trim($this->data[$inputName]);
     			}
 
@@ -283,7 +283,7 @@ 
         public function setRule($inputField, $inputLabel, $ruleSets) {
             $this->_rules[$inputField] = $ruleSets;
             $this->_labels[$inputField] = $inputLabel;
-            $this->logger->info('Set the field rule: name [' .$inputField. '], label [' .$inputLabel. '], rules [' .$ruleSets. ']');
+            $this->logger->info('Set the field rule: name [' . $inputField . '], label [' . $inputLabel . '], rules [' . $ruleSets . ']');
             return $this;
         }
 
@@ -447,7 +447,7 @@ 
             }
             $errorOutput .= $errorsEnd;
             echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
+            return (!$echo) ? $errorOutput : null;
         }
 
         /**
@@ -472,25 +472,25 @@ 
             /*
             //////////////// hack for regex rule that can contain "|"
             */
-            if(strpos($ruleString, 'regex') !== false){
+            if (strpos($ruleString, 'regex') !== false) {
                 $regexRule = array();
                 $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
                 preg_match($rule, $ruleString, $regexRule);
                 $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(!empty($regexRule[0])){
+                 if (!empty($regexRule[0])) {
                      $ruleSets[] = $regexRule[0];
                  }
                  $ruleStringRegex = explode('|', $ruleStringTemp);
                 foreach ($ruleStringRegex as $rule) {
                     $rule = trim($rule);
-                    if($rule){
+                    if ($rule) {
                         $ruleSets[] = $rule;
                     }
                 }
                  
             }
             /***********************************/
-            else{
+            else {
                 if (strpos($ruleString, '|') !== FALSE) {
                     $ruleSets = explode('|', $ruleString);
                 } else {
@@ -522,7 +522,7 @@ 
          * @return void
          */
         protected function _validateRule($inputName, $inputVal, $ruleName) {
-            $this->logger->debug('Rule validation of field [' .$inputName. '], value [' .$inputVal. '], rule [' .$ruleName. ']');
+            $this->logger->debug('Rule validation of field [' . $inputName . '], value [' . $inputVal . '], rule [' . $ruleName . ']');
             // Array to store args
             $ruleArgs = array();
 
@@ -567,7 +567,7 @@ 
                 $key = $i - 1;
                 $rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
             }
-            if (! array_key_exists($inputName, $this->_errors)) {
+            if (!array_key_exists($inputName, $this->_errors)) {
                 $this->_errors[$inputName] = $rulePhrase;
             }
         }
@@ -619,13 +619,13 @@ 
          */
 		protected function _validateRequired($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if(array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
+            if (array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
                 $callbackReturn = $this->_runEmptyCallback($ruleArgs[1]);
                 if ($inputVal == '' && $callbackReturn == true) {
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
             } 
-			else if($inputVal == '') {
+			else if ($inputVal == '') {
 				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
@@ -651,7 +651,7 @@ 
         protected function _validateCallback($inputName, $ruleName, array $ruleArgs) {
             if (function_exists($ruleArgs[1]) && !empty($this->data[$inputName])) {
 				$result = $this->_runCallback($this->data[$inputName], $ruleArgs[1]);
-				if(! $result){
+				if (!$result) {
 					$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
 				}
             }
@@ -685,7 +685,7 @@ 
                         continue;
                     }
                 } 
-				else{
+				else {
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -715,8 +715,8 @@ 
          */
         protected function _validateValidEmail($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if (! preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
@@ -732,7 +732,7 @@ 
         protected function _validateExactLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) != $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -748,7 +748,7 @@ 
         protected function _validateMaxLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) > $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -764,7 +764,7 @@ 
         protected function _validateMinLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) < $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -780,7 +780,7 @@ 
     	protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal >= $ruleArgs[1]) { 
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -796,7 +796,7 @@ 
     	protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal <= $ruleArgs[1]) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -811,8 +811,8 @@ 
          */
     	protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if (! is_numeric($inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!is_numeric($inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -828,7 +828,7 @@ 
 		protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$obj = & get_instance();
-    		if(! isset($obj->database)){
+    		if (!isset($obj->database)) {
     			return;
     		}
     		list($table, $column) = explode('.', $ruleArgs[1]);
@@ -837,7 +837,7 @@ 
     			          ->get();
     		$nb = $obj->database->numRows();
             if ($nb == 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -852,9 +852,9 @@ 
          */
     	protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if (! is_object($this->databaseInstance)){
+            if (!is_object($this->databaseInstance)) {
                 $obj = & get_instance();
-                if(isset($obj->database)){
+                if (isset($obj->database)) {
                     $this->databaseInstance = $obj->database;
                 } else {
                     return;
@@ -865,7 +865,7 @@ 
     			                                      ->where($column, $inputVal);
     		$this->databaseInstance->get();
     		if ($this->databaseInstance->numRows() != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -880,16 +880,16 @@ 
          */
     	protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		if (! is_object($this->databaseInstance)){
+    		if (!is_object($this->databaseInstance)) {
                 $obj = & get_instance();
-                if(isset($obj->database)){
+                if (isset($obj->database)) {
                     $this->databaseInstance = $obj->database;
                 } else {
                     return;
                 }
             }
     		$data = explode(',', $ruleArgs[1]);
-    		if(count($data) < 2){
+    		if (count($data) < 2) {
     			return;
     		}
     		list($table, $column) = explode('.', $data[0]);
@@ -899,7 +899,7 @@ 
                                             		  ->where($field, '!=', trim($val));
             $this->databaseInstance->get();
     		if ($this->databaseInstance->numRows() != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -916,8 +916,8 @@ 
             $inputVal = $this->post($inputName);
     		$list = explode(',', $ruleArgs[1]);
             $list = array_map('trim', $list);
-            if (! in_array($inputVal, $list)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!in_array($inputVal, $list)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -933,8 +933,8 @@ 
         protected function _validateRegex($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$regex = $ruleArgs[1];
-            if (! preg_match($regex, $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!preg_match($regex, $inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));

core/libraries/Form.php

Spacing +49 added lines, -49 removed lines

@@ -25,7 +25,7 @@ 
 	*/
 
 
-	class Form{
+	class Form {
 
 		/**
 		 * Generate the form opened tag
@@ -35,23 +35,23 @@ 
 		 * @param  string $enctype    the form enctype like "multipart/form-data"
 		 * @return string             the generated form html
 		 */
-		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null){
-			if($path){
+		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null) {
+			if ($path) {
 				$path = Url::site_url($path);
 			}
 			$method = strtoupper($method);
 			$str = null;
-			$str .= '<form action = "'.$path.'" method = "'.$method.'"';
-			if(! empty($enctype)){
-				$str .= ' enctype = "'.$enctype.'" ';
+			$str .= '<form action = "' . $path . '" method = "' . $method . '"';
+			if (!empty($enctype)) {
+				$str .= ' enctype = "' . $enctype . '" ';
 			}
-			if(! isset($attributes['accept-charset'])){
+			if (!isset($attributes['accept-charset'])) {
 				$attributes['accept-charset'] = get_config('charset', 'utf-8');
 			}
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			//if CSRF is enabled in the configuration
-			if(get_config('csrf_enable', false) && $method == 'POST'){
+			if (get_config('csrf_enable', false) && $method == 'POST') {
 				$csrfValue = Security::generateCSRF();
 				$csrfName = get_config('csrf_key', 'csrf_key');
 				$str .= static::hidden($csrfName, $csrfValue);
@@ -64,7 +64,7 @@ 
 		 * @see Form::open() for more details
 		 * @return string the generated multipart form html
 		 */
-		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST'){
+		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST') {
 			return self::open($path, $attributes, $method, 'multipart/form-data');
 		}
 
@@ -72,7 +72,7 @@ 
 		 * Generate the form close
 		 * @return string the form close html
 		 */
-		public static function close(){
+		public static function close() {
 			return '</form>';
 		}
 
@@ -83,10 +83,10 @@ 
 		 * @param  array  $legendAttributes the legend additional HTML attributes. Is used only is $legend is not empty
 		 * @return string         the generated fieldset value
 		 */
-		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()){
+		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()) {
 			$str = '<fieldset' . attributes_to_string($fieldsetAttributes) . '>';
-			if($legend){
-				$str .= '<legend' . attributes_to_string($legendAttributes) . '>'.$legend.'</legend>';
+			if ($legend) {
+				$str .= '<legend' . attributes_to_string($legendAttributes) . '>' . $legend . '</legend>';
 			}
 			return $str;
 		}
@@ -95,7 +95,7 @@ 
 		 * Generate the fieldset close tag
 		 * @return string the generated html for fieldset close
 		 */
-		public static function fieldsetClose(){
+		public static function fieldsetClose() {
 			return '</fieldset>';
 		}
 
@@ -105,13 +105,13 @@ 
 		 * @param  string $name the form field name
 		 * @return string       the error message if exists and null if not
 		 */
-		public static function error($name){
+		public static function error($name) {
 			$return = null;
 			$obj = & get_instance();
-			if(isset($obj->formvalidation)){
+			if (isset($obj->formvalidation)) {
 				$errors = $obj->formvalidation->returnErrors();
-				$error =  isset($errors[$name]) ? $errors[$name] : null;
-				if($error){
+				$error = isset($errors[$name]) ? $errors[$name] : null;
+				if ($error) {
 					list($errorStart, $errorEnd) = $obj->formvalidation->getErrorDelimiter();
 					$return = $errorStart . $error . $errorEnd;
 				}
@@ -125,7 +125,7 @@ 
 		 * @param  mixed $default the default value if can not found the given form field name
 		 * @return mixed the form field value if is set, otherwise return the default value.
 		 */
-		public static function value($name, $default = null){
+		public static function value($name, $default = null) {
 			$value = get_instance()->request->query($name);
 			return $value ? $value : $default;
 		}
@@ -137,14 +137,14 @@ 
 		 * @param  array  $attributes the additional attributes to be added
 		 * @return string the generated label html content
 		 */
-		public static function label($label, $for = '', array $attributes = array()){
+		public static function label($label, $for = '', array $attributes = array()) {
 			$str = '<label';
-			if($for){
-				$str .= ' for = "'.$for.'"';
+			if ($for) {
+				$str .= ' for = "' . $for . '"';
 			}
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			$str .= $label.'</label>';
+			$str .= $label . '</label>';
 			return $str;
 		}
 
@@ -156,9 +156,9 @@ 
 		 * @param  string $type       the type of the form field (password, text, submit, button, etc.)
 		 * @return string             the generated form field html content for the input
 		 */
-		public static function input($name, $value = null, array $attributes = array(), $type = 'text'){
+		public static function input($name, $value = null, array $attributes = array(), $type = 'text') {
 			$str = null;
-			$str .= '<input name = "'.$name.'" value = "'.$value.'" type = "'.$type.'"';
+			$str .= '<input name = "' . $name . '" value = "' . $value . '" type = "' . $type . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '/>';
 			return $str;
@@ -168,7 +168,7 @@ 
 		 * Generate the form field for "text"
 		 * @see Form::input() for more details
 		 */
-		public static function text($name, $value = null, array $attributes = array()){
+		public static function text($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'text');
 		}
 
@@ -176,7 +176,7 @@ 
 		 * Generate the form field for "password"
 		 * @see Form::input() for more details
 		 */
-		public static function password($name, $value = null, array $attributes = array()){
+		public static function password($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'password');
 		}
 
@@ -184,8 +184,8 @@ 
 		 * Generate the form field for "radio"
 		 * @see Form::input() for more details
 		 */
-		public static function radio($name, $value = null,  $checked = false, array $attributes = array()){
-			if($checked){
+		public static function radio($name, $value = null, $checked = false, array $attributes = array()) {
+			if ($checked) {
 				$attributes['checked'] = true;
 			}
 			return self::input($name, $value, $attributes, 'radio');
@@ -195,8 +195,8 @@ 
 		 * Generate the form field for "checkbox"
 		 * @see Form::input() for more details
 		 */
-		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()){
-			if($checked){
+		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()) {
+			if ($checked) {
 				$attributes['checked'] = true;
 			}
 			return self::input($name, $value, $attributes, 'checkbox');
@@ -206,7 +206,7 @@ 
 		 * Generate the form field for "number"
 		 * @see Form::input() for more details
 		 */
-		public static function number($name, $value = null, array $attributes = array()){
+		public static function number($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'number');
 		}
 
@@ -214,7 +214,7 @@ 
 		 * Generate the form field for "phone"
 		 * @see Form::input() for more details
 		 */
-		public static function phone($name, $value = null, array $attributes = array()){
+		public static function phone($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'phone');
 		}
 
@@ -222,7 +222,7 @@ 
 		 * Generate the form field for "email"
 		 * @see Form::input() for more details
 		 */
-		public static function email($name, $value = null, array $attributes = array()){
+		public static function email($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'email');
 		}
 		
@@ -230,7 +230,7 @@ 
 		 * Generate the form field for "search"
 		 * @see Form::input() for more details
 		 */
-		public static function search($name, $value = null, array $attributes = array()){
+		public static function search($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'search');
 		}
 		
@@ -238,7 +238,7 @@ 
 		 * Generate the form field for "hidden"
 		 * @see Form::input() for more details
 		 */
-		public static function hidden($name, $value = null, array $attributes = array()){
+		public static function hidden($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'hidden');
 		}
 		
@@ -246,7 +246,7 @@ 
 		 * Generate the form field for "file"
 		 * @see Form::input() for more details
 		 */
-		public static function file($name, array $attributes = array()){
+		public static function file($name, array $attributes = array()) {
 			return self::input($name, null, $attributes, 'file');
 		}
 		
@@ -254,7 +254,7 @@ 
 		 * Generate the form field for "button"
 		 * @see Form::input() for more details
 		 */
-		public static function button($name, $value = null, array $attributes = array()){
+		public static function button($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'button');
 		}
 		
@@ -262,7 +262,7 @@ 
 		 * Generate the form field for "reset"
 		 * @see Form::input() for more details
 		 */
-		public static function reset($name, $value = null, array $attributes = array()){
+		public static function reset($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'reset');
 		}
 		
@@ -270,7 +270,7 @@ 
 		 * Generate the form field for "submit"
 		 * @see Form::input() for more details
 		 */
-		public static function submit($name, $value = null, array $attributes = array()){
+		public static function submit($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'submit');
 		}
 
@@ -281,12 +281,12 @@ 
 		 * @param  array  $attributes the additional attributes to be added
 		 * @return string             the generated textarea form html content
 		 */
-		public static function textarea($name, $value = '', array $attributes = array()){
+		public static function textarea($name, $value = '', array $attributes = array()) {
 			$str = null;
-			$str .= '<textarea name = "'.$name.'"';
+			$str .= '<textarea name = "' . $name . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			$str .= $value.'</textarea>';
+			$str .= $value . '</textarea>';
 			return $str;
 		}
 		
@@ -298,20 +298,20 @@ 
 		 * @param  array  $attributes the additional attribute to be added
 		 * @return string             the generated form field html content for select
 		 */
-		public static function select($name, $values = null, $selected = null, array $attributes = array()){
-			if(! is_array($values)){
+		public static function select($name, $values = null, $selected = null, array $attributes = array()) {
+			if (!is_array($values)) {
 				$values = array('' => $values);
 			}
 			$str = null;
-			$str .= '<select name = "'.$name.'"';
+			$str .= '<select name = "' . $name . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			foreach($values as $key => $val){
+			foreach ($values as $key => $val) {
 				$select = '';
-				if($key == $selected){
+				if ($key == $selected) {
 					$select = 'selected';
 				}
-				$str .= '<option value = "'.$key.'" '.$select.'>'.$val.'</option>';
+				$str .= '<option value = "' . $key . '" ' . $select . '>' . $val . '</option>';
 			}
 			$str .= '</select>';
 			return $str;

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 	/**
 	* Custom application path for tests 
 	*/
-	define('APPS_PATH', TESTS_PATH .'hmvc' . DS);
+	define('APPS_PATH', TESTS_PATH . 'hmvc' . DS);
 
 	/**
 	* The path to the controller directory of your application.
@@ -202,7 +202,7 @@ 
 	* It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
 	* in HMVC architecture (hierichical, controllers, models, views).
 	*/
-	define('MODULE_PATH', dirname(realpath(__FILE__)) . DS .'hmvc' . DS . 'modules' . DS);
+	define('MODULE_PATH', dirname(realpath(__FILE__)) . DS . 'hmvc' . DS . 'modules' . DS);
 
 	/**
 	* The path to the directory of sources external to your application.
@@ -242,7 +242,7 @@ 
 	$_SESSION = array();
 	
 	//check for composer autoload file if exists include it
-	if (file_exists(VENDOR_PATH . 'autoload.php')){
+	if (file_exists(VENDOR_PATH . 'autoload.php')) {
 		require_once VENDOR_PATH . 'autoload.php';
 		
 		//define the class alias for vstream