tnhfw / tnh-fw

core/libraries/PDF.php

Indentation +78 added lines, -78 removed lines

@@ -1,87 +1,87 @@
 <?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.
+     */
 
-	/**
-	 * PDF library to generate PDF document using the library DOMPDF
-	 */
-	class PDF{
+    /**
+     * PDF library to generate PDF document using the library DOMPDF
+     */
+    class PDF{
 		
-		/**
-		 * The dompdf instance
-		 * @var Dompdf
-		 */
-		private $dompdf = null;
+        /**
+         * The dompdf instance
+         * @var Dompdf
+         */
+        private $dompdf = null;
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private $logger;
 		
-		/**
-		 * Create PDF library instance
-		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::PDF');
+        /**
+         * Create PDF library instance
+         */
+        public function __construct(){
+            $this->logger =& class_loader('Log', 'classes');
+            $this->logger->setLogger('Library::PDF');
 
-			require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
-			$this->dompdf = new Dompdf();
-		}
+            require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
+            $this->dompdf = new Dompdf();
+        }
 
-		/**
-		 * Generate PDF document
-		 * @param  string  $html        the HTML content to use for generation
-		 * @param  string  $filename    the generated PDF document filename
-		 * @param  boolean $stream      if need send the generated PDF to browser for download
-		 * @param  string  $paper       the PDF document paper type like 'A4', 'A5', 'letter', etc.
-		 * @param  string  $orientation the PDF document orientation like 'portrait', 'landscape'
-		 * @return string|void               if $stream is true send PDF document to browser for download, else return the generated PDF
-		 * content like to join in Email attachment of for other purpose use.
-		 */
-		public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait'){
-			$this->logger->info('Generating of PDF document: filename [' .$filename. '], stream [' .($stream ? 'TRUE':'FALSE'). '], paper [' .$paper. '], orientation [' .$orientation. ']');
-			$this->dompdf->load_html($html);
-			$this->dompdf->set_paper($paper, $orientation);
-			$this->dompdf->render();
-			if($stream){
-				$this->dompdf->stream($filename);
-			}
-			else{
-				return $this->dompdf->output();
-			}
-		}
+        /**
+         * Generate PDF document
+         * @param  string  $html        the HTML content to use for generation
+         * @param  string  $filename    the generated PDF document filename
+         * @param  boolean $stream      if need send the generated PDF to browser for download
+         * @param  string  $paper       the PDF document paper type like 'A4', 'A5', 'letter', etc.
+         * @param  string  $orientation the PDF document orientation like 'portrait', 'landscape'
+         * @return string|void               if $stream is true send PDF document to browser for download, else return the generated PDF
+         * content like to join in Email attachment of for other purpose use.
+         */
+        public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait'){
+            $this->logger->info('Generating of PDF document: filename [' .$filename. '], stream [' .($stream ? 'TRUE':'FALSE'). '], paper [' .$paper. '], orientation [' .$orientation. ']');
+            $this->dompdf->load_html($html);
+            $this->dompdf->set_paper($paper, $orientation);
+            $this->dompdf->render();
+            if($stream){
+                $this->dompdf->stream($filename);
+            }
+            else{
+                return $this->dompdf->output();
+            }
+        }
 		
-		/**
-		* Return the instance of Dompdf
-		*
-		* @return object the dompdf instance
-		*/
-		public function getDompdf(){
-			return $this->dompdf;
-		}
+        /**
+         * Return the instance of Dompdf
+         *
+         * @return object the dompdf instance
+         */
+        public function getDompdf(){
+            return $this->dompdf;
+        }
 		
-	}
+    }

core/libraries/Upload.php

Indentation +293 added lines, -293 removed lines

@@ -22,139 +22,139 @@ 
      * 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.
