[roomplanner] Refactor to use runmode

2 files changed, 47 insertions, 9 deletions

diff --git a/modules-available/statistics/inc/machine.inc.php b/modules-available/statistics/inc/machine.inc.php
index 8cb5e884..8605749b 100644
--- a/modules-available/statistics/inc/machine.inc.php
+++ b/modules-available/statistics/inc/machine.inc.php
@@ -51,6 +51,11 @@ class Machine
 	public $logintime;
 
 	/**
+	 * @var string state of machine (OFFLINE, IDLE, OCCUPIED, STANDBY)
+	 */
+	public $state;
+
+	/**
 	 * @var string json data of position inside room (if any), null/empty otherwise
 	 */
 	public $position;
diff --git a/modules-available/statistics/inc/statistics.inc.php b/modules-available/statistics/inc/statistics.inc.php
index 1c9ebf07..2500f16f 100644
--- a/modules-available/statistics/inc/statistics.inc.php
+++ b/modules-available/statistics/inc/statistics.inc.php
@@ -7,17 +7,12 @@ class Statistics
 
 	private static $machineFields = false;
 
-	/**
-	 * @param string $machineuuid
-	 * @param int $returnData
-	 * @return \Machine|false
-	 */
-	public static function getMachine($machineuuid, $returnData)
+	private static function initFields($returnData)
 	{
 		if (self::$machineFields === false) {
 			$r = new ReflectionClass('Machine');
 			$props = $r->getProperties(ReflectionProperty::IS_PUBLIC);
-			self::$machineFields = array_flip(array_map(function($e) { return $e->getName(); }, $props));
+			self::$machineFields = array_flip(array_map(function(/* @var ReflectionProperty $e */ $e) { return $e->getName(); }, $props));
 		}
 		if ($returnData === Machine::NO_DATA) {
 			unset(self::$machineFields['data']);
@@ -26,8 +21,19 @@ class Statistics
 		} else {
 			Util::traceError('Invalid $returnData option passed');
 		}
-		$fields = implode(',', array_keys(self::$machineFields));
-		$row = Database::queryFirst("SELECT * FROM machine WHERE machineuuid = :machineuuid", compact('machineuuid'));
+		return implode(',', array_keys(self::$machineFields));
+	}
+
+	/**
+	 * @param string $machineuuid
+	 * @param int $returnData What kind of data to return Machine::NO_DATA, Machine::RAW_DATA, ...
+	 * @return \Machine|false
+	 */
+	public static function getMachine($machineuuid, $returnData)
+	{
+		$fields = self::initFields($returnData);
+
+		$row = Database::queryFirst("SELECT $fields FROM machine WHERE machineuuid = :machineuuid", compact('machineuuid'));
 		if ($row === false)
 			return false;
 		$m = new Machine();
@@ -37,4 +43,31 @@ class Statistics
 		return $m;
 	}
 
+	/**
+	 * @param string $ip
+	 * @param int $returnData What kind of data to return Machine::NO_DATA, Machine::RAW_DATA, ...
+	 * @param string $sort something like 'lastseen ASC' - not sanitized, don't pass user input!
+	 * @return \Machine[] list of matches
+	 */
+	public static function getMachinesByIp($ip, $returnData, $sort = false)
+	{
+		$fields = self::initFields($returnData);
+
+		if ($sort === false) {
+			$sort = '';
+		} else {
+			$sort = "ORDER BY $sort";
+		}
+		$res = Database::simpleQuery("SELECT $fields FROM machine WHERE clientip = :ip $sort", compact('ip'));
+		$list = array();
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$m = new Machine();
+			foreach ($row as $key => $val) {
+				$m->{$key} = $val;
+			}
+			$list[] = $m;
+		}
+		return $list;
+	}
+
 }