Merge pull request #18 from nguyenanhung/v3.1.14-develop

Update fix core CodeIgniter

Author: nguyenanhung

custom/HungNG_CI_Base_Controller_Filename_Checker.php

@@ -13,7 +13,7 @@ class HungNG_CI_Base_Controller_Filename_Checker extends HungNG_CI_Base_Controll
 	{
 		protected $dir;
 		protected $output_ = array();
-		protected $fix = false;
+		protected $fix     = false;
 
 		public function __construct()
 		{
@@ -99,27 +99,19 @@ private function checkFilename($filepath, $dir)
 				}
 
 				return false;
-			} else {
-				return true;
 			}
+
+			return true;
 		}
 
 		private function checkUcFirst($filename)
 		{
-			if (ucfirst($filename) !== $filename) {
-				return false;
-			}
-
-			return true;
+			return ucfirst($filename) === $filename;
 		}
 
 		private function hasPrefix($filename, $prefix)
 		{
-			if (strncmp($prefix, $filename, bear_str_length($prefix)) === 0) {
-				return true;
-			}
-
-			return false;
+			return strncmp($prefix, $filename, bear_str_length($prefix)) === 0;
 		}
 	}
 }

custom/HungNG_CI_Base_Hooks_Log_Query.php

@@ -36,7 +36,7 @@ public function __construct()
 			$this->_file_ext = (isset($config['log_file_extension']) && $config['log_file_extension'] !== '') ? ltrim($config['log_file_extension'], '.') : 'php';
 			$this->_file_prefix = (isset($config['query_log_file_prefix']) && $config['query_log_file_prefix'] !== '') ? rtrim($config['query_log_file_prefix'], '-') . '-' : 'log-';
 
-			file_exists($this->_log_path) or mkdir($this->_log_path, 0755, true);
+			file_exists($this->_log_path) || mkdir($concurrentDirectory = $this->_log_path, 0755, true) || is_dir($concurrentDirectory);
 
 			if (!is_dir($this->_log_path) or !is_really_writable($this->_log_path)) {
 				$this->_enabled = false;
@@ -58,6 +58,9 @@ public function __construct()
 			}
 		}
 
+		/**
+		 * @throws \Exception
+		 */
 		public function run()
 		{
 			if ($this->_enabled === false) {

system/database/DB_query_builder.php

@@ -699,11 +699,11 @@ protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = N
 				$k = substr($k, 0, $match[0][1]).($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
 			}
 
-			${$qb_key} = array('condition' => $prefix.$k, 'value' => $v, 'escape' => $escape);
-			$this->{$qb_key}[] = ${$qb_key};
+			$$qb_key = array('condition' => $prefix.$k, 'value' => $v, 'escape' => $escape);
+			$this->{$qb_key}[] = $$qb_key;
 			if ($this->qb_caching === TRUE)
 			{
-				$this->{$qb_cache_key}[] = ${$qb_key};
+				$this->{$qb_cache_key}[] = $$qb_key;
 				$this->qb_cache_exists[] = substr($qb_key, 3);
 			}
 

system/libraries/Xmlrpc.php

@@ -1736,7 +1736,7 @@ public function addScalar($val, $type = 'string')
 
 		if ($typeof != 1)
 		{
-			echo '<strong>XML_RPC_Values</strong>: not a scalar type (${typeof})<br />';
+			echo "<strong>XML_RPC_Values</strong>: not a scalar type ($typeof)<br />";
 			return 0;
 		}
 

system/libraries/Xmlrpcs.php

@@ -551,9 +551,8 @@ public function multicall($m)
 	 */
 	public function multicall_error($err)
 	{
-		$str = is_string($err) ? $this->xmlrpcstr["multicall_${err}"] : $err->faultString();
-		$code = is_string($err) ? $this->xmlrpcerr["multicall_${err}"] : $err->faultCode();
-
+		$str = is_string($err) ? $this->xmlrpcstr["multicall_$err"] : $err->faultString();
+		$code = is_string($err) ? $this->xmlrpcerr["multicall_$err"] : $err->faultCode();
 		$struct['faultCode'] = new XML_RPC_Values($code, 'int');
 		$struct['faultString'] = new XML_RPC_Values($str, 'string');