tnhfw / tnh-fw

core/classes/database/DatabaseQueryRunner.php

Indentation +163 added lines, -163 removed lines

@@ -1,90 +1,90 @@ 
 <?php
     defined('ROOT_PATH') || exit('Access denied');
-  /**
-   * TNH Framework
-   *
-   * A simple PHP framework using HMVC architecture
-   *
-   * This content is released under the GNU GPL License (GPL)
-   *
-   * Copyright (C) 2017 Tony NGUEREZA
-   *
-   * This program is free software; you can redistribute it and/or
-   * modify it under the terms of the GNU General Public License
-   * as published by the Free Software Foundation; either version 3
-   * of the License, or (at your option) any later version.
-   *
-   * This program is distributed in the hope that it will be useful,
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   * GNU General Public License for more details.
-   *
-   * You should have received a copy of the GNU General Public License
-   * along with this program; if not, write to the Free Software
-   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  */
-  class DatabaseQueryRunner{
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
+    class DatabaseQueryRunner{
       
     /**
-	* The logger instance
-	* @var object
-	*/
+     * The logger instance
+     * @var object
+     */
     private $logger            = null;
     
-  	/**
-  	 * The last query result
-  	 * @var object
-  	*/
-  	private $queryResult       = null;
+        /**
+         * The last query result
+         * @var object
+         */
+        private $queryResult       = null;
   	
-  	/**
-    * The benchmark instance
-    * @var object
-    */
+        /**
+         * The benchmark instance
+         * @var object
+         */
     private $benchmarkInstance = null;
     
     /**
-	 * The SQL query statment to execute
-	 * @var string
-	*/
+     * The SQL query statment to execute
+     * @var string
+     */
     private $query             = null;
     
     /**
-	 * Indicate if we need return result as list (boolean) 
+     * Indicate if we need return result as list (boolean) 
      * or the data used to replace the placeholder (array)
-	 * @var array|boolean
-	 */
-     private $returnAsList     = true;
+     * @var array|boolean
+     */
+        private $returnAsList     = true;
      
      
-     /**
-	   * Indicate if we need return result as array or not
-     * @var boolean
-	   */
-     private $returnAsArray     = true;
+        /**
+         * Indicate if we need return result as array or not
+         * @var boolean
+         */
+        private $returnAsArray     = true;
      
-     /**
-     * The last PDOStatment instance
-     * @var object
-     */
-     private $pdoStatment       = null;
+        /**
+         * The last PDOStatment instance
+         * @var object
+         */
+        private $pdoStatment       = null;
      
-     /**
-  	 * The error returned for the last query
-  	 * @var string
-  	 */
-     private $error             = null;
+        /**
+         * The error returned for the last query
+         * @var string
+         */
+        private $error             = null;
 	
     /**
      * The PDO instance
      * @var object
-    */
+     */
     private $pdo                = null;
   
     /**
      * The database driver name used
      * @var string
-    */
+     */
     private $driver             = null;
 
 
@@ -98,7 +98,7 @@ 
      */
     public function __construct(PDO $pdo = null, $query = null, $returnAsList = true, $returnAsArray = false){
         if (is_object($pdo)){
-          $this->pdo = $pdo;
+            $this->pdo = $pdo;
         }
         $this->query         = $query;
         $this->returnAsList  = $returnAsList;
@@ -116,10 +116,10 @@ 
         //reset instance
         $this->reset();
        
-       //for database query execution time
+        //for database query execution time
         $benchmarkMarkerKey = $this->getBenchmarkKey();
         if (! is_object($this->benchmarkInstance)){
-          $this->benchmarkInstance = & class_loader('Benchmark');
+            $this->benchmarkInstance = & class_loader('Benchmark');
         }
         
         $this->logger->info('Execute SQL query [' . $this->query . ']');
@@ -132,101 +132,101 @@ 
         $responseTime = $this->benchmarkInstance->elapsedTime(
                                                                 'DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 
                                                                 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')'
-                                                              );
-		    //TODO use the configuration value for the high response time currently is 1 second
+                                                                );
+            //TODO use the configuration value for the high response time currently is 1 second
         if ($responseTime >= 1 ){
             $this->logger->warning(
                                     'High response time while processing database query [' . $this->query . ']. 
                                      The response time is [' .$responseTime. '] sec.'
-                                  );
+                                    );
         }
 		
         if ($this->pdoStatment !== false){
-          $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
-          if($isSqlSELECTQuery){
-              $this->setResultForSelect();              
-          }
-          else{
-              $this->setResultForNonSelect();
-          }
-          return $this->queryResult;
+            $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
+            if($isSqlSELECTQuery){
+                $this->setResultForSelect();              
+            }
+            else{
+                $this->setResultForNonSelect();
+            }
+            return $this->queryResult;
         }
         $this->setQueryRunnerError();
     }
 	
-   /**
-   * Return the result for SELECT query
-   * @see DatabaseQueryRunner::execute
-   */
+    /**
+     * Return the result for SELECT query
+     * @see DatabaseQueryRunner::execute
+     */
     protected function setResultForSelect(){
-      //if need return all result like list of record
-      $result = null;
-      $numRows = 0;
-      $fetchMode = PDO::FETCH_OBJ;
-      if($this->returnAsArray){
+        //if need return all result like list of record
+        $result = null;
+        $numRows = 0;
+        $fetchMode = PDO::FETCH_OBJ;
+        if($this->returnAsArray){
         $fetchMode = PDO::FETCH_ASSOC;
-      }
-      if ($this->returnAsList){
-          $result = $this->pdoStatment->fetchAll($fetchMode);
-      }
-      else{
-          $result = $this->pdoStatment->fetch($fetchMode);
-      }
-      //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->driver, array('sqlite', 'pgsql'))){
+        }
+        if ($this->returnAsList){
+            $result = $this->pdoStatment->fetchAll($fetchMode);
+        }
+        else{
+            $result = $this->pdoStatment->fetch($fetchMode);
+        }
+        //Sqlite and pgsql always return 0 when using rowCount()
+        if (in_array($this->driver, array('sqlite', 'pgsql'))){
         $numRows = count($result);  
-      }
-      else{
+        }
+        else{
         $numRows = $this->pdoStatment->rowCount(); 
-      }
-      if(! is_object($this->queryResult)){
-          $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
-      }
-      $this->queryResult->setResult($result);
-      $this->queryResult->setNumRows($numRows);
+        }
+        if(! is_object($this->queryResult)){
+            $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
+        }
+        $this->queryResult->setResult($result);
+        $this->queryResult->setNumRows($numRows);
     }
 
     /**
-   * Return the result for non SELECT query
-   * @see DatabaseQueryRunner::execute
-   */
+     * Return the result for non SELECT query
+     * @see DatabaseQueryRunner::execute
+     */
     protected function setResultForNonSelect(){
-      //Sqlite and pgsql always return 0 when using rowCount()
-      $result = false;
-      $numRows = 0;
-      if (in_array($this->driver, array('sqlite', 'pgsql'))){
+        //Sqlite and pgsql always return 0 when using rowCount()
+        $result = false;
+        $numRows = 0;
+        if (in_array($this->driver, array('sqlite', 'pgsql'))){
         $result = true; //to test the result for the query like UPDATE, INSERT, DELETE
         $numRows = 1; //TODO use the correct method to get the exact affected row
-      }
-      else{
-          //to test the result for the query like UPDATE, INSERT, DELETE
-          $result  = $this->pdoStatment->rowCount() >= 0; 
-          $numRows = $this->pdoStatment->rowCount(); 
-      }
-      if(! is_object($this->queryResult)){
-          $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
-      }
-      $this->queryResult->setResult($result);
-      $this->queryResult->setNumRows($numRows);
+        }
+        else{
+            //to test the result for the query like UPDATE, INSERT, DELETE
+            $result  = $this->pdoStatment->rowCount() >= 0; 
+            $numRows = $this->pdoStatment->rowCount(); 
+        }
+        if(! is_object($this->queryResult)){
+            $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
+        }
+        $this->queryResult->setResult($result);
+        $this->queryResult->setNumRows($numRows);
     }
 
 
