Merge branch 'stable-3.1'

Author: Marius Burkard

server/lib/classes/db_mysql.inc.php

@@ -554,21 +554,24 @@ public function diffrec($record_old, $record_new) {
 
 	public function getDatabaseSize($database_name) {
 		global $app;
+		
 		include 'lib/mysql_clientdb.conf';
+		
 		/* Connect to the database */
 		$link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
 		if (!$link) {
 			$app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG);
 			return;
 		}
+		
 		/* Get database-size from information_schema */
-		$result=mysqli_query("SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".mysqli_real_escape_string($database_name)."';", $link);
-		$this->close;
-		if (!$result) {
-			$app->log('Unable to get the database-size'.mysqli_error($link), LOGLEVEL_DEBUG);
+		$result = mysqli_query($link, "SELECT SUM(data_length+index_length) FROM information_schema.TABLES WHERE table_schema='".mysqli_real_escape_string($link, $database_name)."'");
+		if(!$result) {
+			$app->log('Unable to get the database-size for ' . $database_name . ': '.mysqli_error($link), LOGLEVEL_DEBUG);
 			return;
 		}
 		$database_size = mysqli_fetch_row($result);
+		mysqli_close($link);
 		return $database_size[0];
 	}