From eb2a8263d7d7a0cf70c610e083f985a5e9fdc72e Mon Sep 17 00:00:00 2001
From: "Namhyeon, Go" <gnh1201@gmail.com>
Date: Sun, 28 Apr 2019 23:46:40 +0900
Subject: [PATCH] Update database.php

---
 system/database.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/system/database.php b/system/database.php
index 9490322..597b112 100644
--- a/system/database.php
+++ b/system/database.php
@@ -89,7 +89,7 @@ if(!function_exists("compare_db_key_length")) {
 
 if(!function_exists("get_db_binded_sql")) {
 	function get_db_binded_sql($sql, $bind) {
-		if(count($bind) > 0) {
+		if(check_array_length($bind, 0) == 1) {
 			$bind_keys = array_keys($bind);
 
 			// 2018-08-19: support lower php version (not supported anonymous function)
@@ -148,7 +148,7 @@ if(!check_function_exists("get_db_stmt")) {
 
 		// bind parameter by PDO statement
 		if($bind_pdo) {
-			if(count($bind) > 0) {
+			if(check_array_length($bind, 0) == 1) {
 				foreach($bind as $k=>$v) {
 					$stmt->bindParam(':' . $k, $v);
 				}
@@ -198,7 +198,7 @@ if(!check_function_exists("exec_db_query")) {
 		$sql_terms = explode(" ", $sql);
 		if($sql_terms[0] == "insert") {
 			$stmt = get_db_stmt($sql);
-			if(count($bind) > 0) {
+			if(check_array_length($bind, 0) == 1) {
 				$is_insert_with_bind = true;
 			}
 		} else {
@@ -222,7 +222,7 @@ if(!check_function_exists("exec_db_query")) {
 
 		if($display_error) {
 			$error_info = $stmt->errorInfo();
-			if(count($error_info) > 0) {
+			if(check_array_length($error_info, 0) == 1) {
 				set_error(implode(" ", $error_info), "DATABASE-ERROR");
 			}
 			show_errors(false);
@@ -293,7 +293,7 @@ if(!check_function_exists("exec_db_fetch")) {
 		}
 		$rows = exec_db_fetch_all($sql, $bind);
 
-		if(count($rows) > $start) {
+		if(check_array_length($rows, $start) == 1) {
 			$idx = 0;
 			foreach($rows as $row) {
 				if($idx >= $start) {
@@ -381,7 +381,7 @@ if(!check_function_exists("get_bind_to_sql_select")) {
 		// s1: select fields
 		$s1 = "";
 		if(!array_key_empty("fieldnames", $options)) {
-			$s1 .= (count($options['fieldnames']) > 0) ? implode(", ", $options['fieldnames']) : "*";
+			$s1 .= (check_array_length($options['fieldnames'], 0) == 1 ? implode(", ", $options['fieldnames']) : "*");
 		} elseif(array_key_equals("getcnt", $options, true)) {
 			$s1 .= "count(*) as cnt";
 		} elseif(!array_key_empty("getsum", $options)) {
@@ -425,15 +425,15 @@ if(!check_function_exists("get_bind_to_sql_select")) {
 				foreach($options['setwheres'] as $opts) {
 					if(check_is_string_not_array($opts)) {
 						$s3 .= sprintf(" and (%s)", $opts);
-					} elseif(count($opts) == 3 && is_array($opts[2])) {
+					} elseif(check_array_length($opts, 3) == 0 && is_array($opts[2])) {
 						$s3 .= sprintf(" %s (%s)", $opts[0], get_db_binded_sql($opts[1], $opts[2]));
-					} elseif(count($opts) == 2 && is_array($opts[1])) {
+					} elseif(check_array_length($opts, 2) == 0 && is_array($opts[1])) {
 						if($opts[1][1] == "like") {
 							$s3 .= sprintf(" %s (%s like %s)", $opts[0], $s1a[$opts[1][0]], "'%{$opts[1][2]}%'");
 						} else {
 							$s3 .= sprintf(" %s (%s %s '%s')", $opts[0], $opts[1][0], $opts[1][1], $opts[1][2]);
 						}
-					} elseif(count($opts) == 2) {
+					} elseif(check_array_length($opts, 2) == 0) {
 						$s3 .= sprintf(" %s (%s)", $opts[0], $opts[1]);
 					}
 				}