tnhfw / tnh-fw

core/libraries/Html.php

Indentation +323 added lines, -323 removed lines

@@ -1,343 +1,343 @@
 <?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){
-			$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){
+            $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;
-			$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;
+            $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){
-			if($return){
-				return self::buildUlOl($data, $attributes, true, 'ul');
-			}
-			self::buildUlOl($data, $attributes, false, 'ul');
-		}
+        /**
+         * 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){
+            if($return){
+                return self::buildUlOl($data, $attributes, true, 'ul');
+            }
+            self::buildUlOl($data, $attributes, false, 'ul');
+        }
 
-		/**
-		 * 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){
-			if($return){
-				return self::buildUlOl($data, $attributes, true, 'ol');
-			}
-			self::buildUlOl($data, $attributes, false, 'ol');
-		}
+        /**
+         * 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){
+            if($return){
+                return self::buildUlOl($data, $attributes, true, 'ol');
+            }
+            self::buildUlOl($data, $attributes, false, 'ol');
+        }
 
 
-		/**
-		 * 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;
-			$tableAttributes = '';
-			if(! empty($attributes['table'])){
-				$tableAttributes = ' ' . attributes_to_string($attributes['table']);
-			}
-			$str .= '<table' . $tableAttributes . '>';
-			$str .= self::buildTableHeader($headers, $attributes);
-			$str .= self::buildTableBody($body, $attributes);
+        /**
+         * 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;
+            $tableAttributes = '';
+            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){
-				$str .= self::buildTableFooter($headers, $attributes);
-			}
-			$str .= '</table>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($use_footer){
+                $str .= self::buildTableFooter($headers, $attributes);
+            }
+            $str .= '</table>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * This method is used to build the header of the html table
-		 * @see  Html::table 
-		 * @return string|null
-		 */
-		protected static function buildTableHeader(array $headers, $attributes = array()){
-			$str = null;
-			$theadAttributes = '';
-			if(! empty($attributes['thead'])){
-				$theadAttributes = ' ' . attributes_to_string($attributes['thead']);
-			}
-			$theadtrAttributes = '';
-			if(! empty($attributes['thead_tr'])){
-				$theadtrAttributes = ' ' . attributes_to_string($attributes['thead_tr']);
-			}
-			$thAttributes = '';
-			if(! empty($attributes['thead_th'])){
-				$thAttributes = ' ' . attributes_to_string($attributes['thead_th']);
-			}
-			$str .= '<thead' . $theadAttributes .'>';
-			$str .= '<tr' . $theadtrAttributes .'>';
-			foreach ($headers as $value) {
-				$str .= '<th' . $thAttributes .'>' .$value. '</th>';
-			}
-			$str .= '</tr>';
-			$str .= '</thead>';
-			return $str;
-		}
+        /**
+         * This method is used to build the header of the html table
+         * @see  Html::table 
+         * @return string|null
+         */
+        protected static function buildTableHeader(array $headers, $attributes = array()){
+            $str = null;
+            $theadAttributes = '';
+            if(! empty($attributes['thead'])){
+                $theadAttributes = ' ' . attributes_to_string($attributes['thead']);
+            }
+            $theadtrAttributes = '';
+            if(! empty($attributes['thead_tr'])){
+                $theadtrAttributes = ' ' . attributes_to_string($attributes['thead_tr']);
+            }
+            $thAttributes = '';
+            if(! empty($attributes['thead_th'])){
+                $thAttributes = ' ' . attributes_to_string($attributes['thead_th']);
+            }
+            $str .= '<thead' . $theadAttributes .'>';
+            $str .= '<tr' . $theadtrAttributes .'>';
+            foreach ($headers as $value) {
+                $str .= '<th' . $thAttributes .'>' .$value. '</th>';
+            }
+            $str .= '</tr>';
+            $str .= '</thead>';
+            return $str;
+        }
 
-		/**
-		 * This method is used to build the body of the html table
-		 * @see  Html::table 
-		 * @return string|null
-		 */
-		protected static function buildTableBody(array $body, $attributes = array()){
-			$str = null;
-			$tbodyAttributes = '';
-			if(! empty($attributes['tbody'])){
-				$tbodyAttributes = ' ' . attributes_to_string($attributes['tbody']);
-			}
-			$tbodytrAttributes = '';
-			if(! empty($attributes['tbody_tr'])){
-				$tbodytrAttributes = ' ' . attributes_to_string($attributes['tbody_tr']);
-			}
-			$tbodytdAttributes = '';
-			if(! empty($attributes['tbody_td'])){
-				$tbodytdAttributes = ' ' . attributes_to_string($attributes['tbody_td']);
-			}
-			$str .= '<tbody' . $tbodyAttributes .'>';
-			$str .= self::buildTableBodyContent($body, $tbodytrAttributes, $tbodytdAttributes);
-			$str .= '</tbody>';
-			return $str;
-		}
+        /**
+         * This method is used to build the body of the html table
+         * @see  Html::table 
+         * @return string|null
+         */
+        protected static function buildTableBody(array $body, $attributes = array()){
+            $str = null;
+            $tbodyAttributes = '';
+            if(! empty($attributes['tbody'])){
+                $tbodyAttributes = ' ' . attributes_to_string($attributes['tbody']);
+            }
+            $tbodytrAttributes = '';
+            if(! empty($attributes['tbody_tr'])){
+                $tbodytrAttributes = ' ' . attributes_to_string($attributes['tbody_tr']);
+            }
+            $tbodytdAttributes = '';
+            if(! empty($attributes['tbody_td'])){
+                $tbodytdAttributes = ' ' . attributes_to_string($attributes['tbody_td']);
+            }
+            $str .= '<tbody' . $tbodyAttributes .'>';
+            $str .= self::buildTableBodyContent($body, $tbodytrAttributes, $tbodytdAttributes);
+            $str .= '</tbody>';
+            return $str;
+        }
 
-		/**
-		 * This method is used to build the body content of the html table
-		 * @param  array  $body              the table body data
-		 * @param  string $tbodytrAttributes the html attributes for each tr in tbody
-		 * @param  string $tbodytdAttributes the html attributes for each td in tbody
-		 * @return string                    
-		 */
-		protected static function buildTableBodyContent(array $body, $tbodytrAttributes, $tbodytdAttributes){
-			$str = null;
-			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . $tbodytrAttributes .'>';
-					foreach ($row as $value) {
-						$str .= '<td' . $tbodytdAttributes .'>' .$value. '</td>';	
-					}
-					$str .= '</tr>';
-				}
-			}
-			return $str;
-		}
+        /**
+         * This method is used to build the body content of the html table
+         * @param  array  $body              the table body data
+         * @param  string $tbodytrAttributes the html attributes for each tr in tbody
+         * @param  string $tbodytdAttributes the html attributes for each td in tbody
+         * @return string                    
+         */
+        protected static function buildTableBodyContent(array $body, $tbodytrAttributes, $tbodytdAttributes){
+            $str = null;
+            foreach ($body as $row) {
+                if(is_array($row)){
+                    $str .= '<tr' . $tbodytrAttributes .'>';
+                    foreach ($row as $value) {
+                        $str .= '<td' . $tbodytdAttributes .'>' .$value. '</td>';	
+                    }
+                    $str .= '</tr>';
+                }
+            }
+            return $str;
+        }
 