-	/**
+    /**
      * Return the benchmark instance
      * @return Benchmark
      */
     public function getBenchmark(){
-      return $this->benchmarkInstance;
+        return $this->benchmarkInstance;
     }
 
     /**
      * Set the benchmark instance
      * @param Benchmark $benchmark the benchmark object
-	 * @return object DatabaseQueryRunner
+     * @return object DatabaseQueryRunner
      */
     public function setBenchmark($benchmark){
-      $this->benchmarkInstance = $benchmark;
-      return $this;
+        $this->benchmarkInstance = $benchmark;
+        return $this;
     }
     
     /**
@@ -235,18 +235,18 @@ 
      * @return object DatabaseQueryResult
      */
     public function getQueryResult(){
-      return $this->queryResult;
+        return $this->queryResult;
     }
 
     /**
      * Set the database query result instance
      * @param object $queryResult the query result
      *
-	 * @return object DatabaseQueryRunner
+     * @return object DatabaseQueryRunner
      */
     public function setQueryResult(DatabaseQueryResult $queryResult){
-      $this->queryResult = $queryResult;
-      return $this;
+        $this->queryResult = $queryResult;
+        return $this;
     }
     
     /**
@@ -254,17 +254,17 @@ 
      * @return Log
      */
     public function getLogger(){
-      return $this->logger;
+        return $this->logger;
     }
 
     /**
      * Set the log instance
      * @param Log $logger the log object
-	 * @return object DatabaseQueryRunner
+     * @return object DatabaseQueryRunner
      */
     public function setLogger($logger){
-      $this->logger = $logger;
-      return $this;
+        $this->logger = $logger;
+        return $this;
     }
     
     /**
@@ -272,7 +272,7 @@ 
      * @return string
      */
     public function getQuery(){
-      return $this->query;
+        return $this->query;
     }
     
     /**
@@ -281,8 +281,8 @@ 
      * @return object DatabaseQueryRunner
      */
     public function setQuery($query){
-       $this->query = $query;
-       return $this;
+        $this->query = $query;
+        return $this;
     }
     
     /**
@@ -291,8 +291,8 @@ 
      * @return object DatabaseQueryRunner
      */
     public function setReturnType($returnType){
-       $this->returnAsList = $returnType;
-       return $this;
+        $this->returnAsList = $returnType;
+        return $this;
     }
     
     /**
@@ -301,8 +301,8 @@ 
      * @return object DatabaseQueryRunner
      */
     public function setReturnAsArray($status = true){
-       $this->returnAsArray = $status;
-       return $this;
+        $this->returnAsArray = $status;
+        return $this;
     }
     
     /**
@@ -310,7 +310,7 @@ 
      * @return string
      */
     public function getQueryError(){
-      return $this->error;
+        return $this->error;
     }
 
     /**
@@ -318,7 +318,7 @@ 
      * @return object
      */
     public function getPdo(){
-      return $this->pdo;
+        return $this->pdo;
     }
 
     /**
@@ -327,16 +327,16 @@ 
      * @return object DatabaseQueryRunner
      */
     public function setPdo(PDO $pdo = null){
-      $this->pdo = $pdo;
-      return $this;
+        $this->pdo = $pdo;
+        return $this;
     }
   
-     /**
-     * Return the database driver
-     * @return string
-     */
+        /**
+         * Return the database driver
+         * @return string
+         */
     public function getDriver(){
-      return $this->driver;
+        return $this->driver;
     }
 
     /**
@@ -345,8 +345,8 @@ 
      * @return object DatabaseQueryRunner
      */
     public function setDriver($driver){
-      $this->driver = $driver;
-      return $this;
+        $this->driver = $driver;
+        return $this;
     }
     
     /**
@@ -355,18 +355,18 @@ 
      *  @return string
      */
     protected function getBenchmarkKey(){
-      return md5($this->query . $this->returnAsList . $this->returnAsArray);
+        return md5($this->query . $this->returnAsList . $this->returnAsArray);
     }
     
     /**
      * Set error for database query execution
      */
     protected function setQueryRunnerError(){
-      $error = $this->pdo->errorInfo();
-      $this->error = isset($error[2]) ? $error[2] : '';
-      $this->logger->error('The database query execution got an error: ' . stringfy_vars($error));
-	  //show error message
-      show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
+        $error = $this->pdo->errorInfo();
+        $this->error = isset($error[2]) ? $error[2] : '';
+        $this->logger->error('The database query execution got an error: ' . stringfy_vars($error));
+        //show error message
+        show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
     }
     
     /**
@@ -374,19 +374,19 @@ 
      * @param object $logger the Log instance if not null
      */
     protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
