From 0085d9309252fc1eec276b6eb05f271a140bee5d Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 13 Jun 2017 18:32:23 +0200 Subject: [locationinfo] slxadmin part done, todo: frontend+api --- modules-available/locationinfo/api.inc.php | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'modules-available/locationinfo/api.inc.php') diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 644f990b..34c2a41a 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -230,7 +230,7 @@ function getConfig($locationID) LEFT JOIN `locationinfo_locationconfig` AS li ON (l.locationid = li.locationid) WHERE l.locationid = :locationID", array('locationID' => $locationID)); - $config = defaultConfig(); + $config = LocationInfo::defaultPanelConfig(); if ($dbresult !== false) { if (!empty($dbresult['config'])) { @@ -247,29 +247,6 @@ function getConfig($locationID) return $config; } -/** - * Creates and returns a default config for room that didn't saved a config yet. - * - * @return array Return a default config. - */ -function defaultConfig() -{ - return array( - 'language' => 'en', - 'mode' => 1, - 'vertical' => false, - 'eco' => false, - 'scaledaysauto' => true, - 'daystoshow' => 7, - 'rotation' => 0, - 'scale' => 50, - 'switchtime' => 20, - 'calupdate' => 30, - 'roomupdate' => 5, - 'configupdate' => 180, - ); -} - /** * Gets the pc states of the given locations. * -- cgit v1.2.3-55-g7522