-		/**
-		 * This method is used to build the footer of the html table
-		 * @see  Html::table 
-		 * @return string|null
-		 */
-		protected static function buildTableFooter(array $footers, $attributes = array()){
-			$str = null;
-			$tfootAttributes = '';
-			if(! empty($attributes['tfoot'])){
-				$tfootAttributes = ' ' . attributes_to_string($attributes['tfoot']);
-			}
-			$tfoottrAttributes = '';
-			if(! empty($attributes['tfoot_tr'])){
-				$tfoottrAttributes = ' ' . attributes_to_string($attributes['tfoot_tr']);
-			}
-			$thAttributes = '';
-			if(! empty($attributes['tfoot_th'])){
-				$thAttributes = ' ' . attributes_to_string($attributes['tfoot_th']);
-			}
-			$str .= '<tfoot' . $tfootAttributes .'>';
-				$str .= '<tr' . $tfoottrAttributes .'>';
-				foreach ($footers as $value) {
-					$str .= '<th' . $thAttributes .'>' .$value. '</th>';
-				}
-				$str .= '</tr>';
-				$str .= '</tfoot>';
-			return $str;
-		}
+        /**
+         * This method is used to build the footer of the html table
+         * @see  Html::table 
+         * @return string|null
+         */
+        protected static function buildTableFooter(array $footers, $attributes = array()){
+            $str = null;
+            $tfootAttributes = '';
+            if(! empty($attributes['tfoot'])){
+                $tfootAttributes = ' ' . attributes_to_string($attributes['tfoot']);
+            }
+            $tfoottrAttributes = '';
+            if(! empty($attributes['tfoot_tr'])){
+                $tfoottrAttributes = ' ' . attributes_to_string($attributes['tfoot_tr']);
+            }
+            $thAttributes = '';
+            if(! empty($attributes['tfoot_th'])){
+                $thAttributes = ' ' . attributes_to_string($attributes['tfoot_th']);
+            }
+            $str .= '<tfoot' . $tfootAttributes .'>';
+                $str .= '<tr' . $tfoottrAttributes .'>';
+                foreach ($footers as $value) {
+                    $str .= '<th' . $thAttributes .'>' .$value. '</th>';
+                }
+                $str .= '</tr>';
+                $str .= '</tfoot>';
+            return $str;
+        }
 
-		/**
-		 * Return the HTML content for ol or ul tags
-		 * @see  Html::ol
-		 * @see  Html::ul
-		 * @param  string  $olul   the type 'ol' or 'ul'
-		 * @return void|string
-		 */
-		protected static function buildUlOl($data = array(), $attributes = array(), $return = true, $olul = 'ul'){
-			$data = (array) $data;
-			$str = null;
-			$olulAttributes = '';
-			if(! empty($attributes[$olul])){
-				$olulAttributes = ' ' . attributes_to_string($attributes[$olul]);
-			}
-			$liAttributes = '';
-			if(! empty($attributes['li'])){
-				$liAttributes = ' ' . attributes_to_string($attributes['li']);
-			}
-			$str .= '<' . $olul . $olulAttributes . '>';
-			foreach ($data as $row) {
-				$str .= '<li' . $liAttributes .'>' .$row. '</li>';
-			}
-			$str .= '</' . $olul . '>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
-	}
+        /**
+         * Return the HTML content for ol or ul tags
+         * @see  Html::ol
+         * @see  Html::ul
+         * @param  string  $olul   the type 'ol' or 'ul'
+         * @return void|string
+         */
+        protected static function buildUlOl($data = array(), $attributes = array(), $return = true, $olul = 'ul'){
+            $data = (array) $data;
+            $str = null;
+            $olulAttributes = '';
+            if(! empty($attributes[$olul])){
+                $olulAttributes = ' ' . attributes_to_string($attributes[$olul]);
+            }
+            $liAttributes = '';
+            if(! empty($attributes['li'])){
+                $liAttributes = ' ' . attributes_to_string($attributes['li']);
+            }
+            $str .= '<' . $olul . $olulAttributes . '>';
+            foreach ($data as $row) {
+                $str .= '<li' . $liAttributes .'>' .$row. '</li>';
+            }
+            $str .= '</' . $olul . '>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
+    }

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/classes/model/Model.php

Indentation +126 added lines, -126 removed lines

@@ -22,7 +22,7 @@ 
      * 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.
-    */
+     */
 
 
     /**
@@ -120,10 +120,10 @@ 
         protected $_temporary_return_type = NULL;
     	
     	
-    	/**
+        /**
     		The database cache time 
-    	*/
-    	protected $dbCacheTime = 0;
+         */
+        protected $dbCacheTime = 0;
 
         /**
          * Instance of the Loader class
@@ -151,12 +151,12 @@ 
             }
             else{
                 $obj = & get_instance();
-        		if (isset($obj->database) && is_object($obj->database)){
+                if (isset($obj->database) && is_object($obj->database)){
                     /**
-                    * NOTE: Need use "clone" because some Model need have the personal instance of the database library
-                    * to prevent duplication
-                    */
-        			$this->setDatabaseInstance(clone $obj->database);
+                     * NOTE: Need use "clone" because some Model need have the personal instance of the database library
+                     * to prevent duplication
+                     */
+                    $this->setDatabaseInstance(clone $obj->database);
                 }
             }
 