+        if ($logger !== null){
         $this->logger = $logger;
-      }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
-          $this->logger->setLogger('Library::DatabaseQueryRunner');
-      }
+        }
+        else{
+            $this->logger =& class_loader('Log', 'classes');
+            $this->logger->setLogger('Library::DatabaseQueryRunner');
+        }
     }
     
     
     /**
-    * Reset the instance before run each query
-    */
+     * Reset the instance before run each query
+     */
     private function reset(){
         $this->error = null;
         $this->pdoStatment = null;

core/functions/function_user_agent.php

Indentation +70 added lines, -70 removed lines

@@ -1,75 +1,75 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
 
-	/**
-	 *  @file function_user_agent.php
-	 *    
-	 *  Contains most of the utility functions for agent, platform, mobile, browser, and other management.
-	 *  
-	 *  @package	core
-	 *  @author	Tony NGUEREZA
-	 *  @copyright	Copyright (c) 2017
-	 *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
-	 *  @link	http://www.iacademy.cf
-	 *  @version 1.0.0
-	 *  @since 1.0.0
-	 *  @filesource
-	 */
+    /**
+     *  @file function_user_agent.php
+     *    
+     *  Contains most of the utility functions for agent, platform, mobile, browser, and other management.
+     *  
+     *  @package	core
+     *  @author	Tony NGUEREZA
+     *  @copyright	Copyright (c) 2017
+     *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
+     *  @link	http://www.iacademy.cf
+     *  @version 1.0.0
+     *  @since 1.0.0
+     *  @filesource
+     */
 	
 	 
-	if(! function_exists('get_ip')){
-		/**
-		 *  Retrieves the user's IP address
-		 *  
-		 *  This function allows to retrieve the IP address of the client
-		 *  even if it uses a proxy, the actual IP address is retrieved.
-		 *  
-		 *  @return string the IP address.
-		 */
-		function get_ip(){
-			$ip = '127.0.0.1';
-			$ipServerVars = array(
-								'REMOTE_ADDR',
-								'HTTP_CLIENT_IP',
-								'HTTP_X_FORWARDED_FOR',
-								'HTTP_X_FORWARDED',
-								'HTTP_FORWARDED_FOR',
-								'HTTP_FORWARDED'
-							);
-			foreach ($ipServerVars as $var) {
-				if(isset($_SERVER[$var])){
-					$ip = $_SERVER[$var];
-					break;
-				}
-			}
-			// Strip any secondary IP etc from the IP address
-			if (strpos($ip, ',') > 0) {
-				$ip = substr($ip, 0, strpos($ip, ','));
-			}
-			return $ip;
-		}
-	}
+    if(! function_exists('get_ip')){
+        /**
+         *  Retrieves the user's IP address
+         *  
+         *  This function allows to retrieve the IP address of the client
+         *  even if it uses a proxy, the actual IP address is retrieved.
+         *  
+         *  @return string the IP address.
+         */
+        function get_ip(){
+            $ip = '127.0.0.1';
+            $ipServerVars = array(
+                                'REMOTE_ADDR',
+                                'HTTP_CLIENT_IP',
+                                'HTTP_X_FORWARDED_FOR',
+                                'HTTP_X_FORWARDED',
+                                'HTTP_FORWARDED_FOR',
+                                'HTTP_FORWARDED'
+                            );
+            foreach ($ipServerVars as $var) {
+                if(isset($_SERVER[$var])){
+                    $ip = $_SERVER[$var];
+                    break;
+                }
+            }
+            // Strip any secondary IP etc from the IP address
+            if (strpos($ip, ',') > 0) {
+                $ip = substr($ip, 0, strpos($ip, ','));
+            }
+            return $ip;
+        }
+    }

core/libraries/Assets.php

Indentation +154 added lines, -154 removed lines

@@ -1,168 +1,168 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	/**
-	 *  @file Assets.php
-	 *    
-	 *  This class contains static methods for generating static content links (images, Javascript, CSS, etc.).
-	 *  
-	 *  @package	core	
-	 *  @author	Tony NGUEREZA
-	 *  @copyright	Copyright (c) 2017
-	 *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
-	 *  @link	http://www.iacademy.cf
-	 *  @version 1.0.0
-	 *  @since 1.0.0
-	 *  @filesource
-	 */
-	class Assets{
+    /**
+     *  @file Assets.php
+     *    
+     *  This class contains static methods for generating static content links (images, Javascript, CSS, etc.).
+     *  
+     *  @package	core	
+     *  @author	Tony NGUEREZA
+     *  @copyright	Copyright (c) 2017
+     *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
+     *  @link	http://www.iacademy.cf
+     *  @version 1.0.0
+     *  @since 1.0.0
+     *  @filesource
+     */
+    class Assets{
 		
-		/**
-		 * The logger instance
-		 * @var object
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var object
+         */
+        private static $logger;
 
-		/**
-		 * The signleton of the logger
-		 * @return Object the Log instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				//can't assign reference to static variable
-				self::$logger[0] =& class_loader('Log', 'classes');
-				self::$logger[0]->setLogger('Library::Assets');
-			}
-			return self::$logger[0];
-		}
+        /**
+         * The signleton of the logger
+         * @return Object the Log instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                //can't assign reference to static variable
+                self::$logger[0] =& class_loader('Log', 'classes');
+                self::$logger[0]->setLogger('Library::Assets');
+            }
+            return self::$logger[0];
+        }
 
 
-		/**
-		 *  Generate the link of the assets file.
-		 *  
-		 *  Generates the absolute link of a file inside ASSETS_PATH folder.
-		 *  For example :
-		 *  	echo Assets::path('foo/bar/css/style.css'); => http://mysite.com/assets/foo/bar/css/style.css
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $asset the name of the assets file path with the extension.
-		 *  @return string|null the absolute path of the assets file, if it exists otherwise returns null if the file does not exist.
-		 */
-		public static function path($asset){
-			$logger = self::getLogger();	
-			$path = ASSETS_PATH . $asset;
+        /**
+         *  Generate the link of the assets file.
+         *  
+         *  Generates the absolute link of a file inside ASSETS_PATH folder.
+         *  For example :
+         *  	echo Assets::path('foo/bar/css/style.css'); => http://mysite.com/assets/foo/bar/css/style.css
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $asset the name of the assets file path with the extension.
+         *  @return string|null the absolute path of the assets file, if it exists otherwise returns null if the file does not exist.
+         */
+        public static function path($asset){
+            $logger = self::getLogger();	
+            $path = ASSETS_PATH . $asset;
 			
-			$logger->debug('Including the Assets file [' . $path . ']');
-			//Check if the file exists
-			if(file_exists($path)){
-				$logger->info('Assets file [' . $path . '] included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] does not exist');
-			return null;
-		}
+            $logger->debug('Including the Assets file [' . $path . ']');
+            //Check if the file exists
+            if(file_exists($path)){
+                $logger->info('Assets file [' . $path . '] included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] does not exist');
+            return null;
+        }
 		
-		/**
-		 *  Generate the link of the css file.
-		 *  
-		 *  Generates the absolute link of a file containing the CSS style.
-		 *  For example :
-		 *  	echo Assets::css('mystyle'); => http://mysite.com/assets/css/mystyle.css
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $path the name of the css file without the extension.
-		 *  @return string|null the absolute path of the css file, if it exists otherwise returns null if the file does not exist.
-		 */
-		public static function css($path){
-			$logger = self::getLogger();
-			/*
+        /**
+         *  Generate the link of the css file.
+         *  
+         *  Generates the absolute link of a file containing the CSS style.
+         *  For example :
+         *  	echo Assets::css('mystyle'); => http://mysite.com/assets/css/mystyle.css
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $path the name of the css file without the extension.
+         *  @return string|null the absolute path of the css file, if it exists otherwise returns null if the file does not exist.
+         */
+        public static function css($path){
+            $logger = self::getLogger();
+            /*
 			* if the file name contains the ".css" extension, replace it with 
 			* an empty string for better processing.
 			*/
-			$path = str_ireplace('.css', '', $path);
-			$path = ASSETS_PATH . 'css/' . $path . '.css';
+            $path = str_ireplace('.css', '', $path);
+            $path = ASSETS_PATH . 'css/' . $path . '.css';
 			
-			$logger->debug('Including the Assets file [' . $path . '] for CSS');
-			//Check if the file exists
-			if(file_exists($path)){
-				$logger->info('Assets file [' . $path . '] for CSS included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] for CSS does not exist');
-			return null;
-		}
+            $logger->debug('Including the Assets file [' . $path . '] for CSS');
+            //Check if the file exists
+            if(file_exists($path)){
+                $logger->info('Assets file [' . $path . '] for CSS included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] for CSS does not exist');
+            return null;
+        }
 
-		/**
-		 *  Generate the link of the javascript file.
-		 *  
-		 *  Generates the absolute link of a file containing the javascript.
-		 *  For example :
-		 *  	echo Assets::js('myscript'); => http://mysite.com/assets/js/myscript.js
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $path the name of the javascript file without the extension.
-		 *  @return string|null the absolute path of the javascript file, if it exists otherwise returns null if the file does not exist.
-		 */
-		public static function js($path){
-			$logger = self::getLogger();
-			$path = str_ireplace('.js', '', $path);
-			$path = ASSETS_PATH . 'js/' . $path . '.js';
-			$logger->debug('Including the Assets file [' . $path . '] for javascript');
-			if(file_exists($path)){
-				$logger->info('Assets file [' . $path . '] for Javascript included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] for Javascript does not exist');
-			return null;
-		}
+        /**
+         *  Generate the link of the javascript file.
+         *  
+         *  Generates the absolute link of a file containing the javascript.
+         *  For example :
+         *  	echo Assets::js('myscript'); => http://mysite.com/assets/js/myscript.js
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $path the name of the javascript file without the extension.
+         *  @return string|null the absolute path of the javascript file, if it exists otherwise returns null if the file does not exist.
+         */
+        public static function js($path){
+            $logger = self::getLogger();
+            $path = str_ireplace('.js', '', $path);
+            $path = ASSETS_PATH . 'js/' . $path . '.js';
+            $logger->debug('Including the Assets file [' . $path . '] for javascript');
+            if(file_exists($path)){
+                $logger->info('Assets file [' . $path . '] for Javascript included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] for Javascript does not exist');
+            return null;
+        }
 
-		/**
-		 *  Generate the link of the image file.
-		 *  
-		 *  Generates the absolute link of a file containing the image.
-		 *  For example :
-		 *  	echo Assets::img('myimage.png'); => http://mysite.com/assets/images/myimage.png
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $path the name of the image file with the extension.
-		 *  @return string|null the absolute path of the image file, if it exists otherwise returns null if the file does not exist.
-		 */
-		public static function img($path){
-			$logger = self::getLogger();
-			$path = ASSETS_PATH . 'images/' . $path;
-			$logger->debug('Including the Assets file [' . $path . '] for image');
-			if(file_exists($path)){
-				$logger->info('Assets file [' . $path . '] for image included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] for image does not exist');
-			return null;
-		}
-	}
+        /**
+         *  Generate the link of the image file.
+         *  
+         *  Generates the absolute link of a file containing the image.
+         *  For example :
+         *  	echo Assets::img('myimage.png'); => http://mysite.com/assets/images/myimage.png
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $path the name of the image file with the extension.
+         *  @return string|null the absolute path of the image file, if it exists otherwise returns null if the file does not exist.
+         */
+        public static function img($path){
+            $logger = self::getLogger();
+            $path = ASSETS_PATH . 'images/' . $path;
+            $logger->debug('Including the Assets file [' . $path . '] for image');
+            if(file_exists($path)){
+                $logger->info('Assets file [' . $path . '] for image included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] for image does not exist');
+            return null;
+        }
+    }

core/bootstrap.php

Indentation +165 added lines, -165 removed lines

@@ -1,195 +1,195 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	/**
-	 *  @file bootstrap.php
-	 *  
-	 *  Contains the loading process: loading of constants, common functions, libraries 
-	 *  configurations, etc
-	 *  verification of the environment and the routing of the request.
-	 *  
-	 *  @package	core	
-	 *  @author	Tony NGUEREZA
-	 *  @copyright	Copyright (c) 2017
-	 *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
-	 *  @link	http://www.iacademy.cf
-	 *  @version 1.0.0
-	 *  @filesource
-	 */
+    /**
+     *  @file bootstrap.php
+     *  
+     *  Contains the loading process: loading of constants, common functions, libraries 
+     *  configurations, etc
+     *  verification of the environment and the routing of the request.
+     *  
+     *  @package	core	
+     *  @author	Tony NGUEREZA
+     *  @copyright	Copyright (c) 2017
+     *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
+     *  @link	http://www.iacademy.cf
+     *  @version 1.0.0
+     *  @filesource
+     */
 	
-	//if the application is running in CLI mode $_SESSION global variable is not available
-	if(IS_CLI){
-		$_SESSION = array();
-	}
+    //if the application is running in CLI mode $_SESSION global variable is not available
+    if(IS_CLI){
+        $_SESSION = array();
+    }
 		
-	/**
-	*  inclusion of global constants of the environment that contain : name of the framework,
-	*  version, release date, version of PHP required, etc.
-	*/
-	require_once CORE_PATH . 'constants.php';	
+    /**
+     *  inclusion of global constants of the environment that contain : name of the framework,
+     *  version, release date, version of PHP required, etc.
+     */
+    require_once CORE_PATH . 'constants.php';	
 	
-	/**
-	 *  include file containing commons functions used in the framework such: show_error, 
-	 *  php_exception_handler, php_error_handler, get_instance, etc.
-	 */
-	require_once CORE_PATH . 'common.php';
+    /**
+     *  include file containing commons functions used in the framework such: show_error, 
+     *  php_exception_handler, php_error_handler, get_instance, etc.
+     */
+    require_once CORE_PATH . 'common.php';
 
-	/**
-	 * The Benchmark class
-	 */
-	$BENCHMARK =& class_loader('Benchmark');
+    /**
+     * The Benchmark class
+     */
+    $BENCHMARK =& class_loader('Benchmark');
 	
-	$BENCHMARK->mark('APP_EXECUTION_START');
+    $BENCHMARK->mark('APP_EXECUTION_START');
 	
-	/**
-    * instance of the Log class
-    */
+    /**
+     * instance of the Log class
+     */
     $LOGGER =& class_loader('Log', 'classes');
 
     $LOGGER->setLogger('ApplicationBootstrap');
 
     $LOGGER->debug('Checking PHP version ...');	
 	
-	/**
-	* Verification of the PHP environment: minimum and maximum version
-	*/
-	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
-		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
-	}
-	else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
-		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
-	}
-	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
+    /**
+     * Verification of the PHP environment: minimum and maximum version
+     */
+    if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+        show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
+    }
+    else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+        show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
+    }
+    $LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
 
-	/**
-	* Setting of the PHP error message handling function
-	*/
-	set_error_handler('php_error_handler');
+    /**
+     * Setting of the PHP error message handling function
+     */
+    set_error_handler('php_error_handler');
 
-	/**
-	* Setting of the PHP error exception handling function
-	*/
-	set_exception_handler('php_exception_handler');
+    /**
+     * Setting of the PHP error exception handling function
+     */
+    set_exception_handler('php_exception_handler');
 
-	/**
-	 * Setting of the PHP shutdown handling function
-	 */
-	register_shutdown_function('php_shudown_handler');
+    /**
+     * Setting of the PHP shutdown handling function
+     */
+    register_shutdown_function('php_shudown_handler');
 	
-	//if user have some composer packages
-	$LOGGER->debug('Check for composer autoload');
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
-		$LOGGER->info('The composer autoload file exists include it');
-		require_once VENDOR_PATH . 'autoload.php';
-	}
-	else{
-		$LOGGER->info('The composer autoload file does not exist skipping');
-	}
+    //if user have some composer packages
+    $LOGGER->debug('Check for composer autoload');
+    if(file_exists(VENDOR_PATH . 'autoload.php')){
+        $LOGGER->info('The composer autoload file exists include it');
+        require_once VENDOR_PATH . 'autoload.php';
+    }
+    else{
+        $LOGGER->info('The composer autoload file does not exist skipping');
+    }
 	
-	$LOGGER->debug('Begin to load the required resources');
+    $LOGGER->debug('Begin to load the required resources');
 
-	/**
-	 * Load the EventInfo class file
-	 */
-	require_once CORE_CLASSES_PATH . 'EventInfo.php';
+    /**
+     * Load the EventInfo class file
+     */
+    require_once CORE_CLASSES_PATH . 'EventInfo.php';
 
 
-	$BENCHMARK->mark('CONFIG_INIT_START');
-	/**
-	* Load configurations and using the 
-	* static method "init()" to initialize the Config class .
-	*/
-	$CONFIG =& class_loader('Config', 'classes');	
-	$CONFIG->init();
-	$BENCHMARK->mark('CONFIG_INIT_END');
+    $BENCHMARK->mark('CONFIG_INIT_START');
+    /**
+     * Load configurations and using the 
+     * static method "init()" to initialize the Config class .
+     */
+    $CONFIG =& class_loader('Config', 'classes');	
+    $CONFIG->init();
+    $BENCHMARK->mark('CONFIG_INIT_END');
 
-	$BENCHMARK->mark('MODULE_INIT_START');
-	/**
-	* Load modules and using the 
-	* static method "init()" to initialize the Module class.
-	*/
-	$MODULE =& class_loader('Module', 'classes');
-	$MODULE->init();
-	$BENCHMARK->mark('MODULE_INIT_END');
+    $BENCHMARK->mark('MODULE_INIT_START');
+    /**
+     * Load modules and using the 
+     * static method "init()" to initialize the Module class.
+     */
+    $MODULE =& class_loader('Module', 'classes');
+    $MODULE->init();
+    $BENCHMARK->mark('MODULE_INIT_END');
 
-	$LOGGER->debug('Loading Base Controller ...');
-	/**
-	 * Include of the file containing the Base Controller class 
-	 */
-	require_once CORE_CLASSES_PATH . 'Controller.php';
-	$LOGGER->info('Base Controller loaded successfully');
+    $LOGGER->debug('Loading Base Controller ...');
+    /**
+     * Include of the file containing the Base Controller class 
+     */
+    require_once CORE_CLASSES_PATH . 'Controller.php';
+    $LOGGER->info('Base Controller loaded successfully');
 
-	/**
-	* Register controllers autoload function
-	*/
-	 spl_autoload_register('autoload_controller');
+    /**
+     * Register controllers autoload function
+     */
+        spl_autoload_register('autoload_controller');
 
-	/**
-	* Loading Security class
-	*/
-	$SECURITY =& class_loader('Security', 'classes');
-	$SECURITY->checkWhiteListIpAccess();
+    /**
+     * Loading Security class
+     */
+    $SECURITY =& class_loader('Security', 'classes');
+    $SECURITY->checkWhiteListIpAccess();
 	
-	/**
-	* Loading Url class
-	*/
-	$URL =& class_loader('Url', 'classes');
+    /**
+     * Loading Url class
+     */
+    $URL =& class_loader('Url', 'classes');
 	
-	if(get_config('cache_enable', false)){
-		/**
-		 * Load Cache interface file
-		 */
-		require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
-		$cacheHandler = get_config('cache_handler');
-		if(! $cacheHandler){
-			show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
-		}
-		$CACHE = null;
-		//first check if the cache handler is the system driver
-		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
-			$CACHE =& class_loader($cacheHandler, 'classes/cache');
-		}
-		else{
-			//it's not a system driver use user library
-			$CACHE =& class_loader($cacheHandler);
-		}
-		//check if the page already cached
-		if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
-			$RESPONSE = & class_loader('Response', 'classes');
-			$RESPONSE->renderFinalPageFromCache($CACHE);
-		}
-	}
+    if(get_config('cache_enable', false)){
+        /**
+         * Load Cache interface file
+         */
+        require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
+        $cacheHandler = get_config('cache_handler');
+        if(! $cacheHandler){
+            show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
+        }
+        $CACHE = null;
+        //first check if the cache handler is the system driver
+        if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
+            $CACHE =& class_loader($cacheHandler, 'classes/cache');
+        }
+        else{
+            //it's not a system driver use user library
+            $CACHE =& class_loader($cacheHandler);
+        }
+        //check if the page already cached
+        if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+            $RESPONSE = & class_loader('Response', 'classes');
+            $RESPONSE->renderFinalPageFromCache($CACHE);
+        }
+    }
 	
