diff --git a/application/RaspberryDisplay/RaspberryDisplayController.php b/application/RaspberryDisplay/RaspberryDisplayController.php index e3f20ce30..949a0ac5e 100644 --- a/application/RaspberryDisplay/RaspberryDisplayController.php +++ b/application/RaspberryDisplay/RaspberryDisplayController.php @@ -60,10 +60,9 @@ class RaspberryDisplayController extends mfBaseController } protected function getConfig() { - $ip = $_SERVER['REMOTE_ADDR']; $hostname = $this->request->hostname; - $displays = RaspberryDisplayModel::getByHostnameAndIp($hostname, $ip); + $displays = RaspberryDisplayModel::getByHostname($hostname); if ($displays === null) { die("No display found for this hostname and ip:" . $hostname . " X " . $ip); @@ -82,7 +81,7 @@ class RaspberryDisplayController extends mfBaseController protected function apiAction() { $do = $this->request->do; - if (!$this->me->is("employee") && !in_array($do, ["getDisplays", "change", "reboot"])) { + if ($do !== "getConfig" && !$this->me->is("employee")) { $this->redirect("dashboard"); } diff --git a/application/RaspberryDisplay/RaspberryDisplayModel.php b/application/RaspberryDisplay/RaspberryDisplayModel.php index 2ec6a4ee9..d96b40655 100644 --- a/application/RaspberryDisplay/RaspberryDisplayModel.php +++ b/application/RaspberryDisplay/RaspberryDisplayModel.php @@ -29,11 +29,11 @@ class RaspberryDisplayModel return null; } - public static function getByHostnameAndIp($hostname, $ip) + public static function getByHostname($hostname) { $db = FronkDB::singleton(); - $res = $db->select("RaspberryDisplay", "*", "hostname = '$hostname' AND ip_address = '$ip'"); + $res = $db->select("RaspberryDisplay", "*", "hostname = '$hostname'"); //fetch 2 rows if ($db->num_rows($res)) {