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/classes/database/Database.php

Indentation +324 added lines, -324 removed lines

@@ -1,119 +1,119 @@ 
 <?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 Database{
+    /**
+     * 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 Database{
 	
-  	/**
-  	 * The PDO instance
-  	 * @var object
-  	*/
+        /**
+         * The PDO instance
+         * @var object
+         */
     private $pdo                 = null;
     
-  	/**
-  	 * The database name used for the application
-  	 * @var string
-  	*/
-	  private $databaseName        = null;
+        /**
+         * The database name used for the application
+         * @var string
+         */
+        private $databaseName        = null;
 	
-  	/**
-  	 * The number of rows returned by the last query
-  	 * @var int
-  	*/
+        /**
+         * The number of rows returned by the last query
+         * @var int
+         */
     private $numRows             = 0;
 	
-  	/**
-  	 * The last insert id for the primary key column that have auto increment or sequence
-  	 * @var mixed
-  	*/
+        /**
+         * The last insert id for the primary key column that have auto increment or sequence
+         * @var mixed
+         */
     private $insertId            = null;
 	
-  	/**
-  	 * The full SQL query statment after build for each command
-  	 * @var string
-  	*/
+        /**
+         * The full SQL query statment after build for each command
+         * @var string
+         */
     private $query               = null;
 	
-  	/**
-  	 * The result returned for the last query
-  	 * @var mixed
-  	*/
+        /**
+         * The result returned for the last query
+         * @var mixed
+         */
     private $result              = array();
 	
-  	/**
-  	 * The cache default time to live in second. 0 means no need to use the cache feature
-  	 * @var int
-  	*/
-  	private $cacheTtl             = 0;
+        /**
+         * The cache default time to live in second. 0 means no need to use the cache feature
+         * @var int
+         */
+        private $cacheTtl             = 0;
 	
-  	/**
-  	 * The cache current time to live. 0 means no need to use the cache feature
-  	 * @var int
-  	*/
+        /**
+         * The cache current time to live. 0 means no need to use the cache feature
+         * @var int
+         */
     private $temporaryCacheTtl   = 0;
 	
-  	/**
-  	 * The number of executed query for the current request
-  	 * @var int
-  	*/
+        /**
+         * The number of executed query for the current request
+         * @var int
+         */
     private $queryCount          = 0;
 	
-  	/**
-  	 * The default data to be used in the statments query INSERT, UPDATE
-  	 * @var array
-  	*/
+        /**
+         * The default data to be used in the statments query INSERT, UPDATE
+         * @var array
+         */
     private $data                = array();
 	
-  	/**
-  	 * The database configuration
-  	 * @var array
-  	*/
+        /**
+         * The database configuration
+         * @var array
+         */
     private $config              = array();
 	
-  	/**
-  	 * The logger instance
-  	 * @var object
-  	 */
+        /**
+         * The logger instance
+         * @var object
+         */
     private $logger              = null;
 
     /**
-    * The cache instance
-    * @var object
-    */
+     * The cache instance
+     * @var object
+     */
     private $cacheInstance       = null;
 
     
-  	/**
-    * The DatabaseQueryBuilder instance
-    * @var object
-    */
+        /**
+         * The DatabaseQueryBuilder instance
+         * @var object
+         */
     private $queryBuilder        = null;
     
     /**
-    * The DatabaseQueryRunner instance
-    * @var object
-    */
+     * The DatabaseQueryRunner instance
+     * @var object
+     */
     private $queryRunner         = null;
 
 
@@ -125,8 +125,8 @@ 
         //Set Log instance to use
         $this->setLoggerFromParamOrCreateNewInstance(null);
 		
-    		//Set DatabaseQueryBuilder instance to use
-    		$this->setQueryBuilderFromParamOrCreateNewInstance(null);
+            //Set DatabaseQueryBuilder instance to use
+            $this->setQueryBuilderFromParamOrCreateNewInstance(null);
 
         //Set DatabaseQueryRunner instance to use
         $this->setQueryRunnerFromParamOrCreateNewInstance(null);
@@ -143,22 +143,22 @@ 
      * @return bool 
      */
     public function connect(){
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+        $config = $this->getDatabaseConfiguration();
+        if (! empty($config)){
         try{
             $this->pdo = new PDO($this->getDsnFromDriver(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
-          }
-          catch (PDOException $e){
+            }
+            catch (PDOException $e){
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
-          }
-      }
-      return false;
+            }
+        }
+        return false;
     }
 
 
@@ -167,7 +167,7 @@ 
      * @return int
      */
     public function numRows(){
-      return $this->numRows;
+        return $this->numRows;
     }
 
     /**
@@ -175,7 +175,7 @@ 
      * @return mixed
      */
     public function insertId(){
-      return $this->insertId;
+        return $this->insertId;
     }
 
 
@@ -186,13 +186,13 @@ 
      * @return mixed       the query SQL string or the record result
      */
     public function get($returnSQLQueryOrResultType = false){
-      $this->getQueryBuilder()->limit(1);
-      $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
+        $this->getQueryBuilder()->limit(1);
+        $query = $this->getAll(true);
+        if ($returnSQLQueryOrResultType === true){
         return $query;
-      } else {
+        } else {
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
-      }
+        }
     }
 
     /**
@@ -202,11 +202,11 @@ 
      * @return mixed       the query SQL string or the record result
      */
     public function getAll($returnSQLQueryOrResultType = false){
-	   $query = $this->getQueryBuilder()->getQuery();
-	   if ($returnSQLQueryOrResultType === true){
-      	return $query;
-      }
-      return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
+        $query = $this->getQueryBuilder()->getQuery();
+        if ($returnSQLQueryOrResultType === true){
+            return $query;
+        }
+        return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
     }
 
     /**
@@ -216,19 +216,19 @@ 
      * @return mixed          the insert id of the new record or null
      */
     public function insert($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+        if (empty($data) && $this->getData()){
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
-      }
-      $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
-      $result = $this->query($query);
-      if ($result){
+        }
+        $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
+        $result = $this->query($query);
+        if ($result){
         $this->insertId = $this->pdo->lastInsertId();
-		    //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
+            //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
         return ! $this->insertId() ? true : $this->insertId();
-      }
-      return false;
+        }
+        return false;
     }
 
     /**
@@ -238,13 +238,13 @@ 
      * @return mixed          the update status
      */
     public function update($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+        if (empty($data) && $this->getData()){
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
-      }
-      $query = $this->getQueryBuilder()->update($data, $escape)->getQuery();
-      return $this->query($query);
+        }
+        $query = $this->getQueryBuilder()->update($data, $escape)->getQuery();
+        return $this->query($query);
     }
 
     /**
@@ -252,8 +252,8 @@ 
      * @return mixed the delete status
      */
     public function delete(){
-		$query = $this->getQueryBuilder()->delete()->getQuery();
-    	return $this->query($query);
+        $query = $this->getQueryBuilder()->delete()->getQuery();
+        return $this->query($query);
     }
 
     /**
@@ -262,21 +262,21 @@ 
      * @return object        the current Database instance
      */
     public function setCache($ttl = 0){
-      if ($ttl > 0){
+        if ($ttl > 0){
         $this->cacheTtl = $ttl;
         $this->temporaryCacheTtl = $ttl;
-      }
-      return $this;
+        }
+        return $this;
     }
 	
