[statistics] Per-location usage stats; include active lecture count

2 files changed, 101 insertions, 67 deletions

diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index 2fbf1e84..ab1f2358 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -36,7 +36,7 @@ function HandleParameters()
 		$output = getLocationTree($locationIds);
 	} elseif ($get === "calendar") {
 		$locationIds = LocationInfo::getLocationsOr404($uuid);
-		$output = getCalendar($locationIds);
+		$output = LocationInfo::getCalendar($locationIds);
 	}
 	if ($output !== false) {
 		Header('Content-Type: application/json; charset=utf-8');
@@ -153,69 +153,3 @@ function findLocations($locations, $idList)
 	}
 	return $ret;
 }
-
-// ########## <Calendar> ###########
-/**
- * Gets the calendar of the given ids.
- *
- * @param int[] $idList list with the location ids.
- * @return array Calendar.
- */
-function getCalendar($idList)
-{
-	if (empty($idList))
-		return [];
-
-	// Build SQL query for multiple ids.
-	$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.locationid IN (:idlist)
-				ORDER BY s.servertype ASC";
-	$dbquery = Database::simpleQuery($query, array('idlist' => array_values($idList)));
-
-	$serverList = array();
-	foreach ($dbquery as $dbresult) {
-		if (!isset($serverList[$dbresult['serverid']])) {
-			$serverList[$dbresult['serverid']] = array(
-				'credentials' => (array)json_decode($dbresult['credentials'], true),
-				'type' => $dbresult['servertype'],
-				'idlist' => array()
-			);
-		}
-		$serverList[$dbresult['serverid']]['idlist'][] = $dbresult['locationid'];
-	}
-
-	$resultArray = array();
-	foreach ($serverList as $serverid => $server) {
-		$serverInstance = CourseBackend::getInstance($server['type']);
-		if ($serverInstance === false) {
-			EventLog::warning('Cannot fetch schedule for location (' . implode(', ', $server['idlist']) . ')'
-				. ': Backend type ' . $server['type'] . ' unknown. Disabling location.');
-			Database::exec("UPDATE locationinfo_locationconfig SET serverid = NULL WHERE locationid IN (:lid)",
-				array('lid' => $server['idlist']));
-			continue;
-		}
-		$credentialsOk = $serverInstance->setCredentials($serverid, $server['credentials']);
-
-		if ($credentialsOk) {
-			$calendarFromBackend = $serverInstance->fetchSchedule($server['idlist']);
-		} else {
-			$calendarFromBackend = array();
-		}
-
-		LocationInfo::setServerError($serverid, $serverInstance->getErrors());
-
-		if (is_array($calendarFromBackend)) {
-			foreach ($calendarFromBackend as $key => $value) {
-				$resultArray[] = array(
-					'id' => $key,
-					'calendar' => $value,
-				);
-			}
-		}
-	}
-	return $resultArray;
-}
-
-// ########## </Calendar> ##########
diff --git a/modules-available/locationinfo/inc/locationinfo.inc.php b/modules-available/locationinfo/inc/locationinfo.inc.php
index 9cc06f02..737f2275 100644
--- a/modules-available/locationinfo/inc/locationinfo.inc.php
+++ b/modules-available/locationinfo/inc/locationinfo.inc.php
@@ -134,4 +134,104 @@ class LocationInfo
 		return array();
 	}
 
+	/**
+	 * Gets the calendar of the given ids.
+	 *
+	 * @param int[] $idList list with the location ids.
+	 * @return array Calendar.
+	 */
+	public static function getCalendar(array $idList, bool $forceCached = false): array
+	{
+		if (empty($idList))
+			return [];
+
+		$resultArray = array();
+
+		if ($forceCached) {
+			$res = Database::simpleQuery("SELECT locationid, calendar FROM locationinfo_locationconfig
+					WHERE Length(calendar) > 10 AND lastcalendarupdate > UNIX_TIMESTAMP() - 86400*3");
+			foreach ($res as $row) {
+				$resultArray[] = [
+					'id' => (int)$row['locationid'],
+					'calendar' => json_decode($row['calendar'], true),
+				];
+			}
+			return $resultArray;
+		}
+
+		// Build SQL query for multiple ids.
+		$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.locationid IN (:idlist)
+				ORDER BY s.servertype ASC";
+		$dbquery = Database::simpleQuery($query, array('idlist' => array_values($idList)));
+
+		$serverList = array();
+		foreach ($dbquery as $dbresult) {
+			if (!isset($serverList[$dbresult['serverid']])) {
+				$serverList[$dbresult['serverid']] = array(
+					'credentials' => (array)json_decode($dbresult['credentials'], true),
+					'type' => $dbresult['servertype'],
+					'idlist' => array()
+				);
+			}
+			$serverList[$dbresult['serverid']]['idlist'][] = $dbresult['locationid'];
+		}
+
+		foreach ($serverList as $serverid => $server) {
+			$serverInstance = CourseBackend::getInstance($server['type']);
+			if ($serverInstance === false) {
+				EventLog::warning('Cannot fetch schedule for location (' . implode(', ', $server['idlist']) . ')'
+					. ': Backend type ' . $server['type'] . ' unknown. Disabling location.');
+				Database::exec("UPDATE locationinfo_locationconfig SET serverid = NULL WHERE locationid IN (:lid)",
+					array('lid' => $server['idlist']));
+				continue;
+			}
+			$credentialsOk = $serverInstance->setCredentials($serverid, $server['credentials']);
+
+			if ($credentialsOk) {
+				$calendarFromBackend = $serverInstance->fetchSchedule($server['idlist']);
+			} else {
+				$calendarFromBackend = array();
+			}
+
+			LocationInfo::setServerError($serverid, $serverInstance->getErrors());
+
+			if (is_array($calendarFromBackend)) {
+				foreach ($calendarFromBackend as $key => $value) {
+					$resultArray[] = array(
+						'id' => (int)$key,
+						'calendar' => $value,
+					);
+				}
+			}
+		}
+		return $resultArray;
+	}
+
+	public static function getAllCalendars(bool $forceCached): array
+	{
+		$locations = Database::queryColumnArray("SELECT locationid FROM location");
+		$calendars = [];
+		foreach (LocationInfo::getCalendar($locations, $forceCached) as $cal) {
+			if (empty($cal['calendar']))
+				continue;
+			$calendars[$cal['id']] = $cal['calendar'];
+		}
+		return $calendars;
+	}
+
+	public static function extractCurrentEvent(array $calendar): string
+	{
+		$NOW = time();
+		foreach ($calendar as $event) {
+			$start = strtotime($event['start']);
+			$end = strtotime($event['end']) + 60;
+			if ($NOW >= $start && $NOW <= $end)
+				return $event['title'];
+		}
+		return '';
+	}
+
 }