@@ -174,7 +174,7 @@ 
          */
         public function get($primary_value)
         {
-    		return $this->get_by($this->primary_key, $primary_value);
+            return $this->get_by($this->primary_key, $primary_value);
         }
 
         /**
@@ -189,12 +189,12 @@ 
             {
                 $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
             }
-    		$this->_set_where($where);
+            $this->_set_where($where);
 
             $this->trigger('before_get');
-			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
+            $type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $this->getQueryBuilder()->from($this->_table);
-			$row = $this->_database->get($type);
+            $row = $this->_database->get($type);
             $this->_temporary_return_type = $this->return_type;
             $row = $this->trigger('after_get', $row);
             $this->_with = array();
@@ -231,9 +231,9 @@ 
             {
                 $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
             }
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+            $type = $this->_temporary_return_type == 'array' ? 'array':false;
             $this->getQueryBuilder()->from($this->_table);
-			$result = $this->_database->getAll($type);
+            $result = $this->_database->getAll($type);
             $this->_temporary_return_type = $this->return_type;
 
             foreach ($result as $key => &$row)
@@ -247,7 +247,7 @@ 
         /**
          * Insert a new row into the table. $data should be an associative array
          * of data to be inserted. Returns newly created ID.
-		 * @see Database::insert
+         * @see Database::insert
          */
         public function insert($data = array(), $skip_validation = FALSE, $escape = true)
         {
@@ -260,11 +260,11 @@ 
             {
                 $data = $this->trigger('before_create', $data);
                 $this->getQueryBuilder()->from($this->_table);
-				$this->_database->insert($data, $escape);
+                $this->_database->insert($data, $escape);
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
-				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-				return ! $insert_id ? true : $insert_id;
+                //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
+                return ! $insert_id ? true : $insert_id;
             }
             else
             {
@@ -324,7 +324,7 @@ 
             {
                 $this->getQueryBuilder()->in($this->primary_key, $primary_values)
                                         ->from($this->_table);
-				$result = $this->_database->update($data, $escape);
+                $result = $this->_database->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
             }
@@ -356,7 +356,7 @@ 
             {
                 $this->_set_where($args);
                 $this->getQueryBuilder()->from($this->_table);
-				$result = $this->_database->update($data);
+                $result = $this->_database->update($data);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
             }
@@ -370,7 +370,7 @@ 
         {
             $data = $this->trigger('before_update', $data);
             $this->getQueryBuilder()->from($this->_table);
-			$result = $this->_database->update($data, $escape);
+            $result = $this->_database->update($data, $escape);
             $this->trigger('after_update', array($data, $result));
             return $result;
         }
@@ -382,16 +382,16 @@ 
         {
             $this->trigger('before_delete', $id);
             $this->getQueryBuilder()->where($this->primary_key, $id);
-			$result = false;
+            $result = false;
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
             }
             else
             {
                 $this->getQueryBuilder()->from($this->_table); 
-				$result = $this->_database->delete();
+                $result = $this->_database->delete();
             }
 
             $this->trigger('after_delete', $result);
@@ -404,18 +404,18 @@ 
         public function delete_by()
         {
             $where = func_get_args();
-    	    $where = $this->trigger('before_delete', $where);
+            $where = $this->trigger('before_delete', $where);
             $this->_set_where($where);
-			$result = false;
+            $result = false;
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
             }
             else
             {
                 $this->getQueryBuilder()->from($this->_table); 
-				$result = $this->_database->delete();
+                $result = $this->_database->delete();
             }
             $this->trigger('after_delete', $result);
             return $result;
@@ -428,16 +428,16 @@ 
         {
             $primary_values = $this->trigger('before_delete', $primary_values);
             $this->getQueryBuilder()->in($this->primary_key, $primary_values);
-			$result = false;
+            $result = false;
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
             }
             else
             {
                 $this->getQueryBuilder()->from($this->_table); 
-				$result = $this->_database->delete();
+                $result = $this->_database->delete();
             }
             $this->trigger('after_delete', $result);
             return $result;
@@ -449,8 +449,8 @@ 
          */
         public function truncate()
         {
-			$this->getQueryBuilder()->from($this->_table); 
-			$result = $this->_database->delete();
+            $this->getQueryBuilder()->from($this->_table); 
+            $result = $this->_database->delete();
             return $result;
         }
 
@@ -468,14 +468,14 @@ 
             return $this;
         }
 		
-		/**
-		* Relationship
-		*/
+        /**
+         * Relationship
+         */
         public function relate($row)
         {
-    		if (empty($row))
+            if (empty($row))
             {
-    		    return $row;
+                return $row;
             }
 
             $row = $this->relateBelongsTo($row);
@@ -508,9 +508,9 @@ 
                 $this->getQueryBuilder()->where($this->soft_delete_key, FALSE);
             }
             $this->getQueryBuilder()
-									 ->select(array($key, $value))
-									 ->from($this->_table);
-			$result = $this->_database->getAll();
+                                        ->select(array($key, $value))
+                                        ->from($this->_table);
+            $result = $this->_database->getAll();
             $options = array();
             foreach ($result as $row)
             {
@@ -532,7 +532,7 @@ 
             $where = func_get_args();
             $this->_set_where($where);
             $this->getQueryBuilder()->from($this->_table);
-			$this->_database->getAll();
+            $this->_database->getAll();
             return $this->_database->numRows();
         }
 
@@ -545,20 +545,20 @@ 
             {
                 $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
             }
-			$this->getQueryBuilder()->from($this->_table);
-			$this->_database->getAll();
+            $this->getQueryBuilder()->from($this->_table);
+            $this->_database->getAll();
             return $this->_database->numRows();
         }
 		
-		/**
-		* Enabled cache temporary
-		*/
-		public function cached($ttl = 0){
-		  if ($ttl > 0){
-			$this->_database = $this->_database->cached($ttl);
-		  }
-		  return $this;
-		}
+        /**
+         * Enabled cache temporary
+         */
+        public function cached($ttl = 0){
+            if ($ttl > 0){
+            $this->_database = $this->_database->cached($ttl);
+            }
+            return $this;
+        }
 
         /**
          * Tell the class to skip the insert validation
@@ -582,10 +582,10 @@ 
          */
         public function get_next_id()
         {
-			$this->getQueryBuilder()->select('AUTO_INCREMENT')
-									->from('information_schema.TABLES')
-									->where('TABLE_NAME', $this->_table)
-									->where('TABLE_SCHEMA', $this->_database->getDatabaseName());
+            $this->getQueryBuilder()->select('AUTO_INCREMENT')
+                                    ->from('information_schema.TABLES')
+                                    ->where('TABLE_NAME', $this->_table)
+                                    ->where('TABLE_SCHEMA', $this->_database->getDatabaseName());
             return (int) $this->_database->get()->AUTO_INCREMENT;
         }
 
@@ -708,24 +708,24 @@ 
             {
                 if (is_object($row))
                 {
-					if (isset($row->$attr)){
-						unset($row->$attr);
-					}
+                    if (isset($row->$attr)){
+                        unset($row->$attr);
+                    }
                 }
                 else
                 {
-					if (isset($row[$attr])){
-						unset($row[$attr]);
-					}
+                    if (isset($row[$attr])){
+                        unset($row[$attr]);
+                    }
                 }
             }
             return $row;
         }
 		
-		 /**
-         * Return the database instance
-         * @return Database the database instance
-         */
+            /**
+             * Return the database instance
+             * @return Database the database instance
+             */
         public function getDatabaseInstance(){
             return $this->_database;
         }
@@ -734,7 +734,7 @@ 
          * set the Database instance for future use
          * @param Database $db the database object
          */