-	/**
-	 * Enabled cache temporary for the current query not globally	
-	 * @param  integer $ttl the cache time to live in second
-	 * @return object        the current Database instance
-	 */
-  	public function cached($ttl = 0){
+    /**
+     * Enabled cache temporary for the current query not globally	
+     * @param  integer $ttl the cache time to live in second
+     * @return object        the current Database instance
+     */
+        public function cached($ttl = 0){
         if ($ttl > 0){
-          $this->temporaryCacheTtl = $ttl;
+            $this->temporaryCacheTtl = $ttl;
         }
         return $this;
     }
@@ -288,7 +288,7 @@ 
      * @return mixed       the data after escaped or the same data if not
      */
     public function escape($data, $escaped = true){
-      return $escaped ? 
+        return $escaped ? 
                       $this->pdo->quote(trim($data)) 
                       : $data; 
     }
@@ -298,7 +298,7 @@ 
      * @return int
      */
     public function queryCount(){
-      return $this->queryCount;
+        return $this->queryCount;
     }
 
     /**
@@ -306,7 +306,7 @@ 
      * @return string
      */
     public function getQuery(){
-      return $this->query;
+        return $this->query;
     }
 
     /**
@@ -314,7 +314,7 @@ 
      * @return string
      */
     public function getDatabaseName(){
-      return $this->databaseName;
+        return $this->databaseName;
     }
 
     /**
@@ -322,17 +322,17 @@ 
      * @return object
      */
     public function getPdo(){
-      return $this->pdo;
+        return $this->pdo;
     }
 
     /**
      * Set the PDO instance
      * @param object $pdo the pdo object
-	 * @return object Database
+     * @return object Database
      */
     public function setPdo(PDO $pdo){
-      $this->pdo = $pdo;
-      return $this;
+        $this->pdo = $pdo;
+        return $this;
     }
 
 
@@ -341,44 +341,44 @@ 
      * @return Log
      */
     public function getLogger(){
-      return $this->logger;
+        return $this->logger;
     }
 
     /**
      * Set the log instance
      * @param Log $logger the log object
-	 * @return object Database
+     * @return object Database
      */
     public function setLogger($logger){
-      $this->logger = $logger;
-      return $this;
+        $this->logger = $logger;
+        return $this;
     }
 
-     /**
-     * Return the cache instance
-     * @return CacheInterface
-     */
+        /**
+         * Return the cache instance
+         * @return CacheInterface
+         */
     public function getCacheInstance(){
-      return $this->cacheInstance;
+        return $this->cacheInstance;
     }
 
     /**
      * Set the cache instance
      * @param CacheInterface $cache the cache object
-	 * @return object Database
+     * @return object Database
      */
     public function setCacheInstance($cache){
-      $this->cacheInstance = $cache;
-      return $this;
+        $this->cacheInstance = $cache;
+        return $this;
     }
 	
 	
-	   /**
-     * Return the DatabaseQueryBuilder instance
-     * @return object DatabaseQueryBuilder
-     */
+        /**
+         * Return the DatabaseQueryBuilder instance
+         * @return object DatabaseQueryBuilder
+         */
     public function getQueryBuilder(){
-      return $this->queryBuilder;
+        return $this->queryBuilder;
     }
 
     /**
@@ -386,8 +386,8 @@ 
      * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
      */
     public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
-      $this->queryBuilder = $queryBuilder;
-      return $this;
+        $this->queryBuilder = $queryBuilder;
+        return $this;
     }
     
     /**
@@ -395,7 +395,7 @@ 
      * @return object DatabaseQueryRunner
      */
     public function getQueryRunner(){
-      return $this->queryRunner;
+        return $this->queryRunner;
     }
 
     /**
@@ -403,8 +403,8 @@ 
      * @param object DatabaseQueryRunner $queryRunner the DatabaseQueryRunner object
      */
     public function setQueryRunner(DatabaseQueryRunner $queryRunner){
-      $this->queryRunner = $queryRunner;
-      return $this;
+        $this->queryRunner = $queryRunner;
+        return $this;
     }
 
     /**
@@ -412,7 +412,7 @@ 
      * @return array
      */
     public function getData(){
-      return $this->data;
+        return $this->data;
     }
 
     /**
@@ -423,51 +423,51 @@ 
      * @return object        the current Database instance
      */
     public function setData($key, $value = null, $escape = true){
-  	  if(is_array($key)){
-    		foreach($key as $k => $v){
-    			$this->setData($k, $v, $escape);
-    		}	
-  	  } else {
+        if(is_array($key)){
+            foreach($key as $k => $v){
+                $this->setData($k, $v, $escape);
+            }	
+        } else {
         $this->data[$key] = $this->escape($value, $escape);
-  	  }
-      return $this;
+        }
+        return $this;
     }
 