-	//load model class
-	require_once CORE_CLASSES_MODEL_PATH . 'Model.php';
+    //load model class
+    require_once CORE_CLASSES_MODEL_PATH . 'Model.php';
 	
-	$LOGGER->info('Everything is OK load Router library and dispatch the request to the corresponding controller');
-	/**
-	* Routing
-	* instantiation of the "Router" class and request processing.
-	*/
-	$ROUTER = & class_loader('Router', 'classes');
-	$ROUTER->processRequest();
+    $LOGGER->info('Everything is OK load Router library and dispatch the request to the corresponding controller');
+    /**
+     * Routing
+     * instantiation of the "Router" class and request processing.
+     */
+    $ROUTER = & class_loader('Router', 'classes');
+    $ROUTER->processRequest();

core/classes/Url.php

Indentation +137 added lines, -137 removed lines

@@ -1,149 +1,149 @@
 <?php
-	defined('ROOT_PATH') or exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') or exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
 
-	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)){
-				return $path;
-			}
-			return get_config('base_url') . $path;
-		}
+        /**
+         * 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)){
+                return $path;
+            }
+            return get_config('base_url') . $path;
+        }
 
-		/**
-		 * Return the link using base_url config with front controller "index.php"
-		 * @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)){
-				return $path;
-			}
-			$path = rtrim($path, '/');
-			$baseUrl = get_config('base_url');
-			$frontController = get_config('front_controller');
-			$url = $baseUrl;
-			if($frontController){
-				$url .= $frontController . '/';
-			}
-			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{
-					$path .= $suffix;
-				}
-			}
-			return $url . $path;
-		}
+        /**
+         * Return the link using base_url config with front controller "index.php"
+         * @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)){
+                return $path;
+            }
+            $path = rtrim($path, '/');
+            $baseUrl = get_config('base_url');
+            $frontController = get_config('front_controller');
+            $url = $baseUrl;
+            if($frontController){
+                $url .= $frontController . '/';
+            }
+            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{
+                    $path .= $suffix;
+                }
+            }
+            return $url . $path;
+        }
 
-		/**
-		 * Return the current site URL
-		 * @return string
-		 */
-		public static function current(){
-			$current = '/';
-			$requestUri = get_instance()->request->requestUri();
-			if($requestUri){
-				$current = $requestUri;
-			}
-			return static::domain() . $current;
-		}
+        /**
+         * Return the current site URL
+         * @return string
+         */
+        public static function current(){
+            $current = '/';
+            $requestUri = get_instance()->request->requestUri();
+            if($requestUri){
+                $current = $requestUri;
+            }
+            return static::domain() . $current;
+        }
 
