From: Vincent <vincent@enhydra.fr>
Date: Tue, 3 Nov 2020 07:59:09 +0000 (+0100)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=effb2fdecf485830ccf238b1b8082326d629bc31;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8156e3e..7628581 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +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$/config/settings.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/settings.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/ecomode.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ecomode.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -899,14 +899,7 @@
       <workItem from="1603958541180" duration="5032000" />
       <workItem from="1604042543878" duration="11137000" />
       <workItem from="1604152329376" duration="42646000" />
-      <workItem from="1604347943058" duration="3877000" />
-    </task>
-    <task id="LOCAL-00318" summary=".">
-      <created>1585669021651</created>
-      <option name="number" value="00318" />
-      <option name="presentableId" value="LOCAL-00318" />
-      <option name="project" value="LOCAL" />
-      <updated>1585669021651</updated>
+      <workItem from="1604347943058" duration="4570000" />
     </task>
     <task id="LOCAL-00319" summary=".">
       <created>1585899396649</created>
@@ -1244,7 +1237,14 @@
       <option name="project" value="LOCAL" />
       <updated>1604387168423</updated>
     </task>
-    <option name="localTasksCounter" value="367" />
+    <task id="LOCAL-00367" summary=".">
+      <created>1604389791156</created>
+      <option name="number" value="00367" />
+      <option name="presentableId" value="LOCAL-00367" />
+      <option name="project" value="LOCAL" />
+      <updated>1604389791157</updated>
+    </task>
+    <option name="localTasksCounter" value="368" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1294,21 +1294,21 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604387115667">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604389742372">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1604307637401" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1602171117745" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1604387115667" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1604389742372" />
     <state x="635" y="216" key="FileChooserDialogImpl" timestamp="1604227698339">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="635" y="216" key="FileChooserDialogImpl/0.0.1707.920@0.0.1707.920" timestamp="1604227698339" />
-    <state x="743" y="392" key="NewPhpFileDialog" timestamp="1604238041494">
-      <screen x="0" y="0" width="1707" height="920" />
+    <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1604390075365">
+      <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="743" y="392" key="NewPhpFileDialog/0.0.1707.920@0.0.1707.920" timestamp="1604238041494" />
-    <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1603958673068" />
+    <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1604390075365" />
     <state x="781" y="165" key="SettingsEditor" timestamp="1596008871908">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1321,11 +1321,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="295" y="0" width="1290" height="907" key="dock-window-1/0.0.2560.1040@0.0.2560.1040" timestamp="1603274697406" />
-    <state x="651" y="227" width="550" height="534" key="find.popup" timestamp="1604301949692">
-      <screen x="0" y="0" width="1707" height="920" />
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1604389892117">
+      <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="651" y="227" width="550" height="534" key="find.popup/0.0.1707.920@0.0.1707.920" timestamp="1604301949692" />
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1603559077781" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1604389892117" />
     <state x="512" y="211" key="run.anything.popup" timestamp="1604146410464">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
diff --git a/config/settings.php b/config/settings.php
index f5b637a..cfd1046 100644
--- a/config/settings.php
+++ b/config/settings.php
@@ -20,6 +20,7 @@ $shortcuts['settings'] = [
     ['type' => 'action', 'action' => 'close', 'label' => 'Fermer'],
     ['type' => 'action', 'action' => 'reload', 'label' => 'Recharger'],
     ['type' => 'action', 'action' => 'reboot', 'label' => 'Reboot'],
+    ['type' => 'url', 'href' => '/scripts/ecomode.php?action=fix', 'label' => 'Réparer scènes']
 ];
 
 if (in_array(getCurrentConfig(), $simple)) {
diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 1310b22..5ca5e3a 100644
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -71,10 +71,7 @@ function cronInsteon($cronmin)
 function cronEcoMode($cronmin)
 {
     _logSection('Ecomode');
-    $ecomode = (int)getEcoMode();
-    $scenes = [0 => 'off', 1 => 'on', 2 => 'super'];
-
-    execScene('ecomode/' . $scenes[$ecomode]);
+    ecoMode(null);
 }
 
 function cronTranscode($cronmin)
diff --git a/scripts/ecomode.php b/scripts/ecomode.php
index b6ea01b..27adc5d 100644
--- a/scripts/ecomode.php
+++ b/scripts/ecomode.php
@@ -3,6 +3,10 @@ require_once "import.php";
 if (isset($_GET['action'])) {
     if ($_GET['action'] = 'disablesuper') {
         disableSuperEcoMode();
+    } else if ($_GET['action'] == 'fix') {
+        ecoMode(null, true);
+        header('/');
+        exit;
     }
 } else {
     heartbeat();
diff --git a/scripts/lib/ecomode.php b/scripts/lib/ecomode.php
index ca88c74..8de82b5 100644
--- a/scripts/lib/ecomode.php
+++ b/scripts/lib/ecomode.php
@@ -1,12 +1,13 @@
 <?php
-function ecoMode($mode)
+function ecoMode($mode = null, $force = false)
 {
-
-    setState('ecomode', $mode);
+    if (null !== $mode) {
+        setState('ecomode', $mode);
+    }
     $mode = getEcoMode();
 
     $currentMode = getState('triggeredEcomode', '0');
-    if ($mode == $currentMode) {
+    if (!$force && $mode == $currentMode) {
         return;
     }
     getState('triggeredEcomode', $mode);