-     /**
-     * Execute an SQL query
-     * @param  string  $query the query SQL string
-     * @param  boolean $returnAsList  indicate whether to return all record or just one row 
-     * @param  boolean $returnAsArray return the result as array or not
-     * @return mixed         the query result
-     */
+        /**
+         * Execute an SQL query
+         * @param  string  $query the query SQL string
+         * @param  boolean $returnAsList  indicate whether to return all record or just one row 
+         * @param  boolean $returnAsArray return the result as array or not
+         * @return mixed         the query result
+         */
     public function query($query, $returnAsList = true, $returnAsArray = false){
-      $this->reset();
-      $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
-      //If is the SELECT query
-      $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
+        $this->reset();
+        $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
+        //If is the SELECT query
+        $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
 
-      //cache expire time
-      $cacheExpire = $this->temporaryCacheTtl;
+        //cache expire time
+        $cacheExpire = $this->temporaryCacheTtl;
       
-      //return to the initial cache time
-      $this->temporaryCacheTtl = $this->cacheTtl;
+        //return to the initial cache time
+        $this->temporaryCacheTtl = $this->cacheTtl;
       
-      //config for cache
-      $cacheEnable = get_config('cache_enable');
+        //config for cache
+        $cacheEnable = get_config('cache_enable');
       
-      //the database cache content
-      $cacheContent = null;
+        //the database cache content
+        $cacheContent = null;
 
-      //if can use cache feature for this query
-      $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
+        //if can use cache feature for this query
+        $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
-          $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
-          $cacheContent = $this->getCacheContentForQuery($query, $returnAsList, $returnAsArray);  
-      }
+        if ($dbCacheStatus && $isSqlSELECTQuery){
+            $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
+            $cacheContent = $this->getCacheContentForQuery($query, $returnAsList, $returnAsArray);  
+        }
       