-         public function setDatabaseInstance($db){
+            public function setDatabaseInstance($db){
             $this->_database = $db;
             if ($this->dbCacheTime > 0){
                 $this->_database->setCache($this->dbCacheTime);
@@ -753,14 +753,14 @@ 
         /**
          * Set the loader instance for future use
          * @param Loader $loader the loader object
-		 * @return object
+         * @return object
          */
-         public function setLoader($loader){
+            public function setLoader($loader){
             $this->loaderInstance = $loader;
             return $this;
         }
 
-		/**
+        /**
          * Return the queryBuilder instance this is the shortcut to database queryBuilder
          * @return object the DatabaseQueryBuilder instance
          */
@@ -771,9 +771,9 @@ 
         /**
          * Set the DatabaseQueryBuilder instance for future use
          * @param object $queryBuilder the DatabaseQueryBuilder object
-		 * @return object
+         * @return object
          */
-         public function setQueryBuilder($queryBuilder){
+            public function setQueryBuilder($queryBuilder){
             $this->_database->setQueryBuilder($queryBuilder);
             return $this;
         }
@@ -790,9 +790,9 @@ 
         /**
          * Set the form validation instance for future use
          * @param FormValidation $fv the form validation object
-		 * @return object
+         * @return object
          */
-         public function setFormValidation($fv){
+            public function setFormValidation($fv){
             $this->formValidationInstance = $fv;
             return $this;
         }
@@ -833,12 +833,12 @@ 
          * INTERNAL METHODS
          * ------------------------------------------------------------ */
 
-		/**
-		* relate for the relation "belongs_to"
-		* @return mixed
-		*/
-		protected function relateBelongsTo($row){
-			foreach ($this->belongs_to as $key => $value)
+        /**
+         * relate for the relation "belongs_to"
+         * @return mixed
+         */
+        protected function relateBelongsTo($row){
+            foreach ($this->belongs_to as $key => $value)
             {
                 if (is_string($value))
                 {
@@ -869,15 +869,15 @@ 
                     }
                 }
             }
-			return $row;
-		}
-
-		/**
-		* relate for the relation "has_many"
-		* @return mixed
-		*/
-		protected function relateHasMany($row){
-			foreach ($this->has_many as $key => $value)
+            return $row;
+        }
+
+        /**
+         * relate for the relation "has_many"
+         * @return mixed
+         */
+        protected function relateHasMany($row){
+            foreach ($this->has_many as $key => $value)
             {
                 if (is_string($value))
                 {
@@ -908,8 +908,8 @@ 
                     }
                 }
             }
-			return $row;
-		}
+            return $row;
+        }
 		
         /**
          * Trigger an event and call its observers. Pass through the event name
@@ -945,7 +945,7 @@ 
             }
             $fv = $this->formValidationInstance;
             if (! is_object($fv)){
-                 Loader::library('FormValidation');
+                    Loader::library('FormValidation');
                 $fv = $this->formvalidation;
                 $this->setFormValidation($fv);  
             }
@@ -960,30 +960,30 @@ 
         }
 		
 		
-		/**
-		* Set WHERE parameters, when is array
-		* @param array $params
-		*/
-		protected function _set_where_array(array $params){
-			foreach ($params as $field => $filter)
-			{
-				if (is_array($filter))
-				{
-					$this->getQueryBuilder()->in($field, $filter);
-				}
-				else
-				{
-					if (is_int($field))
-					{
-						$this->getQueryBuilder()->where($filter);
-					}
-					else
-					{
-						$this->getQueryBuilder()->where($field, $filter);
-					}
-				}
-			}
-		}
+        /**
+         * Set WHERE parameters, when is array
+         * @param array $params
+         */
+        protected function _set_where_array(array $params){
+            foreach ($params as $field => $filter)
+            {
+                if (is_array($filter))
+                {
+                    $this->getQueryBuilder()->in($field, $filter);
+                }
+                else
+                {
+                    if (is_int($field))
+                    {
+                        $this->getQueryBuilder()->where($filter);
+                    }
+                    else
+                    {
+                        $this->getQueryBuilder()->where($field, $filter);
+                    }
+                }
+            }
+        }
 
 
         /**
@@ -999,8 +999,8 @@ 
             {
                 $this->getQueryBuilder()->where($params[0]);
             }
-        	else if (count($params) == 2)
-    		{
+            else if (count($params) == 2)
+            {
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
@@ -1009,11 +1009,11 @@ 
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }
-    		}
-    		else if (count($params) == 3)
-    		{
-    			$this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
-    		}
+            }
+            else if (count($params) == 3)
+            {
+                $this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
+            }
             else
             {
                 if (is_array($params[1]))
@@ -1029,7 +1029,7 @@ 
 
         /**
             Shortcut to controller
-        */
+         */
         public function __get($key){
             return get_instance()->{$key};
         }

Spacing +44 added lines, -44 removed lines

@@ -33,7 +33,7 @@ 
      * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
      */
 
-    class Model{
+    class Model {
 
         /* --------------------------------------------------------------
          * VARIABLES
@@ -145,13 +145,13 @@ 
          * Initialise the model, tie into the CodeIgniter superobject and
          * try our best to guess the table name.
          */
-        public function __construct(Database $db = null){
-            if (is_object($db)){
+        public function __construct(Database $db = null) {
+            if (is_object($db)) {
                 $this->setDatabaseInstance($db);
             }
-            else{
+            else {
                 $obj = & get_instance();
-        		if (isset($obj->database) && is_object($obj->database)){
+        		if (isset($obj->database) && is_object($obj->database)) {
                     /**
                     * NOTE: Need use "clone" because some Model need have the personal instance of the database library
                     * to prevent duplication
@@ -187,7 +187,7 @@ 
 
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
     		$this->_set_where($where);
 
@@ -229,9 +229,9 @@ 
             $this->trigger('before_get');
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $this->getQueryBuilder()->from($this->_table);
 			$result = $this->_database->getAll($type);
             $this->_temporary_return_type = $this->return_type;
@@ -264,7 +264,7 @@ 
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
 				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-				return ! $insert_id ? true : $insert_id;
+				return !$insert_id ? true : $insert_id;
             }
             else
             {
@@ -341,13 +341,13 @@ 
         {
             $args = func_get_args();
             $data = array();
-            if (count($args) == 2){
-                if (is_array($args[1])){
+            if (count($args) == 2) {
+                if (is_array($args[1])) {
                     $data = array_pop($args);
                 }
             }
-            else if (count($args) == 3){
-                if (is_array($args[2])){
+            else if (count($args) == 3) {
+                if (is_array($args[2])) {
                     $data = array_pop($args);
                 }
             }
@@ -386,7 +386,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -410,7 +410,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -432,7 +432,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -502,7 +502,7 @@ 
                 $key = $this->primary_key;
                 $value = $args[0];
             }
-            $this->trigger('before_dropdown', array( $key, $value ));
+            $this->trigger('before_dropdown', array($key, $value));
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
                 $this->getQueryBuilder()->where($this->soft_delete_key, FALSE);
@@ -527,7 +527,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
             $where = func_get_args();
             $this->_set_where($where);
@@ -543,7 +543,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
 			$this->getQueryBuilder()->from($this->_table);
 			$this->_database->getAll();
@@ -553,8 +553,8 @@ 
 		/**
 		* Enabled cache temporary
 		*/
-		public function cached($ttl = 0){
-		  if ($ttl > 0){
+		public function cached($ttl = 0) {
+		  if ($ttl > 0) {
 			$this->_database = $this->_database->cached($ttl);
 		  }
 		  return $this;
@@ -708,13 +708,13 @@ 
             {
                 if (is_object($row))
                 {
-					if (isset($row->$attr)){
+					if (isset($row->$attr)) {
 						unset($row->$attr);
 					}
                 }
                 else
                 {
-					if (isset($row[$attr])){
+					if (isset($row[$attr])) {
 						unset($row[$attr]);
 					}
                 }
@@ -726,7 +726,7 @@ 
          * Return the database instance
          * @return Database the database instance
          */
-        public function getDatabaseInstance(){
+        public function getDatabaseInstance() {
             return $this->_database;
         }
 
@@ -734,9 +734,9 @@ 
          * set the Database instance for future use
          * @param Database $db the database object
          */
-         public function setDatabaseInstance($db){
+         public function setDatabaseInstance($db) {
             $this->_database = $db;
-            if ($this->dbCacheTime > 0){
+            if ($this->dbCacheTime > 0) {
                 $this->_database->setCache($this->dbCacheTime);
             }
             return $this;
@@ -746,7 +746,7 @@ 
          * Return the loader instance
          * @return Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loaderInstance;
         }
 
@@ -755,7 +755,7 @@ 
          * @param Loader $loader the loader object
 		 * @return object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loaderInstance = $loader;
             return $this;
         }
@@ -764,7 +764,7 @@ 
          * Return the queryBuilder instance this is the shortcut to database queryBuilder
          * @return object the DatabaseQueryBuilder instance
          */
-        public function getQueryBuilder(){
+        public function getQueryBuilder() {
             return $this->_database->getQueryBuilder();
         }
 
@@ -773,7 +773,7 @@ 
          * @param object $queryBuilder the DatabaseQueryBuilder object
 		 * @return object
          */
-         public function setQueryBuilder($queryBuilder){
+         public function setQueryBuilder($queryBuilder) {
             $this->_database->setQueryBuilder($queryBuilder);
             return $this;
         }
@@ -783,7 +783,7 @@ 
          * Return the FormValidation instance
          * @return FormValidation the form validation instance
          */
-        public function getFormValidation(){
+        public function getFormValidation() {
             return $this->formValidationInstance;
         }
 
@@ -792,7 +792,7 @@ 
          * @param FormValidation $fv the form validation object
 		 * @return object
          */
-         public function setFormValidation($fv){
+         public function setFormValidation($fv) {
             $this->formValidationInstance = $fv;
             return $this;
         }
@@ -806,7 +806,7 @@ 
          */
         public function order_by($criteria, $order = 'ASC')
         {
-            if ( is_array($criteria) )
+            if (is_array($criteria))
             {
                 foreach ($criteria as $key => $value)
                 {
@@ -837,13 +837,13 @@ 
 		* relate for the relation "belongs_to"
 		* @return mixed
 		*/
-		protected function relateBelongsTo($row){
+		protected function relateBelongsTo($row) {
 			foreach ($this->belongs_to as $key => $value)
             {
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $value . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -853,10 +853,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if (is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -876,13 +876,13 @@ 
 		* relate for the relation "has_many"
 		* @return mixed
 		*/
-		protected function relateHasMany($row){
+		protected function relateHasMany($row) {
 			foreach ($this->has_many as $key => $value)
             {
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $this->_table . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -892,10 +892,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if (is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -944,7 +944,7 @@ 
                 return $data;
             }
             $fv = $this->formValidationInstance;
-            if (! is_object($fv)){
+            if (!is_object($fv)) {
                  Loader::library('FormValidation');
                 $fv = $this->formvalidation;
                 $this->setFormValidation($fv);  
@@ -964,7 +964,7 @@ 
 		* Set WHERE parameters, when is array
 		* @param array $params
 		*/
-		protected function _set_where_array(array $params){
+		protected function _set_where_array(array $params) {
 			foreach ($params as $field => $filter)
 			{
 				if (is_array($filter))
@@ -1030,7 +1030,7 @@ 
         /**
             Shortcut to controller
         */
-        public function __get($key){
+        public function __get($key) {
             return get_instance()->{$key};
         }
 

Braces +28 added lines, -56 removed lines

@@ -148,8 +148,7 @@ 
         public function __construct(Database $db = null){
             if (is_object($db)){
                 $this->setDatabaseInstance($db);
-            }
-            else{
+            } else{
                 $obj = & get_instance();
         		if (isset($obj->database) && is_object($obj->database)){
                     /**
@@ -265,8 +264,7 @@ 
                 $this->trigger('after_create', $insert_id);
 				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
 				return ! $insert_id ? true : $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -303,8 +301,7 @@ 
                 $result = $this->_database->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -327,8 +324,7 @@ 
 				$result = $this->_database->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -345,8 +341,7 @@ 
                 if (is_array($args[1])){
                     $data = array_pop($args);
                 }
-            }
-            else if (count($args) == 3){
+            } else if (count($args) == 3){
                 if (is_array($args[2])){
                     $data = array_pop($args);
                 }
@@ -387,8 +382,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -411,8 +405,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -433,8 +426,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -496,8 +488,7 @@ 
             if (count($args) == 2)
             {
                 list($key, $value) = $args;
-            }
-            else
+            } else
             {
                 $key = $this->primary_key;
                 $value = $args[0];
@@ -649,8 +640,7 @@ 
             if (is_object($row))
             {
                 $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['created_at'] = date('Y-m-d H:i:s');
             }
@@ -662,8 +652,7 @@ 
             if (is_object($row))
             {
                 $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['updated_at'] = date('Y-m-d H:i:s');
             }
@@ -690,8 +679,7 @@ 
                 if (is_array($row))
                 {
                     $row[$column] = unserialize($row[$column]);
-                }
-                else
+                } else
                 {
                     $row->$column = unserialize($row->$column);
                 }
@@ -711,8 +699,7 @@ 
 					if (isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
+                } else
                 {
 					if (isset($row[$attr])){
 						unset($row[$attr]);
@@ -812,8 +799,7 @@ 
                 {
                     $this->getQueryBuilder()->orderBy($key, $value);
                 }
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->orderBy($criteria, $order);
             }
@@ -844,8 +830,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -855,15 +840,13 @@ 
                 {
                     if (is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                     }
@@ -883,8 +866,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -894,15 +876,13 @@ 
                 {
                     if (is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                     }
@@ -970,14 +950,12 @@ 
 				if (is_array($filter))
 				{
 					$this->getQueryBuilder()->in($field, $filter);
-				}
-				else
+				} else
 				{
 					if (is_int($field))
 					{
 						$this->getQueryBuilder()->where($filter);
-					}
-					else
+					} else
 					{
 						$this->getQueryBuilder()->where($field, $filter);
 					}
@@ -994,33 +972,27 @@ 
             if (count($params) == 1 && is_array($params[0]))
             {
                 $this->_set_where_array($params[0]);
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->getQueryBuilder()->where($params[0]);
-            }
-        	else if (count($params) == 2)
+            } else if (count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }
-    		}
-    		else if (count($params) == 3)
+    		} else if (count($params) == 3)
     		{
     			$this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
-    		}
-            else
+    		} else
             {
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }

core/classes/Log.php

Indentation +262 added lines, -262 removed lines

@@ -1,293 +1,293 @@
 <?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 Log{
+    class Log{
 		
-		/**
-		 * The defined constante for Log level
-		 */
-		const NONE = 99999999;
-		const FATAL = 500;
-		const ERROR = 400;
-		const WARNING = 300;
-		const INFO = 200;
-		const DEBUG = 100;
-		const ALL = -99999999;
+        /**
+         * The defined constante for Log level
+         */
+        const NONE = 99999999;
+        const FATAL = 500;
+        const ERROR = 400;
+        const WARNING = 300;
+        const INFO = 200;
+        const DEBUG = 100;
+        const ALL = -99999999;
 
-		/**
-		 * The logger name
-		 * @var string
-		 */
-		private $logger = 'ROOT_LOGGER';
+        /**
+         * The logger name
+         * @var string
+         */
+        private $logger = 'ROOT_LOGGER';
 		
-		/**
-		 * List of valid log level to be checked for the configuration
-		 * @var array
-		 */
-		private static $validConfigLevel = array('off', 'none', 'fatal', 'error', 'warning', 'warn', 'info', 'debug', 'all');
+        /**
+         * List of valid log level to be checked for the configuration
+         * @var array
+         */
+        private static $validConfigLevel = array('off', 'none', 'fatal', 'error', 'warning', 'warn', 'info', 'debug', 'all');
 
-		/**
-		 * Create new Log instance
-		 */
-		public function __construct(){
-		}
+        /**
+         * Create new Log instance
+         */
+        public function __construct(){
+        }
 
-		/**
-		 * Set the logger to identify each message in the log
-		 * @param string $logger the logger name
-		 */
-		public  function setLogger($logger){
-			$this->logger = $logger;
-		}
+        /**
+         * Set the logger to identify each message in the log
+         * @param string $logger the logger name
+         */
+        public  function setLogger($logger){
+            $this->logger = $logger;
+        }
 
-		/**
-		 * Save the fatal message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function fatal($message){
-			$this->writeLog($message, self::FATAL);
-		} 
+        /**
+         * Save the fatal message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function fatal($message){
+            $this->writeLog($message, self::FATAL);
+        } 
 		
-		/**
-		 * Save the error message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function error($message){
-			$this->writeLog($message, self::ERROR);
-		} 
+        /**
+         * Save the error message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function error($message){
+            $this->writeLog($message, self::ERROR);
+        } 
 
-		/**
-		 * Save the warning message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function warning($message){
-			$this->writeLog($message, self::WARNING);
-		} 
+        /**
+         * Save the warning message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function warning($message){
+            $this->writeLog($message, self::WARNING);
+        } 
 		
-		/**
-		 * Save the info message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function info($message){
-			$this->writeLog($message, self::INFO);
-		} 
+        /**
+         * Save the info message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function info($message){
+            $this->writeLog($message, self::INFO);
+        } 
 		
-		/**
-		 * Save the debug message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function debug($message){
-			$this->writeLog($message, self::DEBUG);
-		} 
+        /**
+         * Save the debug message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function debug($message){
+            $this->writeLog($message, self::DEBUG);
+        } 
 		
 		
-		/**
-		 * Save the log message
-		 * @param  string $message the log message to be saved
-		 * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
-		 * to allow check the log level threshold.
-		 */
-		public function writeLog($message, $level = self::INFO){
-			$configLogLevel = get_config('log_level');
-			if(! $configLogLevel){
-				//so means no need log just stop here
-				return;
-			}
-			//check config log level
-			if(! self::isValidConfigLevel($configLogLevel)){
-				//NOTE: here need put the show_error() "logging" to false to prevent loop
-				show_error('Invalid config log level [' . $configLogLevel . '], the value must be one of the following: ' . implode(', ', array_map('strtoupper', self::$validConfigLevel)), $title = 'Log Config Error', $logging = false);	
-			}
+        /**
+         * Save the log message
+         * @param  string $message the log message to be saved
+         * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
+         * to allow check the log level threshold.
+         */
+        public function writeLog($message, $level = self::INFO){
+            $configLogLevel = get_config('log_level');
+            if(! $configLogLevel){
+                //so means no need log just stop here
+                return;
+            }
+            //check config log level
+            if(! self::isValidConfigLevel($configLogLevel)){
+                //NOTE: here need put the show_error() "logging" to false to prevent loop
+                show_error('Invalid config log level [' . $configLogLevel . '], the value must be one of the following: ' . implode(', ', array_map('strtoupper', self::$validConfigLevel)), $title = 'Log Config Error', $logging = false);	
+            }
 			
-			//check if config log_logger_name and current log can save log data
-			if(! $this->canSaveLogDataForLogger()){
-				return;
-			}
+            //check if config log_logger_name and current log can save log data
+            if(! $this->canSaveLogDataForLogger()){
+                return;
+            }
 			
-			//if $level is not an integer
-			if(! is_numeric($level)){
-				$level = self::getLevelValue($level);
-			}
+            //if $level is not an integer
+            if(! is_numeric($level)){
+                $level = self::getLevelValue($level);
+            }
 			
-			//check if can logging regarding the log level config
-			$configLevel = self::getLevelValue($configLogLevel);
-			if($configLevel > $level){
-				//can't log
-				return;
-			}
-			//check log file and directory
-			$path = $this->checkAndSetLogFileDirectory();
-			//save the log data
-			$this->saveLogData($path, $level, $message);
-		}	
+            //check if can logging regarding the log level config
+            $configLevel = self::getLevelValue($configLogLevel);
+            if($configLevel > $level){
+                //can't log
+                return;
+            }
+            //check log file and directory
+            $path = $this->checkAndSetLogFileDirectory();
+            //save the log data
+            $this->saveLogData($path, $level, $message);
+        }	
 
-		/**
-		 * Save the log data into file
-		 * @param  string $path    the path of the log file
-		 * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
-		 * @param  string $message the log message to save
-		 * @return void
-		 */
-		protected function saveLogData($path, $level, $message){
-			//may be at this time helper user_agent not yet included
-			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
+        /**
+         * Save the log data into file
+         * @param  string $path    the path of the log file
+         * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
+         * @param  string $message the log message to save
+         * @return void
+         */
+        protected function saveLogData($path, $level, $message){
+            //may be at this time helper user_agent not yet included
+            require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 			
-			///////////////////// date //////////////
-			$timestampWithMicro = microtime(true);
-			$microtime = sprintf('%06d', ($timestampWithMicro - floor($timestampWithMicro)) * 1000000);
-			$dateTime = new DateTime(date('Y-m-d H:i:s.' . $microtime, $timestampWithMicro));
-			$logDate = $dateTime->format('Y-m-d H:i:s.u'); 
-			//ip
-			$ip = get_ip();
+            ///////////////////// date //////////////
+            $timestampWithMicro = microtime(true);
+            $microtime = sprintf('%06d', ($timestampWithMicro - floor($timestampWithMicro)) * 1000000);
+            $dateTime = new DateTime(date('Y-m-d H:i:s.' . $microtime, $timestampWithMicro));
+            $logDate = $dateTime->format('Y-m-d H:i:s.u'); 
+            //ip
+            $ip = get_ip();
 			
-			//if $level is not an integer
-			if(! is_numeric($level)){
-				$level = self::getLevelValue($level);
-			}
+            //if $level is not an integer
+            if(! is_numeric($level)){
+                $level = self::getLevelValue($level);
+            }
 
-			//level name
-			$levelName = self::getLevelName($level);
+            //level name
+            $levelName = self::getLevelName($level);
 			
-			//debug info
-			$dtrace = debug_backtrace();
-			$fileInfo = $dtrace[0];
-			if ($dtrace[0]['file'] == __FILE__){
-				$fileInfo = $dtrace[1];
-			}
+            //debug info
+            $dtrace = debug_backtrace();
+            $fileInfo = $dtrace[0];
+            if ($dtrace[0]['file'] == __FILE__){
+                $fileInfo = $dtrace[1];
+            }
 			
-			$str = $logDate . ' [' . str_pad($levelName, 7 /*warning len*/) . '] ' . ' [' . str_pad($ip, 15) . '] ' . $this->logger . ' : ' . $message . ' ' . '[' . $fileInfo['file'] . '::' . $fileInfo['line'] . ']' . "\n";
-			$fp = fopen($path, 'a+');
-			if(is_resource($fp)){
-				flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
-				fwrite($fp, $str);
-				fclose($fp);
-			}
-		}	
+            $str = $logDate . ' [' . str_pad($levelName, 7 /*warning len*/) . '] ' . ' [' . str_pad($ip, 15) . '] ' . $this->logger . ' : ' . $message . ' ' . '[' . $fileInfo['file'] . '::' . $fileInfo['line'] . ']' . "\n";
+            $fp = fopen($path, 'a+');
+            if(is_resource($fp)){
+                flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
+                fwrite($fp, $str);
+                fclose($fp);
+            }
+        }	
 
-		/**
-		 * Check if the current logger can save log data regarding the configuration
-		 * of logger filter
-		 * @return boolean
-		 */
-		protected function canSaveLogDataForLogger(){
-			if(! empty($this->logger)){
-				$configLoggersName = get_config('log_logger_name', array());
-				if (!empty($configLoggersName)) {
-					//for best comparaison put all string to lowercase
-					$configLoggersName = array_map('strtolower', $configLoggersName);
-					if(! in_array(strtolower($this->logger), $configLoggersName)){
-						return false;
-					}
-				}
-			}
-			return true;
-		}
+        /**
+         * Check if the current logger can save log data regarding the configuration
+         * of logger filter
+         * @return boolean
+         */
+        protected function canSaveLogDataForLogger(){
+            if(! empty($this->logger)){
+                $configLoggersName = get_config('log_logger_name', array());
+                if (!empty($configLoggersName)) {
+                    //for best comparaison put all string to lowercase
+                    $configLoggersName = array_map('strtolower', $configLoggersName);
+                    if(! in_array(strtolower($this->logger), $configLoggersName)){
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
 
-		/**
-		 * Check the file and directory 
-		 * @return string the log file path
-		 */
-		protected function checkAndSetLogFileDirectory(){
-			$logSavePath = get_config('log_save_path');
-			if(! $logSavePath){
-				$logSavePath = LOGS_PATH;
-			}
+        /**
+         * Check the file and directory 
+         * @return string the log file path
+         */
+        protected function checkAndSetLogFileDirectory(){
+            $logSavePath = get_config('log_save_path');
+            if(! $logSavePath){
+                $logSavePath = LOGS_PATH;
+            }
 			
-			if(! is_dir($logSavePath) || !is_writable($logSavePath)){
-				//NOTE: here need put the show_error() "logging" to false to prevent loop
-				show_error('Error : the log dir does not exists or is not writable', $title = 'Log directory error', $logging = false);
-			}
+            if(! is_dir($logSavePath) || !is_writable($logSavePath)){
+                //NOTE: here need put the show_error() "logging" to false to prevent loop
+                show_error('Error : the log dir does not exists or is not writable', $title = 'Log directory error', $logging = false);
+            }
 			
-			$path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
-			if(! file_exists($path)){
-				touch($path);
-			}
-			return $path;
-		}
+            $path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
+            if(! file_exists($path)){
+                touch($path);
+            }
+            return $path;
+        }
 		
-		/**
-		 * Check if the given log level is valid
-		 *
-		 * @param  string  $level the log level
-		 *
-		 * @return boolean        true if the given log level is valid, false if not
-		 */
-		protected static function isValidConfigLevel($level){
-			$level = strtolower($level);
-			return in_array($level, self::$validConfigLevel);
-		}
+        /**
+         * Check if the given log level is valid
+         *
+         * @param  string  $level the log level
+         *
+         * @return boolean        true if the given log level is valid, false if not
+         */
+        protected static function isValidConfigLevel($level){
+            $level = strtolower($level);
+            return in_array($level, self::$validConfigLevel);
+        }
 
-		/**
-		 * Get the log level number for the given level string
-		 * @param  string $level the log level in string format
-		 * 
-		 * @return int        the log level in integer format using the predefined constants
-		 */
-		protected static function getLevelValue($level){
-			$level = strtolower($level);
-			$levelMaps = array(
-				'fatal'   => self::FATAL,
-				'error'   => self::ERROR,
-				'warning' => self::WARNING,
-				'warn'    => self::WARNING,
-				'info'    => self::INFO,
-				'debug'   => self::DEBUG,
-				'all'     => self::ALL
-			);
-			//the default value is NONE, so means no need test for NONE
-			$value = self::NONE;
-			if(isset($levelMaps[$level])){
-				$value = $levelMaps[$level];
-			}
-			return $value;
-		}
+        /**
+         * Get the log level number for the given level string
+         * @param  string $level the log level in string format
+         * 
+         * @return int        the log level in integer format using the predefined constants
+         */
+        protected static function getLevelValue($level){
+            $level = strtolower($level);
+            $levelMaps = array(
+                'fatal'   => self::FATAL,
+                'error'   => self::ERROR,
+                'warning' => self::WARNING,
+                'warn'    => self::WARNING,
+                'info'    => self::INFO,
+                'debug'   => self::DEBUG,
+                'all'     => self::ALL
+            );
+            //the default value is NONE, so means no need test for NONE
+            $value = self::NONE;
+            if(isset($levelMaps[$level])){
+                $value = $levelMaps[$level];
+            }
+            return $value;
+        }
 
-		/**
-		 * Get the log level string for the given log level integer
-		 * @param  integer $level the log level in integer format
-		 * @return string        the log level in string format
-		 */
-		protected static function getLevelName($level){
-			$levelMaps = array(
-				self::FATAL   => 'FATAL',
-				self::ERROR   => 'ERROR',
-				self::WARNING => 'WARNING',
-				self::INFO    => 'INFO',
-				self::DEBUG   => 'DEBUG'
-			);
-			$value = '';
-			if(isset($levelMaps[$level])){
-				$value = $levelMaps[$level];
-			}
-			return $value;
-		}
+        /**
+         * Get the log level string for the given log level integer
+         * @param  integer $level the log level in integer format
+         * @return string        the log level in string format
+         */
+        protected static function getLevelName($level){
+            $levelMaps = array(
+                self::FATAL   => 'FATAL',
+                self::ERROR   => 'ERROR',
+                self::WARNING => 'WARNING',
+                self::INFO    => 'INFO',
+                self::DEBUG   => 'DEBUG'
+            );
+            $value = '';
+            if(isset($levelMaps[$level])){
+                $value = $levelMaps[$level];
+            }
+            return $value;
+        }
 
-	}
+    }

Spacing +30 added lines, -30 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Log{
+	class Log {
 		
 		/**
 		 * The defined constante for Log level
@@ -52,14 +52,14 @@ 
 		/**
 		 * Create new Log instance
 		 */
-		public function __construct(){
+		public function __construct() {
 		}
 
 		/**
 		 * Set the logger to identify each message in the log
 		 * @param string $logger the logger name
 		 */
-		public  function setLogger($logger){
+		public  function setLogger($logger) {
 			$this->logger = $logger;
 		}
 
@@ -68,7 +68,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function fatal($message){
+		public function fatal($message) {
 			$this->writeLog($message, self::FATAL);
 		} 
 		
@@ -77,7 +77,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function error($message){
+		public function error($message) {
 			$this->writeLog($message, self::ERROR);
 		} 
 
@@ -86,7 +86,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function warning($message){
+		public function warning($message) {
 			$this->writeLog($message, self::WARNING);
 		} 
 		
@@ -95,7 +95,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function info($message){
+		public function info($message) {
 			$this->writeLog($message, self::INFO);
 		} 
 		
@@ -104,7 +104,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function debug($message){
+		public function debug($message) {
 			$this->writeLog($message, self::DEBUG);
 		} 
 		
@@ -115,31 +115,31 @@ 
 		 * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
 		 * to allow check the log level threshold.
 		 */
-		public function writeLog($message, $level = self::INFO){
+		public function writeLog($message, $level = self::INFO) {
 			$configLogLevel = get_config('log_level');
-			if(! $configLogLevel){
+			if (!$configLogLevel) {
 				//so means no need log just stop here
 				return;
 			}
 			//check config log level
-			if(! self::isValidConfigLevel($configLogLevel)){
+			if (!self::isValidConfigLevel($configLogLevel)) {
 				//NOTE: here need put the show_error() "logging" to false to prevent loop
 				show_error('Invalid config log level [' . $configLogLevel . '], the value must be one of the following: ' . implode(', ', array_map('strtoupper', self::$validConfigLevel)), $title = 'Log Config Error', $logging = false);	
 			}
 			
 			//check if config log_logger_name and current log can save log data
-			if(! $this->canSaveLogDataForLogger()){
+			if (!$this->canSaveLogDataForLogger()) {
 				return;
 			}
 			
 			//if $level is not an integer
-			if(! is_numeric($level)){
+			if (!is_numeric($level)) {
 				$level = self::getLevelValue($level);
 			}
 			
 			//check if can logging regarding the log level config
 			$configLevel = self::getLevelValue($configLogLevel);
-			if($configLevel > $level){
+			if ($configLevel > $level) {
 				//can't log
 				return;
 			}
@@ -156,7 +156,7 @@ 
 		 * @param  string $message the log message to save
 		 * @return void
 		 */
-		protected function saveLogData($path, $level, $message){
+		protected function saveLogData($path, $level, $message) {
 			//may be at this time helper user_agent not yet included
 			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 			
@@ -169,7 +169,7 @@ 
 			$ip = get_ip();
 			
 			//if $level is not an integer
-			if(! is_numeric($level)){
+			if (!is_numeric($level)) {
 				$level = self::getLevelValue($level);
 			}
 
@@ -179,13 +179,13 @@ 
 			//debug info
 			$dtrace = debug_backtrace();
 			$fileInfo = $dtrace[0];
-			if ($dtrace[0]['file'] == __FILE__){
+			if ($dtrace[0]['file'] == __FILE__) {
 				$fileInfo = $dtrace[1];
 			}
 			
 			$str = $logDate . ' [' . str_pad($levelName, 7 /*warning len*/) . '] ' . ' [' . str_pad($ip, 15) . '] ' . $this->logger . ' : ' . $message . ' ' . '[' . $fileInfo['file'] . '::' . $fileInfo['line'] . ']' . "\n";
 			$fp = fopen($path, 'a+');
-			if(is_resource($fp)){
+			if (is_resource($fp)) {
 				flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
 				fwrite($fp, $str);
 				fclose($fp);
@@ -197,13 +197,13 @@ 
 		 * of logger filter
 		 * @return boolean
 		 */
-		protected function canSaveLogDataForLogger(){
-			if(! empty($this->logger)){
+		protected function canSaveLogDataForLogger() {
+			if (!empty($this->logger)) {
 				$configLoggersName = get_config('log_logger_name', array());
 				if (!empty($configLoggersName)) {
 					//for best comparaison put all string to lowercase
 					$configLoggersName = array_map('strtolower', $configLoggersName);
-					if(! in_array(strtolower($this->logger), $configLoggersName)){
+					if (!in_array(strtolower($this->logger), $configLoggersName)) {
 						return false;
 					}
 				}
@@ -215,19 +215,19 @@ 
 		 * Check the file and directory 
 		 * @return string the log file path
 		 */
-		protected function checkAndSetLogFileDirectory(){
+		protected function checkAndSetLogFileDirectory() {
 			$logSavePath = get_config('log_save_path');
-			if(! $logSavePath){
+			if (!$logSavePath) {
 				$logSavePath = LOGS_PATH;
 			}
 			
-			if(! is_dir($logSavePath) || !is_writable($logSavePath)){
+			if (!is_dir($logSavePath) || !is_writable($logSavePath)) {
 				//NOTE: here need put the show_error() "logging" to false to prevent loop
 				show_error('Error : the log dir does not exists or is not writable', $title = 'Log directory error', $logging = false);
 			}
 			
 			$path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
-			if(! file_exists($path)){
+			if (!file_exists($path)) {
 				touch($path);
 			}
 			return $path;
@@ -240,7 +240,7 @@ 
 		 *
 		 * @return boolean        true if the given log level is valid, false if not
 		 */
-		protected static function isValidConfigLevel($level){
+		protected static function isValidConfigLevel($level) {
 			$level = strtolower($level);
 			return in_array($level, self::$validConfigLevel);
 		}
@@ -251,7 +251,7 @@ 
 		 * 
 		 * @return int        the log level in integer format using the predefined constants
 		 */
-		protected static function getLevelValue($level){
+		protected static function getLevelValue($level) {
 			$level = strtolower($level);
 			$levelMaps = array(
 				'fatal'   => self::FATAL,
@@ -264,7 +264,7 @@ 
 			);
 			//the default value is NONE, so means no need test for NONE
 			$value = self::NONE;
-			if(isset($levelMaps[$level])){
+			if (isset($levelMaps[$level])) {
 				$value = $levelMaps[$level];
 			}
 			return $value;
@@ -275,7 +275,7 @@ 
 		 * @param  integer $level the log level in integer format
 		 * @return string        the log level in string format
 		 */
-		protected static function getLevelName($level){
+		protected static function getLevelName($level) {
 			$levelMaps = array(
 				self::FATAL   => 'FATAL',
 				self::ERROR   => 'ERROR',
@@ -284,7 +284,7 @@ 
 				self::DEBUG   => 'DEBUG'
 			);
 			$value = '';
-			if(isset($levelMaps[$level])){
+			if (isset($levelMaps[$level])) {
 				$value = $levelMaps[$level];
 			}
 			return $value;