tnhfw / tnh-fw

core/libraries/FormValidation.php

Spacing +54 added lines, -54 removed lines

@@ -25,13 +25,13 @@ 
     */
 
 
-     class FormValidation{
+     class FormValidation {
 		 
         /**
          * The form validation status
          * @var boolean
          */
-        protected $_success  = false;
+        protected $_success = false;
 
         /**
          * The list of errors messages
@@ -40,31 +40,31 @@ 
         protected $_errorsMessages = array();
         
         // Array of rule sets, fieldName => PIPE seperated ruleString
-        protected $_rules             = array();
+        protected $_rules = array();
         
         // Array of errors, niceName => Error Message
-        protected $_errors             = array();
+        protected $_errors = array();
         
         // Array of post Key => Nice name labels
-        protected $_labels          = array();
+        protected $_labels = array();
         
         /**
          * The errors delimiters
          * @var array
          */
-        protected $_allErrorsDelimiter   = array('<div class="error">', '</div>');
+        protected $_allErrorsDelimiter = array('<div class="error">', '</div>');
 
         /**
          * The each error delimiter
          * @var array
          */
-        protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
+        protected $_eachErrorDelimiter = array('<p class="error">', '</p>');
         
 		/**
          * Indicated if need force the validation to be failed
          * @var boolean
          */
-        protected $_forceFail            = false;
+        protected $_forceFail = false;
 
         /**
          * The list of the error messages overrides by the original
@@ -98,13 +98,13 @@ 
          * @return void
          */
         public function __construct() {
-            $this->logger =& class_loader('Log', 'classes');
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::FormValidation');
            
 		   //Load form validation language message
             Loader::lang('form_validation');
             $obj = & get_instance();
-            $this->_errorsMessages  = array(
+            $this->_errorsMessages = array(
                         'required'         => $obj->lang->get('fv_required'),
                         'min_length'       => $obj->lang->get('fv_min_length'),
                         'max_length'       => $obj->lang->get('fv_max_length'),
@@ -141,7 +141,7 @@ 
             $this->_success              = false;
             $this->_forceFail            = false;
             $this->data                  = array();
-			$this->enableCsrfCheck       = false;
+			$this->enableCsrfCheck = false;
         }
 
         /**
@@ -150,7 +150,7 @@ 
 		 *
          * @return FormValidation Current instance of object.
          */
-        public function setData(array $data){
+        public function setData(array $data) {
             $this->logger->debug('Setting the form validation data, the values are: ' . stringfy_vars($data));
             $this->data = $data;
 			return $this;
@@ -160,7 +160,7 @@ 
          * Get the form validation data
          * @return array the form validation data to be validated
          */
-        public function getData(){
+        public function getData() {
             return $this->data;
         }
 
@@ -169,7 +169,7 @@ 
 		*
 		* @return string the function name
 		*/
-        protected function _toCallCase($funcName, $prefix='_validate') {
+        protected function _toCallCase($funcName, $prefix = '_validate') {
             $funcName = strtolower($funcName);
             $finalFuncName = $prefix;
             foreach (explode('_', $funcName) as $funcNamePart) {
@@ -193,7 +193,7 @@ 
          * @return boolean Whether or not the form has been submitted or the data is available for validation.
          */
         public function canDoValidation() {
-            return get_instance()->request->method() === 'POST' || ! empty($this->data);
+            return get_instance()->request->method() === 'POST' || !empty($this->data);
         }
 
         /**
@@ -215,16 +215,16 @@ 
          * afterwards.
          */
         protected function _run() {
-            if(get_instance()->request->method() == 'POST' || $this->enableCsrfCheck){
+            if (get_instance()->request->method() == 'POST' || $this->enableCsrfCheck) {
                 $this->logger->debug('Check if CSRF is enabled in configuration');
                 //first check for CSRF
-                if( get_config('csrf_enable', false) || $this->enableCsrfCheck){
+                if (get_config('csrf_enable', false) || $this->enableCsrfCheck) {
                      $this->logger->info('Check the CSRF value if is valid');
-                    if(! Security::validateCSRF()){
+                    if (!Security::validateCSRF()) {
                         show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
                     }
                 }
-                else{
+                else {
                     $this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
                 }
             }
@@ -232,10 +232,10 @@ 
             $this->_forceFail = false;
 
             foreach ($this->getData() as $inputName => $inputVal) {
-    			if(is_array($this->data[$inputName])){
+    			if (is_array($this->data[$inputName])) {
     				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
     			}
-    			else{
+    			else {
     				$this->data[$inputName] = trim($this->data[$inputName]);
     			}
 
@@ -262,7 +262,7 @@ 
         public function setRule($inputField, $inputLabel, $ruleSets) {
             $this->_rules[$inputField] = $ruleSets;
             $this->_labels[$inputField] = $inputLabel;
-            $this->logger->info('Set the field rule: name [' .$inputField. '], label [' .$inputLabel. '], rules [' .$ruleSets. ']');
+            $this->logger->info('Set the field rule: name [' . $inputField . '], label [' . $inputLabel . '], rules [' . $ruleSets . ']');
             return $this;
         }
 
@@ -427,7 +427,7 @@ 
             }
             $errorOutput .= $errorsEnd;
             echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
+            return (!$echo) ? $errorOutput : null;
         }
 
         /**
@@ -452,26 +452,26 @@ 
             /*
             //////////////// hack for regex rule that can contain "|"
             */
-            if(strpos($ruleString, 'regex') !== false){
+            if (strpos($ruleString, 'regex') !== false) {
                 $regexRule = array();
                 $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
                 preg_match($rule, $ruleString, $regexRule);
                 $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(isset($regexRule[0]) && !empty($regexRule[0])){
+                 if (isset($regexRule[0]) && !empty($regexRule[0])) {
                      $ruleSets[] = $regexRule[0];
                  }
                  $ruleStringRegex = explode('|', $ruleStringTemp);
-                 if(is_array($ruleStringRegex)){
+                 if (is_array($ruleStringRegex)) {
                     foreach ($ruleStringRegex as $rule) {
                         $rule = trim($rule);
-                        if($rule){
+                        if ($rule) {
                             $ruleSets[] = $rule;
                         }
                     }
                  }
             }
             /***********************************/
-            else{
+            else {
                 if (strpos($ruleString, '|') !== FALSE) {
                     $ruleSets = explode('|', $ruleString);
                 } else {
@@ -503,7 +503,7 @@ 
          * @return void
          */
         protected function _validateRule($inputName, $inputVal, $ruleName) {
-            $this->logger->debug('Rule validation of field [' .$inputName. '], value [' .$inputVal. '], rule [' .$ruleName. ']');
+            $this->logger->debug('Rule validation of field [' . $inputName . '], value [' . $inputVal . '], rule [' . $ruleName . ']');
             // Array to store args
             $ruleArgs = array();
 
@@ -547,7 +547,7 @@ 
                 $key = $i - 1;
                 $rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
             }
-            if (! array_key_exists($inputName, $this->_errors)) {
+            if (!array_key_exists($inputName, $this->_errors)) {
                 $this->_errors[$inputName] = $rulePhrase;
             }
         }
@@ -599,13 +599,13 @@ 
          */
 		protected function _validateRequired($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if(array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
+            if (array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
                 $callbackReturn = $this->_runEmptyCallback($ruleArgs[1]);
                 if ($inputVal == '' && $callbackReturn == true) {
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
             } 
-			else if($inputVal == '') {
+			else if ($inputVal == '') {
 				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
@@ -631,7 +631,7 @@ 
         protected function _validateCallback($inputName, $ruleName, array $ruleArgs) {
             if (function_exists($ruleArgs[1]) && !empty($this->data[$inputName])) {
 				$result = $this->_runCallback($this->data[$inputName], $ruleArgs[1]);
-				if(! $result){
+				if (!$result) {
 					$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
 				}
             }
@@ -665,7 +665,7 @@ 
                         continue;
                     }
                 } 
-				else{
+				else {
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -695,8 +695,8 @@ 
          */
         protected function _validateValidEmail($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if (! preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
@@ -712,7 +712,7 @@ 
         protected function _validateExactLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) != $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -728,7 +728,7 @@ 
         protected function _validateMaxLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) > $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -744,7 +744,7 @@ 
         protected function _validateMinLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) < $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -760,7 +760,7 @@ 
     	protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal >= $ruleArgs[1]) { 
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -776,7 +776,7 @@ 
     	protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal <= $ruleArgs[1]) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -791,8 +791,8 @@ 
          */
     	protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if (! is_numeric($inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!is_numeric($inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -808,7 +808,7 @@ 
 		protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$obj = & get_instance();
-    		if(! isset($obj->database)){
+    		if (!isset($obj->database)) {
     			return;
     		}
     		list($table, $column) = explode('.', $ruleArgs[1]);
@@ -817,7 +817,7 @@ 
     			          ->get();
     		$nb = $obj->database->numRows();
             if ($nb == 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -833,7 +833,7 @@ 
     	protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$obj = & get_instance();
-    		if(! isset($obj->database)){
+    		if (!isset($obj->database)) {
     			return;
     		}
     		list($table, $column) = explode('.', $ruleArgs[1]);
@@ -842,7 +842,7 @@ 
     			          ->get();
     		$nb = $obj->database->numRows();
             if ($nb != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -858,11 +858,11 @@ 
     	protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$obj = & get_instance();
-    		if(! isset($obj->database)){
+    		if (!isset($obj->database)) {
     			return;
     		}
     		$data = explode(',', $ruleArgs[1]);
-    		if(count($data) < 2){
+    		if (count($data) < 2) {
     			return;
     		}
     		list($table, $column) = explode('.', $data[0]);
@@ -873,7 +873,7 @@ 
                 		  ->get();
     		$nb = $obj->database->numRows();
             if ($nb != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -890,8 +890,8 @@ 
             $inputVal = $this->post($inputName);
     		$list = explode(',', $ruleArgs[1]);
             $list = array_map('trim', $list);
-            if (! in_array($inputVal, $list)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!in_array($inputVal, $list)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -907,8 +907,8 @@ 
         protected function _validateRegex($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$regex = $ruleArgs[1];
-            if (! preg_match($regex, $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!preg_match($regex, $inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));

core/libraries/StringHash.php

Spacing +1 added lines, -1 removed lines

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

core/libraries/Html.php

Spacing +46 added lines, -46 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Html{
+	class Html {
 
 		/**
 		 * Generate the html anchor link
@@ -35,21 +35,21 @@ 
 		 *
 		 * @return string|void             the anchor link generated html if $return is true or display it if not
 		 */
-		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true){
-			if(! is_url($link)){
+		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true) {
+			if (!is_url($link)) {
 				$link = Url::site_url($link);
 			}
-			if(! $anchor){
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "'.$link.'"';
+			$str .= '<a href = "' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -64,18 +64,18 @@ 
 		 *
 		 * @return string|void             the generated html for mailto link if $return is true or display it if not
 		 */
-		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true){
-			if(! $anchor){
+		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true) {
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "mailto:'.$link.'"';
+			$str .= '<a href = "mailto:' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -88,8 +88,8 @@ 
 		 *
 		 * @return string|void      the generated "br" html if $return is true or display it if not
 		 */
-		public static function br($nb = 1, $return = true){
-			if(! is_numeric($nb) || $nb <= 0){
+		public static function br($nb = 1, $return = true) {
+			if (!is_numeric($nb) || $nb <= 0) {
 				$nb = 1;
 			}
 			$str = null;
@@ -97,7 +97,7 @@ 
 				$str .= '<br />';
 			}
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -111,15 +111,15 @@ 
 		 *
 		 * @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){
-			if(! is_numeric($nb) || $nb <= 0){
+		public static function hr($nb = 1, array $attributes = array(), $return = true) {
+			if (!is_numeric($nb) || $nb <= 0) {
 				$nb = 1;
 			}
 			$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;
@@ -135,18 +135,18 @@ 
 		 *
 		 * @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){
-			if(! is_numeric($nb) || $nb <= 0){
+		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true) {
+			if (!is_numeric($nb) || $nb <= 0) {
 				$nb = 1;
 			}
-			if(! is_numeric($type) || $type <= 0 || $type > 6){
+			if (!is_numeric($type) || $type <= 0 || $type > 6) {
 				$type = 1;
 			}
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
+				$str .= '<h' . $type . attributes_to_string($attributes) . '>' . $text . '</h' . $type . '>';
 			}
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -161,15 +161,15 @@ 
 		 *
 		 * @return string|void the generated "ul" html  if $return is true or display it if not.
 		 */
-		public static function ul($data = array(), $attributes = array(), $return = true){
+		public static function ul($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ul' . (! empty($attributes['ul']) ? attributes_to_string($attributes['ul']):'') . '>';
+			$str .= '<ul' . (!empty($attributes['ul']) ? attributes_to_string($attributes['ul']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (! empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ul>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -183,15 +183,15 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "ol" html  if $return is true or display it if not.
 		 */
-		public static function ol($data = array(), $attributes = array(), $return = true){
+		public static function ol($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']):'') . '>';
+			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ol>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -209,46 +209,46 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "table" html  if $return is true or display it if not.
 		 */
-		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true){
+		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true) {
 			$headers = (array) $headers;
 			$body = (array) $body;
 			$str = null;
-			$str .= '<table' . (! empty($attributes['table']) ? attributes_to_string($attributes['table']):'') . '>';
-			if(! empty($headers)){
-				$str .= '<thead' . (! empty($attributes['thead']) ? attributes_to_string($attributes['thead']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']):'') .'>';
+			$str .= '<table' . (!empty($attributes['table']) ? attributes_to_string($attributes['table']) : '') . '>';
+			if (!empty($headers)) {
+				$str .= '<thead' . (!empty($attributes['thead']) ? attributes_to_string($attributes['thead']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
 			}
-			else{
+			else {
 				//no need check for footer
 				$use_footer = false;
 			}
-			$str .= '<tbody' . (! empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']):'') .'>';
+			$str .= '<tbody' . (!empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']) : '') . '>';
 			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . (! empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']):'') .'>';
+				if (is_array($row)) {
+					$str .= '<tr' . (!empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']) : '') . '>';
 					foreach ($row as $value) {
-						$str .= '<td' . (! empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']):'') .'>' .$value. '</td>';	
+						$str .= '<td' . (!empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']) : '') . '>' . $value . '</td>';	
 					}
 					$str .= '</tr>';
 				}
 			}
 			$str .= '</tbody>';
-			if($use_footer){
-				$str .= '<tfoot' . (! empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']):'') .'>';
+			if ($use_footer) {
+				$str .= '<tfoot' . (!empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</tfoot>';
 			}
 			$str .= '</table>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;

core/libraries/Pagination.php

Spacing +39 added lines, -39 removed lines

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

core/libraries/Form.php

Spacing +51 added lines, -51 removed lines

@@ -25,7 +25,7 @@ 
 	*/
 
 
-	class Form{
+	class Form {
 
 		/**
 		 * Generate the form opened tag
@@ -35,33 +35,33 @@ 
 		 * @param  string $enctype    the form enctype like "multipart/form-data"
 		 * @return string             the generated form html
 		 */
-		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null){
-			if($path){
+		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null) {
+			if ($path) {
 				$path = Url::site_url($path);
 			}
 			$method = strtoupper($method);
 			$str = null;
-			$str .= '<form action = "'.$path.'" method = "'.$method.'"';
-			if(! empty($enctype)){
-				$str .= ' enctype = "'.$enctype.'" ';
+			$str .= '<form action = "' . $path . '" method = "' . $method . '"';
+			if (!empty($enctype)) {
+				$str .= ' enctype = "' . $enctype . '" ';
 			}
-			if(! isset($attributes['accept-charset'])){
+			if (!isset($attributes['accept-charset'])) {
 				$attributes['accept-charset'] = get_config('charset', 'utf-8');
 			}
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$checkCsrf = false;
 			//check if the user set the checking of CSRF manually
-			if($method != 'POST' && isset($attributes['csrf'])){
+			if ($method != 'POST' && isset($attributes['csrf'])) {
 				$obj = & get_instance();
-				if(! isset($obj->formvalidation)){
+				if (!isset($obj->formvalidation)) {
 					Loader::library('FormValidation');
 				}
 				$obj->formvalidation->enableCsrfCheck = true;
 				$checkCsrf = true;
 			}
 			//if CSRF enable or is set manually
-			if((get_config('csrf_enable', false) && $method == 'POST') || ($method != 'POST' && $checkCsrf)){
+			if ((get_config('csrf_enable', false) && $method == 'POST') || ($method != 'POST' && $checkCsrf)) {
 				$csrfValue = Security::generateCSRF();
 				$csrfName = get_config('csrf_key', 'csrf_key');
 				$str .= static::hidden($csrfName, $csrfValue);
@@ -74,7 +74,7 @@ 
 		 * @see Form::open() for more details
 		 * @return string the generated multipart form html
 		 */
-		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST'){
+		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST') {
 			return self::open($path, $attributes, $method, 'multipart/form-data');
 		}
 
@@ -82,7 +82,7 @@ 
 		 * Generate the form close
 		 * @return string the form close html
 		 */
-		public static function close(){
+		public static function close() {
 			return '</form>';
 		}
 
@@ -93,10 +93,10 @@ 
 		 * @param  array  $legendAttributes the legend additional HTML attributes. Is used only is $legend is not empty
 		 * @return string         the generated fieldset value
 		 */
-		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()){
+		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()) {
 			$str = '<fieldset' . attributes_to_string($fieldsetAttributes) . '>';
-			if($legend){
-				$str .= '<legend' . attributes_to_string($legendAttributes) . '>'.$legend.'</legend>';
+			if ($legend) {
+				$str .= '<legend' . attributes_to_string($legendAttributes) . '>' . $legend . '</legend>';
 			}
 			return $str;
 		}
@@ -105,7 +105,7 @@ 
 		 * Generate the fieldset close tag
 		 * @return string the generated html for fieldset close
 		 */
-		public static function fieldsetClose(){
+		public static function fieldsetClose() {
 			return '</fieldset>';
 		}
 
@@ -115,13 +115,13 @@ 
 		 * @param  string $name the form field name
 		 * @return string       the error message if exists and null if not
 		 */
-		public static function error($name){
+		public static function error($name) {
 			$return = null;
 			$obj = & get_instance();
-			if(isset($obj->formvalidation)){
+			if (isset($obj->formvalidation)) {
 				$errors = $obj->formvalidation->returnErrors();
-				$error =  isset($errors[$name]) ? $errors[$name] : null;
-				if($error){
+				$error = isset($errors[$name]) ? $errors[$name] : null;
+				if ($error) {
 					list($errorStart, $errorEnd) = $obj->formvalidation->getErrorDelimiter();
 					$return = $errorStart . $error . $errorEnd;
 				}
@@ -135,7 +135,7 @@ 
 		 * @param  mixed $default the default value if can not found the given form field name
 		 * @return mixed the form field value if is set, otherwise return the default value.
 		 */
-		public static function value($name, $default = null){
+		public static function value($name, $default = null) {
 			$value = get_instance()->request->query($name);
 			return $value ? $value : $default;
 		}
@@ -147,14 +147,14 @@ 
 		 * @param  array  $attributes the additional attributes to be added
 		 * @return string the generated label html content
 		 */
-		public static function label($label, $for = '', array $attributes = array()){
+		public static function label($label, $for = '', array $attributes = array()) {
 			$str = '<label';
-			if($for){
-				$str .= ' for = "'.$for.'"';
+			if ($for) {
+				$str .= ' for = "' . $for . '"';
 			}
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			$str .= $label.'</label>';
+			$str .= $label . '</label>';
 			return $str;
 		}
 
@@ -166,9 +166,9 @@ 
 		 * @param  string $type       the type of the form field (password, text, submit, button, etc.)
 		 * @return string             the generated form field html content for the input
 		 */
-		public static function input($name, $value = null, array $attributes = array(), $type = 'text'){
+		public static function input($name, $value = null, array $attributes = array(), $type = 'text') {
 			$str = null;
-			$str .= '<input name = "'.$name.'" value = "'.$value.'" type = "'.$type.'"';
+			$str .= '<input name = "' . $name . '" value = "' . $value . '" type = "' . $type . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '/>';
 			return $str;
@@ -178,7 +178,7 @@ 
 		 * Generate the form field for "text"
 		 * @see Form::input() for more details
 		 */
-		public static function text($name, $value = null, array $attributes = array()){
+		public static function text($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'text');
 		}
 
@@ -186,7 +186,7 @@ 
 		 * Generate the form field for "password"
 		 * @see Form::input() for more details
 		 */
-		public static function password($name, $value = null, array $attributes = array()){
+		public static function password($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'password');
 		}
 
@@ -194,8 +194,8 @@ 
 		 * Generate the form field for "radio"
 		 * @see Form::input() for more details
 		 */
-		public static function radio($name, $value = null,  $checked = false, array $attributes = array()){
-			if($checked){
+		public static function radio($name, $value = null, $checked = false, array $attributes = array()) {
+			if ($checked) {
 				$attributes['checked'] = true;
 			}
 			return self::input($name, $value, $attributes, 'radio');
@@ -205,8 +205,8 @@ 
 		 * Generate the form field for "checkbox"
 		 * @see Form::input() for more details
 		 */
-		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()){
-			if($checked){
+		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()) {
+			if ($checked) {
 				$attributes['checked'] = true;
 			}
 			return self::input($name, $value, $attributes, 'checkbox');
@@ -216,7 +216,7 @@ 
 		 * Generate the form field for "number"
 		 * @see Form::input() for more details
 		 */
-		public static function number($name, $value = null, array $attributes = array()){
+		public static function number($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'number');
 		}
 
@@ -224,7 +224,7 @@ 
 		 * Generate the form field for "phone"
 		 * @see Form::input() for more details
 		 */
-		public static function phone($name, $value = null, array $attributes = array()){
+		public static function phone($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'phone');
 		}
 
@@ -232,7 +232,7 @@ 
 		 * Generate the form field for "email"
 		 * @see Form::input() for more details
 		 */
-		public static function email($name, $value = null, array $attributes = array()){
+		public static function email($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'email');
 		}
 		
@@ -240,7 +240,7 @@ 
 		 * Generate the form field for "search"
 		 * @see Form::input() for more details
 		 */
-		public static function search($name, $value = null, array $attributes = array()){
+		public static function search($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'search');
 		}
 		
@@ -248,7 +248,7 @@ 
 		 * Generate the form field for "hidden"
 		 * @see Form::input() for more details
 		 */
-		public static function hidden($name, $value = null, array $attributes = array()){
+		public static function hidden($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'hidden');
 		}
 		
@@ -256,7 +256,7 @@ 
 		 * Generate the form field for "file"
 		 * @see Form::input() for more details
 		 */
-		public static function file($name, array $attributes = array()){
+		public static function file($name, array $attributes = array()) {
 			return self::input($name, null, $attributes, 'file');
 		}
 		
@@ -264,7 +264,7 @@ 
 		 * Generate the form field for "button"
 		 * @see Form::input() for more details
 		 */
-		public static function button($name, $value = null, array $attributes = array()){
+		public static function button($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'button');
 		}
 		
@@ -272,7 +272,7 @@ 
 		 * Generate the form field for "reset"
 		 * @see Form::input() for more details
 		 */
-		public static function reset($name, $value = null, array $attributes = array()){
+		public static function reset($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'reset');
 		}
 		
@@ -280,7 +280,7 @@ 
 		 * Generate the form field for "submit"
 		 * @see Form::input() for more details
 		 */
-		public static function submit($name, $value = null, array $attributes = array()){
+		public static function submit($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'submit');
 		}
 
@@ -291,12 +291,12 @@ 
 		 * @param  array  $attributes the additional attributes to be added
 		 * @return string             the generated textarea form html content
 		 */
-		public static function textarea($name, $value = '', array $attributes = array()){
+		public static function textarea($name, $value = '', array $attributes = array()) {
 			$str = null;
-			$str .= '<textarea name = "'.$name.'"';
+			$str .= '<textarea name = "' . $name . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			$str .= $value.'</textarea>';
+			$str .= $value . '</textarea>';
 			return $str;
 		}
 		
@@ -308,20 +308,20 @@ 
 		 * @param  array  $attributes the additional attribute to be added
 		 * @return string             the generated form field html content for select
 		 */
-		public static function select($name, $values = null, $selected = null, array $attributes = array()){
-			if(! is_array($values)){
+		public static function select($name, $values = null, $selected = null, array $attributes = array()) {
+			if (!is_array($values)) {
 				$values = array('' => $values);
 			}
 			$str = null;
-			$str .= '<select name = "'.$name.'"';
+			$str .= '<select name = "' . $name . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			foreach($values as $key => $val){
+			foreach ($values as $key => $val) {
 				$select = '';
-				if($key == $selected){
+				if ($key == $selected) {
 					$select = 'selected';
 				}
-				$str .= '<option value = "'.$key.'" '.$select.'>'.$val.'</option>';
+				$str .= '<option value = "' . $key . '" ' . $select . '>' . $val . '</option>';
 			}
 			$str .= '</select>';
 			return $str;

core/libraries/Browser.php

Spacing +10 added lines, -10 removed lines

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

core/functions/function_lang.php

Spacing +4 added lines, -4 removed lines

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

core/functions/function_user_agent.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	
 	 
-	if(! function_exists('get_ip')){
+	if (!function_exists('get_ip')) {
 		/**
 		 *  Retrieves the user's IP address
 		 *  
@@ -50,7 +50,7 @@ 
 		 *  
 		 *  @return string the IP address.
 		 */
-		function get_ip(){
+		function get_ip() {
 			$ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '';
 
 			if (isset($_SERVER["HTTP_CLIENT_IP"])) {

core/functions/function_string.php

Spacing +5 added lines, -5 removed lines

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