-      if ( !$cacheContent){
-  	   	//count the number of query execution to server
+        if ( !$cacheContent){
+                //count the number of query execution to server
         $this->queryCount++;
         
         $this->queryRunner->setQuery($query);
@@ -482,33 +482,33 @@ 
                 $key = $this->getCacheKeyForQuery($this->query, $returnAsList, $returnAsArray);
                 $this->setCacheContentForQuery($this->query, $key, $this->result, $cacheExpire);
             if (! $this->result){
-              $this->logger->info('No result where found for the query [' . $query . ']');
+                $this->logger->info('No result where found for the query [' . $query . ']');
             }
-          }
+            }
+        }
+        } else if ($isSqlSELECTQuery){
+            $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+            $this->result = $cacheContent;
+            $this->numRows = count($this->result);
         }
-      } else if ($isSqlSELECTQuery){
-          $this->logger->info('The result for query [' .$this->query. '] already cached use it');
-          $this->result = $cacheContent;
-          $this->numRows = count($this->result);
-      }
-      return $this->result;
+        return $this->result;
     }
 	
 	
-	 /**
-	 * Return the database configuration
-	 * @return array
-	 */
-  	public  function getDatabaseConfiguration(){
-  	  return $this->config;
-  	}
-
-   /**
-    * Setting the database configuration using the configuration file and additional configuration from param
-    * @param array $overwriteConfig the additional configuration to overwrite with the existing one
-    * @param boolean $useConfigFile whether to use database configuration file
-	  * @return object Database
-    */
+        /**
+         * Return the database configuration
+         * @return array
+         */
+        public  function getDatabaseConfiguration(){
+        return $this->config;
+        }
+
+    /**
+     * Setting the database configuration using the configuration file and additional configuration from param
+     * @param array $overwriteConfig the additional configuration to overwrite with the existing one
+     * @param boolean $useConfigFile whether to use database configuration file
+     * @return object Database
+     */
     public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
         $db = array();
         if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
@@ -521,50 +521,50 @@ 
         
         //default configuration
         $config = array(
-          'driver' => 'mysql',
-          'username' => 'root',
-          'password' => '',
-          'database' => '',
-          'hostname' => 'localhost',
-          'charset' => 'utf8',
-          'collation' => 'utf8_general_ci',
-          'prefix' => '',
-          'port' => ''
+            'driver' => 'mysql',
+            'username' => 'root',
+            'password' => '',
+            'database' => '',
+            'hostname' => 'localhost',
+            'charset' => 'utf8',
+            'collation' => 'utf8_general_ci',
+            'prefix' => '',
+            'port' => ''
         );
 		
-    	$config = array_merge($config, $db);
-    	//determine the port using the hostname like localhost:3307
-      //hostname will be "localhost", and port "3307"
-      $p = explode(':', $config['hostname']);
-  	  if (count($p) >= 2){
-  		  $config['hostname'] = $p[0];
-  		  $config['port'] = $p[1];
-  		}
+        $config = array_merge($config, $db);
+        //determine the port using the hostname like localhost:3307
+        //hostname will be "localhost", and port "3307"
+        $p = explode(':', $config['hostname']);
+        if (count($p) >= 2){
+            $config['hostname'] = $p[0];
+            $config['port'] = $p[1];
+            }
 		
-		 $this->databaseName = $config['database'];
-		 $this->config = $config;
-		 $this->logger->info(
-								'The database configuration are listed below: ' 
-								. stringfy_vars(array_merge(
-															$this->config, 
-															array('password' => string_hidden($this->config['password']))
-												))
-							);
+            $this->databaseName = $config['database'];
+            $this->config = $config;
+            $this->logger->info(
+                                'The database configuration are listed below: ' 
+                                . stringfy_vars(array_merge(
+                                                            $this->config, 
+                                                            array('password' => string_hidden($this->config['password']))
+                                                ))
+                            );
 	  