-		/**
-		 * Generate a friendly  text to use in link (slugs)
-		 * @param  string  $str       the title or text to use to get the friendly text
-		 * @param  string  $separator the caracters separator
-		 * @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){
-			$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');
-			$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){
-				$str = substr($str, 0, -1);
-			}
-			if($lowercase){
-				$str = strtolower($str);
-			}
-			return $str;
-		}
+        /**
+         * Generate a friendly  text to use in link (slugs)
+         * @param  string  $str       the title or text to use to get the friendly text
+         * @param  string  $separator the caracters separator
+         * @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){
+            $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');
+            $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){
+                $str = substr($str, 0, -1);
+            }
+            if($lowercase){
+                $str = strtolower($str);
+            }
+            return $str;
+        }
 
-		/**
-		 * Get the current application domain with protocol
-		 * @return string the domain name
-		 */
-		public static function domain(){
-			$domain = 'localhost';
-			$port = get_instance()->request->server('SERVER_PORT');
-			$protocol = 'http';
-			if(is_https()){
-				$protocol = 'https';
-			}
+        /**
+         * Get the current application domain with protocol
+         * @return string the domain name
+         */
+        public static function domain(){
+            $domain = 'localhost';
+            $port = get_instance()->request->server('SERVER_PORT');
+            $protocol = 'http';
+            if(is_https()){
+                $protocol = 'https';
+            }
 
-			$domainserverVars = array(
-				'HTTP_HOST',
-				'SERVER_NAME',
-				'SERVER_ADDR'
-			);
+            $domainserverVars = array(
+                'HTTP_HOST',
+                'SERVER_NAME',
+                'SERVER_ADDR'
+            );
 
-			foreach ($domainserverVars as $var) {
-				$value = get_instance()->request->server($var);
-				if($value){
-					$domain = $value;
-					break;
-				}
-			}
+            foreach ($domainserverVars as $var) {
+                $value = get_instance()->request->server($var);
+                if($value){
+                    $domain = $value;
+                    break;
+                }
+            }
 			
-			if($port && ((is_https() && $port != 443) || (!is_https() && $port != 80))){
-				$domain .= ':'.$port;
-			}
-			return $protocol.'://'.$domain;
-		}
+            if($port && ((is_https() && $port != 443) || (!is_https() && $port != 80))){
+                $domain .= ':'.$port;
+            }
+            return $protocol.'://'.$domain;
+        }
 
