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

FIX #934 shorten with leading number breaks api

Browse Source
This commit is contained in:
Ulrich Block 2016-10-03 19:23:47 +02:00
parent a34ac452d9
commit 0fc92c6670
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stuff/api/api_gserver.php
View File

@ -584,7 +584,7 @@ if (!isset($success['false']) and array_value_exists('action', 'add', $data) and
$homeDirLabel = $data['home_label'];
}
if ($quotaActive == 'Y' and isset($data['hdd']) and $data['hdd'] != $row['hdd']) {
if ($quotaActive == 'Y' and isset($data['hdd']) and strlen($data['hdd']) > 0 and $data['hdd'] != $row['hdd']) {
$updateArray[] = $data['hdd'];
$eventualUpdate .= ',`hdd`=?';
$hdd = $data['hdd'];

16
stuff/api/api_list.php
View File

@ -72,12 +72,12 @@ if (array_value_exists('action', 'ls', $data)) {
if (!isset($listLimit) or in_array('gameServer', $listLimit)) {
$query = $sql->prepare("SELECT r.`id`,r.`ip`,r.`description`,r.`altips`,r.`maxslots`,r.`maxserver`,r.`maxserver`-COUNT(g.`id`) AS `freeserver`,COUNT(g.`id`) AS `installedserver`,r.`active` AS `hostactive`,r.`resellerid` AS `resellerid`,(r.`maxslots`-SUM(g.`slots`)) AS `leftslots`,SUM(g.`slots`) AS `installedslots` FROM `rserverdata` r LEFT JOIN `gsswitch` g ON g.`rootID`=r.`id` GROUP BY r.`id` HAVING ((`freeserver` > 0 OR `freeserver` IS NULL) AND (`leftslots`>0 OR `leftslots` IS NULL) AND `hostactive`='Y' AND `resellerid`=?) ORDER BY `freeserver` DESC");
$query2 = $sql->prepare("SELECT t.`shorten`,t.`description` FROM `rservermasterg` AS r INNER JOIN `servertypes` AS t ON r.`servertypeid` = t.`id` WHERE r.`serverid`=?");
$query->execute(array($resellerID));
if ($apiType == 'xml' and isset($key) and isset($element)) {
$query = $sql->prepare("SELECT r.`id`,r.`ip`,r.`description`,r.`altips`,r.`maxslots`,r.`maxserver`,r.`maxserver`-COUNT(g.`id`) AS `freeserver`,COUNT(g.`id`) AS `installedserver`,r.`active` AS `hostactive`,r.`resellerid` AS `resellerid`,(r.`maxslots`-SUM(g.`slots`)) AS `leftslots`,SUM(g.`slots`) AS `installedslots` FROM `rserverdata` r LEFT JOIN `gsswitch` g ON g.`rootID`=r.`id` GROUP BY r.`id` HAVING ((`freeserver` > 0 OR `freeserver` IS NULL) AND (`leftslots`>0 OR `leftslots` IS NULL) AND `hostactive`='Y' AND `resellerid`=?) ORDER BY `freeserver` DESC");
$query2 = $sql->prepare("SELECT t.`shorten`,t.`description` FROM `rservermasterg` AS r INNER JOIN `servertypes` AS t ON r.`servertypeid` = t.`id` WHERE r.`serverid`=?");
$query->execute(array($resellerID));
while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
$listRootServerXML = $responsexml->createElement('gameServer');
@ -116,7 +116,13 @@ if (array_value_exists('action', 'ls', $data)) {
$query2->execute(array($row['id']));
while ($row2 = $query2->fetch(PDO::FETCH_ASSOC)) {
$listShortenXML = $responsexml->createElement($row2['shorten'], $row2['description']);
if (is_numeric(substr($row2['shorten'], 0, 1))) {
$listShortenXML = $responsexml->createElement('hide_numeric_' . $row2['shorten'], $row2['description']);
} else {
$listShortenXML = $responsexml->createElement($row2['shorten'], $row2['description']);
}
$listServerXML->appendChild($listShortenXML);
}