summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.idea/php.xml5
-rw-r--r--modules-available/locationinfo/page.inc.php8
2 files changed, 12 insertions, 1 deletions
diff --git a/.idea/php.xml b/.idea/php.xml
index cd67c36e..2a5958c5 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpProjectSharedConfiguration" php_language_level="5.4.0" />
+ <component name="PhpUnit">
+ <phpunit_settings>
+ <PhpUnitSettings load_method="CUSTOM_LOADER" />
+ </phpunit_settings>
+ </component>
</project> \ No newline at end of file
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index effe07da..a03d6f1c 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -79,9 +79,15 @@ class Page_LocationInfo extends Page
$result['rotation'] = Request::post('rotation', 0, 'int');
$result['scale'] = Request::post('scale', 50, 'int');
$result['switchtime'] = Request::post('switchtime', 20, 'int');
- $result['calupdate'] = Request::post('calupdate', 30, 'int');
+ $result['calupdate'] = Request::post('calupdate', 120, 'int');
$result['roomupdate'] = Request::post('roomupdate', 30, 'int');
$result['configupdate'] = Request::post('configupdate', 180, 'int');
+ if ($result['roomupdate'] < 30) {
+ $result['roomupdate'] = 30;
+ }
+ if ($result['calupdate'] < 120) {
+ $result['calupdate'] = 120;
+ }
$serverid = Request::post('serverid', 0, 'int');
$serverlocationid = Request::post('serverlocationid', '', 'string');