-		/**
-		 * Get the current request query string
-		 * @return string
-		 */
-		public static function queryString(){
-			return get_instance()->request->server('QUERY_STRING');
-		}
-	}
+        /**
+         * Get the current request query string
+         * @return string
+         */
+        public static function queryString(){
+            return get_instance()->request->server('QUERY_STRING');
+        }
+    }

core/libraries/Form.php

Indentation +292 added lines, -292 removed lines

@@ -1,320 +1,320 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
 
-	class Form{
+    class Form{
 
-		/**
-		 * Generate the form opened tag
-		 * @param  string $path       the form action path
-		 * @param  array  $attributes the additional form attributes
-		 * @param  string $method     the form method like 'GET', 'POST'
-		 * @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){
-				$path = Url::site_url($path);
-			}
-			$method = strtoupper($method);
-			$str = null;
-			$str .= '<form action = "'.$path.'" method = "'.$method.'"';
-			if(! empty($enctype)){
-				$str .= ' enctype = "'.$enctype.'" ';
-			}
-			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'){
-				$csrfValue = Security::generateCSRF();
-				$csrfName = get_config('csrf_key', 'csrf_key');
-				$str .= static::hidden($csrfName, $csrfValue);
-			}
-			return $str;
-		}
+        /**
+         * Generate the form opened tag
+         * @param  string $path       the form action path
+         * @param  array  $attributes the additional form attributes
+         * @param  string $method     the form method like 'GET', 'POST'
+         * @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){
+                $path = Url::site_url($path);
+            }
+            $method = strtoupper($method);
+            $str = null;
+            $str .= '<form action = "'.$path.'" method = "'.$method.'"';
+            if(! empty($enctype)){
+                $str .= ' enctype = "'.$enctype.'" ';
+            }
+            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'){
+                $csrfValue = Security::generateCSRF();
+                $csrfName = get_config('csrf_key', 'csrf_key');
+                $str .= static::hidden($csrfName, $csrfValue);
+            }
+            return $str;
+        }
 
-		/**
-		 * Generate the form opened tag for multipart like to send a file
-		 * @see Form::open() for more details
-		 * @return string the generated multipart form html
-		 */
-		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST'){
-			return self::open($path, $attributes, $method, 'multipart/form-data');
-		}
+        /**
+         * Generate the form opened tag for multipart like to send a file
+         * @see Form::open() for more details
+         * @return string the generated multipart form html
+         */
+        public static function openMultipart($path = null, array $attributes = array(), $method = 'POST'){
+            return self::open($path, $attributes, $method, 'multipart/form-data');
+        }
 
-		/**
-		 * Generate the form close
-		 * @return string the form close html
-		 */
-		public static function close(){
-			return '</form>';
-		}
+        /**
+         * Generate the form close
+         * @return string the form close html
+         */
+        public static function close(){
+            return '</form>';
+        }
 
-		/**
-		 * Generate the form fieldset & legend
-		 * @param  string $legend the legend tag value
-		 * @param  array  $fieldsetAttributes the fieldset additional HTML attributes
-		 * @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()){
-			$str = '<fieldset' . attributes_to_string($fieldsetAttributes) . '>';
-			if($legend){
-				$str .= '<legend' . attributes_to_string($legendAttributes) . '>'.$legend.'</legend>';
-			}
-			return $str;
-		}
+        /**
+         * Generate the form fieldset & legend
+         * @param  string $legend the legend tag value
+         * @param  array  $fieldsetAttributes the fieldset additional HTML attributes
+         * @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()){
+            $str = '<fieldset' . attributes_to_string($fieldsetAttributes) . '>';
+            if($legend){
+                $str .= '<legend' . attributes_to_string($legendAttributes) . '>'.$legend.'</legend>';
+            }
+            return $str;
+        }
 
-		/**
-		 * Generate the fieldset close tag
-		 * @return string the generated html for fieldset close
-		 */
-		public static function fieldsetClose(){
-			return '</fieldset>';
-		}
+        /**
+         * Generate the fieldset close tag
+         * @return string the generated html for fieldset close
+         */
+        public static function fieldsetClose(){
+            return '</fieldset>';
+        }
 
-		/**
-		 * Get the error message for the given form field name.
-		 * This use the form validation information to get the error information.
-		 * @param  string $name the form field name
-		 * @return string       the error message if exists and null if not
-		 */
-		public static function error($name){
-			$return = null;
-			$obj = & get_instance();
-			if(isset($obj->formvalidation)){
-				$errors = $obj->formvalidation->returnErrors();
-				$error =  isset($errors[$name]) ? $errors[$name] : null;
-				if($error){
-					list($errorStart, $errorEnd) = $obj->formvalidation->getErrorDelimiter();
-					$return = $errorStart . $error . $errorEnd;
-				}
-			}
-			return $return;
-		}
+        /**
+         * Get the error message for the given form field name.
+         * This use the form validation information to get the error information.
+         * @param  string $name the form field name
+         * @return string       the error message if exists and null if not
+         */
+        public static function error($name){
+            $return = null;
+            $obj = & get_instance();
+            if(isset($obj->formvalidation)){
+                $errors = $obj->formvalidation->returnErrors();
+                $error =  isset($errors[$name]) ? $errors[$name] : null;
+                if($error){
+                    list($errorStart, $errorEnd) = $obj->formvalidation->getErrorDelimiter();
+                    $return = $errorStart . $error . $errorEnd;
+                }
+            }
+            return $return;
+        }
 
-		/**
-		 * Get the form field value
-		 * @param  string $name    the form field name
-		 * @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){
-			$value = get_instance()->request->query($name);
-			return $value ? $value : $default;
-		}
+        /**
+         * Get the form field value
+         * @param  string $name    the form field name
+         * @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){
+            $value = get_instance()->request->query($name);
+            return $value ? $value : $default;
+        }
 
-		/**
-		 * Generate the form label html content
-		 * @param  string $label      the title of the label
-		 * @param  string $for        the value of the label "for" attribute
-		 * @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()){
-			$str = '<label';
-			if($for){
-				$str .= ' for = "'.$for.'"';
-			}
-			$str .= attributes_to_string($attributes);
-			$str .= '>';
-			$str .= $label.'</label>';
-			return $str;
-		}
+        /**
+         * Generate the form label html content
+         * @param  string $label      the title of the label
+         * @param  string $for        the value of the label "for" attribute
+         * @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()){
+            $str = '<label';
+            if($for){
+                $str .= ' for = "'.$for.'"';
+            }
+            $str .= attributes_to_string($attributes);
+            $str .= '>';
+            $str .= $label.'</label>';
+            return $str;
+        }
 
-		/**
-		 * Generate the form field for input like "text", "email", "password", etc.
-		 * @param  string $name       the form field name
-		 * @param  mixed $value      the form field value to be set
-		 * @param  array  $attributes the additional attributes to be added in the form input
-		 * @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'){
-			$str = null;
-			$str .= '<input name = "'.$name.'" value = "'.$value.'" type = "'.$type.'"';
-			$str .= attributes_to_string($attributes);
-			$str .= '/>';
-			return $str;
-		}
+        /**
+         * Generate the form field for input like "text", "email", "password", etc.
+         * @param  string $name       the form field name
+         * @param  mixed $value      the form field value to be set
+         * @param  array  $attributes the additional attributes to be added in the form input
+         * @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'){
+            $str = null;
+            $str .= '<input name = "'.$name.'" value = "'.$value.'" type = "'.$type.'"';
+            $str .= attributes_to_string($attributes);
+            $str .= '/>';
+            return $str;
+        }
 		
-		/**
-		 * Generate the form field for "text"
-		 * @see Form::input() for more details
-		 */
-		public static function text($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'text');
-		}
+        /**
+         * Generate the form field for "text"
+         * @see Form::input() for more details
+         */
+        public static function text($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'text');
+        }
 
