API: Calendar rework.

1 files changed, 1 insertions, 29 deletions

diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 6a9fae42..b7a3f570 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -374,10 +374,7 @@ class Page_LocationInfo extends Page
 			die('Unauthorized');
 		}
 		$action = Request::any('action');
-		if ($action === 'pcsubtable') {
-			$id = Request::any('id', 0, 'int');
-			$this->ajaxShowLocation($id);
-		} elseif ($action === 'timetable') {
+		if ($action === 'timetable') {
 			$id = Request::any('id', 0, 'int');
 			$this->ajaxTimeTable($id);
 		} elseif ($action === 'config') {
@@ -389,31 +386,6 @@ class Page_LocationInfo extends Page
 		}
 	}
 
-//TODO REMOVE FUNCTION. NOT NECCESSARY BUT AFTER TESTING pcSTATE
-	private function ajaxShowLocation($id)
-	{
-		$dbquery = Database::simpleQuery("SELECT machineuuid, clientip, position, logintime, lastseen, lastboot  FROM `machine` WHERE locationid = :id", array('id' => $id));
-
-		$data = array();
-
-		while($dbdata=$dbquery->fetch(PDO::FETCH_ASSOC)) {
-			$pc = array();
-			$pc['id'] = $dbdata['machineuuid'];
-			$pc['ip'] = $dbdata['clientip'];
-			$pc['pcState'] = LocationInfo::getPcState($dbdata);
-
-			$position = json_decode($dbdata['position'], true);
-			$pc['x'] = $position['gridRow'];
-			$pc['y'] = $position['gridCol'];
-
-			$data[] = $pc;
-		}
-
-		echo Render::parse('pcsubtable', array(
-			'list' => array_values($data)
-		));
-	}
-
 	private function ajaxCredentials($id) {
 		$dbresult = Database::queryFirst('SELECT servertype, credentials FROM `setting_location_info` WHERE serverid = :id', array('id' => $id));
 		$tmpcredentialArray = json_decode($dbresult['credentials'], true);