From 7f1d6822a3c17c8660705112494fe689e81b0403 Mon Sep 17 00:00:00 2001 From: Lacrimosa99 Date: Fri, 21 Jun 2019 22:47:16 +0200 Subject: [PATCH] Revert "#1166" MySQL add database dropdown not working. --- stuff/admin/mysql_db.php | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/stuff/admin/mysql_db.php b/stuff/admin/mysql_db.php index 264545ed..aff3b3ae 100644 --- a/stuff/admin/mysql_db.php +++ b/stuff/admin/mysql_db.php @@ -238,10 +238,10 @@ if ($ui->st('d', 'get') == 'ad' or $ui->st('d', 'get') == 'md') { $table = getUserList($resellerLockupID); $table2 = array(); - $query = $sql->prepare("SELECT s.`id`,s.`ip`,s.`description`(s.`max_databases`/100)*COUNT(d.`id`) AS `usedpercent` FROM `mysql_external_servers` s LEFT JOIN `mysql_external_dbs` d ON s.`id`=d.`sid` WHERE s.`active`='Y' AND s.`resellerid`=? GROUP BY s.`id`,s.`ip` HAVING `usedpercent`<100 ORDER BY `usedpercent` ASC"); + $query = $sql->prepare("SELECT s.`id`,s.`ip`,(s.`max_databases`/100)*COUNT(d.`id`) AS `usedpercent` FROM `mysql_external_servers` s LEFT JOIN `mysql_external_dbs` d ON s.`id`=d.`sid` WHERE s.`active`='Y' AND s.`resellerid`=? GROUP BY s.`id`,s.`ip` HAVING `usedpercent`<100 ORDER BY `usedpercent` ASC"); $query->execute(array($reseller_id)); while ($row = $query->fetch(PDO::FETCH_ASSOC)) { - $table2[$row['id']] = ($row['description'] != null and $row['description'] != '') ? $row['ip'] . ' ' . $row['description'] : $row['ip']; + $table2[$row['id']] = $row['ip']; } $template_file = 'admin_mysql_db_add.tpl'; @@ -249,22 +249,21 @@ if ($ui->st('d', 'get') == 'ad' or $ui->st('d', 'get') == 'md') { // Gather data for modding in case we have an ID and define mod template } else if ($ui->st('d', 'get') == 'md' and $id) { - $query = $sql->prepare("SELECT e.*,AES_DECRYPT(e.`password`,?) AS `decryptedpassword`,s.`ip`,s.`description` AS `descriptionmserver`,u.`cname`,CONCAT(u.`vname`,' ',u.`name`) AS `full_name` FROM `mysql_external_dbs` AS e LEFT JOIN `mysql_external_servers` s ON e.`sid`=s.`id` LEFT JOIN `userdata` u ON e.`uid`=u.`id` WHERE e.`id`=? AND e.`resellerid`=? LIMIT 1"); + $query = $sql->prepare("SELECT e.*,AES_DECRYPT(e.`password`,?) AS `decryptedpassword`,s.`ip`,u.`cname`,CONCAT(u.`vname`,' ',u.`name`) AS `full_name` FROM `mysql_external_dbs` AS e LEFT JOIN `mysql_external_servers` s ON e.`sid`=s.`id` LEFT JOIN `userdata` u ON e.`uid`=u.`id` WHERE e.`id`=? AND e.`resellerid`=? LIMIT 1"); $query->execute(array($aeskey, $id, $resellerLockupID)); while ($row = $query->fetch(PDO::FETCH_ASSOC)) { - $externalID = $row['externalID']; - $ip = $row['ip']; - $manage_host_table = $row['manage_host_table']; - $ips = $row['ips']; - $active = $row['active']; - $description = $row['description']; - $descriptionmserver = $row['descriptionmserver']; - $dbName = $row['dbname']; - $password = $row['decryptedpassword']; + $externalID = $row['externalID']; + $ip = $row['ip']; + $manage_host_table = $row['manage_host_table']; + $ips = $row['ips']; + $active = $row['active']; + $description = $row['description']; + $dbName = $row['dbname']; + $password = $row['decryptedpassword']; - $userName = trim($row['cname'] . ' ' . $row['full_name']); - $table2[$row['sid']] = ($row['descriptionmserver'] != null and $row['descriptionmserver'] != '') ? $row['ip'] . ' ' . $row['descriptionmserver'] : $row['ip']; + $userName = trim($row['cname'] . ' ' . $row['full_name']); + $table2[$row['sid']] = $row['ip']; } // Check if database entry exists and if not display 404 page @@ -352,4 +351,4 @@ if ($ui->st('d', 'get') == 'ad' or $ui->st('d', 'get') == 'md') { configureDateTables('-1', '1, "asc"', 'ajax.php?w=datatable&d=mysqldb'); $template_file = 'admin_mysql_db_list.tpl'; -} +} \ No newline at end of file