From e67a90f3dfa7630bdc5702126f62786fc79bf009 Mon Sep 17 00:00:00 2001
From: Ulrich Block <ulblock@gmx.de>
Date: Mon, 15 Feb 2016 20:02:52 +0100
Subject: [PATCH] All GS of root are restarted if one master type updated #727

---
 web/get_password.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/get_password.php b/web/get_password.php
index f6e0c113..d42ab44c 100644
--- a/web/get_password.php
+++ b/web/get_password.php
@@ -52,7 +52,7 @@ $ip = $ui->ip('REMOTE_ADDR', 'server');
 
 if ($ui->st('w', 'get') == 'ms' and $ui->username('shorten', 50, 'get')) {
 
-	$query = $sql->prepare("SELECT r.`id`,r.`serverid`,r.`resellerid`,r.`installing`,r.`updating`,d.`resellerid` AS `userid`,s.`steamVersion`,r.`localVersion` FROM `rservermasterg` r INNER JOIN `rserverdata` d ON r.`serverid`=d.`id` INNER JOIN `servertypes` s ON r.`servertypeid`=s.`id` WHERE s.`shorten`=? AND (d.`ip`=? OR d.`altips` LIKE ?) LIMIT 1");
+	$query = $sql->prepare("SELECT r.`id`,r.`serverid`,r.`resellerid`,r.`installing`,r.`updating`,r.`servertypeid`,d.`resellerid` AS `userid`,s.`steamVersion`,r.`localVersion` FROM `rservermasterg` r INNER JOIN `rserverdata` d ON r.`serverid`=d.`id` INNER JOIN `servertypes` s ON r.`servertypeid`=s.`id` WHERE s.`shorten`=? AND (d.`ip`=? OR d.`altips` LIKE ?) LIMIT 1");
 	$query->execute(array($ui->username('shorten', 50, 'get'), $ip, '%' . $ip . '%'));
 
 	while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
@@ -67,8 +67,8 @@ if ($ui->st('w', 'get') == 'ms' and $ui->username('shorten', 50, 'get')) {
 
             if ($query2->rowCount() > 0) {
 
-                $query2 = $sql->prepare("SELECT `id`,`userid`,CONCAT(`serverip`,':',`port`) AS `name` FROM `gsswitch` WHERE `rootID`=? AND `active`='Y' AND `stopped`='N' AND `updateRestart`='Y'");
-                $query2->execute(array($row['serverid']));
+                $query2 = $sql->prepare("SELECT g.`id`,g.`userid`,CONCAT(g.`serverip`,':',g.`port`) AS `name` FROM `gsswitch` AS g INNER JOIN `serverlist` AS s ON g.`serverid`=s.`id` WHERE g.`rootID`=? AND s.`servertype`=? AND g.`active`='Y' AND g.`stopped`='N' AND g.`updateRestart`='Y'");
+                $query2->execute(array($row['serverid'], $row['servertypeid']));
                 while ($row2 = $query2->fetch(PDO::FETCH_ASSOC)) {
 
                     $query3 = $sql->prepare("UPDATE `gsswitch` SET `jobPending`='Y' WHERE `id`=? AND `resellerid`=? LIMIT 1");