fixed code indention

2 files changed, 25 insertions, 1 deletions

diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
index 79a9ae0331..7dea1e249b 100644
--- a/scripts/decode_bug.php
+++ b/scripts/decode_bug.php
@@ -80,7 +80,7 @@ if (!empty($_POST) && isset($_POST['bug_encoded'])) {
 }
 
 if (!empty($bug_encoded)) {
-    if (get_magic_quotes_gpc()) {
+    if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
         $bug_encoded = stripslashes($bug_encoded);
     }
 
diff --git a/scripts/setup.php b/scripts/setup.php
index 43cfed9f68..93cab08d95 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -1382,6 +1382,30 @@ switch ($action) {
                     message('error', 'Empty phpMyAdmin control user password while using pmadb!');
                     $err = TRUE;
                 }
+                /* Check whether we can connect as control user */
+                if (!empty($new_server['controluser']) && !empty($new_server['controlpass'])) {
+                    if ($new_server['extension'] == 'mysql') {
+                        $socket = empty($new_server['socket']) || $new_server['connect_type'] == 'tcp' ? '' : ':' . $new_server['socket'];
+                        $port = empty($new_server['port']) || $new_server['connect_type'] == 'socket' ? '' : ':' . $new_server['port'];
+                        $conn = @mysql_connect($new_server['host'] . $socket . $port, $new_server['controluser'], $new_server['controlpass']);
+                        if ($conn === FALSE) {
+                            message('error', 'Could not connect as control user!');
+                            $err = TRUE;
+                        } else {
+                            mysql_close($conn);
+                        }
+                    } else { 
+                        $socket = empty($new_server['socket']) || $new_server['connect_type'] == 'tcp' ? NULL : $new_server['socket'];
+                        $port = empty($new_server['port']) || $new_server['connect_type'] == 'socket' ? NULL : $new_server['port'];
+                        $conn = @mysqli_connect($new_server['host'], $new_server['controluser'], $new_server['controlpass'], NULL, $port, $socket);
+                        if ($conn === FALSE) {
+                            message('error', 'Could not connect as control user!');
+                            $err = TRUE;
+                        } else {
+                            mysqli_close($conn);
+                        }
+                    }
+                }
             } else {
                 message('warning', 'You didn\'t set phpMyAdmin database, so you can not use all phpMyAdmin features.');
             }