.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1c44539eb579146dd2557ccb3b6e9c0d712540c0..9d9c4a6d612f30ae589d954972c82c2b64d208d6 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/weatherstation.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/weatherstation.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -766,13 +766,9 @@
       <workItem from="1574323616439" duration="14985000" />
       <workItem from="1575617000688" duration="1986000" />
       <workItem from="1575646996012" duration="72000" />
-    </task>
-    <task id="LOCAL-00202" summary=".">
-      <created>1565865380451</created>
-      <option name="number" value="00202" />
-      <option name="presentableId" value="LOCAL-00202" />
-      <option name="project" value="LOCAL" />
-      <updated>1565865380452</updated>
+      <workItem from="1575647085982" duration="668000" />
+      <workItem from="1576479934693" duration="252000" />
+      <workItem from="1576480199671" duration="1812000" />
     </task>
     <task id="LOCAL-00203" summary=".">
       <created>1565944175034</created>
@@ -1110,7 +1106,14 @@
       <option name="project" value="LOCAL" />
       <updated>1575617712738</updated>
     </task>
-    <option name="localTasksCounter" value="251" />
+    <task id="LOCAL-00251" summary=".">
+      <created>1575647196441</created>
+      <option name="number" value="00251" />
+      <option name="presentableId" value="LOCAL-00251" />
+      <option name="project" value="LOCAL" />
+      <updated>1575647196441</updated>
+    </task>
+    <option name="localTasksCounter" value="252" />
     <servers />
   </component>
   <component name="TodoView">
@@ -1166,15 +1169,24 @@
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="552" y="238" key="#Plugins/0.0.1920.1160@0.0.1920.1160" timestamp="1575647067016" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1575617704022">
+    <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1576479992407">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1575617704022" />
-    <state x="732" y="383" key="com.intellij.ide.util.TipDialog" timestamp="1575647093028">
+    <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576479992407" />
+    <state x="701" y="127" key="CommitChangelistDialog2" timestamp="1575647157027">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
+    <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1575617704022" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1576480418011">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1575617014990" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576480418011" />
+    <state x="976" y="257" width="607" height="526" key="find.popup" timestamp="1576492890263">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="976" y="257" width="607" height="526" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1576492890263" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 25986a490b7fe1d42058d640b3407bad129b4ce8..8b86b47f39ad3660a3e1aaf2e60453afe6f915c5 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -225,7 +225,7 @@ function checkSpottyLogin()
         $player = $squeezeboxPlayers['Cuisine'];
 
         $accounts = [
-            SQUEEZEBOX_SPOTIFY_USERNAME => SQUEEZEBOX_SPOTIFY_PASSWORD,
+            //SQUEEZEBOX_SPOTIFY_USERNAME => SQUEEZEBOX_SPOTIFY_PASSWORD,
             'v12l' => 'Lr8ka&7cs@fc%lW7',
             'jrme75009' => 'tortuga5009',
         ];

diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php
index 1e165972c8176ad9972369fdb2768fb1123ec928..2cdc2ed0bb77c0753781df5ac469f2a6752d7d1c 100644 (file)
--- a/scripts/lib/weatherstation.php
+++ b/scripts/lib/weatherstation.php
@@ -104,10 +104,10 @@ function accuweatherIcon($icon)
 
 function isDay()
 {
-    $time = time();
+    $time = new DateTime('now', new DateTimeZone('Europe/Paris'));
 
-    $sunrise = date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, LATITUDE, LONGITUDE);
-    $sunset = date_sunset($time, SUNFUNCS_RET_TIMESTAMP, LATITUDE, LONGITUDE);
+    $sunrise = date_sunrise($time->getTimestamp(), SUNFUNCS_RET_TIMESTAMP, LATITUDE, LONGITUDE, 90, $time->getOffset() / 3600);
+    $sunset = date_sunset($time->getTimestamp(), SUNFUNCS_RET_TIMESTAMP, LATITUDE, LONGITUDE, 90, $time->getOffset() / 3600);
 
     if ($time > $sunset && $sunrise < $sunset) {
         $sunrise += 3600 * 24;