Optimize Code

Author: hungnguyenhp

hungng/HungNG_CI_Base_Controllers.php

@@ -104,7 +104,7 @@ protected function errorExceptionResponse($exception)
 					(ENVIRONMENT === 'development' || ENVIRONMENT === 'staging' || ENVIRONMENT === 'testing')
 				)
 				||
-				in_array(getIPAddress(), config_item('whitelist_ip'))
+				in_array(getIPAddress(), config_item('whitelist_ip'), true)
 			) {
 				$response['error'] = array(
 					'Code'          => $exception->getCode(),
@@ -188,7 +188,7 @@ protected function errorSignatureResponse($validSignature = array())
 			$response            = array();
 			$response['code']    = StatusCodes::HTTP_FORBIDDEN;
 			$response['message'] = StatusCodes::$statusTexts[StatusCodes::HTTP_FORBIDDEN];
-			if ((defined('_PROCESS_TEST_') && _PROCESS_TEST_ === true) || in_array(getIPAddress(), config_item('whitelist_ip'))) {
+			if ((defined('_PROCESS_TEST_') && _PROCESS_TEST_ === true) || in_array(getIPAddress(), config_item('whitelist_ip'), true)) {
 				$response['validSignature'] = $validSignature;
 			}
 

hungng/HungNG_CI_Base_Module.php

@@ -104,7 +104,7 @@ protected function errorExceptionResponse($exception)
 					(ENVIRONMENT === 'development' || ENVIRONMENT === 'staging' || ENVIRONMENT === 'testing')
 				)
 				||
-				in_array(getIPAddress(), config_item('whitelist_ip'))
+				in_array(getIPAddress(), config_item('whitelist_ip'), true)
 			) {
 				$response['error'] = array(
 					'Code'          => $exception->getCode(),
@@ -188,7 +188,7 @@ protected function errorSignatureResponse($validSignature = array())
 			$response            = array();
 			$response['code']    = StatusCodes::HTTP_FORBIDDEN;
 			$response['message'] = StatusCodes::$statusTexts[StatusCodes::HTTP_FORBIDDEN];
-			if ((defined('_PROCESS_TEST_') && _PROCESS_TEST_ === true) || in_array(getIPAddress(), config_item('whitelist_ip'))) {
+			if ((defined('_PROCESS_TEST_') && _PROCESS_TEST_ === true) || in_array(getIPAddress(), config_item('whitelist_ip'), true)) {
 				$response['validSignature'] = $validSignature;
 			}
 

hungng/HungNG_Custom_Based_model.php

@@ -145,8 +145,8 @@ public function close()
 		 */
 		public function page_limit($size = 500, $page = 0)
 		{
-			if ($size != 'no_limit') {
-				if ($page != 0) {
+			if ($size !== 'no_limit') {
+				if ($page !== 0) {
 					if (!$page || $page <= 0 || empty($page)) {
 						$page = 1;
 					}
@@ -338,7 +338,7 @@ public function get_data_simple_result($selectField = '*', $wheres = [], $size =
 				}
 			}
 			// Limit Result
-			self::_page_limit($size, $page);
+			$this->_page_limit($size, $page);
 			// Order Result
 			foreach ($orderBy as $key => $val) {
 				$this->db->order_by($this->tableName . '.' . $key, $val);
@@ -369,9 +369,9 @@ public function get_info($value = '', $field = null, $array = false)
 			}
 			if ($array === true) {
 				return $this->db->get()->row_array();
-			} else {
-				return $this->db->get()->row();
 			}
+
+			return $this->db->get()->row();
 		}
 
 		/**
@@ -402,12 +402,12 @@ public function get_value($value_input = '', $field_input = null, $field_output
 			if (null !== $field_output) {
 				if (null === $query->row()) {
 					return null;
-				} else {
-					return $query->row()->$field_output;
 				}
-			} else {
-				return $query->row();
+
+				return $query->row()->$field_output;
 			}
+
+			return $query->row();
 		}
 
 		/**
@@ -497,16 +497,14 @@ public function request_builder($search)
 		{
 			if (!empty($search)) {
 				foreach ($search as $field => $value) {
-					if ($this->db->field_exists($field, $this->tableName)) {
-						if (!empty($value)) {
-							if (is_array($value)) {
-								$this->db->where_in($this->tableName . '.' . $field, $value);
-							} else {
-								$this->db->like($this->tableName . '.' . $field, $value);
-							}
+					if (!empty($value) && $this->db->field_exists($field, $this->tableName)) {
+						if (is_array($value)) {
+							$this->db->where_in($this->tableName . '.' . $field, $value);
+						} else {
+							$this->db->like($this->tableName . '.' . $field, $value);
 						}
 					}
-					if ($field == 'sort') {
+					if ($field === 'sort') {
 						$sort   = (strpos($value, '-') === false) ? 'DESC' : 'ASC';
 						$column = (strpos($value, '-') === false) ? $value : substr($value, 1);
 						if ($this->db->field_exists($column, $this->tableName)) {
@@ -522,7 +520,7 @@ public function request_builder($search)
 		 */
 		public function __destruct()
 		{
-			if ($this->db != '') {
+			if ($this->db) {
 				$this->close();
 			}
 		}

hungng/HungNG_Lang.php

@@ -104,7 +104,7 @@ public function load($langfile, $idiom = '', $return = false, $add_suffix = true
 				$langfile = preg_replace('/_lang$/', '', $langfile) . '_lang';
 			}
 			$langfile .= '.php';
-			if (empty($idiom) or !preg_match('/^[a-z_-]+$/i', $idiom)) {
+			if (empty($idiom) || !preg_match('/^[a-z_-]+$/i', $idiom)) {
 				$config =& get_config();
 				$idiom  = empty($config['language']) ? $this->base_language : $config['language'];
 			}