Merge pull request #317 from xibosignage/develop

1.8.5 patch
xibosignage · Jan 30, 2018 · e074fbe · e074fbe
2 parents b737667 + 265341c
commit e074fbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/Helper/Session.php b/lib/Helper/Session.php
@@ -286,10 +286,15 @@ public function setUser($userId)
     public function regenerateSessionId()
     {
         //$this->log->debug('Session regenerate');
-
         session_regenerate_id(true);
 
         $this->key = session_id();
+
+        // PHP7 calls open/close on regenerate
+        // PHP5 does neither
+        if (version_compare(phpversion(), '7.0') === -1) {
+            $this->insertSession($this->key, '', time(), time() + $this->maxLifetime);
+        }
     }
 
     /**

diff --git a/lib/Widget/ForecastIo.php b/lib/Widget/ForecastIo.php
@@ -36,7 +36,7 @@
  */
 class ForecastIo extends ModuleWidget
 {
-    const API_ENDPOINT = 'https://api.darksky.net/forecast/player/';
+    const API_ENDPOINT = 'https://api.darksky.net/forecast/';
 
     private $resourceFolder;
     protected $codeSchemaVersion = 1;
@@ -46,7 +46,7 @@ class ForecastIo extends ModuleWidget
      */
     public function init()
     {
-        $this->resourceFolder = PROJECT_ROOT . '/modules/forecastio';
+        $this->resourceFolder = PROJECT_ROOT . '/modules/forecastio/player';
 
         // Initialise extra validation rules
         v::with('Xibo\\Validation\\Rules\\');