malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "#1166"

Browse Source 
MySQL add database dropdown not working.
This commit is contained in:
Lacrimosa99 2019-06-21 22:47:16 +02:00
parent 1e36cab4eb
commit 7f1d6822a3
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
stuff/admin/mysql_db.php
View File

@ -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