.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8f8e39252c0aaa69bbdde03e441d56d493b5f2ae..317c68bf7cd4a37e7b432041e3c99c6d7497935f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,10 @@
   <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/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/light.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/light.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1062,14 +1065,7 @@
       <workItem from="1649747856888" duration="2527000" />
       <workItem from="1649833630727" duration="738000" />
       <workItem from="1649835938314" duration="1458000" />
-      <workItem from="1649877396831" duration="699000" />
-    </task>
-    <task id="LOCAL-00473" summary=".">
-      <created>1619348281960</created>
-      <option name="number" value="00473" />
-      <option name="presentableId" value="LOCAL-00473" />
-      <option name="project" value="LOCAL" />
-      <updated>1619348281960</updated>
+      <workItem from="1649877396831" duration="1123000" />
     </task>
     <task id="LOCAL-00474" summary=".">
       <created>1619544331948</created>
@@ -1407,7 +1403,14 @@
       <option name="project" value="LOCAL" />
       <updated>1649837406909</updated>
     </task>
-    <option name="localTasksCounter" value="522" />
+    <task id="LOCAL-00522" summary=".">
+      <created>1649878144183</created>
+      <option name="number" value="00522" />
+      <option name="presentableId" value="LOCAL-00522" />
+      <option name="project" value="LOCAL" />
+      <updated>1649878144183</updated>
+    </task>
+    <option name="localTasksCounter" value="523" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index c8d337290cac3d0c3810b0bbf3112e00f4948dc4..8745543c3c8bd6da65944491e0bbe443a68c36b3 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -18,6 +18,10 @@ if (in_array($_GET['device'], $cubesalon)) {
 
 require_once "import.php";
 
+if (gloria()) {
+    die('0');
+}
+
 
 if ($_GET['device'] == 480) {
     chambreToggle();

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 39c270043109f19a97f96239898c3398d0c46376..6333dad475a5ff2b9ea017133fc9a31def39cec9 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -630,3 +630,13 @@ function makeNav($nav)
     $res .= '</ul></nav>';
     return $res;
 }
+
+function gloria()
+{
+    $j = intval(date('N'));
+    if ($j !== 4) {
+        return false;
+    }
+    $h = intval(date('H'));
+    return $h >= 11 && $h <= 16;
+}

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 1559974764cdcd506fe475b44c8df0bf318f4787..113a4adceeb4436ea319afbde90898f50f8207fb 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -674,7 +674,6 @@ $scenes = [
         ['type' => 'function', 'function' => 'stopAllSqueezebox'],
         ['type' => 'function', 'function' => 'offAllOMX'],
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/on'],
-        ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Stop All Sounds'],
         ['type' => 'scene', 'scene' => 'chambre/planetarium/off'],
         ['type' => 'scene', 'scene' => 'cuisine/coffee/off'],
         ['type' => 'scene', 'scene' => 'bureau/pc/shutdown'],

diff --git a/scripts/light.php b/scripts/light.php
index 5444bd5d31819996bcde7d45ce70fe39bab62203..51760419e372474964bb1ac2608f27e28c0b2346 100644 (file)
--- a/scripts/light.php
+++ b/scripts/light.php
@@ -2,6 +2,9 @@
 include "import.php";
 
 if (isset($_GET['scene'])) {
+    if ($_GET['scene'] == 'home/welcome/eco' && gloria()) {
+        $_GET['scene'] = 'home/welcome';
+    }
     execScene($_GET['scene'], true);
 } else if (isset($_GET['cheminee'])) {
     if ($_GET['cheminee'] == 'on') {