-		 //Now connect to the database
-		 $this->connect();
+            //Now connect to the database
+            $this->connect();
 		 
-     //do update of QueryRunner and Builder
-     $this->updateQueryBuilderAndRunnerProperties();
+        //do update of QueryRunner and Builder
+        $this->updateQueryBuilderAndRunnerProperties();
 
-		 return $this;
+            return $this;
     }
 
     /**
      * Close the connexion
      */
     public function close(){
-      $this->pdo = null;
+        $this->pdo = null;
     }
 
     /**
@@ -572,18 +572,18 @@ 
      * @return void
      */
     protected function updateQueryBuilderAndRunnerProperties(){
-       //update queryBuilder with some properties needed
-     if(is_object($this->queryBuilder)){
+        //update queryBuilder with some properties needed
+        if(is_object($this->queryBuilder)){
         $this->queryBuilder->setDriver($this->config['driver']);
         $this->queryBuilder->setPrefix($this->config['prefix']);
         $this->queryBuilder->setPdo($this->pdo);
-     }
+        }
 
-      //update queryRunner with some properties needed
-     if(is_object($this->queryRunner)){
+        //update queryRunner with some properties needed
+        if(is_object($this->queryRunner)){
         $this->queryRunner->setDriver($this->config['driver']);
         $this->queryRunner->setPdo($this->pdo);
-     }
+        }
     }
 	
 
@@ -592,24 +592,24 @@ 
      * @return string the DSN string
      */
     protected function getDsnFromDriver(){
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+        $config = $this->getDatabaseConfiguration();
+        if (! empty($config)){
         $driver = $config['driver'];
         $driverDsnMap = array(
-                              'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
-                                          . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
-                                          . 'dbname=' . $config['database'],
-                              'pgsql' => 'pgsql:host=' . $config['hostname'] . ';' 
-                                          . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
-                                          . 'dbname=' . $config['database'],
-                              'sqlite' => 'sqlite:' . $config['database'],
-                              'oracle' => 'oci:dbname=' . $config['hostname'] 
+                                'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
+                                            . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
+                                            . 'dbname=' . $config['database'],
+                                'pgsql' => 'pgsql:host=' . $config['hostname'] . ';' 
+                                            . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
+                                            . 'dbname=' . $config['database'],
+                                'sqlite' => 'sqlite:' . $config['database'],
+                                'oracle' => 'oci:dbname=' . $config['hostname'] 
                                             . (($config['port']) != '' ? ':' . $config['port'] : '')
                                             . '/' . $config['database']
-                              );
+                                );
         return isset($driverDsnMap[$driver]) ? $driverDsnMap[$driver] : '';
-      }                   
-      return null;
+        }                   
+        return null;
     }
 
     /**
@@ -621,11 +621,11 @@ 
     protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray){
         $cacheKey = $this->getCacheKeyForQuery($query, $returnAsList, $returnAsArray);
         if (! is_object($this->cacheInstance)){
-    			//can not call method with reference in argument
-    			//like $this->setCacheInstance(& get_instance()->cache);
-    			//use temporary variable
-    			$instance = & get_instance()->cache;
-    			$this->cacheInstance = $instance;
+                //can not call method with reference in argument
+                //like $this->setCacheInstance(& get_instance()->cache);
+                //use temporary variable
+                $instance = & get_instance()->cache;
+                $this->cacheInstance = $instance;
         }
         return $this->cacheInstance->get($cacheKey);
     }
@@ -637,87 +637,87 @@ 
      * @param mixed $result the query result to save
      * @param int $expire the cache TTL
      */
-     protected function setCacheContentForQuery($query, $key, $result, $expire){
+        protected function setCacheContentForQuery($query, $key, $result, $expire){
         $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
         if (! is_object($this->cacheInstance)){
-  				//can not call method with reference in argument
-  				//like $this->setCacheInstance(& get_instance()->cache);
-  				//use temporary variable
-  				$instance = & get_instance()->cache;
-  				$this->cacheInstance = $instance;
-  			}
+                    //can not call method with reference in argument
+                    //like $this->setCacheInstance(& get_instance()->cache);
+                    //use temporary variable
+                    $instance = & get_instance()->cache;
+                    $this->cacheInstance = $instance;
+                }
         $this->cacheInstance->set($key, $result, $expire);
-     }
+        }
 
     
-	 /**
-     * Return the cache key for the given query
-     * @see Database::query
-     * 
-     *  @return string
-     */
+        /**
+         * Return the cache key for the given query
+         * @see Database::query
+         * 
+         *  @return string
+         */
     protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray){
-      return md5($query . $returnAsList . $returnAsArray);
+        return md5($query . $returnAsList . $returnAsArray);
     }
     