-		/**
-		 * Generate the form field for "password"
-		 * @see Form::input() for more details
-		 */
-		public static function password($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'password');
-		}
+        /**
+         * Generate the form field for "password"
+         * @see Form::input() for more details
+         */
+        public static function password($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'password');
+        }
 
-		/**
-		 * 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){
-				$attributes['checked'] = true;
-			}
-			return self::input($name, $value, $attributes, 'radio');
-		}
+        /**
+         * 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){
+                $attributes['checked'] = true;
+            }
+            return self::input($name, $value, $attributes, 'radio');
+        }
 
-		/**
-		 * 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){
-				$attributes['checked'] = true;
-			}
-			return self::input($name, $value, $attributes, 'checkbox');
-		}
+        /**
+         * 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){
+                $attributes['checked'] = true;
+            }
+            return self::input($name, $value, $attributes, 'checkbox');
+        }
 
-		/**
-		 * Generate the form field for "number"
-		 * @see Form::input() for more details
-		 */
-		public static function number($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'number');
-		}
+        /**
+         * Generate the form field for "number"
+         * @see Form::input() for more details
+         */
+        public static function number($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'number');
+        }
 
-		/**
-		 * Generate the form field for "phone"
-		 * @see Form::input() for more details
-		 */
-		public static function phone($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'phone');
-		}
+        /**
+         * Generate the form field for "phone"
+         * @see Form::input() for more details
+         */
+        public static function phone($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'phone');
+        }
 
-		/**
-		 * Generate the form field for "email"
-		 * @see Form::input() for more details
-		 */
-		public static function email($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'email');
-		}
+        /**
+         * Generate the form field for "email"
+         * @see Form::input() for more details
+         */
+        public static function email($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'email');
+        }
 		
-		/**
-		 * Generate the form field for "search"
-		 * @see Form::input() for more details
-		 */
-		public static function search($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'search');
-		}
+        /**
+         * Generate the form field for "search"
+         * @see Form::input() for more details
+         */
+        public static function search($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'search');
+        }
 		
-		/**
-		 * Generate the form field for "hidden"
-		 * @see Form::input() for more details
-		 */
-		public static function hidden($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'hidden');
-		}
+        /**
+         * Generate the form field for "hidden"
+         * @see Form::input() for more details
+         */
+        public static function hidden($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'hidden');
+        }
 		
-		/**
-		 * Generate the form field for "file"
-		 * @see Form::input() for more details
-		 */
-		public static function file($name, array $attributes = array()){
-			return self::input($name, null, $attributes, 'file');
-		}
+        /**
+         * Generate the form field for "file"
+         * @see Form::input() for more details
+         */
+        public static function file($name, array $attributes = array()){
+            return self::input($name, null, $attributes, 'file');
+        }
 		
-		/**
-		 * Generate the form field for "button"
-		 * @see Form::input() for more details
-		 */
-		public static function button($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'button');
-		}
+        /**
+         * Generate the form field for "button"
+         * @see Form::input() for more details
+         */
+        public static function button($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'button');
+        }
 		
-		/**
-		 * Generate the form field for "reset"
-		 * @see Form::input() for more details
-		 */
-		public static function reset($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'reset');
-		}
+        /**
+         * Generate the form field for "reset"
+         * @see Form::input() for more details
+         */
+        public static function reset($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'reset');
+        }
 		
-		/**
-		 * Generate the form field for "submit"
-		 * @see Form::input() for more details
-		 */
-		public static function submit($name, $value = null, array $attributes = array()){
-			return self::input($name, $value, $attributes, 'submit');
-		}
+        /**
+         * Generate the form field for "submit"
+         * @see Form::input() for more details
+         */
+        public static function submit($name, $value = null, array $attributes = array()){
+            return self::input($name, $value, $attributes, 'submit');
+        }
 
