tnhfw / tnh-fw

core/libraries/Cookie.php

Braces +1 added lines, -2 removed lines

@@ -93,8 +93,7 @@
 				$logger->info('Delete cookie item ['.$item.']');
 				unset($_COOKIE[$item]);
 				return true;
-			}
-			else{
+			} else{
 				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
 				return false;
 			}

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Cookie{
+	class Cookie {
 		
 		/**
 		 * The logger instance
@@ -36,9 +36,9 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Cookie');
 			}
 			return self::$logger[0];
@@ -50,9 +50,9 @@ 
 		 * @param  mixed $default the default value to use if can not find the cokkie item in the list
 		 * @return mixed          the cookie value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
+			if (array_key_exists($item, $_COOKIE)) {
 				return $_COOKIE[$item];
 			}
 			$logger->warning('Cannot find cookie item [' . $item . '], using the default value [' . $default . ']');
@@ -69,14 +69,14 @@ 
 		 * @param boolean $secure   if this cookie will be available on secure connection or not
 		 * @param boolean $httponly if this cookie will be available under HTTP protocol.
 		 */
-		public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false){
-			if(headers_sent()){
+		public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false) {
+			if (headers_sent()) {
 				show_error('There exists a cookie that we wanted to create that we couldn\'t 
 						    because headers was already sent. Make sure to do this first 
 							before outputing anything.');
 			}
 			$timestamp = $expire;
-			if($expire){
+			if ($expire) {
 				$timestamp = time() + $expire;
 			}
 			setcookie($name, $value, $timestamp, $path, $domain, $secure, $httponly);
@@ -87,15 +87,15 @@ 
 		 * @param  string $item the cookie item name to be cleared
 		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
 		 */
-		public static function delete($item){
+		public static function delete($item) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
-				$logger->info('Delete cookie item ['.$item.']');
+			if (array_key_exists($item, $_COOKIE)) {
+				$logger->info('Delete cookie item [' . $item . ']');
 				unset($_COOKIE[$item]);
 				return true;
 			}
-			else{
-				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Cookie item [' . $item . '] to be deleted does not exists');
 				return false;
 			}
 		}
@@ -105,7 +105,7 @@ 
 		 * @param  string $item the cookie item name
 		 * @return boolean       true if the cookie item is set, false or not
 		 */
-		public static function exists($item){
+		public static function exists($item) {
 			return array_key_exists($item, $_COOKIE);
 		}
 

Indentation +101 added lines, -101 removed lines

@@ -1,112 +1,112 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	class Cookie{
+    class Cookie{
 		
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private static $logger;
 
-		/**
-		 * The signleton of the logger
-		 * @return Object the Log instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
-				self::$logger[0]->setLogger('Library::Cookie');
-			}
-			return self::$logger[0];
-		}
+        /**
+         * The signleton of the logger
+         * @return Object the Log instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                self::$logger[0] =& class_loader('Log', 'classes');
+                self::$logger[0]->setLogger('Library::Cookie');
+            }
+            return self::$logger[0];
+        }
 
-		/**
-		 * Get the cookie item value
-		 * @param  string $item    the cookie item name to get
-		 * @param  mixed $default the default value to use if can not find the cokkie item in the list
-		 * @return mixed          the cookie value if exist or the default value
-		 */
-		public static function get($item, $default = null){
-			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
-				return $_COOKIE[$item];
-			}
-			$logger->warning('Cannot find cookie item [' . $item . '], using the default value [' . $default . ']');
-			return $default;
-		}
+        /**
+         * Get the cookie item value
+         * @param  string $item    the cookie item name to get
+         * @param  mixed $default the default value to use if can not find the cokkie item in the list
+         * @return mixed          the cookie value if exist or the default value
+         */
+        public static function get($item, $default = null){
+            $logger = self::getLogger();
+            if(array_key_exists($item, $_COOKIE)){
+                return $_COOKIE[$item];
+            }
+            $logger->warning('Cannot find cookie item [' . $item . '], using the default value [' . $default . ']');
+            return $default;
+        }
 
-		/**
-		 * Set the cookie item value
-		 * @param string  $name     the cookie item name
-		 * @param string  $value    the cookie value to set
-		 * @param integer $expire   the time to live for this cookie
-		 * @param string  $path     the path that the cookie will be available
-		 * @param string  $domain   the domain that the cookie will be available
-		 * @param boolean $secure   if this cookie will be available on secure connection or not
-		 * @param boolean $httponly if this cookie will be available under HTTP protocol.
-		 */
-		public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false){
-			if(headers_sent()){
-				show_error('There exists a cookie that we wanted to create that we couldn\'t 
+        /**
+         * Set the cookie item value
+         * @param string  $name     the cookie item name
+         * @param string  $value    the cookie value to set
+         * @param integer $expire   the time to live for this cookie
+         * @param string  $path     the path that the cookie will be available
+         * @param string  $domain   the domain that the cookie will be available
+         * @param boolean $secure   if this cookie will be available on secure connection or not
+         * @param boolean $httponly if this cookie will be available under HTTP protocol.
+         */
+        public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false){
+            if(headers_sent()){
+                show_error('There exists a cookie that we wanted to create that we couldn\'t 
 						    because headers was already sent. Make sure to do this first 
 							before outputing anything.');
-			}
-			$timestamp = $expire;
-			if($expire){
-				$timestamp = time() + $expire;
-			}
-			setcookie($name, $value, $timestamp, $path, $domain, $secure, $httponly);
-		}
+            }
+            $timestamp = $expire;
+            if($expire){
+                $timestamp = time() + $expire;
+            }
+            setcookie($name, $value, $timestamp, $path, $domain, $secure, $httponly);
+        }
 
-		/**
-		 * Delete the cookie item in the list
-		 * @param  string $item the cookie item name to be cleared
-		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
-		 */
-		public static function delete($item){
-			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
-				$logger->info('Delete cookie item ['.$item.']');
-				unset($_COOKIE[$item]);
-				return true;
-			}
-			else{
-				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
-				return false;
-			}
-		}
+        /**
+         * Delete the cookie item in the list
+         * @param  string $item the cookie item name to be cleared
+         * @return boolean true if the item exists and is deleted successfully otherwise will return false.
+         */
+        public static function delete($item){
+            $logger = self::getLogger();
+            if(array_key_exists($item, $_COOKIE)){
+                $logger->info('Delete cookie item ['.$item.']');
+                unset($_COOKIE[$item]);
+                return true;
+            }
+            else{
+                $logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
+                return false;
+            }
+        }
 
-		/**
-		 * Check if the given cookie item exists
-		 * @param  string $item the cookie item name
-		 * @return boolean       true if the cookie item is set, false or not
-		 */
-		public static function exists($item){
-			return array_key_exists($item, $_COOKIE);
-		}
+        /**
+         * Check if the given cookie item exists
+         * @param  string $item the cookie item name
+         * @return boolean       true if the cookie item is set, false or not
+         */
+        public static function exists($item){
+            return array_key_exists($item, $_COOKIE);
+        }
 
-	}
+    }

core/libraries/StringHash.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class StringHash{
+	class StringHash {
 		 
 		 //blowfish
 		private static $algo = '$2a';

Indentation +58 added lines, -58 removed lines

@@ -1,65 +1,65 @@
 <?php 
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	class StringHash{
+    class StringHash{
 		 
-		 //blowfish
-		private static $algo = '$2a';
+            //blowfish
+        private static $algo = '$2a';
 		
-		//cost parameter
-		private static $cost = '$10';
+        //cost parameter
+        private static $cost = '$10';
 
-		/**
-		 * Get the unique salt for the string hash
-		 * @return string the unique generated salt
-		 */
-		private static function uniqueSalt() {
-			return substr(sha1(mt_rand()), 0, 22);
-		}
+        /**
+         * Get the unique salt for the string hash
+         * @return string the unique generated salt
+         */
+        private static function uniqueSalt() {
+            return substr(sha1(mt_rand()), 0, 22);
+        }
 
-		/**
-		 * Hash the given string
-		 * @param  string $value the plain string text to be hashed
-		 * @return string           the hashed string
-		 */
-		public static function hash($value) {
-			return crypt($value, self::$algo .
-					self::$cost .
-					'$' . self::uniqueSalt());
-		}
+        /**
+         * Hash the given string
+         * @param  string $value the plain string text to be hashed
+         * @return string           the hashed string
+         */
+        public static function hash($value) {
+            return crypt($value, self::$algo .
+                    self::$cost .
+                    '$' . self::uniqueSalt());
+        }
 
-		/**
-		 * Check if the hash and plain string is valid
-		 * @param  string $hash     the hashed string
-		 * @param  string $plain the plain text
-		 * @return boolean  true if is valid or false if not
-		 */
-		public static function check($hash, $plain) {
-			$full_salt = substr($hash, 0, 29);
-			$new_hash = crypt($plain, $full_salt);
-			return ($hash === $new_hash);
-		}	
-	}
\ No newline at end of file
+        /**
+         * Check if the hash and plain string is valid
+         * @param  string $hash     the hashed string
+         * @param  string $plain the plain text
+         * @return boolean  true if is valid or false if not
+         */
+        public static function check($hash, $plain) {
+            $full_salt = substr($hash, 0, 29);
+            $new_hash = crypt($plain, $full_salt);
+            return ($hash === $new_hash);
+        }	
+    }
\ No newline at end of file

core/libraries/Html.php

Braces +1 added lines, -2 removed lines

@@ -222,8 +222,7 @@
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
-			}
-			else{
+			} else{
 				//no need check for footer
 				$use_footer = false;
 			}

Spacing +43 added lines, -43 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,21 +35,21 @@ 
 		 *
 		 * @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){
-			if(! is_url($link)){
+		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true) {
+			if (!is_url($link)) {
 				$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;
@@ -64,18 +64,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;
@@ -88,14 +88,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;
@@ -109,13 +109,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;
@@ -131,17 +131,17 @@ 
 		 *
 		 * @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;
-			if($type <= 0 || $type > 6){
+			if ($type <= 0 || $type > 6) {
 				$type = 1;
 			}
 			$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;
@@ -156,15 +156,15 @@ 
 		 *
 		 * @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){
+		public static function ul($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ul' . (! empty($attributes['ul']) ? attributes_to_string($attributes['ul']):'') . '>';
+			$str .= '<ul' . (!empty($attributes['ul']) ? attributes_to_string($attributes['ul']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (! empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ul>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -178,15 +178,15 @@ 
 		 * @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){
+		public static function ol($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']):'') . '>';
+			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ol>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -204,46 +204,46 @@ 
 		 * @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;
-			$str .= '<table' . (! empty($attributes['table']) ? attributes_to_string($attributes['table']):'') . '>';
-			if(! empty($headers)){
-				$str .= '<thead' . (! empty($attributes['thead']) ? attributes_to_string($attributes['thead']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']):'') .'>';
+			$str .= '<table' . (!empty($attributes['table']) ? attributes_to_string($attributes['table']) : '') . '>';
+			if (!empty($headers)) {
+				$str .= '<thead' . (!empty($attributes['thead']) ? attributes_to_string($attributes['thead']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
 			}
-			else{
+			else {
 				//no need check for footer
 				$use_footer = false;
 			}
-			$str .= '<tbody' . (! empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']):'') .'>';
+			$str .= '<tbody' . (!empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']) : '') . '>';
 			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . (! empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']):'') .'>';
+				if (is_array($row)) {
+					$str .= '<tr' . (!empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']) : '') . '>';
 					foreach ($row as $value) {
-						$str .= '<td' . (! empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']):'') .'>' .$value. '</td>';	
+						$str .= '<td' . (!empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']) : '') . '>' . $value . '</td>';	
 					}
 					$str .= '</tr>';
 				}
 			}
 			$str .= '</tbody>';
-			if($use_footer){
-				$str .= '<tfoot' . (! empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']):'') .'>';
+			if ($use_footer) {
+				$str .= '<tfoot' . (!empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</tfoot>';
 			}
 			$str .= '</table>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;

Indentation +238 added lines, -238 removed lines

@@ -1,251 +1,251 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	class Html{
+    class Html{
 
-		/**
-		 * Generate the html anchor link
-		 * @param  string $link       the href attribute value
-		 * @param  string $anchor     the displayed anchor
-		 * @param  array  $attributes the additional attributes to be added
-		 * @param boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @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){
-			if(! is_url($link)){
-				$link = Url::site_url($link);
-			}
-			if(! $anchor){
-				$anchor = $link;
-			}
-			$str = null;
-			$str .= '<a href = "'.$link.'"';
-			$str .= attributes_to_string($attributes);
-			$str .= '>';
-			$str .= $anchor;
-			$str .= '</a>';
+        /**
+         * Generate the html anchor link
+         * @param  string $link       the href attribute value
+         * @param  string $anchor     the displayed anchor
+         * @param  array  $attributes the additional attributes to be added
+         * @param boolean $return whether need return the generated html or just display it directly
+         *
+         * @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){
+            if(! is_url($link)){
+                $link = Url::site_url($link);
+            }
+            if(! $anchor){
+                $anchor = $link;
+            }
+            $str = null;
+            $str .= '<a href = "'.$link.'"';
+            $str .= attributes_to_string($attributes);
+            $str .= '>';
+            $str .= $anchor;
+            $str .= '</a>';
 
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 		
-		/**
-		 * Generate an mailto anchor link
-		 * @param  string $link       the email address 
-		 * @param  string $anchor     the displayed value of the link
-		 * @param  array  $attributes the additional attributes to be added
-		 * @param boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @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){
-				$anchor = $link;
-			}
-			$str = null;
-			$str .= '<a href = "mailto:'.$link.'"';
-			$str .= attributes_to_string($attributes);
-			$str .= '>';
-			$str .= $anchor;
-			$str .= '</a>';
+        /**
+         * Generate an mailto anchor link
+         * @param  string $link       the email address 
+         * @param  string $anchor     the displayed value of the link
+         * @param  array  $attributes the additional attributes to be added
+         * @param boolean $return whether need return the generated html or just display it directly
+         *
+         * @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){
+                $anchor = $link;
+            }
+            $str = null;
+            $str .= '<a href = "mailto:'.$link.'"';
+            $str .= attributes_to_string($attributes);
+            $str .= '>';
+            $str .= $anchor;
+            $str .= '</a>';
 
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "br" tag  
-		 * @param  integer $nb the number of generated "<br />" tag
-		 * @param boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @return string|void      the generated "br" html if $return is true or display it if not
-		 */
-		public static function br($nb = 1, $return = true){
-			$nb = (int) $nb;
-			$str = null;
-			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<br />';
-			}
+        /**
+         * Generate the html "br" tag  
+         * @param  integer $nb the number of generated "<br />" tag
+         * @param boolean $return whether need return the generated html or just display it directly
+         *
+         * @return string|void      the generated "br" html if $return is true or display it if not
+         */
+        public static function br($nb = 1, $return = true){
+            $nb = (int) $nb;
+            $str = null;
+            for ($i = 1; $i <= $nb; $i++) {
+                $str .= '<br />';
+            }
 
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html content for tag "hr"
-		 * @param integer $nb the number of generated "<hr />" tag
-		 * @param  array   $attributes the tag attributes
-		 * @param  boolean $return    whether need return the generated html or just display it directly
-		 *
-		 * @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){
-			$nb = (int) $nb;
-			$str = null;
-			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<hr' .attributes_to_string($attributes). ' />';
-			}
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html content for tag "hr"
+         * @param integer $nb the number of generated "<hr />" tag
+         * @param  array   $attributes the tag attributes
+         * @param  boolean $return    whether need return the generated html or just display it directly
+         *
+         * @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){
+            $nb = (int) $nb;
+            $str = null;
+            for ($i = 1; $i <= $nb; $i++) {
+                $str .= '<hr' .attributes_to_string($attributes). ' />';
+            }
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html content for tag like h1, h2, h3, h4, h5 and h6
-		 * @param  integer $type       the tag type 1 mean h1, 2 h2, etc,
-		 * @param  string  $text       the display text
-		 * @param integer $nb the number of generated "<h{1,2,3,4,5,6}>"
-		 * @param  array   $attributes the tag attributes
-		 * @param  boolean $return    whether need return the generated html or just display it directly
-		 *
-		 * @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){
-			$nb = (int) $nb;
-			$type = (int) $type;
-			if($type <= 0 || $type > 6){
-				$type = 1;
-			}
-			$str = null;
-			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
-			}
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html content for tag like h1, h2, h3, h4, h5 and h6
+         * @param  integer $type       the tag type 1 mean h1, 2 h2, etc,
+         * @param  string  $text       the display text
+         * @param integer $nb the number of generated "<h{1,2,3,4,5,6}>"
+         * @param  array   $attributes the tag attributes
+         * @param  boolean $return    whether need return the generated html or just display it directly
+         *
+         * @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){
+            $nb = (int) $nb;
+            $type = (int) $type;
+            if($type <= 0 || $type > 6){
+                $type = 1;
+            }
+            $str = null;
+            for ($i = 1; $i <= $nb; $i++) {
+                $str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
+            }
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "ul" tag
-		 * @param  array   $data the data to use for each "li" tag
-		 * @param  array   $attributes   the "ul" properties attribute use the array index below for each tag:
-		 *  for ul "ul", for li "li".
-		 * @param  boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @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){
-			$data = (array) $data;
-			$str = null;
-			$str .= '<ul' . (! empty($attributes['ul']) ? attributes_to_string($attributes['ul']):'') . '>';
-			foreach ($data as $row) {
-				$str .= '<li' . (! empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
-			}
-			$str .= '</ul>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html "ul" tag
+         * @param  array   $data the data to use for each "li" tag
+         * @param  array   $attributes   the "ul" properties attribute use the array index below for each tag:
+         *  for ul "ul", for li "li".
+         * @param  boolean $return whether need return the generated html or just display it directly
+         *
+         * @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){
+            $data = (array) $data;
+            $str = null;
+            $str .= '<ul' . (! empty($attributes['ul']) ? attributes_to_string($attributes['ul']):'') . '>';
+            foreach ($data as $row) {
+                $str .= '<li' . (! empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+            }
+            $str .= '</ul>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "ol" tag
-		 * @param  array   $data the data to use for each "li" tag
-		 * @param  array   $attributes   the "ol" properties attribute use the array index below for each tag:
-		 *  for ol "ol", for li "li".
-		 * @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){
-			$data = (array) $data;
-			$str = null;
-			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']):'') . '>';
-			foreach ($data as $row) {
-				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
-			}
-			$str .= '</ol>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html "ol" tag
+         * @param  array   $data the data to use for each "li" tag
+         * @param  array   $attributes   the "ol" properties attribute use the array index below for each tag:
+         *  for ol "ol", for li "li".
+         * @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){
+            $data = (array) $data;
+            $str = null;
+            $str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']):'') . '>';
+            foreach ($data as $row) {
+                $str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+            }
+            $str .= '</ol>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "table" tag
-		 * @param  array   $headers            the table headers to use between (<thead>)
-		 * @param  array   $body the table body values between (<tbody>)
-		 * @param  array   $attributes   the table properties attribute use the array index below for each tag:
-		 *  for table "table", for thead "thead", for thead tr "thead_tr",
-		 *  for thead th "thead_th", for tbody "tbody", for tbody tr "tbody_tr", for tbody td "tbody_td", for tfoot "tfoot",
-		 *  for tfoot tr "tfoot_tr", for tfoot th "tfoot_th".
-		 * @param boolean $use_footer whether need to generate table footer (<tfoot>) use the $headers values
-		 * @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){
-			$headers = (array) $headers;
-			$body = (array) $body;
-			$str = null;
-			$str .= '<table' . (! empty($attributes['table']) ? attributes_to_string($attributes['table']):'') . '>';
-			if(! empty($headers)){
-				$str .= '<thead' . (! empty($attributes['thead']) ? attributes_to_string($attributes['thead']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']):'') .'>';
-				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']):'') .'>' .$value. '</th>';
-				}
-				$str .= '</tr>';
-				$str .= '</thead>';
-			}
-			else{
-				//no need check for footer
-				$use_footer = false;
-			}
-			$str .= '<tbody' . (! empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']):'') .'>';
-			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . (! empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']):'') .'>';
-					foreach ($row as $value) {
-						$str .= '<td' . (! empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']):'') .'>' .$value. '</td>';	
-					}
-					$str .= '</tr>';
-				}
-			}
-			$str .= '</tbody>';
-			if($use_footer){
-				$str .= '<tfoot' . (! empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']):'') .'>';
-				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']):'') .'>' .$value. '</th>';
-				}
-				$str .= '</tr>';
-				$str .= '</tfoot>';
-			}
-			$str .= '</table>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
-	}
+        /**
+         * Generate the html "table" tag
+         * @param  array   $headers            the table headers to use between (<thead>)
+         * @param  array   $body the table body values between (<tbody>)
+         * @param  array   $attributes   the table properties attribute use the array index below for each tag:
+         *  for table "table", for thead "thead", for thead tr "thead_tr",
+         *  for thead th "thead_th", for tbody "tbody", for tbody tr "tbody_tr", for tbody td "tbody_td", for tfoot "tfoot",
+         *  for tfoot tr "tfoot_tr", for tfoot th "tfoot_th".
+         * @param boolean $use_footer whether need to generate table footer (<tfoot>) use the $headers values
+         * @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){
+            $headers = (array) $headers;
+            $body = (array) $body;
+            $str = null;
+            $str .= '<table' . (! empty($attributes['table']) ? attributes_to_string($attributes['table']):'') . '>';
+            if(! empty($headers)){
+                $str .= '<thead' . (! empty($attributes['thead']) ? attributes_to_string($attributes['thead']):'') .'>';
+                $str .= '<tr' . (! empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']):'') .'>';
+                foreach ($headers as $value) {
+                    $str .= '<th' . (! empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']):'') .'>' .$value. '</th>';
+                }
+                $str .= '</tr>';
+                $str .= '</thead>';
+            }
+            else{
+                //no need check for footer
+                $use_footer = false;
+            }
+            $str .= '<tbody' . (! empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']):'') .'>';
+            foreach ($body as $row) {
+                if(is_array($row)){
+                    $str .= '<tr' . (! empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']):'') .'>';
+                    foreach ($row as $value) {
+                        $str .= '<td' . (! empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']):'') .'>' .$value. '</td>';	
+                    }
+                    $str .= '</tr>';
+                }
+            }
+            $str .= '</tbody>';
+            if($use_footer){
+                $str .= '<tfoot' . (! empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']):'') .'>';
+                $str .= '<tr' . (! empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']):'') .'>';
+                foreach ($headers as $value) {
+                    $str .= '<th' . (! empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']):'') .'>' .$value. '</th>';
+                }
+                $str .= '</tr>';
+                $str .= '</tfoot>';
+            }
+            $str .= '</table>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
+    }

core/libraries/Pagination.php

Braces +13 added lines, -26 removed lines

@@ -41,8 +41,7 @@ 
                 require_once CONFIG_PATH . 'config_pagination.php';
                 if(empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
-                }
-				else{
+                } else{
 					if(! empty($overwriteConfig)){
 						$config = array_merge($config, $overwriteConfig);
 					}
@@ -50,8 +49,7 @@ 
 					Config::setAll($config);
 					unset($config);
 				}
-            }
-            else{
+            } else{
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -83,18 +81,15 @@ 
             $currentUrl = Url::current();
             if($queryString == ''){
                 $query = '?' . $pageQueryName . '=';
-            }
-            else{
+            } else{
                 $tab = explode($pageQueryName . '=', $queryString);
                 $nb = count($tab);
                 if($nb == 1){
                     $query = '?' . $queryString . '&' . $pageQueryName . '=';
-                }
-                else{
+                } else{
                     if($tab[0] == ''){
                         $query = '?' . $pageQueryName . '=';
-                    }
-                    else{
+                    } else{
                         $query = '?' . $tab[0] . '' . $pageQueryName . '=';
                     }
                 }
@@ -113,20 +108,17 @@ 
             if($numberOfLink % 2 == 0){
                 $start = $currentPageNumber - ($numberOfLink / 2) + 1;
                 $end = $currentPageNumber + ($numberOfLink / 2);
-            }
-            else{
+            } else{
                 $start = $currentPageNumber - floor($numberOfLink / 2);
                 $end = $currentPageNumber + floor($numberOfLink / 2);
             }
             if($start <= 1){
                 $begin = 1;
                 $end = $numberOfLink;
-            }
-            else if($start > 1 && $end < $numberOfPage){
+            } else if($start > 1 && $end < $numberOfPage){
                 $begin = $start;
                 $end = $end;
-            }
-            else{
+            } else{
                 $begin = ($numberOfPage - $numberOfLink) + 1;
                 $end = $numberOfPage;
             }
@@ -138,32 +130,27 @@ 
                 for($i = $begin; $i <= $end; $i++){
                     if($i == $currentPageNumber){
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
+                    } else{
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }
                 $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' . $this->config['next_text'] . '</a>' . $this->config['next_close'];
-            }
-            else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            } else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
                 for($i = $begin; $i <= $end; $i++){
                     if($i == $currentPageNumber){
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
+                    } else{
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' . $this->config['digit_close'];
                     }
                 }
                 $navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
-            }
-            else if($currentPageNumber == $numberOfPage){
+            } else if($currentPageNumber == $numberOfPage){
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
                 for($i = $begin; $i <= $end; $i++){
                     if($i == $currentPageNumber){
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
+                    } else{
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }

Spacing +39 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-    class Pagination{
+    class Pagination {
         
 		/**
          * The list of loaded config
@@ -36,15 +36,15 @@ 
          * Create an instance of pagination
          * @param array $overwriteConfig the list of configuration to overwrite the defined configuration in config_pagination.php
          */
-        public function __construct($overwriteConfig = array()){
-            if(file_exists(CONFIG_PATH . 'config_pagination.php')){
+        public function __construct($overwriteConfig = array()) {
+            if (file_exists(CONFIG_PATH . 'config_pagination.php')) {
                 $config = array();
                 require_once CONFIG_PATH . 'config_pagination.php';
-                if(empty($config) || ! is_array($config)){
+                if (empty($config) || !is_array($config)) {
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
                 }
-				else{
-					if(! empty($overwriteConfig)){
+				else {
+					if (!empty($overwriteConfig)) {
 						$config = array_merge($config, $overwriteConfig);
 					}
 					$this->config = $config;
@@ -53,7 +53,7 @@ 
 					unset($config);
 				}
             }
-            else{
+            else {
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -64,8 +64,8 @@ 
          * config_pagination.php
          * @param array $config the configuration to set
          */
-        public function setConfig(array $config = array()){
-            if(! empty($config)){
+        public function setConfig(array $config = array()) {
+            if (!empty($config)) {
                 $this->config = array_merge($this->config, $config);
                 Config::setAll($config);
             }
@@ -77,26 +77,26 @@ 
          * @param  int $currentPageNumber the current page number
          * @return string the pagination link
          */
-        public function getLink($totalRows, $currentPageNumber){
+        public function getLink($totalRows, $currentPageNumber) {
             $pageQueryName = $this->config['page_query_string_name'];
             $numberOfLink = $this->config['nb_link'];
 			$numberOfRowPerPage = $this->config['pagination_per_page'];
             $queryString = Url::queryString();
             $currentUrl = Url::current();
-            if($queryString == ''){
+            if ($queryString == '') {
                 $query = '?' . $pageQueryName . '=';
             }
-            else{
+            else {
                 $tab = explode($pageQueryName . '=', $queryString);
                 $nb = count($tab);
-                if($nb == 1){
+                if ($nb == 1) {
                     $query = '?' . $queryString . '&' . $pageQueryName . '=';
                 }
-                else{
-                    if($tab[0] == ''){
+                else {
+                    if ($tab[0] == '') {
                         $query = '?' . $pageQueryName . '=';
                     }
-                    else{
+                    else {
                         $query = '?' . $tab[0] . '' . $pageQueryName . '=';
                     }
                 }
@@ -106,67 +106,67 @@ 
             $navbar = '';
             $numberOfPage = ceil($totalRows / $numberOfRowPerPage);
             $currentPageNumber = (int) $currentPageNumber;
-			if($currentPageNumber <= 0){
+			if ($currentPageNumber <= 0) {
 				$currentPageNumber = 1;
 			}
-            if($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0 || !is_numeric($numberOfLink) || !is_numeric($numberOfRowPerPage)
-            ){
+            if ($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0 || !is_numeric($numberOfLink) || !is_numeric($numberOfRowPerPage)
+            ) {
                 return $navbar;
             }
-            if($numberOfLink % 2 == 0){
+            if ($numberOfLink % 2 == 0) {
                 $start = $currentPageNumber - ($numberOfLink / 2) + 1;
                 $end = $currentPageNumber + ($numberOfLink / 2);
             }
-            else{
+            else {
                 $start = $currentPageNumber - floor($numberOfLink / 2);
                 $end = $currentPageNumber + floor($numberOfLink / 2);
             }
-            if($start <= 1){
+            if ($start <= 1) {
                 $begin = 1;
                 $end = $numberOfLink;
             }
-            else if($start > 1 && $end < $numberOfPage){
+            else if ($start > 1 && $end < $numberOfPage) {
                 $begin = $start;
                 $end = $end;
             }
-            else{
+            else {
                 $begin = ($numberOfPage - $numberOfLink) + 1;
                 $end = $numberOfPage;
             }
-            if($numberOfPage <= $numberOfLink){
+            if ($numberOfPage <= $numberOfLink) {
                 $begin = 1;
                 $end = $numberOfPage;
             }
-            if($currentPageNumber == 1){
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
+            if ($currentPageNumber == 1) {
+                for ($i = $begin; $i <= $end; $i++) {
+                    if ($i == $currentPageNumber) {
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                     }
-                    else{
+                    else {
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }
                 $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' . $this->config['next_text'] . '</a>' . $this->config['next_close'];
             }
-            else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage) {
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
+                for ($i = $begin; $i <= $end; $i++) {
+                    if ($i == $currentPageNumber) {
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                     }
-                    else{
-                        $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' . $this->config['digit_close'];
+                    else {
+                        $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }
-                $navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
+                $navbar .= $this->config['next_open'] . "<a href='$query" . ($currentPageNumber + 1) . "'>" . $this->config['next_text'] . "</a>" . $this->config['next_close'];
             }
-            else if($currentPageNumber == $numberOfPage){
+            else if ($currentPageNumber == $numberOfPage) {
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
+                for ($i = $begin; $i <= $end; $i++) {
+                    if ($i == $currentPageNumber) {
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                     }
-                    else{
+                    else {
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }

Indentation +36 added lines, -36 removed lines

@@ -1,32 +1,32 @@ 
 <?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.
-	*/
+    /**
+     * 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 Pagination{
         
-		/**
+        /**
          * The list of loaded config
          * @var array
          */
@@ -43,15 +43,15 @@ 
                 if(empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
                 }
-				else{
-					if(! empty($overwriteConfig)){
-						$config = array_merge($config, $overwriteConfig);
-					}
-					$this->config = $config;
+                else{
+                    if(! empty($overwriteConfig)){
+                        $config = array_merge($config, $overwriteConfig);
+                    }
+                    $this->config = $config;
                     //put it gobally
-					Config::setAll($config);
-					unset($config);
-				}
+                    Config::setAll($config);
+                    unset($config);
+                }
             }
             else{
                 show_error('Unable to find the pagination configuration file');
@@ -80,7 +80,7 @@ 
         public function getLink($totalRows, $currentPageNumber){
             $pageQueryName = $this->config['page_query_string_name'];
             $numberOfLink = $this->config['nb_link'];
-			$numberOfRowPerPage = $this->config['pagination_per_page'];
+            $numberOfRowPerPage = $this->config['pagination_per_page'];
             $queryString = Url::queryString();
             $currentUrl = Url::current();
             if($queryString == ''){
@@ -106,9 +106,9 @@ 
             $navbar = '';
             $numberOfPage = ceil($totalRows / $numberOfRowPerPage);
             $currentPageNumber = (int) $currentPageNumber;
-			if($currentPageNumber <= 0){
-				$currentPageNumber = 1;
-			}
+            if($currentPageNumber <= 0){
+                $currentPageNumber = 1;
+            }
             if($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0 || !is_numeric($numberOfLink) || !is_numeric($numberOfRowPerPage)
             ){
                 return $navbar;

core/libraries/Browser.php

Spacing +10 added lines, -10 removed lines

@@ -918,27 +918,27 @@ 
                 if (isset($aresult[1])) {
                     $this->setBrowser(self::BROWSER_IE);
                     $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                    if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
-                        if($aresult[1] == '3.1'){
+                    if (preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)) {
+                        if ($aresult[1] == '3.1') {
                             $this->setVersion('7.0');
                         }
-                        else if($aresult[1] == '4.0'){
+                        else if ($aresult[1] == '4.0') {
                             $this->setVersion('8.0');
                         }
-                        else if($aresult[1] == '5.0'){
+                        else if ($aresult[1] == '5.0') {
                             $this->setVersion('9.0');
                         }
-                        else if($aresult[1] == '6.0'){
+                        else if ($aresult[1] == '6.0') {
                             $this->setVersion('10.0');
                         }
-                        else if($aresult[1] == '7.0'){
+                        else if ($aresult[1] == '7.0') {
                             $this->setVersion('11.0');
                         }
-                        else if($aresult[1] == '8.0'){
+                        else if ($aresult[1] == '8.0') {
                             $this->setVersion('11.0');
                         }
                     }
-                    if(stripos($this->_agent, 'IEMobile') !== false) {
+                    if (stripos($this->_agent, 'IEMobile') !== false) {
                         $this->setBrowser(self::BROWSER_POCKET_IE);
                         $this->setMobile(true);
                     }
@@ -1684,8 +1684,8 @@ 
                 $this->_platform = self::PLATFORM_ANDROID;
             } elseif (stripos($this->_agent, 'Silk') !== false) {
                 $this->_platform = self::PLATFORM_FIRE_OS;
-            } elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false ) {
-                $this->_platform = self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV;
+            } elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false) {
+                $this->_platform = self::PLATFORM_LINUX . '/' . self::PLATFORM_SMART_TV;
             } elseif (stripos($this->_agent, 'linux') !== false) {
                 $this->_platform = self::PLATFORM_LINUX;
             } else if (stripos($this->_agent, 'Nokia') !== false) {

Braces +5 added lines, -10 removed lines

@@ -921,20 +921,15 @@
                     if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
                         if($aresult[1] == '3.1'){
                             $this->setVersion('7.0');
-                        }
-                        else if($aresult[1] == '4.0'){
+                        } else if($aresult[1] == '4.0'){
                             $this->setVersion('8.0');
-                        }
-                        else if($aresult[1] == '5.0'){
+                        } else if($aresult[1] == '5.0'){
                             $this->setVersion('9.0');
-                        }
-                        else if($aresult[1] == '6.0'){
+                        } else if($aresult[1] == '6.0'){
                             $this->setVersion('10.0');
-                        }
-                        else if($aresult[1] == '7.0'){
+                        } else if($aresult[1] == '7.0'){
                             $this->setVersion('11.0');
-                        }
-                        else if($aresult[1] == '8.0'){
+                        } else if($aresult[1] == '8.0'){
                             $this->setVersion('11.0');
                         }
                     }

core/functions/function_lang.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	if(! function_exists('__')){
+	if (!function_exists('__')) {
 		/**
 		 * function for the shortcut to Lang::get()
 		 * @param  string $key the language key to retrieve
@@ -32,20 +32,20 @@ 
 		 * for the given key
 		 * @return string  the language value
 		 */
-		function __($key, $default = 'LANGUAGE_ERROR'){
+		function __($key, $default = 'LANGUAGE_ERROR') {
 			return get_instance()->lang->get($key, $default);
 		}
 
 	}
 
 
-	if(! function_exists('get_languages')){
+	if (!function_exists('get_languages')) {
 		/**
 		 * function for the shortcut to Lang::getSupported()
 		 * 
 		 * @return array all the supported languages
 		 */
-		function get_languages(){
+		function get_languages() {
 			return get_instance()->lang->getSupported();
 		}
 

Indentation +46 added lines, -46 removed lines

@@ -1,52 +1,52 @@
 <?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.
+     */
 
-	if(! function_exists('__')){
-		/**
-		 * function for the shortcut to Lang::get()
-		 * @param  string $key the language key to retrieve
-		 * @param mixed $default the default value to return if can not find the value
-		 * for the given key
-		 * @return string  the language value
-		 */
-		function __($key, $default = 'LANGUAGE_ERROR'){
-			return get_instance()->lang->get($key, $default);
-		}
+    if(! function_exists('__')){
+        /**
+         * function for the shortcut to Lang::get()
+         * @param  string $key the language key to retrieve
+         * @param mixed $default the default value to return if can not find the value
+         * for the given key
+         * @return string  the language value
+         */
+        function __($key, $default = 'LANGUAGE_ERROR'){
+            return get_instance()->lang->get($key, $default);
+        }
 
-	}
+    }
 
 
-	if(! function_exists('get_languages')){
-		/**
-		 * function for the shortcut to Lang::getSupported()
-		 * 
-		 * @return array all the supported languages
-		 */
-		function get_languages(){
-			return get_instance()->lang->getSupported();
-		}
+    if(! function_exists('get_languages')){
+        /**
+         * function for the shortcut to Lang::getSupported()
+         * 
+         * @return array all the supported languages
+         */
+        function get_languages(){
+            return get_instance()->lang->getSupported();
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

core/functions/function_string.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 	 *  @filesource
 	 */
 
-	if(! function_exists('get_random_string')){
+	if (!function_exists('get_random_string')) {
 		/**
 		 * Generate a random string
 		 * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
@@ -49,9 +49,9 @@ 
 		 * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
 		 * @return string the generated string.
 		 */
-		function get_random_string($type = 'alnum', $length = 10, $lower = false){
+		function get_random_string($type = 'alnum', $length = 10, $lower = false) {
 			$str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-			switch($type){
+			switch ($type) {
 				case 'alpha':
 					$str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 				break;
@@ -63,10 +63,10 @@ 
 				break;
 			}
 			$random = null;
-			for($i = 0; $i < $length; $i++){
+			for ($i = 0; $i < $length; $i++) {
 				$random .= $str[mt_rand() % strlen($str)];
 			}
-			if($lower){
+			if ($lower) {
 				$random = strtolower($random);
 			}
 			return $random;

Indentation +71 added lines, -71 removed lines

@@ -1,74 +1,74 @@
 <?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_string.php
-	 *
-	 *  This file contains the definition of the functions relating to the processing of strings characters.
-	 *
-	 *  @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_string.php
+     *
+     *  This file contains the definition of the functions relating to the processing of strings characters.
+     *
+     *  @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_random_string')){
-		/**
-		 * Generate a random string
-		 * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
-		 * "alnum" for alpha-numeric characters and "num" for numbers.
-		 * By default it is "alnum".
-		 * @param  integer $length the length of the string to generate. By default it is 10.
-		 * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
-		 * @return string the generated string.
-		 */
-		function get_random_string($type = 'alnum', $length = 10, $lower = false){
-			$str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-			switch($type){
-				case 'alpha':
-					$str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-				break;
-				case 'alnum':
-					$str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-				break;
-				case 'num':
-					$str = '1234567890';
-				break;
-			}
-			$random = null;
-			for($i = 0; $i < $length; $i++){
-				$random .= $str[mt_rand() % strlen($str)];
-			}
-			if($lower){
-				$random = strtolower($random);
-			}
-			return $random;
-		}
-	}
+    if(! function_exists('get_random_string')){
+        /**
+         * Generate a random string
+         * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
+         * "alnum" for alpha-numeric characters and "num" for numbers.
+         * By default it is "alnum".
+         * @param  integer $length the length of the string to generate. By default it is 10.
+         * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
+         * @return string the generated string.
+         */
+        function get_random_string($type = 'alnum', $length = 10, $lower = false){
+            $str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+            switch($type){
+                case 'alpha':
+                    $str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+                break;
+                case 'alnum':
+                    $str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+                break;
+                case 'num':
+                    $str = '1234567890';
+                break;
+            }
+            $random = null;
+            for($i = 0; $i < $length; $i++){
+                $random .= $str[mt_rand() % strlen($str)];
+            }
+            if($lower){
+                $random = strtolower($random);
+            }
+            return $random;
+        }
+    }

core/views/errors.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="Tony NGUEREZA">
-    <title><?php echo $title;?></title>
+    <title><?php echo $title; ?></title>
 	<style type = 'text/css'>
 	/* reset */
 		*{
@@ -64,10 +64,10 @@ 
   <body>
 	<div class="container">
 		<div class = "title">
-			<h2><?php echo $title;?></h2>
+			<h2><?php echo $title; ?></h2>
 		</div>
 		<div class = "body">
-			<p><?php echo $error;?></p>
+			<p><?php echo $error; ?></p>
 		</div>
 	</div> <!-- ./container-->
    </body>

core/lang/en/lang_form_validation.php

Spacing +3 added lines, -3 removed lines

@@ -3,11 +3,11 @@ 
  	/**
  	 * Form validation language message (English) 
  	 */
- 	$lang['fv_required']     		= 'Field %1 is required.';
+ 	$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.';
-    $lang['fv_less_than'] 		    = 'Field %1 must less than %2.';
+    $lang['fv_less_than'] = 'Field %1 must less than %2.';
     $lang['fv_greater_than'] 		= 'Field %1 must greater than %2.';
     $lang['fv_matches']      		= 'Field %1 must be identical to field %2.';
     $lang['fv_valid_email']  		= 'Field %1 must contain a valid E-mail address.';
@@ -16,7 +16,7 @@ 
     $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_exists']	   			= 'The value of the field %1 does not exist.';
+    $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).';
     $lang['fv_numeric']	   			= 'The value of field %1 must be a number.';

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).';