-    */
+     */
 
 
 
     /**
-    *    Upload
-    *
-    *    A complete class to upload files with php 5 or higher, but the best: very simple to use.
-    *
-    *    @author Olaf Erlandsen <info@webdevfreelance.com>
-    *    @author http://www.webdevfreelance.com/
-    *
-    *    @package FileUpload
-    *    @version 1.5
-    */
+     *    Upload
+     *
+     *    A complete class to upload files with php 5 or higher, but the best: very simple to use.
+     *
+     *    @author Olaf Erlandsen <info@webdevfreelance.com>
+     *    @author http://www.webdevfreelance.com/
+     *
+     *    @package FileUpload
+     *    @version 1.5
+     */
     class Upload{
 
         /**
-        *   Version
-        *
-        *   @since      1.5
-        *   @version    1.0
-        */
+         *   Version
+         *
+         *   @since      1.5
+         *   @version    1.0
+         */
         const VERSION = '1.5';
 
         /**
-        *    Upload function name
-        *    Remember:
-        *        Default function: move_uploaded_file
-        *        Native options:
-        *            - move_uploaded_file (Default and best option)
-        *            - copy
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
+         *    Upload function name
+         *    Remember:
+         *        Default function: move_uploaded_file
+         *        Native options:
+         *            - move_uploaded_file (Default and best option)
+         *            - copy
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        string
+         */
         private $upload_function = 'move_uploaded_file';
 
         /**
-        *    Array with the information obtained from the
-        *    variable $_FILES or $HTTP_POST_FILES.
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
+         *    Array with the information obtained from the
+         *    variable $_FILES or $HTTP_POST_FILES.
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        array
+         */
         private $file_array    = array();
 
         /**
-        *    If the file you are trying to upload already exists it will
-        *    be overwritten if you set the variable to true.
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        boolean
-        */
+         *    If the file you are trying to upload already exists it will
+         *    be overwritten if you set the variable to true.
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        boolean
+         */
         private $overwrite_file = false;
 
         /**
-        *    Input element
-        *    Example:
-        *        <input type="file" name="file" />
-        *    Result:
-        *        FileUpload::$input = file
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
+         *    Input element
+         *    Example:
+         *        <input type="file" name="file" />
+         *    Result:
+         *        FileUpload::$input = file
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        string
+         */
         private $input;
 
         /**
-        *    Path output
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
+         *    Path output
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        string
+         */
         private $destination_directory;
 
         /**
-        *    Output filename
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
+         *    Output filename
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        string
+         */
         private $filename;
 
         /**
-        *    Max file size
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        float
-        */
+         *    Max file size
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        float
+         */
         private $max_file_size= 0.0;
 
         /**
-        *    List of allowed mime types
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
+         *    List of allowed mime types
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        array
+         */
         private $allowed_mime_types = array();
 
         /**
-        *    Callbacks
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
+         *    Callbacks
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        array
+         */
         private $callbacks = array('before' => null, 'after' => null);
 
         /**
-        *    File object
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        object
-        */
+         *    File object
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        object
+         */
         private $file;
 
         /**
-        *    Helping mime types
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
+         *    Helping mime types
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        array
+         */
         private $mime_helping = array(
             'text'      =>    array('text/plain',),
             'image'     =>    array(
@@ -210,13 +210,13 @@ 
 
 
         /**
-        *    Construct
-        *
-        *    @since     0.1
-        *    @version   1.0.1
-        *    @return    object
-        *    @method    object    __construct
-        */
+         *    Construct
+         *
+         *    @since     0.1
+         *    @version   1.0.1
+         *    @return    object
+         *    @method    object    __construct
+         */
         public function __construct(){
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Upload');
@@ -260,17 +260,17 @@ 
             $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
         }
         /**
-        *    Set input.
-        *    If you have $_FILES["file"], you must use the key "file"
-        *    Example:
-        *        $object->setInput("file");
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $input
-        *    @return    object
-        *    @method    boolean     setInput
-        */
+         *    Set input.
+         *    If you have $_FILES["file"], you must use the key "file"
+         *    Example:
+         *        $object->setInput("file");
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     string      $input
+         *    @return    object
+         *    @method    boolean     setInput
+         */
         public function setInput($input)
         {
             if (!empty($input) && (is_string($input) || is_numeric($input) )) {
@@ -279,18 +279,18 @@ 
             return $this;
         }
         /**
-        *    Set new filename
-        *    Example:
-        *        FileUpload::setFilename("new file.txt")
-        *    Remember:
-        *        Use %s to retrive file extension
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $filename
-        *    @return    object
-        *    @method    boolean     setFilename
-        */
+         *    Set new filename
+         *    Example:
+         *        FileUpload::setFilename("new file.txt")
+         *    Remember:
+         *        Use %s to retrive file extension
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     string      $filename
+         *    @return    object
+         *    @method    boolean     setFilename
+         */
         public function setFilename($filename)
         {
             if ($this->isFilename($filename)) {
@@ -299,14 +299,14 @@ 
             return $this;
         }
         /**
-        *    Set automatic filename
-        *
-        *    @since     1.0
-        *    @version   1.5
-        *    @param     string      $extension
-        *    @return    object
-        *    @method    boolean     setAutoFilename
-        */
+         *    Set automatic filename
+         *
+         *    @since     1.0
+         *    @version   1.5
+         *    @param     string      $extension
+         *    @return    object
+         *    @method    boolean     setAutoFilename
+         */
         public function setAutoFilename()
         {
             $this->filename = sha1(mt_rand(1, 9999).uniqid());
@@ -314,14 +314,14 @@ 
             return $this;
         }
         /**
-        *    Set file size limit
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     double     $file_size
-        *    @return    object
-        *    @method    boolean     setMaxFileSize
-        */
+         *    Set file size limit
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     double     $file_size
+         *    @return    object
+         *    @method    boolean     setMaxFileSize
+         */
         public function setMaxFileSize($file_size)
         {
             $file_size = $this->sizeInBytes($file_size);
@@ -337,14 +337,14 @@ 
             return $this;
         }
         /**
-        *    Set array mime types
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     array       $mimes
-        *    @return    object
-        *    @method    boolean     setAllowedMimeTypes
-        */
+         *    Set array mime types
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     array       $mimes
+         *    @return    object
+         *    @method    boolean     setAllowedMimeTypes
+         */
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
@@ -353,14 +353,14 @@ 
             return $this;
         }
         /**
-        *    Set input callback
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     mixed       $callback
-        *    @return    object
-        *    @method    boolean     setCallbackInput
-        */
+         *    Set input callback
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     mixed       $callback
+         *    @return    object
+         *    @method    boolean     setCallbackInput
+         */
         public function setCallbackInput($callback)
         {
             if (is_callable($callback, false)) {
@@ -369,14 +369,14 @@ 
             return $this;
         }
         /**
-        *    Set output callback
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     mixed       $callback
-        *    @return    object
-        *    @method    boolean     setCallbackOutput
-        */
+         *    Set output callback
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     mixed       $callback
+         *    @return    object
+         *    @method    boolean     setCallbackOutput
+         */
         public function setCallbackOutput($callback)
         {
             if (is_callable($callback, false)) {
@@ -385,14 +385,14 @@ 
             return $this;
         }
         /**
-        *    Append a mime type to allowed mime types
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @param     string      $mime
-        *    @return    object
-        *    @method    boolean     setAllowMimeType
-        */
+         *    Append a mime type to allowed mime types
+         *
+         *    @since     1.0
+         *    @version   1.0.1
+         *    @param     string      $mime
+         *    @return    object
+         *    @method    boolean     setAllowMimeType
+         */
         public function setAllowMimeType($mime)
         {
             if (!empty($mime) && is_string($mime)) {
@@ -402,13 +402,13 @@ 
             return $this;
         }
         /**
-        *    Set allowed mime types from mime helping
-        *
-        *    @since     1.0.1
-        *    @version   1.0.1
-        *    @return    object
-        *    @method    boolean    setMimeHelping
-        */
+         *    Set allowed mime types from mime helping
+         *
+         *    @since     1.0.1
+         *    @version   1.0.1
+         *    @return    object
+         *    @method    boolean    setMimeHelping
+         */
         public function setMimeHelping($name)
         {
             if (!empty($name) && is_string($name)) {
@@ -419,17 +419,17 @@ 
             return $this;
         }
         /**
-        *    Set function to upload file
-        *    Examples:
-        *        1.- FileUpload::setUploadFunction("move_uploaded_file");
-        *        2.- FileUpload::setUploadFunction("copy");
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $function
-        *    @return    object
-        *    @method    boolean     setUploadFunction
-        */
+         *    Set function to upload file
+         *    Examples:
+         *        1.- FileUpload::setUploadFunction("move_uploaded_file");
+         *        2.- FileUpload::setUploadFunction("copy");
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     string      $function
+         *    @return    object
+         *    @method    boolean     setUploadFunction
+         */
         public function setUploadFunction($function)
         {
             if (!empty($function) && (is_array($function) || is_string($function) )) {
@@ -440,13 +440,13 @@ 
             return $this;
         }
         /**
-        *    Clear allowed mime types cache
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @return    object
-        *    @method    boolean    clearAllowedMimeTypes
-        */
+         *    Clear allowed mime types cache
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @return    object
+         *    @method    boolean    clearAllowedMimeTypes
+         */
         public function clearAllowedMimeTypes()
         {
             $this->allowed_mime_types = array();
@@ -454,15 +454,15 @@ 
             return $this;
         }
         /**
-        *    Set destination output
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $destination_directory      Destination path
-        *    @param     boolean     $create_if_not_exist
-        *    @return    object
-        *    @method    boolean     setDestinationDirectory
-        */
+         *    Set destination output
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     string      $destination_directory      Destination path
+         *    @param     boolean     $create_if_not_exist
+         *    @return    object
+         *    @method    boolean     setDestinationDirectory
+         */
         public function setDestinationDirectory($destination_directory, $create_if_not_exist = false) {
             $destination_directory = realpath($destination_directory);
             if (substr($destination_directory, -1) != DIRECTORY_SEPARATOR) {
@@ -486,14 +486,14 @@ 
             return $this;
         }
         /**
-        *    Check file exists
-        *
-        *    @since      1.0
-        *    @version    1.0.1
-        *    @param      string     $file_destination
-        *    @return     boolean
-        *    @method     boolean    fileExists
-        */
+         *    Check file exists
+         *
+         *    @since      1.0
+         *    @version    1.0.1
+         *    @param      string     $file_destination
+         *    @return     boolean
+         *    @method     boolean    fileExists
+         */
         public function fileExists($file_destination)
         {
             if ($this->isFilename($file_destination)) {
@@ -502,14 +502,14 @@ 
             return false;
         }
         /**
-        *    Check dir exists
-        *
-        *    @since        1.0
-        *    @version    1.0.1
-        *    @param      string     $path
-        *    @return     boolean
-        *    @method     boolean    dirExists
-        */
+         *    Check dir exists
+         *
+         *    @since        1.0
+         *    @version    1.0.1
+         *    @param      string     $path
+         *    @return     boolean
+         *    @method     boolean    dirExists
+         */
         public function dirExists($path)
         {
             if ($this->isDirpath($path)) {
@@ -518,29 +518,29 @@ 
             return false;
         }
         /**
-        *    Check valid filename
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @param     string      $filename
-        *    @return    boolean
-        *    @method    boolean     isFilename
-        */
+         *    Check valid filename
+         *
+         *    @since     1.0
+         *    @version   1.0.1
+         *    @param     string      $filename
+         *    @return    boolean
+         *    @method    boolean     isFilename
+         */
         public function isFilename($filename)
         {
             $filename = basename($filename);
             return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
         }
         /**
-        *    Validate mime type with allowed mime types,
-        *    but if allowed mime types is empty, this method return true
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $mime
-        *    @return    boolean
-        *    @method    boolean     checkMimeType
-        */
+         *    Validate mime type with allowed mime types,
+         *    but if allowed mime types is empty, this method return true
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @param     string      $mime
+         *    @return    boolean
+         *    @method    boolean     checkMimeType
+         */
         public function checkMimeType($mime)
         {
             if (count($this->allowed_mime_types) == 0) {
@@ -549,26 +549,26 @@ 
             return in_array(strtolower($mime), $this->allowed_mime_types);
         }
         /**
-        *    Retrive status of upload
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @return    boolean
-        *    @method    boolean    getStatus
-        */
+         *    Retrive status of upload
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @return    boolean
+         *    @method    boolean    getStatus
+         */
         public function getStatus()
         {
             return $this->file['status'];
         }
         /**
-        *    Check valid path
-        *
-        *    @since        1.0
-        *    @version    1.0.1
-        *    @param        string    $filename
-        *    @return     boolean
-        *    @method     boolean    isDirpath
-        */
+         *    Check valid path
+         *
+         *    @since        1.0
+         *    @version    1.0.1
+         *    @param        string    $filename
+         *    @return     boolean
+         *    @method     boolean    isDirpath
+         */
         public function isDirpath($path)
         {
             if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
@@ -581,26 +581,26 @@ 
             return false;
         }
         /**
-        *    Allow overwriting files
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @return     object
-        *    @method     boolean    allowOverwriting
-        */
+         *    Allow overwriting files
+         *
+         *    @since      1.0
+         *    @version    1.0
+         *    @return     object
+         *    @method     boolean    allowOverwriting
+         */
         public function allowOverwriting()
         {
             $this->overwrite_file = true;
             return $this;
         }
         /**
-        *    File info
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @return     object
-        *    @method     object    getInfo
-        */
+         *    File info
+         *
+         *    @since      1.0
+         *    @version    1.0
+         *    @return     object
+         *    @method     object    getInfo
+         */
         public function getInfo()
         {
             return (object)$this->file;
@@ -618,13 +618,13 @@ 
 
         
         /**
-        *    Upload file
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @return    boolean
-        *    @method    boolean    save
-        */
+         *    Upload file
+         *
+         *    @since     1.0
+         *    @version   1.0.1
+         *    @return    boolean
+         *    @method    boolean    save
+         */
         public function save(){
             if (count($this->file_array) > 0 && array_key_exists($this->input, $this->file_array)) {
                 // set original filename if not have a new name
@@ -681,15 +681,15 @@ 
 
 
         /**
-        *    File size for humans.
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @param      integer    $bytes
-        *    @param      integer    $precision
-        *    @return     string
-        *    @method     string     sizeFormat
-        */
+         *    File size for humans.
+         *
+         *    @since      1.0
+         *    @version    1.0
+         *    @param      integer    $bytes
+         *    @param      integer    $precision
+         *    @return     string
+         *    @method     string     sizeFormat
+         */
         public function sizeFormat($size, $precision = 2)
         {
             if($size > 0){
@@ -702,14 +702,14 @@ 
 
         
         /**
-        *    Convert human file size to bytes
-        *
-        *    @since      1.0
-        *    @version    1.0.1
-        *    @param      integer|double    $size
-        *    @return     integer|double
-        *    @method     string     sizeInBytes
-        */
+         *    Convert human file size to bytes
+         *
+         *    @since      1.0
+         *    @version    1.0.1
+         *    @param      integer|double    $size
+         *    @return     integer|double
+         *    @method     string     sizeInBytes
+         */
         public function sizeInBytes($size)
         {
             $unit = 'B';
@@ -761,7 +761,7 @@ 
                 return true;
             }
 
-             //check for php upload error
+                //check for php upload error
             if(is_numeric($this->file['error']) && $this->file['error'] > 0){
                 $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                 return true;
@@ -773,7 +773,7 @@ 
                 return true;
             }
 
-             // Check file size
+                // Check file size
             if ($this->max_file_size > 0 && $this->max_file_size < $this->file['size']) {
                 $this->setError(sprintf($this->error_messages['max_file_size'], $this->sizeFormat($this->max_file_size)));
                 return true;

core/constants.php

Indentation +72 added lines, -72 removed lines

@@ -1,81 +1,81 @@
 <?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 constants.php
-	 *    
-	 *  This file contains the declaration of most of the constants used in the system, 
-	 *  for example: the version, the name of the framework, 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
-	 *  @filesource
-	 */
+    /**
+     *  @file constants.php
+     *    
+     *  This file contains the declaration of most of the constants used in the system, 
+     *  for example: the version, the name of the framework, 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
+     *  @filesource
+     */
 
-	/**
-	 *  The framework name
-	 */
-	define('TNH_NAME', 'TNH Framework');
+    /**
+     *  The framework name
+     */
+    define('TNH_NAME', 'TNH Framework');
 
-	/**
-	 *  The version of the framework in X.Y.Z format (Major, minor and bugs). 
-	 *  If there is the presence of the word "dev", it means that 
-	 *  it is a version under development.
-	 */
-	define('TNH_VERSION', '1.0.0-dev');
+    /**
+     *  The version of the framework in X.Y.Z format (Major, minor and bugs). 
+     *  If there is the presence of the word "dev", it means that 
+     *  it is a version under development.
+     */
+    define('TNH_VERSION', '1.0.0-dev');
 
-	/**
-	 *  The date of publication or release of the framework
-	 */
-	define('TNH_RELEASE_DATE', '2017/02/05');
+    /**
+     *  The date of publication or release of the framework
+     */
+    define('TNH_RELEASE_DATE', '2017/02/05');
 
-	/**
-	 *  The author of the framework, the person who developed the framework.
-	 */
-	define('TNH_AUTHOR', 'Tony NGUEREZA');
+    /**
+     *  The author of the framework, the person who developed the framework.
+     */
+    define('TNH_AUTHOR', 'Tony NGUEREZA');
 
-	/**
-	 *  Email address of the author of the framework.
-	 */
-	define('TNH_AUTHOR_EMAIL', 'nguerezatony@gmail.com');
+    /**
+     *  Email address of the author of the framework.
+     */
+    define('TNH_AUTHOR_EMAIL', 'nguerezatony@gmail.com');
 
-	/**
-	 *  The minimum PHP version required to use the framework. 
-	 *  If the version of PHP installed is lower, then the application will not work.
-	 *  Note: we use the PHP version_compare function to compare the required version with 
-	 *  the version installed on your system.
-	 */
-	define('TNH_REQUIRED_PHP_MIN_VERSION', '5.4');
+    /**
+     *  The minimum PHP version required to use the framework. 
+     *  If the version of PHP installed is lower, then the application will not work.
+     *  Note: we use the PHP version_compare function to compare the required version with 
+     *  the version installed on your system.
+     */
+    define('TNH_REQUIRED_PHP_MIN_VERSION', '5.4');
 
-	/**
-	 *  The maximum version of PHP required to use the framework. 
-	 *  If the version of PHP installed is higher than the required one, then the application will not work.
-	 */
-	define('TNH_REQUIRED_PHP_MAX_VERSION', '7.1');
\ No newline at end of file
+    /**
+     *  The maximum version of PHP required to use the framework. 
+     *  If the version of PHP installed is higher than the required one, then the application will not work.
+     */
+    define('TNH_REQUIRED_PHP_MAX_VERSION', '7.1');
\ No newline at end of file

core/common.php

Indentation +536 added lines, -536 removed lines

@@ -1,585 +1,585 @@
 <?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 common.php
-	 *  
-	 *  Contains most of the commons functions used by the system
-	 *  
-	 *  @package	core
-	 *  @author	Tony NGUEREZA
-	 *  @copyright	Copyright (c) 2017
-	 *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
-	 *  @link	http://www.iacademy.cf
-	 *  @version 1.0.0
-	 *  @filesource
-	 */
+    /**
+     *  @file common.php
+     *  
+     *  Contains most of the commons functions used by the system
+     *  
+     *  @package	core
+     *  @author	Tony NGUEREZA
+     *  @copyright	Copyright (c) 2017
+     *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
+     *  @link	http://www.iacademy.cf
+     *  @version 1.0.0
+     *  @filesource
+     */
 	
 
-	/**
-	 * This function is the class loader helper is used if the library "Loader" not yet loaded
-	 * he load the class once
-	 * @param  string $class  the class name to be loaded
-	 * @param  string $dir    the directory where to find the class
-	 * @param  mixed $params the parameter to pass as argument to the constructor of the class
-	 * @codeCoverageIgnore
-	 * 
-	 * @return object         the instance of the loaded class
-	 */
-	function & class_loader($class, $dir = 'libraries', $params = null){
-		//put the first letter of class to upper case 
-		$class = ucfirst($class);
-		static $classes = array();
-		if (isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log'){
-			return $classes[$class];
-		}
-		$found = false;
-		foreach (array(ROOT_PATH, CORE_PATH) as $path) {
-			$file = $path . $dir . '/' . $class . '.php';
-			if (file_exists($file)){
-				if (class_exists($class, false) === false){
-					require_once $file;
-				}
-				//already found
-				$found = true;
-				break;
-			}
-		}
-		if (! $found){
-			//can't use show_error() at this time because some dependencies not yet loaded
-			set_http_status_header(503);
-			echo 'Cannot find the class [' . $class . ']';
-			die();
-		}
+    /**
+     * This function is the class loader helper is used if the library "Loader" not yet loaded
+     * he load the class once
+     * @param  string $class  the class name to be loaded
+     * @param  string $dir    the directory where to find the class
+     * @param  mixed $params the parameter to pass as argument to the constructor of the class
+     * @codeCoverageIgnore
+     * 
+     * @return object         the instance of the loaded class
+     */
+    function & class_loader($class, $dir = 'libraries', $params = null){
+        //put the first letter of class to upper case 
+        $class = ucfirst($class);
+        static $classes = array();
+        if (isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log'){
+            return $classes[$class];
+        }
+        $found = false;
+        foreach (array(ROOT_PATH, CORE_PATH) as $path) {
+            $file = $path . $dir . '/' . $class . '.php';
+            if (file_exists($file)){
+                if (class_exists($class, false) === false){
+                    require_once $file;
+                }
+                //already found
+                $found = true;
+                break;
+            }
+        }
+        if (! $found){
+            //can't use show_error() at this time because some dependencies not yet loaded
+            set_http_status_header(503);
+            echo 'Cannot find the class [' . $class . ']';
+            die();
+        }
 		
-		/*
+        /*
 		   TODO use the best method to get the Log instance
 		 */
-		if ($class == 'Log'){
-			//can't use the instruction like "return new Log()" 
-			//because we need return the reference instance of the loaded class.
-			$log = new Log();
-			return $log;
-		}
-		//track of loaded classes
-		class_loaded($class);
+        if ($class == 'Log'){
+            //can't use the instruction like "return new Log()" 
+            //because we need return the reference instance of the loaded class.
+            $log = new Log();
+            return $log;
+        }
+        //track of loaded classes
+        class_loaded($class);
 		
-		//record the class instance
-		$classes[$class] = isset($params) ? new $class($params) : new $class();
+        //record the class instance
+        $classes[$class] = isset($params) ? new $class($params) : new $class();
 		
-		return $classes[$class];
-	}
+        return $classes[$class];
+    }
 
-	/**
-	 * This function is the helper to record the loaded classes
-	 * @param  string $class the loaded class name
-	 * @codeCoverageIgnore
-	 * 
-	 * @return array        the list of the loaded classes
-	 */
-	function & class_loaded($class = null){
-		static $list = array();
-		if ($class !== null){
-			$list[strtolower($class)] = $class;
-		}
-		return $list;
-	}
+    /**
+     * This function is the helper to record the loaded classes
+     * @param  string $class the loaded class name
+     * @codeCoverageIgnore
+     * 
+     * @return array        the list of the loaded classes
+     */
+    function & class_loaded($class = null){
+        static $list = array();
+        if ($class !== null){
+            $list[strtolower($class)] = $class;
+        }
+        return $list;
+    }
 
-	/**
-	 * This function is used to load the configurations in the case the "Config" library not yet loaded
-	 * @param  array  $overwrite_values if need overwrite the existing configuration
-	 * @codeCoverageIgnore
-	 * 
-	 * @return array                   the configurations values
-	 */
-	function & load_configurations(array $overwrite_values = array()){
-		static $config;
-		if (empty($config)){
-			$file = CONFIG_PATH . 'config.php';
-			$found = false;
-			if (file_exists($file)){
-				require_once $file;
-				$found = true;
-			}
-			if (! $found){
-				set_http_status_header(503);
-				echo 'Unable to find the configuration file [' . $file . ']';
-				die();
-			}
-		}
-		foreach ($overwrite_values as $key => $value) {
-			$config[$key] = $value;
-		}
-		return $config;
-	}
+    /**
+     * This function is used to load the configurations in the case the "Config" library not yet loaded
+     * @param  array  $overwrite_values if need overwrite the existing configuration
+     * @codeCoverageIgnore
+     * 
+     * @return array                   the configurations values
+     */
+    function & load_configurations(array $overwrite_values = array()){
+        static $config;
+        if (empty($config)){
+            $file = CONFIG_PATH . 'config.php';
+            $found = false;
+            if (file_exists($file)){
+                require_once $file;
+                $found = true;
+            }
+            if (! $found){
+                set_http_status_header(503);
+                echo 'Unable to find the configuration file [' . $file . ']';
+                die();
+            }
+        }
+        foreach ($overwrite_values as $key => $value) {
+            $config[$key] = $value;
+        }
+        return $config;
+    }
 
-	/**
-	 * This function is the helper to get the config value in case the "Config" library not yet loaded
-	 * @param  string $key     the config item to get the vale
-	 * @param  mixed $default the default value to return if can't find the config item in the configuration
-	 * @test
-	 * 
-	 * @return mixed          the config value
-	 */
-	function get_config($key, $default = null){
-		static $cfg;
-		if (empty($cfg)){
-			$cfg[0] = & load_configurations();
-		}
-		return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
-	}
+    /**
+     * This function is the helper to get the config value in case the "Config" library not yet loaded
+     * @param  string $key     the config item to get the vale
+     * @param  mixed $default the default value to return if can't find the config item in the configuration
+     * @test
+     * 
+     * @return mixed          the config value
+     */
+    function get_config($key, $default = null){
+        static $cfg;
+        if (empty($cfg)){
+            $cfg[0] = & load_configurations();
+        }
+        return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
+    }
 
-	/**
-	 * This function is a helper to logging message
-	 * @param  string $level   the log level "ERROR", "DEBUG", "INFO", etc.
-	 * @param  string $message the log message to be saved
-	 * @param  string $logger  the logger to use if is set
-	 * 
-	 * @codeCoverageIgnore
-	 */
-	function save_to_log($level, $message, $logger = null){
-		$log =& class_loader('Log', 'classes');
-		if ($logger){
-			$log->setLogger($logger);
-		}
-		$log->writeLog($message, $level);
-	}
+    /**
+     * This function is a helper to logging message
+     * @param  string $level   the log level "ERROR", "DEBUG", "INFO", etc.
+     * @param  string $message the log message to be saved
+     * @param  string $logger  the logger to use if is set
+     * 
+     * @codeCoverageIgnore
+     */
+    function save_to_log($level, $message, $logger = null){
+        $log =& class_loader('Log', 'classes');
+        if ($logger){
+            $log->setLogger($logger);
+        }
+        $log->writeLog($message, $level);
+    }
 
-	/**
-	 * Set the HTTP status header
-	 * @param integer $code the HTTP status code
-	 * @param string  $text the HTTP status text
-	 * 
-	 * @codeCoverageIgnore
-	 */
-	function set_http_status_header($code = 200, $text = null){
-		if (empty($text)){
-			$http_status = array(
-								100 => 'Continue',
-								101 => 'Switching Protocols',
+    /**
+     * Set the HTTP status header
+     * @param integer $code the HTTP status code
+     * @param string  $text the HTTP status text
+     * 
+     * @codeCoverageIgnore
+     */
+    function set_http_status_header($code = 200, $text = null){
+        if (empty($text)){
+            $http_status = array(
+                                100 => 'Continue',
+                                101 => 'Switching Protocols',
 
-								200 => 'OK',
-								201 => 'Created',
-								202 => 'Accepted',
-								203 => 'Non-Authoritative Information',
-								204 => 'No Content',
-								205 => 'Reset Content',
-								206 => 'Partial Content',
+                                200 => 'OK',
+                                201 => 'Created',
+                                202 => 'Accepted',
+                                203 => 'Non-Authoritative Information',
+                                204 => 'No Content',
+                                205 => 'Reset Content',
+                                206 => 'Partial Content',
 
-								300 => 'Multiple Choices',
-								301 => 'Moved Permanently',
-								302 => 'Found',
-								303 => 'See Other',
-								304 => 'Not Modified',
-								305 => 'Use Proxy',
-								307 => 'Temporary Redirect',
+                                300 => 'Multiple Choices',
+                                301 => 'Moved Permanently',
+                                302 => 'Found',
+                                303 => 'See Other',
+                                304 => 'Not Modified',
+                                305 => 'Use Proxy',
+                                307 => 'Temporary Redirect',
 
-								400 => 'Bad Request',
-								401 => 'Unauthorized',
-								402 => 'Payment Required',
-								403 => 'Forbidden',
-								404 => 'Not Found',
-								405 => 'Method Not Allowed',
-								406 => 'Not Acceptable',
-								407 => 'Proxy Authentication Required',
-								408 => 'Request Timeout',
-								409 => 'Conflict',
-								410 => 'Gone',
-								411 => 'Length Required',
-								412 => 'Precondition Failed',
-								413 => 'Request Entity Too Large',
-								414 => 'Request-URI Too Long',
-								415 => 'Unsupported Media Type',
-								416 => 'Requested Range Not Satisfiable',
-								417 => 'Expectation Failed',
-								418 => 'I\'m a teapot',
+                                400 => 'Bad Request',
+                                401 => 'Unauthorized',
+                                402 => 'Payment Required',
+                                403 => 'Forbidden',
+                                404 => 'Not Found',
+                                405 => 'Method Not Allowed',
+                                406 => 'Not Acceptable',
+                                407 => 'Proxy Authentication Required',
+                                408 => 'Request Timeout',
+                                409 => 'Conflict',
+                                410 => 'Gone',
+                                411 => 'Length Required',
+                                412 => 'Precondition Failed',
+                                413 => 'Request Entity Too Large',
+                                414 => 'Request-URI Too Long',
+                                415 => 'Unsupported Media Type',
+                                416 => 'Requested Range Not Satisfiable',
+                                417 => 'Expectation Failed',
+                                418 => 'I\'m a teapot',
 
-								500 => 'Internal Server Error',
-								501 => 'Not Implemented',
-								502 => 'Bad Gateway',
-								503 => 'Service Unavailable',
-								504 => 'Gateway Timeout',
-								505 => 'HTTP Version Not Supported',
-							);
-			if (isset($http_status[$code])){
-				$text = $http_status[$code];
-			}
-			else{
-				show_error('No HTTP status text found for your code please check it.');
-			}
-		}
+                                500 => 'Internal Server Error',
+                                501 => 'Not Implemented',
+                                502 => 'Bad Gateway',
+                                503 => 'Service Unavailable',
+                                504 => 'Gateway Timeout',
+                                505 => 'HTTP Version Not Supported',
+                            );
+            if (isset($http_status[$code])){
+                $text = $http_status[$code];
+            }
+            else{
+                show_error('No HTTP status text found for your code please check it.');
+            }
+        }
 		
-		if (strpos(php_sapi_name(), 'cgi') === 0){
-			header('Status: ' . $code . ' ' . $text, TRUE);
-		}
-		else{
-			$proto = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
-			header($proto . ' ' . $code . ' ' . $text, TRUE, $code);
-		}
-	}
+        if (strpos(php_sapi_name(), 'cgi') === 0){
+            header('Status: ' . $code . ' ' . $text, TRUE);
+        }
+        else{
+            $proto = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
+            header($proto . ' ' . $code . ' ' . $text, TRUE, $code);
+        }
+    }
 
-	/**
-	 *  This function displays an error message to the user and ends the execution of the script.
-	 *  
-	 *  @param string $msg the message to display
-	 *  @param string $title the message title: "error", "info", "warning", etc.
-	 *  @param boolean $logging either to save error in log
-	 *  
-	 *  @codeCoverageIgnore
-	 */
-	function show_error($msg, $title = 'error', $logging = true){
-		$title = strtoupper($title);
-		$data = array();
-		$data['error'] = $msg;
-		$data['title'] = $title;
-		if ($logging){
-			save_to_log('error', '['.$title.'] '.strip_tags($msg), 'GLOBAL::ERROR');
-		}
-		$response = & class_loader('Response', 'classes');
-		$response->sendError($data);
-		die();
-	}
+    /**
+     *  This function displays an error message to the user and ends the execution of the script.
+     *  
+     *  @param string $msg the message to display
+     *  @param string $title the message title: "error", "info", "warning", etc.
+     *  @param boolean $logging either to save error in log
+     *  
+     *  @codeCoverageIgnore
+     */
+    function show_error($msg, $title = 'error', $logging = true){
+        $title = strtoupper($title);
+        $data = array();
+        $data['error'] = $msg;
+        $data['title'] = $title;
+        if ($logging){
+            save_to_log('error', '['.$title.'] '.strip_tags($msg), 'GLOBAL::ERROR');
+        }
+        $response = & class_loader('Response', 'classes');
+        $response->sendError($data);
+        die();
+    }
 
-	/**
-	 *  Check whether the protocol used is "https" or not
-	 *  That is, the web server is configured to use a secure connection.
-	 *  @codeCoverageIgnore
-	 *  
-	 *  @return boolean true if the web server uses the https protocol, false if not.
-	 */
-	function is_https(){
-		/*
+    /**
+     *  Check whether the protocol used is "https" or not
+     *  That is, the web server is configured to use a secure connection.
+     *  @codeCoverageIgnore
+     *  
+     *  @return boolean true if the web server uses the https protocol, false if not.
+     */
+    function is_https(){
+        /*
 		* some servers pass the "HTTPS" parameter in the server variable,
 		* if is the case, check if the value is "on", "true", "1".
 		*/
-		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off'){
-			return true;
-		}
-		else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
-			return true;
-		}
-		else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
-			return true;
-		}
-		return false;
-	}
+        if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off'){
+            return true;
+        }
+        else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
+            return true;
+        }
+        else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
+            return true;
+        }
+        return false;
+    }
 	
-	/**
-	 *  This function is used to check the URL format of the given string argument. 
-	 *  The address is valid if the protocol is http, https, ftp, etc.
-	 *
-	 *  @param string $url the URL address to check
-	 *  @test
-	 *  
-	 *  @return boolean true if is a valid URL address or false.
-	 */
-	function is_url($url){
-		return preg_match('/^(http|https|ftp):\/\/(.*)/', $url) == 1;
-	}
+    /**
+     *  This function is used to check the URL format of the given string argument. 
+     *  The address is valid if the protocol is http, https, ftp, etc.
+     *
+     *  @param string $url the URL address to check
+     *  @test
+     *  
+     *  @return boolean true if is a valid URL address or false.
+     */
+    function is_url($url){
+        return preg_match('/^(http|https|ftp):\/\/(.*)/', $url) == 1;
+    }
 	
-	/**
-	 *  Function defined to load controller
-	 *  
-	 *  @param string $controllerClass the controller class name to be loaded
-	 *  @codeCoverageIgnore
-	 */
-	function autoload_controller($controllerClass){
-		if (file_exists($path = APPS_CONTROLLER_PATH . $controllerClass . '.php')){
-			require_once $path;
-		}
-	}
+    /**
+     *  Function defined to load controller
+     *  
+     *  @param string $controllerClass the controller class name to be loaded
+     *  @codeCoverageIgnore
+     */
+    function autoload_controller($controllerClass){
+        if (file_exists($path = APPS_CONTROLLER_PATH . $controllerClass . '.php')){
+            require_once $path;
+        }
+    }
 	
-	/**
-	 *  Function defined for handling PHP exception error message, 
-	 *  it displays an error message using the function "show_error"
-	 *  
-	 *  @param object $ex instance of the "Exception" class or a derived class
-	 *  @codeCoverageIgnore
-	 *  
-	 *  @return boolean
-	 */
-	function php_exception_handler($ex){
-		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
-			show_error('An exception is occured in file '. $ex->getFile() .' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());
-		}
-		else{
-			save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
-		}
-		return true;
-	}
+    /**
+     *  Function defined for handling PHP exception error message, 
+     *  it displays an error message using the function "show_error"
+     *  
+     *  @param object $ex instance of the "Exception" class or a derived class
+     *  @codeCoverageIgnore
+     *  
+     *  @return boolean
+     */
+    function php_exception_handler($ex){
+        if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
+            show_error('An exception is occured in file '. $ex->getFile() .' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());
+        }
+        else{
+            save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
+        }
+        return true;
+    }
 	
-	/**
-	 *  Function defined for PHP error message handling
-	 *  			
-	 *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
-	 *  @param string $errstr the error message
-	 *  @param string $errfile the file where the error occurred
-	 *  @param int $errline the line number where the error occurred
-	 *  @codeCoverageIgnore
-	 *  
-	 *  @return boolean	
-	 */
-	function php_error_handler($errno , $errstr, $errfile , $errline){
-		$isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno);
-		if ($isError){
-			set_http_status_header(500);
-		}
-		if (! (error_reporting() & $errno)) {
-			save_to_log('error', 'An error is occurred in the file ' . $errfile . ' at line ' . $errline . ' raison : ' . $errstr, 'PHP ERROR');
-			return;
-		}
-		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
-			$errorType = 'error';
-			switch ($errno) {
-				case E_USER_ERROR:
-					$errorType = 'error';
-					break;
-				case E_USER_WARNING:
-					$errorType = 'warning';
-					break;
-				case E_USER_NOTICE:
-					$errorType = 'notice';
-					break;
-				default:
-					$errorType = 'error';
-					break;
-			}
-			show_error('An error is occurred in the file <b>' . $errfile . '</b> at line <b>' . $errline .'</b> raison : ' . $errstr, 'PHP ' . $errorType);
-		}
-		if ($isError){
-			die();
-		}
-		return true;
-	}
+    /**
+     *  Function defined for PHP error message handling
+     *  			
+     *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
+     *  @param string $errstr the error message
+     *  @param string $errfile the file where the error occurred
+     *  @param int $errline the line number where the error occurred
+     *  @codeCoverageIgnore
+     *  
+     *  @return boolean	
+     */
+    function php_error_handler($errno , $errstr, $errfile , $errline){
+        $isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno);
+        if ($isError){
+            set_http_status_header(500);
+        }
+        if (! (error_reporting() & $errno)) {
+            save_to_log('error', 'An error is occurred in the file ' . $errfile . ' at line ' . $errline . ' raison : ' . $errstr, 'PHP ERROR');
+            return;
+        }
+        if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
+            $errorType = 'error';
+            switch ($errno) {
+                case E_USER_ERROR:
+                    $errorType = 'error';
+                    break;
+                case E_USER_WARNING:
+                    $errorType = 'warning';
+                    break;
+                case E_USER_NOTICE:
+                    $errorType = 'notice';
+                    break;
+                default:
+                    $errorType = 'error';
+                    break;
+            }
+            show_error('An error is occurred in the file <b>' . $errfile . '</b> at line <b>' . $errline .'</b> raison : ' . $errstr, 'PHP ' . $errorType);
+        }
+        if ($isError){
+            die();
+        }
+        return true;
+    }
 
-	/**
-	 * This function is used to run in shutdown situation of the script
-	 * @codeCoverageIgnore
-	 */
-	function php_shudown_handler(){
-		$lastError = error_get_last();
-		if (isset($lastError) &&
-			($lastError['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING))){
-			php_error_handler($lastError['type'], $lastError['message'], $lastError['file'], $lastError['line']);
-		}
-	}
+    /**
+     * This function is used to run in shutdown situation of the script
+     * @codeCoverageIgnore
+     */
+    function php_shudown_handler(){
+        $lastError = error_get_last();
+        if (isset($lastError) &&
+            ($lastError['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING))){
+            php_error_handler($lastError['type'], $lastError['message'], $lastError['file'], $lastError['line']);
+        }
+    }
 
 
-	/**
-	 *  Convert array attributes to string
-	 *
-	 *  This function converts an associative array into HTML attributes.
-	 *  For example :
-	 *  $a = array('name' => 'Foo', 'type' => 'text'); => produces the following string:
-	 *  name = "Foo" type = "text"
-	 *
-	 *  @param array $attributes associative array to convert to a string attribute.
-	 *   
-	 *  @return string string of the HTML attribute.
-	 */
-	function attributes_to_string(array $attributes){
-		$str = ' ';
-		//we check that the array passed as an argument is not empty.
-		if (! empty($attributes)){
-			foreach($attributes as $key => $value){
-				$key = trim(htmlspecialchars($key));
-				$value = trim(htmlspecialchars($value));
-				/*
+    /**
+     *  Convert array attributes to string
+     *
+     *  This function converts an associative array into HTML attributes.
+     *  For example :
+     *  $a = array('name' => 'Foo', 'type' => 'text'); => produces the following string:
+     *  name = "Foo" type = "text"
+     *
+     *  @param array $attributes associative array to convert to a string attribute.
+     *   
+     *  @return string string of the HTML attribute.
+     */
+    function attributes_to_string(array $attributes){
+        $str = ' ';
+        //we check that the array passed as an argument is not empty.
+        if (! empty($attributes)){
+            foreach($attributes as $key => $value){
+                $key = trim(htmlspecialchars($key));
+                $value = trim(htmlspecialchars($value));
+                /*
 				* To predict the case where the string to convert contains the character "
 				* we check if this is the case we add a slash to solve this problem.
 				* For example:
 				* 	$attr = array('placeholder' => 'I am a "puple"')
 				* 	$str = attributes_to_string($attr); => placeholder = "I am a \"puple\""
 				 */
-				if ($value && strpos('"', $value) !== false){
-					$value = addslashes($value);
-				}
-				$str .= $key.' = "'.$value.'" ';
-			}
-		}
-		//remove the space after using rtrim()
-		return rtrim($str);
-	}
+                if ($value && strpos('"', $value) !== false){
+                    $value = addslashes($value);
+                }
+                $str .= $key.' = "'.$value.'" ';
+            }
+        }
+        //remove the space after using rtrim()
+        return rtrim($str);
+    }
 
 
-	/**
-	* Function to stringfy PHP variable, useful in debug situation
-	*
-	* @param mixed $var the variable to stringfy
-	* @codeCoverageIgnore
-	*
-	* @return string the stringfy value
-	*/
-	function stringfy_vars($var){
-		return print_r($var, true);
-	}
+    /**
+     * Function to stringfy PHP variable, useful in debug situation
+     *
+     * @param mixed $var the variable to stringfy
+     * @codeCoverageIgnore
+     *
+     * @return string the stringfy value
+     */
+    function stringfy_vars($var){
+        return print_r($var, true);
+    }
 
-	/**
-	 * Clean the user input
-	 * @param  mixed $str the value to clean
-	 * @test
-	 * 
-	 * @return mixed   the sanitize value
-	 */
-	function clean_input($str){
-		if (is_array($str)){
-			$str = array_map('clean_input', $str);
-		}
-		else if (is_object($str)){
-			$obj = $str;
-			foreach ($str as $var => $value) {
-				$obj->$var = clean_input($value);
-			}
-			$str = $obj;
-		}
-		else{
-			$str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
-		}
-		return $str;
-	}
+    /**
+     * Clean the user input
+     * @param  mixed $str the value to clean
+     * @test
+     * 
+     * @return mixed   the sanitize value
+     */
+    function clean_input($str){
+        if (is_array($str)){
+            $str = array_map('clean_input', $str);
+        }
+        else if (is_object($str)){
+            $obj = $str;
+            foreach ($str as $var => $value) {
+                $obj->$var = clean_input($value);
+            }
+            $str = $obj;
+        }
+        else{
+            $str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
+        }
+        return $str;
+    }
 	
-	/**
-	 * This function is used to hidden some part of the given string. Helpful if you need hide some confidential 
-	 * Information like credit card number, password, etc.
-	 *
-	 * @param  string $str the string you want to hide some part
-	 * @param  int $startCount the length of non hidden for the beginning char
-	 * @param  int $endCount the length of non hidden for the ending char
-	 * @param  string $hiddenChar the char used to hide the given string
-	 * @test
-	 * 
-	 * @return string the string with the hidden part.
-	 */
-	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
-		//get the string length
-		$len = strlen($str);
-		//if str is empty
-		if ($len <= 0){
-			return str_repeat($hiddenChar, 6);
-		}
-		//if the length is less than startCount and endCount
-		//or the startCount and endCount length is 0
-		//or startCount is negative or endCount is negative
-		//return the full string hidden
+    /**
+     * This function is used to hidden some part of the given string. Helpful if you need hide some confidential 
+     * Information like credit card number, password, etc.
+     *
+     * @param  string $str the string you want to hide some part
+     * @param  int $startCount the length of non hidden for the beginning char
+     * @param  int $endCount the length of non hidden for the ending char
+     * @param  string $hiddenChar the char used to hide the given string
+     * @test
+     * 
+     * @return string the string with the hidden part.
+     */
+    function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
+        //get the string length
+        $len = strlen($str);
+        //if str is empty
+        if ($len <= 0){
+            return str_repeat($hiddenChar, 6);
+        }
+        //if the length is less than startCount and endCount
+        //or the startCount and endCount length is 0
+        //or startCount is negative or endCount is negative
+        //return the full string hidden
 		
-		if ((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)){
-			return str_repeat($hiddenChar, $len);
-		}
-		//the start non hidden string
-		$startNonHiddenStr = substr($str, 0, $startCount);
-		//the end non hidden string
-		$endNonHiddenStr = null;
-		if ($endCount > 0){
-			$endNonHiddenStr = substr($str, - $endCount);
-		}
-		//the hidden string
-		$hiddenStr = str_repeat($hiddenChar, $len - ($startCount + $endCount));
+        if ((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)){
+            return str_repeat($hiddenChar, $len);
+        }
+        //the start non hidden string
+        $startNonHiddenStr = substr($str, 0, $startCount);
+        //the end non hidden string
+        $endNonHiddenStr = null;
+        if ($endCount > 0){
+            $endNonHiddenStr = substr($str, - $endCount);
+        }
+        //the hidden string
+        $hiddenStr = str_repeat($hiddenChar, $len - ($startCount + $endCount));
 		
-		return $startNonHiddenStr . $hiddenStr . $endNonHiddenStr;
-	}
+        return $startNonHiddenStr . $hiddenStr . $endNonHiddenStr;
+    }
 	
-	/**
-	 * This function is used to set the initial session config regarding the configuration
-	 * @codeCoverageIgnore
-	 */
-	function set_session_config(){
-		//$_SESSION is not available on cli mode 
-		if (! IS_CLI){
-			$logger =& class_loader('Log', 'classes');
-			$logger->setLogger('PHPSession');
-			//set session params
-			$sessionHandler = get_config('session_handler', 'files'); //the default is to store in the files
-			$sessionName = get_config('session_name');
-			if ($sessionName){
-				session_name($sessionName);
-			}
-			$logger->info('Session handler: ' . $sessionHandler);
-			$logger->info('Session name: ' . $sessionName);
+    /**
+     * This function is used to set the initial session config regarding the configuration
+     * @codeCoverageIgnore
+     */
+    function set_session_config(){
+        //$_SESSION is not available on cli mode 
+        if (! IS_CLI){
+            $logger =& class_loader('Log', 'classes');
+            $logger->setLogger('PHPSession');
+            //set session params
+            $sessionHandler = get_config('session_handler', 'files'); //the default is to store in the files
+            $sessionName = get_config('session_name');
+            if ($sessionName){
+                session_name($sessionName);
+            }
+            $logger->info('Session handler: ' . $sessionHandler);
+            $logger->info('Session name: ' . $sessionName);
 
-			if ($sessionHandler == 'files'){
-				$sessionSavePath = get_config('session_save_path');
-				if ($sessionSavePath){
-					if (! is_dir($sessionSavePath)){
-						mkdir($sessionSavePath, 1773);
-					}
-					session_save_path($sessionSavePath);
-					$logger->info('Session save path: ' . $sessionSavePath);
-				}
-			}
-			else if ($sessionHandler == 'database'){
-				//load database session handle library
-				//Database Session handler Model
-				require_once CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php';
+            if ($sessionHandler == 'files'){
+                $sessionSavePath = get_config('session_save_path');
+                if ($sessionSavePath){
+                    if (! is_dir($sessionSavePath)){
+                        mkdir($sessionSavePath, 1773);
+                    }
+                    session_save_path($sessionSavePath);
+                    $logger->info('Session save path: ' . $sessionSavePath);
+                }
+            }
+            else if ($sessionHandler == 'database'){
+                //load database session handle library
+                //Database Session handler Model
+                require_once CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php';
 
-				$DBS =& class_loader('DBSessionHandler', 'classes');
-				session_set_save_handler($DBS, true);
-				$logger->info('session save path: ' . get_config('session_save_path'));
-			}
-			else{
-				show_error('Invalid session handler configuration');
-			}
-			$lifetime = get_config('session_cookie_lifetime', 0);
-			$path = get_config('session_cookie_path', '/');
-			$domain = get_config('session_cookie_domain', '');
-			$secure = get_config('session_cookie_secure', false);
-			session_set_cookie_params(
-				$lifetime,
-				$path,
-				$domain,
-				$secure,
-				$httponly = true /*for security for access to cookie via javascript or XSS attack*/
-			);
-			//to prevent attack of Session Fixation 
-			//thank to https://www.phparch.com/2018/01/php-sessions-in-depth/
-			ini_set('session.use_strict_mode ', 1);
-			ini_set('session.use_only_cookies', 1);
-			ini_set('session.use_trans_sid ', 0);
+                $DBS =& class_loader('DBSessionHandler', 'classes');
+                session_set_save_handler($DBS, true);
+                $logger->info('session save path: ' . get_config('session_save_path'));
+            }
+            else{
+                show_error('Invalid session handler configuration');
+            }
+            $lifetime = get_config('session_cookie_lifetime', 0);
+            $path = get_config('session_cookie_path', '/');
+            $domain = get_config('session_cookie_domain', '');
+            $secure = get_config('session_cookie_secure', false);
+            session_set_cookie_params(
+                $lifetime,
+                $path,
+                $domain,
+                $secure,
+                $httponly = true /*for security for access to cookie via javascript or XSS attack*/
+            );
+            //to prevent attack of Session Fixation 
+            //thank to https://www.phparch.com/2018/01/php-sessions-in-depth/
+            ini_set('session.use_strict_mode ', 1);
+            ini_set('session.use_only_cookies', 1);
+            ini_set('session.use_trans_sid ', 0);
 			
-			$logger->info('Session lifetime: ' . $lifetime);
-			$logger->info('Session cookie path: ' . $path);
-			$logger->info('Session domain: ' . $domain);
-			$logger->info('Session is secure: ' . ($secure ? 'TRUE':'FALSE'));
+            $logger->info('Session lifetime: ' . $lifetime);
+            $logger->info('Session cookie path: ' . $path);
+            $logger->info('Session domain: ' . $domain);
+            $logger->info('Session is secure: ' . ($secure ? 'TRUE':'FALSE'));
 			
-			if ((function_exists('session_status') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()){
-				$logger->info('Session not yet start, start it now');
-				session_start();
-			}
-		}
-	}
+            if ((function_exists('session_status') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()){
+                $logger->info('Session not yet start, start it now');
+                session_start();
+            }
+        }
+    }
 	
-	/**
-	* This function is very useful, it allows to recover the instance of the global controller.
-	* Note this function always returns the address of the super instance.
-	* For example :
-	* $obj = & get_instance();
-	* 
-	* @codeCoverageIgnore
-	*  
-	* @return object the instance of the "Controller" class
-	*/
-	function & get_instance(){
-		return Controller::get_instance();
-	}
+    /**
+     * This function is very useful, it allows to recover the instance of the global controller.
+     * Note this function always returns the address of the super instance.
+     * For example :
+     * $obj = & get_instance();
+     * 
+     * @codeCoverageIgnore
+     *  
+     * @return object the instance of the "Controller" class
+     */
+    function & get_instance(){
+        return Controller::get_instance();
+    }

core/lang/en/lang_form_validation.php

Indentation +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@ 
 <?php 
     defined('ROOT_PATH') || exit('Access denied');
- 	/**
- 	 * Form validation language message (English) 
- 	 */
- 	$lang['fv_required']     		= 'Field %1 is required.';
+        /**
+         * Form validation language message (English) 
+         */
+        $lang['fv_required']     		= 'Field %1 is required.';
     $lang['fv_min_length']   		= 'Field %1 must contain at least %2 characters.';
     $lang['fv_max_length']   		= 'Field %1 must contain at most %2 characters.';
     $lang['fv_exact_length'] 		= 'Field %1 must contain exactly %2 characters.';
@@ -14,8 +14,8 @@ 
     $lang['fv_not_equal_post_key']  = 'Field %1 must not be the same as field %2.';
     $lang['fv_not_equal_string']    = 'Field %1 must not contain the value %2.';
     $lang['fv_depends']      		= 'Field %1 depends on field %2 which is not valid.';
-	$lang['fv_is_unique']	   		= 'The value of field %1 already exists.';
-	$lang['fv_is_unique_update']	= 'The value of field %1 already exists for another record.';
+    $lang['fv_is_unique']	   		= 'The value of field %1 already exists.';
+    $lang['fv_is_unique_update']	= 'The value of field %1 already exists for another record.';
     $lang['fv_exists']	   			= 'The value of the field %1 does not exist.';
     $lang['fv_regex']	   			= 'The value of the field %1 does not use the correct format.';
     $lang['fv_in_list']	   			= 'The value of field %1 must be one of the list (%2).';

core/lang/en/lang_file_upload.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php 
     defined('ROOT_PATH') || exit('Access denied');
- 	/**
- 	 * File upload language messages (English) 
- 	 */
- 	$lang['fu_upload_err_ini_size']     = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
+        /**
+         * File upload language messages (English) 
+         */
+        $lang['fu_upload_err_ini_size']     = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
     $lang['fu_upload_err_form_size']   	= 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
     $lang['fu_upload_err_partial']   	= 'The uploaded file was only partially uploaded.';
     $lang['fu_upload_err_no_file'] 		= 'No file was choosed. Please select one.';

core/classes/database/DatabaseQueryRunner.php

Indentation +163 added lines, -163 removed lines

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

core/functions/function_user_agent.php

Indentation +70 added lines, -70 removed lines

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

core/libraries/Assets.php

Indentation +154 added lines, -154 removed lines

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