-		/**
-		 * Generate the form field for textarea
-		 * @param  string $name       the name of the textarea field
-		 * @param  string $value      the textarea field value
-		 * @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()){
-			$str = null;
-			$str .= '<textarea name = "'.$name.'"';
-			$str .= attributes_to_string($attributes);
-			$str .= '>';
-			$str .= $value.'</textarea>';
-			return $str;
-		}
+        /**
+         * Generate the form field for textarea
+         * @param  string $name       the name of the textarea field
+         * @param  string $value      the textarea field value
+         * @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()){
+            $str = null;
+            $str .= '<textarea name = "'.$name.'"';
+            $str .= attributes_to_string($attributes);
+            $str .= '>';
+            $str .= $value.'</textarea>';
+            return $str;
+        }
 		
-		/**
-		 * Generate the form field for select
-		 * @param  string $name       the name of the form field
-		 * @param  mixed|array $values      the values used to populate the "option" tags
-		 * @param  mixed $selected   the selected value in the option list
-		 * @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)){
-				$values = array('' => $values);
-			}
-			$str = null;
-			$str .= '<select name = "'.$name.'"';
-			$str .= attributes_to_string($attributes);
-			$str .= '>';
-			foreach($values as $key => $val){
-				$select = '';
-				if($key == $selected){
-					$select = 'selected';
-				}
-				$str .= '<option value = "'.$key.'" '.$select.'>'.$val.'</option>';
-			}
-			$str .= '</select>';
-			return $str;
-		}
+        /**
+         * Generate the form field for select
+         * @param  string $name       the name of the form field
+         * @param  mixed|array $values      the values used to populate the "option" tags
+         * @param  mixed $selected   the selected value in the option list
+         * @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)){
+                $values = array('' => $values);
+            }
+            $str = null;
+            $str .= '<select name = "'.$name.'"';
+            $str .= attributes_to_string($attributes);
+            $str .= '>';
+            foreach($values as $key => $val){
+                $select = '';
+                if($key == $selected){
+                    $select = 'selected';
+                }
+                $str .= '<option value = "'.$key.'" '.$select.'>'.$val.'</option>';
+            }
+            $str .= '</select>';
+            return $str;
+        }
 
-	}
+    }

tests/tnhfw/classes/RouterTest.php

Indentation +82 added lines, -82 removed lines

@@ -1,151 +1,151 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class RouterTest extends TestCase
-	{	
+    class RouterTest extends TestCase
+    {	
 	
-		public static function setUpBeforeClass()
-		{
+        public static function setUpBeforeClass()
+        {
 		
-		}
+        }
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 		
-		protected function setUp()
-		{
-		}
+        protected function setUp()
+        {
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 		
-		public function testAutoUri()
-		{
+        public function testAutoUri()
+        {
             //when application run in CLI the first argument will be used as route URI
             $_SERVER['argv'][1] = '';
             
             $r = new Router();
             //remove all all config
             $r->setRouteConfiguration(array(), false)
-              ->setRouteUri()
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri()
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
 
             $this->assertNull($r->getController());
-			$this->assertSame('index', $r->getMethod());
-			$this->assertSame(0, count($r->getArgs()));
-		}
+            $this->assertSame('index', $r->getMethod());
+            $this->assertSame(0, count($r->getArgs()));
+        }
         
         public function testCustomUri()
-		{
+        {
             $r = new Router();
             $r->setRouteUri('users/profile/34/54')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('users', $r->getController());
-			$this->assertSame('profile', $r->getMethod());
-			$this->assertSame(2, count($r->getArgs()));
-		}
+            $this->assertSame('profile', $r->getMethod());
+            $this->assertSame(2, count($r->getArgs()));
+        }
         
         public function testWithCustomConfigControllerMethod()
-		{
+        {
             $r = new Router();
             $r->add('/foo/bar', 'fooController@fooMethod')
-              ->setRouteUri('/foo/bar')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri('/foo/bar')
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('fooController', $r->getController());
-			$this->assertSame('fooMethod', $r->getMethod());
-			$this->assertSame(0, count($r->getArgs()));
-			$this->assertNull($r->getModule());
-		}
+            $this->assertSame('fooMethod', $r->getMethod());
+            $this->assertSame(0, count($r->getArgs()));
+            $this->assertNull($r->getModule());
+        }
         
         public function testWithCustomConfigModuleControllerMethod()
-		{
+        {
             $r = new Router();
             $r->add('/foo/bar', 'fooModule#fooController@fooMethod')
-              ->setRouteUri('/foo/bar')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri('/foo/bar')
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('fooController', $r->getController());
-			$this->assertSame('fooMethod', $r->getMethod());
-			$this->assertSame('fooModule', $r->getModule());
-			$this->assertSame(0, count($r->getArgs()));
-		}
+            $this->assertSame('fooMethod', $r->getMethod());
+            $this->assertSame('fooModule', $r->getModule());
+            $this->assertSame(0, count($r->getArgs()));
+        }
         
         public function testWithCustomConfigUsingAnyPattern()
-		{
+        {
             $r = new Router();
             $r->add('/foo/(:any)', 'fooController@fooMethod')
-              ->setRouteUri('/foo/bar123-baz')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri('/foo/bar123-baz')
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('fooController', $r->getController());
-			$this->assertSame('fooMethod', $r->getMethod());
-			$this->assertSame(1, count($r->getArgs()));
+            $this->assertSame('fooMethod', $r->getMethod());
+            $this->assertSame(1, count($r->getArgs()));
             $args = $r->getArgs();
             $this->assertSame('bar123-baz', $args[0]);
-		}
+        }
         
-         public function testWithCustomConfigUsingNumericPattern()
-		{
+            public function testWithCustomConfigUsingNumericPattern()
+        {
             $r = new Router();
             $r->add('/foo/(:num)', 'fooController@fooMethod')
-              ->setRouteUri('/foo/34')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri('/foo/34')
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('fooController', $r->getController());
-			$this->assertSame('fooMethod', $r->getMethod());
-			$this->assertSame(1, count($r->getArgs()));
+            $this->assertSame('fooMethod', $r->getMethod());
+            $this->assertSame(1, count($r->getArgs()));
             $args = $r->getArgs();
             $this->assertSame('34', $args[0]);
-		}
+        }
         
         public function testWithCustomConfigUsingAlphaPattern()
-		{
+        {
             $r = new Router();
             $r->add('/foo/(:alpha)', 'fooController@fooMethod')
-              ->setRouteUri('/foo/baz')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri('/foo/baz')
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('fooController', $r->getController());
-			$this->assertSame('fooMethod', $r->getMethod());
-			$this->assertSame(1, count($r->getArgs()));
+            $this->assertSame('fooMethod', $r->getMethod());
+            $this->assertSame(1, count($r->getArgs()));
             $args = $r->getArgs();
             $this->assertSame('baz', $args[0]);
-		}
+        }
         
         public function testWithCustomConfigUsingAlphaNumericPattern()
-		{
+        {
             $r = new Router();
             $r->add('/foo/(:alnum)', 'fooController@fooMethod')
-              ->setRouteUri('/foo/baz123')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri('/foo/baz123')
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('fooController', $r->getController());
-			$this->assertSame('fooMethod', $r->getMethod());
-			$this->assertSame(1, count($r->getArgs()));
+            $this->assertSame('fooMethod', $r->getMethod());
+            $this->assertSame(1, count($r->getArgs()));
             $args = $r->getArgs();
             $this->assertSame('baz123', $args[0]);
-		}
+        }
         
         public function testWithCustomConfigUsingMultiplePattern()
-		{
+        {
             $r = new Router();
             $r->add('/foo/(:alpha)/(:num)', 'fooController@fooMethod')
-              ->setRouteUri('/foo/baz/123')
-              ->setRouteSegments()
-              ->determineRouteParamsInformation();
+                ->setRouteUri('/foo/baz/123')
+                ->setRouteSegments()
+                ->determineRouteParamsInformation();
             $this->assertSame('fooController', $r->getController());
-			$this->assertSame('fooMethod', $r->getMethod());
-			$this->assertSame(2, count($r->getArgs()));
+            $this->assertSame('fooMethod', $r->getMethod());
+            $this->assertSame(2, count($r->getArgs()));
             $args = $r->getArgs();
             $this->assertSame('baz', $args[0]);
             $this->assertSame('123', $args[1]);
-		}
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

tests/tnhfw/classes/database/DatabaseQueryBuilderTest.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class DatabaseQueryBuilderTest extends TestCase
-	{	
+    class DatabaseQueryBuilderTest extends TestCase
+    {	
 	
-		public static function setUpBeforeClass()
-		{
+        public static function setUpBeforeClass()
+        {
 		
-		}
+        }
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 		
-		protected function setUp()
-		{
-		}
+        protected function setUp()
+        {
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 		
-		public function testNotYet()
-		{
-			$this->markTestSkipped();
-		}
+        public function testNotYet()
+        {
+            $this->markTestSkipped();
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

tests/tnhfw/classes/database/DatabaseQueryResultTest.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class DatabaseQueryResultTest extends TestCase
-	{	
+    class DatabaseQueryResultTest extends TestCase
+    {	
 	
-		public static function setUpBeforeClass()
-		{
+        public static function setUpBeforeClass()
+        {
 		
-		}
+        }
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 		
-		protected function setUp()
-		{
-		}
+        protected function setUp()
+        {
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 		
-		public function testNotYet()
-		{
-			$this->markTestSkipped();
-		}
+        public function testNotYet()
+        {
+            $this->markTestSkipped();
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file