Bugfixes und Caching wie besprochen verändert

3 files changed, 9 insertions, 4 deletions

diff --git a/modules-available/locationinfo/inc/coursebackend.inc.php b/modules-available/locationinfo/inc/coursebackend.inc.php
index e21cbac3..47eb73f4 100644
--- a/modules-available/locationinfo/inc/coursebackend.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend.inc.php
@@ -136,10 +136,10 @@ abstract class CourseBackend
                 
             }
             //Check if we should refresh other rooms recently requested by front ends
-            if ($this->getCacheTime()>0) {
+            if ($this->getCacheTime()>0&&$this->RefreshTime()>0) {
                     $dbquery4 = Database::simpleQuery("SELECT locationid ,serverroomid, lastcalenderupdate FROM location_info WHERE serverid= :id", array('id' => $this->serverID));
                     foreach($dbquery4->fetchAll(PDO::FETCH_COLUMN) as $row){
-                        if($row['lastcalenderupdate']<$this->getRefreshTime()){
+                        if(strtotime($row['lastcalenderupdate'])>strtotime("-".$this->getRefreshTime()."seconds")&&strtotime($row['lastcalenderupdate'])> strtotime("-".$this->getCacheTime()."seconds")){
                             $sroomIDs[$row['locationid']] = $row['serverroomid'];
                             }
                     }
diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
index 3bb17e88..8180f9da 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
@@ -8,7 +8,7 @@ class Coursebackend_Davinci extends CourseBackend {
         $this->location = $location."/daVinciIS.dll?";
         $this->serverID = $serverID;
     }
-    public function setCredentials($param) {
+    public function setCredentials($json,$location,$serverID) {
         //Davinci doesn't have credentials
     }
     public function getCredentials(){
diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
index 01b476fb..461e24c2 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_hisinone.inc.php
@@ -287,4 +287,9 @@ class CourseBackend_HisInOne extends CourseBackend
         return $DateArray;
     }
 
-}
\ No newline at end of file
+}
+
+
+$client = CourseBackend_HisInOne();
+$login = ['username'=> 'test','password'=>'test!','role'=>'SOAP'];
+$client->setCredentials();
\ No newline at end of file