-	   /**
-     * Set the Log instance using argument or create new instance
-     * @param object $logger the Log instance if not null
-     */
+        /**
+         * Set the Log instance using argument or create new instance
+         * @param object $logger the Log instance if not null
+         */
     protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
+        if ($logger !== null){
         $this->logger = $logger;
-      }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
-          $this->logger->setLogger('Library::Database');
-      }
+        }
+        else{
+            $this->logger =& class_loader('Log', 'classes');
+            $this->logger->setLogger('Library::Database');
+        }
     }
 	
-   /**
-   * Set the DatabaseQueryBuilder instance using argument or create new instance
-   * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
-   */
-	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
-	  if ($queryBuilder !== null){
+    /**
+     * Set the DatabaseQueryBuilder instance using argument or create new instance
+     * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
+     */
+    protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
+        if ($queryBuilder !== null){
         $this->queryBuilder = $queryBuilder;
-	  }
-	  else{
-		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes/database');
-	  }
-	}
-
-  /**
-   * Set the DatabaseQueryRunner instance using argument or create new instance
-   * @param object $queryRunner the DatabaseQueryRunner instance if not null
-   */
-  protected function setQueryRunnerFromParamOrCreateNewInstance(DatabaseQueryRunner $queryRunner = null){
+        }
+        else{
+            $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes/database');
+        }
+    }
+
+    /**
+     * Set the DatabaseQueryRunner instance using argument or create new instance
+     * @param object $queryRunner the DatabaseQueryRunner instance if not null
+     */
+    protected function setQueryRunnerFromParamOrCreateNewInstance(DatabaseQueryRunner $queryRunner = null){
     if ($queryRunner !== null){
         $this->queryRunner = $queryRunner;
     }
     else{
-      $this->queryRunner =& class_loader('DatabaseQueryRunner', 'classes/database');
+        $this->queryRunner =& class_loader('DatabaseQueryRunner', 'classes/database');
+    }
     }
-  }
 
     /**
      * Reset the database class attributs to the initail values before each query.
      */
     private function reset(){
-	   //query builder reset
-      $this->getQueryBuilder()->reset();
-      $this->numRows  = 0;
-      $this->insertId = null;
-      $this->query    = null;
-      $this->result   = array();
-      $this->data     = array();
+        //query builder reset
+        $this->getQueryBuilder()->reset();
+        $this->numRows  = 0;
+        $this->insertId = null;
+        $this->query    = null;
+        $this->result   = array();
+        $this->data     = array();
     }
 
     /**
      * The class destructor
      */
     public function __destruct(){
-      $this->pdo = null;
+        $this->pdo = null;
     }
 
 }

core/classes/Url.php

Indentation +142 added lines, -142 removed lines

@@ -1,154 +1,154 @@
 <?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(){
-			$obj = & get_instance();
-			$domain = 'localhost';
-			$port = $obj->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(){
+            $obj = & get_instance();
+            $domain = 'localhost';
+            $port = $obj->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 = $obj->request->server($var);
-				if($value){
-					$domain = $value;
-					break;
-				}
-			}
+            foreach ($domainserverVars as $var) {
+                $value = $obj->request->server($var);
+                if($value){
+                    $domain = $value;
+                    break;
+                }
+            }
 			
-			if($port && ((is_https() && $port != 443) || (!is_https() && $port != 80))){
-				//some server use SSL but the port doesn't equal 443 sometime is 80 if is the case put the port at this end
-				//of the domain like https://my.domain.com:787
-				if(is_https() && $port != 80){
-					$domain .= ':'.$port;
-				}
-			}
-			return $protocol.'://'.$domain;
-		}
+            if($port && ((is_https() && $port != 443) || (!is_https() && $port != 80))){
+                //some server use SSL but the port doesn't equal 443 sometime is 80 if is the case put the port at this end
+                //of the domain like https://my.domain.com:787
+                if(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/classes/Config.php

Indentation +164 added lines, -164 removed lines

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

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;
+        }
+    }