diff options
9 files changed, 98 insertions, 227 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 412b20bf..8bf93b46 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -9,63 +9,63 @@ function HandleParameters() { $getAction = Request::get('action', 0, 'string'); - if ($getAction == "roominfo") { - $roomIDs = Request::get('id', 0, 'string'); - $array = filterIdList($roomIDs); + if ($getAction == "locationinfo") { + $locationIds = Request::get('id', 0, 'string'); + $array = filterIdList($locationIds); $getCoords = Request::get('coords', 0, 'string'); if (empty($getCoords)) { $getCoords = '0'; } - echo getRoomInfo($array, $getCoords); + echo getLocationInfo($array, $getCoords); } elseif ($getAction == "openingtime") { - $roomIDs = Request::get('id', 0, 'string'); - $array = filterIdList($roomIDs); + $locationIds = Request::get('id', 0, 'string'); + $array = filterIdList($locationIds); echo getOpeningTime($array); } elseif ($getAction == "config") { - $getRoomID = Request::get('id', 0, 'int'); - getConfig($getRoomID); + $locationId = Request::get('id', 0, 'int'); + getConfig($locationId); } elseif ($getAction == "pcstates") { - $roomIDs = Request::get('id', 0, 'string'); - $array = filterIdList($roomIDs); + $locationIds = Request::get('id', 0, 'string'); + $array = filterIdList($locationIds); echo getPcStates($array); - } elseif ($getAction == "roomtree") { - $roomIDs = Request::get('id', 0, 'string'); - $array = filterIdList($roomIDs); - echo getRoomTree($array); + } elseif ($getAction == "locationtree") { + $locationIds = Request::get('id', 0, 'string'); + $array = filterIdList($locationIds); + echo getLocationTree($array); } elseif ($getAction == "calendar") { - $roomIDs = Request::get('id', 0, 'string'); - $array = filterIdList($roomIDs); + $locationIds = Request::get('id', 0, 'string'); + $array = filterIdList($locationIds); echo getCalendar($array); } } /** - * Filters the id list. Removes Double / non-int / hidden rooms. + * Filters the id list. Removes Double / non-int / hidden locations. * - * @param $roomids Array of the room ids. - * @return array The filtered array of the room ids. + * @param string $locationIds comma separated list of location ids + * @return array The filtered array of the location ids. */ -function filterIdList($roomids) +function filterIdList($locationIds) { - $idList = explode(',', $roomids); + $idList = explode(',', $locationIds); $filteredIdList = array_filter($idList, 'is_numeric'); $filteredIdList = array_unique($filteredIdList); - $filteredIdList = filterHiddenRoom($filteredIdList); + $filteredIdList = filterHiddenLocations($filteredIdList); return $filteredIdList; } /** - * Filters the hidden rooms from an array. + * Filters the hidden locations from an array. * * @param $idArray Id list * @return array Filtered id list */ -function filterHiddenRoom($idArray) +function filterHiddenLocations($idArray) { $filteredArray = array(); if (!empty($idArray)) { - $query = "SELECT locationid, hidden FROM `location_info` WHERE locationid IN ("; + $query = "SELECT locationid, hidden FROM `locationinfo_locationconfig` WHERE locationid IN ("; $query .= implode(",", $idArray); $query .= ")"; @@ -81,15 +81,15 @@ function filterHiddenRoom($idArray) return $filteredArray; } -// ########## <Roominfo> ########## +// ########## <Locationinfo> ########## /** - * Gets the room info of the given rooms. + * Gets the location info of the given locations. * * @param $idList Array list of ids. * @param bool $coords Defines if coords should be included or not. - * @return string Roominfo JSON + * @return string location info, formatted as JSON */ -function getRoomInfo($idList, $coords = false) +function getLocationInfo($idList, $coords = false) { $coordinates = (string)$coords; @@ -97,7 +97,7 @@ function getRoomInfo($idList, $coords = false) if (!empty($idList)) { // Build SQL Query for multiple ids. - $query = "SELECT l.locationid, m.machineuuid, m.position, m.logintime, m.lastseen, m.lastboot FROM location_info AS l + $query = "SELECT l.locationid, m.machineuuid, m.position, m.logintime, m.lastseen, m.lastboot FROM locationinfo_locationconfig AS l LEFT JOIN `machine` AS m ON l.locationid = m.locationid WHERE l.hidden = 0 AND l.locationid IN ("; $query .= implode(",", $idList); @@ -142,7 +142,7 @@ function getRoomInfo($idList, $coords = false) return json_encode(array_values($dbresult), true); } -// ########## </Roominfo> ########### +// ########## </Locationinfo> ########### // ########## <Openingtime> ########## /** @@ -164,7 +164,7 @@ function getOpeningTime($idList) return '[]'; $openingTimes = array(); $qs = '?' . str_repeat(',?', count($allIds) - 1); - $res = Database::simpleQuery("SELECT locationid, openingtime FROM location_info WHERE locationid IN ($qs)", + $res = Database::simpleQuery("SELECT locationid, openingtime FROM locationinfo_locationconfig WHERE locationid IN ($qs)", array_values($allIds)); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { $openingTimes[(int)$row['locationid']] = $row['openingtime']; @@ -238,9 +238,9 @@ function formatOpeningtime($openingtime) */ function getConfig($locationID) { - $dbresult = Database::queryFirst("SELECT l.locationname, li.config, li.serverroomid, s.servertype FROM `location_info` AS li + $dbresult = Database::queryFirst("SELECT l.locationname, li.config, li.serverlocationid, s.servertype FROM `locationinfo_locationconfig` AS li RIGHT JOIN `location` AS l ON l.locationid=li.locationid - LEFT JOIN `setting_location_info` AS s ON s.serverid=li.serverid + LEFT JOIN `locationinfo_coursebackend` AS s ON s.serverid=li.serverid WHERE l.locationid=:locationID", array('locationID' => $locationID)); $config = array(); @@ -294,15 +294,15 @@ function getPcStates($idList) { $pcStates = array(); - $roominfoList = json_decode(getRoomInfo($idList), true); - foreach ($roominfoList as $roomInfo) { - $result['id'] = $roomInfo['id']; + $locationInfoList = json_decode(getLocationInfo($idList), true); + foreach ($locationInfoList as $locationInfo) { + $result['id'] = $locationInfo['id']; $idle = 0; $occupied = 0; $off = 0; $broken = 0; - foreach ($roomInfo['computer'] as $computer) { + foreach ($locationInfo['computer'] as $computer) { if ($computer['pcState'] == "IDLE") { $idle++; } elseif ($computer['pcState'] == "OCCUPIED") { @@ -324,27 +324,27 @@ function getPcStates($idList) } /** - * Gets the room tree of the given locations. + * Gets the location tree of the given locations. * * @param int[] $idList Array list of the locations. - * @return string Room tree JSON. + * @return string location tree data as JSON. */ -function getRoomTree($idList) +function getLocationTree($idList) { $locations = Location::getTree(); - $ret = findRooms($locations, $idList); + $ret = findLocations($locations, $idList); return json_encode($ret); } -function findRooms($locations, $idList) +function findLocations($locations, $idList) { $ret = array(); foreach ($locations as $location) { if (in_array($location['locationid'], $idList)) { $ret[] = $location; } elseif (!empty($location['children'])) { - $ret = array_merge($ret, findRooms($location['children'], $idList)); + $ret = array_merge($ret, findLocations($location['children'], $idList)); } } return $ret; @@ -364,9 +364,9 @@ function getCalendar($idList) if (!empty($idList)) { // Build SQL query for multiple ids. $qs = '?' . str_repeat(',?', count($idList) - 1); - $query = "SELECT l.locationid, l.serverid, l.serverroomid, s.servertype, s.credentials - FROM `location_info` AS l - INNER JOIN setting_location_info AS s ON (s.serverid = l.serverid) + $query = "SELECT l.locationid, l.serverid, l.serverlocationid, s.servertype, s.credentials + FROM `locationinfo_locationconfig` AS l + INNER JOIN locationinfo_coursebackend AS s ON (s.serverid = l.serverid) WHERE l.hidden = 0 AND l.locationid IN ($qs) ORDER BY s.servertype ASC"; @@ -390,7 +390,7 @@ function getCalendar($idList) if ($serverInstance === false) { EventLog::warning('Cannot fetch schedule for locationid ' . $server['locationid'] . ': Backend type ' . $server['type'] . ' unknown. Disabling location.'); - Database::exec("UPDATE location_info SET serverid = 0 WHERE locationid = :lid", + Database::exec("UPDATE locationinfo_locationconfig SET serverid = 0 WHERE locationid = :lid", array('lid' => $server['locationid'])); continue; } diff --git a/modules-available/locationinfo/frontend/doorsign.html b/modules-available/locationinfo/frontend/doorsign.html index 7017fe0b..a703cce3 100755 --- a/modules-available/locationinfo/frontend/doorsign.html +++ b/modules-available/locationinfo/frontend/doorsign.html @@ -1339,7 +1339,7 @@ optional: */ function preInitRoom(room) { - $.getJSON("../../../api.php?do=locationinfo&action=roominfo&id=" + room.id + "&coords=1", function (result) { + $.getJSON("../../../api.php?do=locationinfo&action=locationinfo&id=" + room.id + "&coords=1", function (result) { generateRoomLayoutDiv((100 - room.config.scale) + "%", room); if (result[0] == null) { @@ -1552,7 +1552,7 @@ optional: */ function queryRooms(ids) { $.ajax({ - url: "../../../api.php?do=locationinfo&action=roominfo&id=" + ids + "&coords=0", + url: "../../../api.php?do=locationinfo&action=locationinfo&id=" + ids + "&coords=0", dataType: 'json', cache: false, timeout: 30000, diff --git a/modules-available/locationinfo/frontend/panel.html b/modules-available/locationinfo/frontend/panel.html index cd4db81f..bd22408e 100644 --- a/modules-available/locationinfo/frontend/panel.html +++ b/modules-available/locationinfo/frontend/panel.html @@ -143,7 +143,7 @@ function init() { var ids = getUrlParameter("id"); - $.getJSON("../../../api.php?do=locationinfo&action=roomtree&id=" + ids, function (result) { + $.getJSON("../../../api.php?do=locationinfo&action=locationtree&id=" + ids, function (result) { generateLayout(result); setInterval(update, 1000); diff --git a/modules-available/locationinfo/inc/coursebackend.inc.php b/modules-available/locationinfo/inc/coursebackend.inc.php index 0ce9424d..3e95a170 100644 --- a/modules-available/locationinfo/inc/coursebackend.inc.php +++ b/modules-available/locationinfo/inc/coursebackend.inc.php @@ -146,8 +146,8 @@ abstract class CourseBackend if (empty($requestedLocationIds)) return array(); $NOW = time(); - $dbquery1 = Database::simpleQuery("SELECT locationid, calendar, serverroomid, lastcalendarupdate - FROM location_info WHERE locationid IN (:locations)", + $dbquery1 = Database::simpleQuery("SELECT locationid, calendar, serverlocationid, lastcalendarupdate + FROM locationinfo_locationconfig WHERE locationid IN (:locations)", array('locations' => array_values($requestedLocationIds))); $returnValue = []; $remoteIds = []; @@ -156,7 +156,7 @@ abstract class CourseBackend if ($row['lastcalendarupdate'] + $this->getCacheTime() > $NOW) { $returnValue[$row['locationid']] = json_decode($row['calendar']); } else { - $remoteIds[$row['locationid']] = $row['serverroomid']; + $remoteIds[$row['locationid']] = $row['serverlocationid']; } } @@ -166,8 +166,8 @@ abstract class CourseBackend } // Check if we should refresh other rooms recently requested by front ends if ($this->getRefreshTime() > $this->getCacheTime()) { - $dbquery4 = Database::simpleQuery("SELECT locationid, serverroomid FROM location_info - WHERE serverid = :serverid AND serverroomid NOT IN (:skiplist) + $dbquery4 = Database::simpleQuery("SELECT locationid, serverlocationid FROM locationinfo_locationconfig + WHERE serverid = :serverid AND serverlocationid NOT IN (:skiplist) AND lastcalendarupdate BETWEEN :lowerage AND :upperage LIMIT " . self::MAX_ADDIDIONAL_LOCATIONS, array( 'serverid' => $this->serverId, @@ -176,7 +176,7 @@ abstract class CourseBackend 'upperage' => $NOW - $this->getCacheTime(), )); while ($row = $dbquery4->fetch(PDO::FETCH_ASSOC)) { - $remoteIds[$row['locationid']] = $row['serverroomid']; + $remoteIds[$row['locationid']] = $row['serverlocationid']; } } $backendResponse = $this->fetchSchedulesInternal($remoteIds); @@ -188,10 +188,10 @@ abstract class CourseBackend // Caching requested by backend, write to DB foreach ($backendResponse as $serverRoomId => $calendar) { $value = json_encode($calendar); - Database::simpleQuery("UPDATE location_info SET calendar = :ttable, lastcalendarupdate = :now - WHERE serverid = :serverid AND serverroomid = :serverroomid", array( + Database::simpleQuery("UPDATE locationinfo_locationconfig SET calendar = :ttable, lastcalendarupdate = :now + WHERE serverid = :serverid AND serverlocationid = :serverlocationid", array( 'serverid' => $this->serverId, - 'serverroomid' => $serverRoomId, + 'serverlocationid' => $serverRoomId, 'ttable' => $value, 'now' => $NOW )); diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php index 7617d143..6b13ad9a 100644 --- a/modules-available/locationinfo/inc/locationinfo.inc.php +++ b/modules-available/locationinfo/inc/locationinfo.inc.php @@ -45,7 +45,7 @@ class LocationInfo public static function setServerError($serverId, $message) { if ($message === false || $message === null) { - Database::exec("UPDATE `setting_location_info` SET error = NULL + Database::exec("UPDATE `locationinfo_coursebackend` SET error = NULL WHERE serverid = :id", array('id' => $serverId)); } else { if (empty($message)) { @@ -55,7 +55,7 @@ class LocationInfo 'timestamp' => time(), 'error' => (string)$message )); - Database::exec("UPDATE `setting_location_info` SET error = :error + Database::exec("UPDATE `locationinfo_coursebackend` SET error = :error WHERE serverid = :id", array('id' => $serverId, 'error' => $error)); } } diff --git a/modules-available/locationinfo/install.inc.php b/modules-available/locationinfo/install.inc.php index 659dec8f..9cab652a 100644 --- a/modules-available/locationinfo/install.inc.php +++ b/modules-available/locationinfo/install.inc.php @@ -3,159 +3,30 @@ $res = array(); // TODO: serverid NULL, constraint to serverlist on delete set NULL -$res[] = tableCreate('location_info', ' - `locationid` INT(11) NOT NULL, +$res[] = tableCreate('locationinfo_locationconfig', ' + `locationid` INT(10) UNSIGNED NOT NULL, `serverid` INT(11) NOT NULL, - `serverroomid` VARCHAR(2000), + `serverlocationid` VARCHAR(150), `hidden` BOOLEAN NOT NULL DEFAULT 0, - `openingtime` VARCHAR(2000), - `config` VARCHAR(2000), - `calendar` VARCHAR(2000), + `openingtime` BLOB, + `config` BLOB, + `calendar` BLOB, `lastcalendarupdate` INT(11) NOT NULL DEFAULT 0, PRIMARY KEY (`locationid`) '); // TODO: KEY `servername` (`servername`) -$res[] = tableCreate('setting_location_info', ' - `serverid` int(10) NOT NULL AUTO_INCREMENT, - `servername` VARCHAR(2000) NOT NULL, - `serverurl` VARCHAR(2000) NOT NULL, +$res[] = tableCreate('locationinfo_coursebackend', ' + `serverid` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `servername` VARCHAR(200) NOT NULL, `servertype` VARCHAR(100) NOT NULL, - `credentials` VARCHAR(2000), - `error` VARCHAR(2000), + `credentials` BLOB, + `error` VARCHAR(1000), PRIMARY KEY (`serverid`) '); // Create response for browser -if (!tableHasColumn('setting_location_info', 'credentials')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` ADD `credentials` VARCHAR(2000) AFTER `servertype`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding column credentials failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (!tableHasColumn('setting_location_info', 'error')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` ADD `error` VARCHAR(2000) AFTER `credentials`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding column error failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableHasColumn('setting_location_info', 'login')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` DROP COLUMN login"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Dropping column login failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableHasColumn('setting_location_info', 'passwd')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` DROP COLUMN passwd"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Dropping column passwd failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableHasColumn('location_info', 'serverroomid')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY serverroomid VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column serverroomid failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableHasColumn('location_info', 'openingtime')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY openingtime VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column openingtime failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableHasColumn('location_info', 'config')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY config VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column config failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableHasColumn('location_info', 'calendar')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY calendar VARCHAR(2000)"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column calendar failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableHasColumn('location_info', 'lastcalendarupdate')) { - $ret = Database::exec("ALTER TABLE `location_info` MODIFY lastcalendarupdate INT(11) NOT NULL DEFAULT 0"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Updateing column lastcalendarupdate failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (tableExists('locationinfo')) { - $ret = Database::exec("DROP TABLE `locationinfo`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Droping table locationinfo failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (!tableHasColumn('location_info', 'config')) { - $ret = Database::exec("ALTER TABLE `location_info` ADD `config` VARCHAR(2000) NOT NULL DEFAULT '' AFTER `openingtime`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding config to location_info failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (!tableHasColumn('location_info', 'calendar')) { - $ret = Database::exec("ALTER TABLE `location_info` ADD `calendar` VARCHAR(2000) NOT NULL DEFAULT '' AFTER `config`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding calendar to location_info failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (!tableHasColumn('location_info', 'serverid')) { - $ret = Database::exec("ALTER TABLE `location_info` ADD `serverid` INT(11) NOT NULL AFTER `locationid`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding serverid to location_info failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (!tableHasColumn('location_info', 'serverroomid')) { - $ret = Database::exec("ALTER TABLE `location_info` ADD `serverroomid` INT(11) NOT NULL AFTER `serverid`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding serverroomid to location_info failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (!tableHasColumn('location_info', 'lastcalendarupdate')) { - $ret = Database::exec("ALTER TABLE `location_info` ADD `lastcalendarupdate` INT(11) NOT NULL AFTER `calendar`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding lastcalendarupdate to location_info failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - -if (!tableHasColumn('setting_location_info', 'servername')) { - $ret = Database::exec("ALTER TABLE `setting_location_info` ADD `servername` VARCHAR(2000) NOT NULL AFTER `serverid`"); - if ($ret === false) { - finalResponse(UPDATE_FAILED, 'Adding servername to setting_location_info failed: ' . Database::lastError()); - } - $res[] = UPDATE_DONE; -} - if (in_array(UPDATE_DONE, $res)) { finalResponse(UPDATE_DONE, 'Tables created successfully'); } diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index bec605ce..effe07da 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -55,7 +55,7 @@ class Page_LocationInfo extends Page Messages::addError('server-id-missing'); return; } - Database::exec("DELETE FROM `setting_location_info` WHERE serverid=:id", array('id' => $id)); + Database::exec("DELETE FROM `locationinfo_coursebackend` WHERE serverid=:id", array('id' => $id)); } /** @@ -83,16 +83,16 @@ class Page_LocationInfo extends Page $result['roomupdate'] = Request::post('roomupdate', 30, 'int'); $result['configupdate'] = Request::post('configupdate', 180, 'int'); $serverid = Request::post('serverid', 0, 'int'); - $serverroomid = Request::post('serverroomid', '', 'string'); + $serverlocationid = Request::post('serverlocationid', '', 'string'); - Database::exec("INSERT INTO `location_info` (locationid, serverid, serverroomid, config, lastcalendarupdate) - VALUES (:id, :serverid, :serverroomid, :config, 0) + Database::exec("INSERT INTO `locationinfo_locationconfig` (locationid, serverid, serverlocationid, config, lastcalendarupdate) + VALUES (:id, :serverid, :serverlocationid, :config, 0) ON DUPLICATE KEY UPDATE config = VALUES(config), serverid = VALUES(serverid), - serverroomid = VALUES(serverroomid), lastcalendarupdate = 0", array( + serverlocationid = VALUES(serverlocationid), lastcalendarupdate = 0", array( 'id' => $locationid, 'config' => json_encode($result), 'serverid' => $serverid, - 'serverroomid' => $serverroomid, + 'serverlocationid' => $serverlocationid, )); Message::addSuccess('config-saved'); @@ -128,12 +128,12 @@ class Page_LocationInfo extends Page 'credentials' => json_encode($credentialsJson) ); if ($serverid === 0) { - Database::exec('INSERT INTO `setting_location_info` (servername, servertype, credentials) + Database::exec('INSERT INTO `locationinfo_coursebackend` (servername, servertype, credentials) VALUES (:name, :type, :credentials)', $params); $this->checkConnection(Database::lastInsertId()); } else { $params['id'] = $serverid; - Database::exec('UPDATE `setting_location_info` + Database::exec('UPDATE `locationinfo_coursebackend` SET servername = :name, servertype = :type, credentials = :credentials WHERE serverid = :id', $params); $this->checkConnection($serverid); @@ -158,7 +158,7 @@ class Page_LocationInfo extends Page $deleteCounter = 0; if (!$easyMode) { - $resulttmp = Database::queryFirst("SELECT openingtime FROM `location_info` WHERE locationid = :id", array('id' => $locationid)); + $resulttmp = Database::queryFirst("SELECT openingtime FROM `locationinfo_locationconfig` WHERE locationid = :id", array('id' => $locationid)); if ($resulttmp !== false) { $resulttmp = json_decode($resulttmp['openingtime'], true); } @@ -218,7 +218,7 @@ class Page_LocationInfo extends Page } } - Database::exec("INSERT INTO `location_info` (locationid, openingtime) + Database::exec("INSERT INTO `locationinfo_locationconfig` (locationid, openingtime) VALUES (:id, :openingtime) ON DUPLICATE KEY UPDATE openingtime = VALUES(openingtime)", array('id' => $locationid, 'openingtime' => json_encode($result))); @@ -258,7 +258,7 @@ class Page_LocationInfo extends Page //} } - Database::exec("INSERT INTO `location_info` (locationid, openingtime) + Database::exec("INSERT INTO `locationinfo_locationconfig` (locationid, openingtime) VALUES (:id, :openingtime) ON DUPLICATE KEY UPDATE openingtime = VALUES(openingtime)", array('id' => $locationid, 'openingtime' => json_encode($result))); @@ -279,7 +279,7 @@ class Page_LocationInfo extends Page } $dbresult = Database::queryFirst("SELECT servertype, credentials - FROM `setting_location_info` + FROM `locationinfo_coursebackend` WHERE serverid = :serverid", array('serverid' => $serverid)); $serverInstance = CourseBackend::getInstance($dbresult['servertype']); @@ -322,17 +322,17 @@ class Page_LocationInfo extends Page $params[] = $hidden; $return[] = array('locationid' => $child, 'hidden' => $hidden); } - Database::exec("INSERT INTO location_info (locationid, hidden) + Database::exec("INSERT INTO locationinfo_locationconfig (locationid, hidden) VALUES $qs ON DUPLICATE KEY UPDATE hidden = VALUES(hidden)", $params); // Handle parents - uncheck if not all children are checked while ($loc['parentlocationid'] != 0) { $stats = Database::queryFirst('SELECT Count(*) AS total, Sum(li.hidden > 0) AS hidecount FROM location l - LEFT JOIN location_info li USING (locationid) + LEFT JOIN locationinfo_locationconfig li USING (locationid) WHERE l.parentlocationid = :parent', array('parent' => $loc['parentlocationid'])); $hidden = ($stats['total'] == $stats['hidecount']) ? 1 : 0; $params = array('locationid' => $loc['parentlocationid'], 'hidden' => $hidden); - Database::exec('INSERT INTO location_info (locationid, hidden) + Database::exec('INSERT INTO locationinfo_locationconfig (locationid, hidden) VALUES (:locationid, :hidden) ON DUPLICATE KEY UPDATE hidden = VALUES(hidden)', $params); $return[] = $params; $loc = $locs[$loc['parentlocationid']]; @@ -348,7 +348,7 @@ class Page_LocationInfo extends Page $locations = Location::getLocations(0, 0, false, true); // Get hidden state of all locations - $dbquery = Database::simpleQuery("SELECT li.locationid, li.hidden FROM `location_info` AS li"); + $dbquery = Database::simpleQuery("SELECT li.locationid, li.hidden FROM `locationinfo_locationconfig` AS li"); while ($row = $dbquery->fetch(PDO::FETCH_ASSOC)) { $locid = (int)$row['locationid']; @@ -365,7 +365,7 @@ class Page_LocationInfo extends Page // Get the Serverlist from the DB and make it mustache accessable $serverlist = array(); - $dbquery2 = Database::simpleQuery("SELECT * FROM `setting_location_info`"); + $dbquery2 = Database::simpleQuery("SELECT * FROM `locationinfo_coursebackend`"); while ($row = $dbquery2->fetch(PDO::FETCH_ASSOC)) { if (isset($servertypes[$row['servertype']])) { $row['typename'] = $servertypes[$row['servertype']]; @@ -438,7 +438,7 @@ class Page_LocationInfo extends Page private function ajaxServerSettings($id) { $dbresult = Database::queryFirst('SELECT servername, servertype, credentials - FROM `setting_location_info` WHERE serverid = :id', array('id' => $id)); + FROM `locationinfo_coursebackend` WHERE serverid = :id', array('id' => $id)); // Credentials stuff. $dbcredentials = json_decode($dbresult['credentials'], true); @@ -531,7 +531,7 @@ class Page_LocationInfo extends Page */ private function ajaxTimeTable($id) { - $row = Database::queryFirst("SELECT openingtime FROM `location_info` WHERE locationid = :id", array('id' => $id)); + $row = Database::queryFirst("SELECT openingtime FROM `locationinfo_locationconfig` WHERE locationid = :id", array('id' => $id)); if ($row !== false) { $openingtimes = json_decode($row['openingtime'], true); } @@ -589,7 +589,7 @@ class Page_LocationInfo extends Page private function ajaxLoadLocationConfig($id) { // Get Config data from db - $location = Database::queryFirst("SELECT config, serverid, serverroomid FROM `location_info` WHERE locationid = :id", array('id' => $id)); + $location = Database::queryFirst("SELECT config, serverid, serverlocationid FROM `locationinfo_locationconfig` WHERE locationid = :id", array('id' => $id)); if ($location === false) { die("Invalid location id: $id"); } @@ -597,7 +597,7 @@ class Page_LocationInfo extends Page $config = json_decode($location['config'], true); // TODO: Validate we got an array, fill with defaults otherwise // get Server / ID list - $dbq = Database::simpleQuery("SELECT serverid, servername FROM setting_location_info ORDER BY servername ASC"); + $dbq = Database::simpleQuery("SELECT serverid, servername FROM locationinfo_coursebackend ORDER BY servername ASC"); $serverList = array(); while ($row = $dbq->fetch(PDO::FETCH_ASSOC)) { if ($row['serverid'] == $location['serverid']) { @@ -628,7 +628,7 @@ class Page_LocationInfo extends Page 'configupdate' => $config['configupdate'], 'serverlist' => $serverList, 'serverid' => $location['serverid'], - 'serverroomid' => $location['serverroomid'] + 'serverlocationid' => $location['serverlocationid'] )); } diff --git a/modules-available/locationinfo/templates/config.html b/modules-available/locationinfo/templates/config.html index e97b72fc..cce63de1 100644 --- a/modules-available/locationinfo/templates/config.html +++ b/modules-available/locationinfo/templates/config.html @@ -36,7 +36,7 @@ <label>{{lang_roomId}}</label> </div> <div class="col-sm-7"> - <input class="form-control" name="serverroomid" id="serverroomid" value="{{serverroomid}}"> + <input class="form-control" name="serverlocationid" id="serverlocationid" value="{{serverlocationid}}"> </div> <div class="col-sm-2"> <a class="btn btn-default helptext" title="{{lang_roomIdTooltip}}"> diff --git a/modules-available/rebootcontrol/inc/rebootqueries.inc.php b/modules-available/rebootcontrol/inc/rebootqueries.inc.php index df3c13d8..62092748 100644 --- a/modules-available/rebootcontrol/inc/rebootqueries.inc.php +++ b/modules-available/rebootcontrol/inc/rebootqueries.inc.php @@ -36,8 +36,8 @@ class RebootQueries { if (empty($list)) return array(); - $qs = '?' . str_repeat(',?', count($list) - 1); - $res = Database::simpleQuery("SELECT machineuuid, clientip, locationid FROM machine WHERE machineuuid IN ($qs)", $list); + $res = Database::simpleQuery("SELECT machineuuid, clientip, locationid FROM machine + WHERE machineuuid IN (:list)", compact('list')); return $res->fetchAll(PDO::FETCH_ASSOC); } |