From cf27ae7e9decf8cfca9077c0477fcdfa1d4d935a Mon Sep 17 00:00:00 2001
From: Ulrich Block <ulblock@gmx.de>
Date: Sun, 20 Mar 2016 15:56:53 +0100
Subject: [PATCH] incorrect restart #772 + optinal GET args

Server restart when user is inactive #772
Support optional args as GET at statuscheck.php #774
---
 web/statuscheck.php              | 28 ++++++++++++++++++++++++----
 web/stuff/admin/voice_master.php |  1 -
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/web/statuscheck.php b/web/statuscheck.php
index 9ab91a83..d0a8f0d7 100644
--- a/web/statuscheck.php
+++ b/web/statuscheck.php
@@ -45,18 +45,21 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
     $timelimit = 600;
 }
 
+$checkTypesOfServer = array('gs', 'vs', 'vh', 'my', 'st');
+
 if (isset($argv)) {
 
     $args = array();
 
     foreach ($argv as $a) {
-        if ($a == 'gs' or $a == 'vs' or $a == 'vh' or $a == 'my' or $a == 'st') {
+        if (in_array($a, $checkTypesOfServer)) {
             $checkTypeOfServer = $a;
         } else if (is_numeric($a)) {
             $sleep = $a;
         } else {
 
             $e = explode(':', $a);
+
             if (isset($e[1])) {
                 $args[$e[0]] = $e[1];
             }
@@ -64,6 +67,22 @@ if (isset($argv)) {
     }
 }
 
+if (isset($_GET['checkTypeOfServer']) and in_array($_GET['checkTypeOfServer'], $checkTypesOfServer)) {
+    $checkTypeOfServer = $_GET['checkTypeOfServer'];
+}
+
+if (isset($_GET['sleep']) and is_numeric($_GET['sleep'])) {
+    $sleep = intval($_GET['sleep']);
+}
+
+if (isset($_GET['tsDebug']) and ($_GET['tsDebug'] == 1 or $_GET['tsDebug'] == 0)) {
+    $args['tsDebug'] = intval($_GET['tsDebug']);
+}
+
+if (isset($_GET['coolDown']) and is_numeric($_GET['coolDown'])) {
+    $args['coolDown'] = intval($_GET['coolDown']);
+}
+
 define('EASYWIDIR', dirname(__FILE__));
 
 include(EASYWIDIR . '/stuff/methods/vorlage.php');
@@ -203,7 +222,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
         $serverBatchV3Array = array();
         $allServersV3Array = array();
 
-        $query2 = $sql->prepare("SELECT g.`id`,g.`serverid`,g.`serverip`,g.`port`,g.`port2`,g.`port3`,g.`port4`,g.`port5`,t.`gameq`,t.`shorten`,t.`useQueryPort` FROM `gsswitch` g INNER JOIN `serverlist` s ON g.`serverid`=s.`id` INNER JOIN `servertypes` t ON s.`servertype`=t.`id` WHERE g.`rootID`=? AND g.`stopped`='N' AND g.`active`='Y'");
+        $query2 = $sql->prepare("SELECT g.`id`,g.`serverid`,g.`serverip`,g.`port`,g.`port2`,g.`port3`,g.`port4`,g.`port5`,t.`gameq`,t.`shorten`,t.`useQueryPort` FROM `gsswitch` g INNER JOIN `serverlist` s ON g.`serverid`=s.`id` INNER JOIN `servertypes` t ON s.`servertype`=t.`id` INNER JOIN `userdata` u ON u.`id`=g.`userid` WHERE g.`rootID`=? AND g.`stopped`='N' AND g.`active`='Y' AND u.`active`='Y'");
         $query = $sql->prepare("SELECT DISTINCT(`rootID`) AS `root_id` FROM `gsswitch` WHERE `active`='Y'");
         $query->execute();
         while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
@@ -901,7 +920,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
                             $vs = $server['virtualserver_status'];
                             $uptime = (isset($server['virtualserver_uptime'])) ? $server['virtualserver_uptime'] : 0;
 
-                            $vselect2 = $sql->prepare("SELECT * FROM `voice_server` WHERE `localserverid`=? AND `masterserver`=? AND `resellerid`=? LIMIT 1");
+                            $vselect2 = $sql->prepare("SELECT v.*,u.`active` AS `user_active` FROM `voice_server` AS v INNER JOIN `userdata` u ON u.`id`=v.`userid` WHERE v.`localserverid`=? AND v.`masterserver`=? AND v.`resellerid`=? LIMIT 1");
                             $vselect2->execute(array($virtualserver_id, $vrow['id'], $resellerid));
                             foreach ($vselect2->fetchall(PDO::FETCH_ASSOC) as $vrow2) {
                                 $autoRestart = $vrow2['autoRestart'];
@@ -923,6 +942,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
                                 $max_upload_total_bandwidth = $vrow2['max_upload_total_bandwidth'];
                                 $address = $vrow2['ip'] . ':' . $vrow2['port'];
                                 $active = $vrow2['active'];
+                                $userActive = $vrow2['user_active'];
                                 $notified = $vrow2['notified'];
                                 $olduptime = $vrow2['uptime'];
                                 $initialpassword = $vrow2['initialpassword'];
@@ -934,7 +954,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
                                 $newtraffic = $filetraffic;
                             }
 
-                            if (isset($ts3id) and $vs == 'online' and $active == 'N') {
+                            if (isset($ts3id) and $vs == 'online' and ($active == 'N' or $userActive == 'N')) {
 
                                 print "Inactive TS3 server $address running. Stopping it.\r\n";
                                 $connection->StopServer($virtualserver_id);
diff --git a/web/stuff/admin/voice_master.php b/web/stuff/admin/voice_master.php
index 724b109d..85b9964c 100644
--- a/web/stuff/admin/voice_master.php
+++ b/web/stuff/admin/voice_master.php
@@ -157,7 +157,6 @@ virtualserver_weblist_enabled 0 = Off';
         }
 
         $resellerToBeWritten = ($query->rowCount() > 0) ? $ui->id('managedForID', 10, 'post') : null;
-
     }
 
     $query = $sql->prepare("SELECT `id`,`ssh2ip`,`description` FROM `voice_tsdns` WHERE `active`='Y' AND `resellerid`=?");