Various undefined variables generate errors within database.php

[ddb4github]

1. missed global $config
2. typo '$k' to '$key'

--- lib/database.php	2019-04-03 19:13:09.383859716 +0800
+++ lib/database.php	2019-04-08 01:00:51.986580645 +0800
@@ -642,7 +642,7 @@
    @param $log - whether to log error messages, defaults to true
    @returns - (bool) the output of the sql query as a single variable */
 function db_index_exists($table, $index, $log = true, $db_conn = false) {
-	global $database_log;
+	global $database_log, $config;
 	if (!isset($database_log)) {
 		$database_log = false;
 	}
@@ -670,7 +670,7 @@
    @param $log - whether to log error messages, defaults to true
    @returns - (bool) the output of the sql query as a single variable */
 function db_index_matches($table, $index, $columns, $log = true, $db_conn = false) {
-	global $database_log;
+	global $database_log, $config;
 	if (!isset($database_log)) {
 		$database_log = false;
 	}
@@ -924,7 +924,7 @@
 					$del = array_diff($index, $k['columns']);
 					if (!empty($add) || !empty($del)) {
 						if (!db_execute("ALTER TABLE `$table` DROP INDEX `$n`", $log, $db_conn) ||
-						    !db_execute("ALTER TABLE `$table` ADD INDEX `$n` (" . $k['name'] . '` (' . db_format_index_create($key['columns']) . ')', $log, $db_conn)) {
+						    !db_execute("ALTER TABLE `$table` ADD INDEX `$n` (" . $k['name'] . '` (' . db_format_index_create($k['columns']) . ')', $log, $db_conn)) {
 							return false;
 						}
 					}
@@ -944,7 +944,7 @@
 	if (isset($data['keys'])) {
 		foreach ($data['keys'] as $k) {
 			if (!isset($allindexes[$k['name']])) {
-				if (!db_execute("ALTER TABLE `$table` ADD INDEX `" . $k['name'] . '` (' . db_format_index_create($key['columns']) . ')', $log, $db_conn)) {
+				if (!db_execute("ALTER TABLE `$table` ADD INDEX `" . $k['name'] . '` (' . db_format_index_create($k['columns']) . ')', $log, $db_conn)) {
 					return false;
 				}
 			}

[cigamit]

Good catch. Resolved.