From 50d168ab6bcf4af5ba08d1bf1ac320fba06a8d87 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 19 Sep 2016 22:13:33 +0200
Subject: [PATCH] Use more dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dbstructure.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/include/dbstructure.php b/include/dbstructure.php
index e7514872fd..0da209a366 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -17,6 +17,14 @@ function update_fail($update_id, $error_message){
 		$admin_mail_list
 	);
 
+	// No valid result?
+	if (!dbm::is_result($adminlist)) {
+		logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_WARNING);
+
+		// Don't continue
+		return;
+	}
+
 	// every admin could had different language
 
 	foreach ($adminlist as $admin) {
@@ -73,7 +81,7 @@ function table_structure($table) {
 	$fielddata = array();
 	$indexdata = array();
 
-	if (is_array($indexes))
+	if (dbm::is_result($indexes))
 		foreach ($indexes AS $index) {
 			if ($index["Index_type"] == "FULLTEXT")
 				continue;
@@ -85,7 +93,7 @@ function table_structure($table) {
 			$indexdata[$index["Key_name"]][] = $column;
 		}
 
-	if (is_array($structures)) {
+	if (dbm::is_result($structures)) {
 		foreach($structures AS $field) {
 			$fielddata[$field["Field"]]["type"] = $field["Type"];
 			if ($field["Null"] == "NO")
@@ -135,6 +143,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 	foreach ($tables AS $table) {
 		$table = current($table);
 
+		logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG);
 		$database[$table] = table_structure($table);
 	}
 
@@ -149,7 +158,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 		$sql3="";
 		if (!isset($database[$name])) {
 			$r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
-			if(false === $r) {
+			if(!dbm::is_result($r)) {
 				$errors .=  t('Errors encountered creating database tables.').$name.EOL;
 			}
 			$is_new_table = True;
@@ -226,7 +235,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 
 			if ($action) {
 				$r = @$db->q($sql3);
-				if(false === $r)
+				if(dbm::is_result($r))
 					$errors .= t('Errors encountered performing database changes.').$sql3.EOL;
 			}
 		}