tnhfw / tnh-fw

core/libraries/Html.php

Spacing +53 added lines, -53 removed lines

@@ -24,7 +24,7 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
 
-    class Html{
+    class Html {
 
         /**
          * Generate the html anchor link
@@ -35,19 +35,19 @@ 
          *
          * @return string|void             the anchor link generated html if $return is true or display it if not
          */
-        public static function a($link = '', $anchor = null, array $attributes = array(), $return = true){
+        public static function a($link = '', $anchor = null, array $attributes = array(), $return = true) {
             $link = Url::site_url($link);
-            if(! $anchor){
+            if (!$anchor) {
                 $anchor = $link;
             }
             $str = null;
-            $str .= '<a href = "'.$link.'"';
+            $str .= '<a href = "' . $link . '"';
             $str .= attributes_to_string($attributes);
             $str .= '>';
             $str .= $anchor;
             $str .= '</a>';
 
-            if($return){
+            if ($return) {
                 return $str;
             }
             echo $str;
@@ -62,18 +62,18 @@ 
          *
          * @return string|void             the generated html for mailto link if $return is true or display it if not
          */
-        public static function mailto($link, $anchor = null, array $attributes = array(), $return = true){
-            if(! $anchor){
+        public static function mailto($link, $anchor = null, array $attributes = array(), $return = true) {
+            if (!$anchor) {
                 $anchor = $link;
             }
             $str = null;
-            $str .= '<a href = "mailto:'.$link.'"';
+            $str .= '<a href = "mailto:' . $link . '"';
             $str .= attributes_to_string($attributes);
             $str .= '>';
             $str .= $anchor;
             $str .= '</a>';
 
-            if($return){
+            if ($return) {
                 return $str;
             }
             echo $str;
@@ -86,14 +86,14 @@ 
          *
          * @return string|void      the generated "br" html if $return is true or display it if not
          */
-        public static function br($nb = 1, $return = true){
+        public static function br($nb = 1, $return = true) {
             $nb = (int) $nb;
             $str = null;
             for ($i = 1; $i <= $nb; $i++) {
                 $str .= '<br />';
             }
 
-            if($return){
+            if ($return) {
                 return $str;
             }
             echo $str;
@@ -107,13 +107,13 @@ 
          *
          * @return string|void the generated "hr" html if $return is true or display it if not.
          */
-        public static function hr($nb = 1, array $attributes = array(), $return = true){
+        public static function hr($nb = 1, array $attributes = array(), $return = true) {
             $nb = (int) $nb;
             $str = null;
             for ($i = 1; $i <= $nb; $i++) {
-                $str .= '<hr' .attributes_to_string($attributes). ' />';
+                $str .= '<hr' . attributes_to_string($attributes) . ' />';
             }
-            if($return){
+            if ($return) {
                 return $str;
             }
             echo $str;
@@ -129,14 +129,14 @@ 
          *
          * @return string|void the generated header html if $return is true or display it if not.
          */
-        public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true){
+        public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true) {
             $nb = (int) $nb;
             $type = (int) $type;
             $str = null;
             for ($i = 1; $i <= $nb; $i++) {
-                $str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
+                $str .= '<h' . $type . attributes_to_string($attributes) . '>' . $text . '</h' . $type . '>';
             }
-            if($return){
+            if ($return) {
                 return $str;
             }
             echo $str;
@@ -151,8 +151,8 @@ 
          *
          * @return string|void the generated "ul" html  if $return is true or display it if not.
          */
-        public static function ul($data = array(), $attributes = array(), $return = true){
-            if($return){
+        public static function ul($data = array(), $attributes = array(), $return = true) {
+            if ($return) {
                 return self::buildUlOl($data, $attributes, true, 'ul');
             }
             self::buildUlOl($data, $attributes, false, 'ul');
@@ -166,8 +166,8 @@ 
          * @param  boolean $return whether need return the generated html or just display it directly
          * @return string|void the generated "ol" html  if $return is true or display it if not.
          */
-        public static function ol($data = array(), $attributes = array(), $return = true){
-            if($return){
+        public static function ol($data = array(), $attributes = array(), $return = true) {
+            if ($return) {
                 return self::buildUlOl($data, $attributes, true, 'ol');
             }
             self::buildUlOl($data, $attributes, false, 'ol');
@@ -186,23 +186,23 @@ 
          * @param  boolean $return whether need return the generated html or just display it directly
          * @return string|void the generated "table" html  if $return is true or display it if not.
          */
-        public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true){
+        public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true) {
             $headers = (array) $headers;
             $body = (array) $body;
             $str = null;
             $tableAttributes = '';
-            if(! empty($attributes['table'])){
+            if (!empty($attributes['table'])) {
                 $tableAttributes = ' ' . attributes_to_string($attributes['table']);
             }
             $str .= '<table' . $tableAttributes . '>';
             $str .= self::buildTableHeader($headers, $attributes);
             $str .= self::buildTableBody($body, $attributes);
 
-            if($use_footer){
+            if ($use_footer) {
                 $str .= self::buildTableFooter($headers, $attributes);
             }
             $str .= '</table>';
-            if($return){
+            if ($return) {
                 return $str;
             }
             echo $str;
@@ -213,24 +213,24 @@ 
          * @see  Html::table 
          * @return string|null
          */
-        protected static function buildTableHeader(array $headers, $attributes = array()){
+        protected static function buildTableHeader(array $headers, $attributes = array()) {
             $str = null;
             $theadAttributes = '';
-            if(! empty($attributes['thead'])){
+            if (!empty($attributes['thead'])) {
                 $theadAttributes = ' ' . attributes_to_string($attributes['thead']);
             }
             $theadtrAttributes = '';
-            if(! empty($attributes['thead_tr'])){
+            if (!empty($attributes['thead_tr'])) {
                 $theadtrAttributes = ' ' . attributes_to_string($attributes['thead_tr']);
             }
             $thAttributes = '';
-            if(! empty($attributes['thead_th'])){
+            if (!empty($attributes['thead_th'])) {
                 $thAttributes = ' ' . attributes_to_string($attributes['thead_th']);
             }
-            $str .= '<thead' . $theadAttributes .'>';
-            $str .= '<tr' . $theadtrAttributes .'>';
+            $str .= '<thead' . $theadAttributes . '>';
+            $str .= '<tr' . $theadtrAttributes . '>';
             foreach ($headers as $value) {
-                $str .= '<th' . $thAttributes .'>' .$value. '</th>';
+                $str .= '<th' . $thAttributes . '>' . $value . '</th>';
             }
             $str .= '</tr>';
             $str .= '</thead>';
@@ -242,21 +242,21 @@ 
          * @see  Html::table 
          * @return string|null
          */
-        protected static function buildTableBody(array $body, $attributes = array()){
+        protected static function buildTableBody(array $body, $attributes = array()) {
             $str = null;
             $tbodyAttributes = '';
-            if(! empty($attributes['tbody'])){
+            if (!empty($attributes['tbody'])) {
                 $tbodyAttributes = ' ' . attributes_to_string($attributes['tbody']);
             }
             $tbodytrAttributes = '';
-            if(! empty($attributes['tbody_tr'])){
+            if (!empty($attributes['tbody_tr'])) {
                 $tbodytrAttributes = ' ' . attributes_to_string($attributes['tbody_tr']);
             }
             $tbodytdAttributes = '';
-            if(! empty($attributes['tbody_td'])){
+            if (!empty($attributes['tbody_td'])) {
                 $tbodytdAttributes = ' ' . attributes_to_string($attributes['tbody_td']);
             }
-            $str .= '<tbody' . $tbodyAttributes .'>';
+            $str .= '<tbody' . $tbodyAttributes . '>';
             $str .= self::buildTableBodyContent($body, $tbodytrAttributes, $tbodytdAttributes);
             $str .= '</tbody>';
             return $str;
@@ -269,13 +269,13 @@ 
          * @param  string $tbodytdAttributes the html attributes for each td in tbody
          * @return string                    
          */
-        protected static function buildTableBodyContent(array $body, $tbodytrAttributes, $tbodytdAttributes){
+        protected static function buildTableBodyContent(array $body, $tbodytrAttributes, $tbodytdAttributes) {
             $str = null;
             foreach ($body as $row) {
-                if(is_array($row)){
-                    $str .= '<tr' . $tbodytrAttributes .'>';
+                if (is_array($row)) {
+                    $str .= '<tr' . $tbodytrAttributes . '>';
                     foreach ($row as $value) {
-                        $str .= '<td' . $tbodytdAttributes .'>' .$value. '</td>';	
+                        $str .= '<td' . $tbodytdAttributes . '>' . $value . '</td>';	
                     }
                     $str .= '</tr>';
                 }
@@ -288,24 +288,24 @@ 
          * @see  Html::table 
          * @return string|null
          */
-        protected static function buildTableFooter(array $footers, $attributes = array()){
+        protected static function buildTableFooter(array $footers, $attributes = array()) {
             $str = null;
             $tfootAttributes = '';
-            if(! empty($attributes['tfoot'])){
+            if (!empty($attributes['tfoot'])) {
                 $tfootAttributes = ' ' . attributes_to_string($attributes['tfoot']);
             }
             $tfoottrAttributes = '';
-            if(! empty($attributes['tfoot_tr'])){
+            if (!empty($attributes['tfoot_tr'])) {
                 $tfoottrAttributes = ' ' . attributes_to_string($attributes['tfoot_tr']);
             }
             $thAttributes = '';
-            if(! empty($attributes['tfoot_th'])){
+            if (!empty($attributes['tfoot_th'])) {
                 $thAttributes = ' ' . attributes_to_string($attributes['tfoot_th']);
             }
-            $str .= '<tfoot' . $tfootAttributes .'>';
-                $str .= '<tr' . $tfoottrAttributes .'>';
+            $str .= '<tfoot' . $tfootAttributes . '>';
+                $str .= '<tr' . $tfoottrAttributes . '>';
                 foreach ($footers as $value) {
-                    $str .= '<th' . $thAttributes .'>' .$value. '</th>';
+                    $str .= '<th' . $thAttributes . '>' . $value . '</th>';
                 }
                 $str .= '</tr>';
                 $str .= '</tfoot>';
@@ -319,23 +319,23 @@ 
          * @param  string  $olul   the type 'ol' or 'ul'
          * @return void|string
          */
-        protected static function buildUlOl($data = array(), $attributes = array(), $return = true, $olul = 'ul'){
+        protected static function buildUlOl($data = array(), $attributes = array(), $return = true, $olul = 'ul') {
             $data = (array) $data;
             $str = null;
             $olulAttributes = '';
-            if(! empty($attributes[$olul])){
+            if (!empty($attributes[$olul])) {
                 $olulAttributes = ' ' . attributes_to_string($attributes[$olul]);
             }
             $liAttributes = '';
-            if(! empty($attributes['li'])){
+            if (!empty($attributes['li'])) {
                 $liAttributes = ' ' . attributes_to_string($attributes['li']);
             }
             $str .= '<' . $olul . $olulAttributes . '>';
             foreach ($data as $row) {
-                $str .= '<li' . $liAttributes .'>' .$row. '</li>';
+                $str .= '<li' . $liAttributes . '>' . $row . '</li>';
             }
             $str .= '</' . $olul . '>';
-            if($return){
+            if ($return) {
                 return $str;
             }
             echo $str;

core/libraries/Form.php

Spacing +49 added lines, -49 removed lines

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

core/bootstrap.php

Indentation +186 added lines, -186 removed lines

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

Spacing +14 added lines, -14 removed lines

@@ -86,9 +86,9 @@ 
 	/**
 	* Verification of the PHP environment: minimum and maximum version
 	*/
-	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')) {
 		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
-	} else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+	} else if (version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')) {
 		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
 	}
 	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
@@ -110,10 +110,10 @@ 
 	
 	//if user have some composer packages
 	$LOGGER->debug('Check for composer autoload');
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
+	if (file_exists(VENDOR_PATH . 'autoload.php')) {
 		$LOGGER->info('The composer autoload file exists include it');
 		require_once VENDOR_PATH . 'autoload.php';
-	} else{
+	} else {
 		$LOGGER->info('The composer autoload file does not exist skipping');
 	}
 	
@@ -158,35 +158,35 @@ 
 	/**
 	* Loading Security class
 	*/
-	$SECURITY =& class_loader('Security', 'classes');
+	$SECURITY = & class_loader('Security', 'classes');
 	$SECURITY->checkWhiteListIpAccess();
 	
 	/**
 	* Loading Url class
 	*/
-	$URL =& class_loader('Url', 'classes');
+	$URL = & class_loader('Url', 'classes');
 	
-	if(get_config('cache_enable', false)){
+	if (get_config('cache_enable', false)) {
 		/**
 		 * Load Cache interface file
 		 */
 		require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
 		$cacheHandler = get_config('cache_handler');
-		if(! $cacheHandler){
+		if (!$cacheHandler) {
 			show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
 		}
 		$CACHE = null;
 		//first check if the cache handler is the system driver
-		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
-			$CACHE =& class_loader($cacheHandler, 'classes/cache');
-		} else{
+		if (file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')) {
+			$CACHE = & class_loader($cacheHandler, 'classes/cache');
+		} else {
 			//it's not a system driver use user library
-			$CACHE =& class_loader($cacheHandler);
+			$CACHE = & class_loader($cacheHandler);
 		}
 		//check if the page already cached
-		if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+		if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get') {
 			$RESPONSE = & class_loader('Response', 'classes');
-			if ($RESPONSE->renderFinalPageFromCache($CACHE)){
+			if ($RESPONSE->renderFinalPageFromCache($CACHE)) {
 				return;
 			}
 		}

core/common.php

Spacing +69 added lines, -69 removed lines

@@ -53,14 +53,14 @@ 
         //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'){
+        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){
+            if (file_exists($file)) {
+                if (class_exists($class, false) === false) {
                     require_once $file;
                 }
                 //already found
@@ -68,7 +68,7 @@ 
                 break;
             }
         }
-        if (! $found){
+        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 . ']';
@@ -78,7 +78,7 @@ 
         /*
 		   TODO use the best method to get the Log instance
 		 */
-        if ($class == 'Log'){
+        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();
@@ -102,7 +102,7 @@ 
      */
     function & class_loaded($class = null){
         static $list = array();
-        if ($class !== null){
+        if ($class !== null) {
             $list[strtolower($class)] = $class;
         }
         return $list;
@@ -117,14 +117,14 @@ 
      */
     function & load_configurations(array $overwrite_values = array()){
         static $config;
-        if (empty($config)){
+        if (empty($config)) {
             $file = CONFIG_PATH . 'config.php';
             $found = false;
-            if (file_exists($file)){
+            if (file_exists($file)) {
                 require_once $file;
                 $found = true;
             }
-            if (! $found){
+            if (!$found) {
                 set_http_status_header(503);
                 echo 'Unable to find the configuration file [' . $file . ']';
                 die();
@@ -144,9 +144,9 @@ 
      * 
      * @return mixed          the config value
      */
-    function get_config($key, $default = null){
+    function get_config($key, $default = null) {
         static $cfg;
-        if (empty($cfg)){
+        if (empty($cfg)) {
             $cfg[0] = & load_configurations();
         }
         return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
@@ -160,9 +160,9 @@ 
      * 
      * @codeCoverageIgnore
      */
-    function save_to_log($level, $message, $logger = null){
-        $log =& class_loader('Log', 'classes');
-        if ($logger){
+    function save_to_log($level, $message, $logger = null) {
+        $log = & class_loader('Log', 'classes');
+        if ($logger) {
             $log->setLogger($logger);
         }
         $log->writeLog($message, $level);
@@ -175,8 +175,8 @@ 
      * 
      * @codeCoverageIgnore
      */
-    function set_http_status_header($code = 200, $text = null){
-        if (empty($text)){
+    function set_http_status_header($code = 200, $text = null) {
+        if (empty($text)) {
             $http_status = array(
                                 100 => 'Continue',
                                 101 => 'Switching Protocols',
@@ -220,20 +220,20 @@ 
                                 504 => 'Gateway Timeout',
                                 505 => 'HTTP Version Not Supported',
                             );
-            if (isset($http_status[$code])){
+            if (isset($http_status[$code])) {
                 $text = $http_status[$code];
             }
-            else{
+            else {
                 show_error('No HTTP status text found for your code please check it.');
             }
         }
 		
-        if (strpos(php_sapi_name(), 'cgi') === 0){
+        if (strpos(php_sapi_name(), 'cgi') === 0) {
             header('Status: ' . $code . ' ' . $text, TRUE);
         }
-        else{
+        else {
             $proto = 'HTTP/1.1';
-            if(isset($_SERVER['SERVER_PROTOCOL'])){
+            if (isset($_SERVER['SERVER_PROTOCOL'])) {
                 $proto = $_SERVER['SERVER_PROTOCOL'];
             }
             header($proto . ' ' . $code . ' ' . $text, TRUE, $code);
@@ -249,13 +249,13 @@ 
      *  
      *  @codeCoverageIgnore
      */
-    function show_error($msg, $title = 'error', $logging = true){
+    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');
+        if ($logging) {
+            save_to_log('error', '[' . $title . '] ' . strip_tags($msg), 'GLOBAL::ERROR');
         }
         $response = & class_loader('Response', 'classes');
         $response->sendError($data);
@@ -269,18 +269,18 @@ 
      *  
      *  @return boolean true if the web server uses the https protocol, false if not.
      */
-    function is_https(){
+    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'){
+        if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
             return true;
         }
-        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
+        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
             return true;
         }
-        if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
+        if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
             return true;
         }
         return false;
@@ -295,7 +295,7 @@ 
      *  
      *  @return boolean true if is a valid URL address or false.
      */
-    function is_url($url){
+    function is_url($url) {
         return preg_match('/^(http|https|ftp):\/\/(.*)/', $url) == 1;
     }
 	
@@ -305,8 +305,8 @@ 
      *  @param string $controllerClass the controller class name to be loaded
      *  @codeCoverageIgnore
      */
-    function autoload_controller($controllerClass){
-        if (file_exists($path = APPS_CONTROLLER_PATH . $controllerClass . '.php')){
+    function autoload_controller($controllerClass) {
+        if (file_exists($path = APPS_CONTROLLER_PATH . $controllerClass . '.php')) {
             require_once $path;
         }
     }
@@ -320,11 +320,11 @@ 
      *  
      *  @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());
+    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{
+        else {
             save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
         }
         return true;
@@ -341,16 +341,16 @@ 
      *  
      *  @return boolean	
      */
-    function php_error_handler($errno , $errstr, $errfile , $errline){
+    function php_error_handler($errno, $errstr, $errfile, $errline) {
         $isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno);
-        if ($isError){
+        if ($isError) {
             set_http_status_header(500);
         }
-        if (! (error_reporting() & $errno)) {
+        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'))){
+        if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))) {
             $errorType = 'error';
             switch ($errno) {
                 case E_USER_WARNING:
@@ -360,9 +360,9 @@ 
                     $errorType = 'notice';
                     break;
             }
-            show_error('An error is occurred in the file <b>' . $errfile . '</b> at line <b>' . $errline .'</b> raison : ' . $errstr, 'PHP ' . $errorType);
+            show_error('An error is occurred in the file <b>' . $errfile . '</b> at line <b>' . $errline . '</b> raison : ' . $errstr, 'PHP ' . $errorType);
         }
-        if ($isError){
+        if ($isError) {
             die();
         }
         return true;
@@ -372,10 +372,10 @@ 
      * This function is used to run in shutdown situation of the script
      * @codeCoverageIgnore
      */
-    function php_shudown_handler(){
+    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))){
+            ($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']);
         }
     }
@@ -393,11 +393,11 @@ 
      *   
      *  @return string string of the HTML attribute.
      */
-    function attributes_to_string(array $attributes){
+    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){
+        if (!empty($attributes)) {
+            foreach ($attributes as $key => $value) {
                 $key = trim(htmlspecialchars($key));
                 $value = trim(htmlspecialchars($value));
                 /*
@@ -407,10 +407,10 @@ 
 				* 	$attr = array('placeholder' => 'I am a "puple"')
 				* 	$str = attributes_to_string($attr); => placeholder = "I am a \"puple\""
 				 */
-                if ($value && strpos('"', $value) !== false){
+                if ($value && strpos('"', $value) !== false) {
                     $value = addslashes($value);
                 }
-                $str .= $key.' = "'.$value.'" ';
+                $str .= $key . ' = "' . $value . '" ';
             }
         }
         //remove the space after using rtrim()
@@ -426,7 +426,7 @@ 
      *
      * @return string the stringfy value
      */
-    function stringfy_vars($var){
+    function stringfy_vars($var) {
         return print_r($var, true);
     }
 
@@ -437,18 +437,18 @@ 
      * 
      * @return mixed   the sanitize value
      */
-    function clean_input($str){
-        if (is_array($str)){
+    function clean_input($str) {
+        if (is_array($str)) {
             $str = array_map('clean_input', $str);
         }
-        else if (is_object($str)){
+        else if (is_object($str)) {
             $obj = $str;
             foreach ($str as $var => $value) {
                 $obj->$var = clean_input($value);
             }
             $str = $obj;
         }
-        else{
+        else {
             $str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
         }
         return $str;
@@ -466,11 +466,11 @@ 
      * 
      * @return string the string with the hidden part.
      */
-    function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
+    function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*') {
         //get the string length
         $len = strlen($str);
         //if str is empty
-        if ($len <= 0){
+        if ($len <= 0) {
             return str_repeat($hiddenChar, 6);
         }
         //if the length is less than startCount and endCount
@@ -478,14 +478,14 @@ 
         //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)){
+        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){
+        if ($endCount > 0) {
             $endNonHiddenStr = substr($str, - $endCount);
         }
         //the hidden string
@@ -498,40 +498,40 @@ 
      * This function is used to set the initial session config regarding the configuration
      * @codeCoverageIgnore
      */
-    function set_session_config(){
+    function set_session_config() {
         //$_SESSION is not available on cli mode 
-        if (! IS_CLI){
-            $logger =& class_loader('Log', 'classes');
+        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){
+            if ($sessionName) {
                 session_name($sessionName);
             }
             $logger->info('Session handler: ' . $sessionHandler);
             $logger->info('Session name: ' . $sessionName);
 
-            if ($sessionHandler == 'files'){
+            if ($sessionHandler == 'files') {
                 $sessionSavePath = get_config('session_save_path');
-                if ($sessionSavePath){
-                    if (! is_dir($sessionSavePath)){
+                if ($sessionSavePath) {
+                    if (!is_dir($sessionSavePath)) {
                         mkdir($sessionSavePath, 1773);
                     }
                     session_save_path($sessionSavePath);
                     $logger->info('Session save path: ' . $sessionSavePath);
                 }
             }
-            else if ($sessionHandler == 'database'){
+            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');
+                $DBS = & class_loader('DBSessionHandler', 'classes');
                 session_set_save_handler($DBS, true);
                 $logger->info('session save path: ' . get_config('session_save_path'));
             }
-            else{
+            else {
                 show_error('Invalid session handler configuration');
             }
             $lifetime = get_config('session_cookie_lifetime', 0);
@@ -554,9 +554,9 @@ 
             $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 is secure: ' . ($secure ? 'TRUE' : 'FALSE'));
 			
-            if ((function_exists('session_status') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()){
+            if ((function_exists('session_status') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) {
                 $logger->info('Session not yet start, start it now');
                 session_start();
             }

Braces +7 added lines, -14 removed lines

@@ -222,16 +222,14 @@ 
                             );
             if (isset($http_status[$code])){
                 $text = $http_status[$code];
-            }
-            else{
+            } 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{
+        } else{
             $proto = 'HTTP/1.1';
             if(isset($_SERVER['SERVER_PROTOCOL'])){
                 $proto = $_SERVER['SERVER_PROTOCOL'];
@@ -323,8 +321,7 @@ 
     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{
+        } else{
             save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
         }
         return true;
@@ -440,15 +437,13 @@ 
     function clean_input($str){
         if (is_array($str)){
             $str = array_map('clean_input', $str);
-        }
-        else if (is_object($str)){
+        } else if (is_object($str)){
             $obj = $str;
             foreach ($str as $var => $value) {
                 $obj->$var = clean_input($value);
             }
             $str = $obj;
-        }
-        else{
+        } else{
             $str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
         }
         return $str;
@@ -521,8 +516,7 @@ 
                     session_save_path($sessionSavePath);
                     $logger->info('Session save path: ' . $sessionSavePath);
                 }
-            }
-            else if ($sessionHandler == 'database'){
+            } else if ($sessionHandler == 'database'){
                 //load database session handle library
                 //Database Session handler Model
                 require_once CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php';
@@ -530,8 +524,7 @@ 
                 $DBS =& class_loader('DBSessionHandler', 'classes');
                 session_set_save_handler($DBS, true);
                 $logger->info('session save path: ' . get_config('session_save_path'));
-            }
-            else{
+            } else{
                 show_error('Invalid session handler configuration');
             }
             $lifetime = get_config('session_cookie_lifetime', 0);

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

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
         /**
          * 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_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.';