.

diff --git a/.idea/home.iml b/.idea/home.iml
index eeb712158e07070ad341bd7340d6975d7fd6f56b..a57de6e761934c0896b36f69325fd66e401c2508 100644 (file)
--- a/.idea/home.iml
+++ b/.idea/home.iml
@@ -46,6 +46,19 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-idn" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php72" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/deprecation-contracts" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation-contracts" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/inflector" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/voku/portable-ascii" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/support" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/contracts" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/macroable" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/collections" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/.idea/php.xml b/.idea/php.xml
index 416f651fa4f35aa5fec4d0c88584ac1723bcd639..8c805bdae031ad5780ad63c178c11287cd97c7e6 100644 (file)
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -78,50 +78,50 @@
       <path value="$PROJECT_DIR$/vendor/hoa/consistency" />
       <path value="$PROJECT_DIR$/vendor/hoa/eventsource" />
       <path value="$PROJECT_DIR$/vendor/woojean/php-redis-queue" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-exception" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-locale" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-xml" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zzarbi/synology" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/alphayax/freebox_api_php" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/alphayax/rest" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/composer" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/container-interop/container-interop" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/datto/json-rpc" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/datto/json-rpc-http" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/doctrine/cache" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/guzzle" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/promises" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/psr7" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/kevinrob/guzzle-cache-middleware" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/monolog/monolog" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/php-tmdb/api" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/http-message" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/log" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/rtheunissen/guzzle-log-middleware" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/sqmk/phue" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/event-dispatcher" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/options-resolver" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-db" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-escaper" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-http" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n-resources" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-loader" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-stdlib" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-uri" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-validator" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-cache" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/stream" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/protocol" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/http" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/exception" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/event" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/consistency" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/eventsource" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/woojean/php-redis-queue" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/contracts" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-exception" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-locale" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-xml" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zzarbi/synology" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/alphayax/freebox_api_php" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/alphayax/rest" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/composer" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/container-interop/container-interop" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/datto/json-rpc" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/datto/json-rpc-http" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/doctrine/cache" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/guzzlehttp/guzzle" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/guzzlehttp/promises" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/guzzlehttp/psr7" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/kevinrob/guzzle-cache-middleware" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/monolog/monolog" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/php-tmdb/api" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/psr/container" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/psr/http-message" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/psr/log" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/ralouphie/getallheaders" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/rtheunissen/guzzle-log-middleware" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/sqmk/phue" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/symfony/event-dispatcher" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/symfony/options-resolver" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-db" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-escaper" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-http" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n-resources" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-loader" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-stdlib" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-uri" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-validator" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-cache" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/stream" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/protocol" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/http" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/exception" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/event" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/consistency" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/eventsource" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/woojean/php-redis-queue" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
       <path value="$PROJECT_DIR$/vendor/predis/predis" />
@@ -131,6 +131,19 @@
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/support" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/contracts" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/macroable" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/collections" />
+      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.3" />

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f777a34b511f6c6a8df860d8a901253b15b9ae3d..549288a129b9f4e3265b323965cacbf2233eaca6 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,34 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change afterPath="$PROJECT_DIR$/install.md" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/scripts/lib/wol.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/scripts/wc.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/scripts/wol.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/home.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/home.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" 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/homeconnect.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/homeconnect.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/http.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/http.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/pc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/pc.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ssh.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/sleeppc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/sleeppc.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/rooms/medium/entree.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/rooms/originaux/entree.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/rooms/originaux/litjerome.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/rooms/originaux/litvincent.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/rooms/originaux/sdb.jpg" beforeDir="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/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.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/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/_startdaemon.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/_startdaemon.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/domoticz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/hue.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/hue.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/insteon.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/logcatb.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcatb.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/logcats.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcats.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/ssh.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/startdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/servers/startdaemon" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -79,6 +99,9 @@
     <auto-save>true</auto-save>
   </component>
   <component name="JupyterTrust" id="3f62eec0-7d7b-45be-bd97-06244d65817c" />
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.3">
     <include_path>
       <path value="$PROJECT_DIR$/vendor/composer" />
@@ -157,50 +180,50 @@
       <path value="$PROJECT_DIR$/vendor/hoa/consistency" />
       <path value="$PROJECT_DIR$/vendor/hoa/eventsource" />
       <path value="$PROJECT_DIR$/vendor/woojean/php-redis-queue" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-exception" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-locale" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-xml" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zzarbi/synology" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/alphayax/freebox_api_php" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/alphayax/rest" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/composer" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/container-interop/container-interop" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/datto/json-rpc" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/datto/json-rpc-http" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/doctrine/cache" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/guzzle" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/promises" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/psr7" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/kevinrob/guzzle-cache-middleware" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/monolog/monolog" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/php-tmdb/api" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/http-message" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/log" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/rtheunissen/guzzle-log-middleware" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/sqmk/phue" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/event-dispatcher" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/options-resolver" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-db" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-escaper" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-http" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n-resources" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-loader" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-stdlib" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-uri" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-validator" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-cache" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/stream" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/protocol" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/http" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/exception" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/event" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/consistency" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/eventsource" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/woojean/php-redis-queue" />
-      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/contracts" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-exception" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-locale" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-xml" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zzarbi/synology" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/alphayax/freebox_api_php" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/alphayax/rest" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/composer" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/container-interop/container-interop" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/datto/json-rpc" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/datto/json-rpc-http" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/doctrine/cache" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/guzzlehttp/guzzle" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/guzzlehttp/promises" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/guzzlehttp/psr7" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/kevinrob/guzzle-cache-middleware" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/monolog/monolog" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/php-tmdb/api" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/psr/container" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/psr/http-message" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/psr/log" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/ralouphie/getallheaders" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/rtheunissen/guzzle-log-middleware" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/sqmk/phue" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/symfony/event-dispatcher" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/symfony/options-resolver" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-db" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-escaper" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-http" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n-resources" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-loader" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-stdlib" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-uri" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zendframework/zend-validator" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/zf1/zend-cache" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/stream" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/protocol" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/http" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/exception" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/event" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/consistency" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/hoa/eventsource" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/woojean/php-redis-queue" />
+      <path value="$USER_HOME$/CloudStation/Drive/Works/home/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
       <path value="$PROJECT_DIR$/vendor/predis/predis" />
@@ -210,6 +233,19 @@
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/support" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/contracts" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/macroable" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/collections" />
+      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
     </include_path>
   </component>
   <component name="ProjectId" id="1PFC0igWIhrgYSSHbpcyuWkyTcm" />
@@ -255,6 +291,7 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -279,8 +316,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -300,6 +342,12 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
       <setting name="vmparams" value="" />
       <setting name="cmdLine" value="run-app" />
@@ -1021,14 +1069,11 @@
       <workItem from="1622440150420" duration="1374000" />
       <workItem from="1622659686189" duration="138000" />
       <workItem from="1622659989891" duration="3855000" />
-      <workItem from="1622676912583" duration="2362000" />
-    </task>
-    <task id="LOCAL-00441" summary=".">
-      <created>1611656702791</created>
-      <option name="number" value="00441" />
-      <option name="presentableId" value="LOCAL-00441" />
-      <option name="project" value="LOCAL" />
-      <updated>1611656702791</updated>
+      <workItem from="1622676912583" duration="2526000" />
+      <workItem from="1622787397330" duration="3950000" />
+      <workItem from="1638959846647" duration="5250000" />
+      <workItem from="1638973361360" duration="1389000" />
+      <workItem from="1639125380760" duration="3516000" />
     </task>
     <task id="LOCAL-00442" summary=".">
       <created>1611683302030</created>
@@ -1366,7 +1411,14 @@
       <option name="project" value="LOCAL" />
       <updated>1622664420442</updated>
     </task>
-    <option name="localTasksCounter" value="490" />
+    <task id="LOCAL-00490" summary=".">
+      <created>1622706612279</created>
+      <option name="number" value="00490" />
+      <option name="presentableId" value="LOCAL-00490" />
+      <option name="project" value="LOCAL" />
+      <updated>1622706612280</updated>
+    </task>
+    <option name="localTasksCounter" value="491" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1392,7 +1444,6 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />

diff --git a/config/global.php b/config/global.php
index 3e7d015731c6cce9dbc266cf0b92126e8d4c7bfa..7ca4681a8eecba0444afb16012e6a537f8a6eb94 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -24,8 +24,8 @@ $squeezeboxPlayers = array(
     //'Salon' => 'dc:a6:32:02:47:c1',
     //'Salon' => 'cc:cc:2d:15:82:0e',
     //'Salon' => '5a:a1:4c:5c:e7:5e',
-    //'Salon' => 'bb:bb:78:49:8f:a4',
-    'Salon' => '00:04:20:17:82:8b',
+    'Salon' => 'bb:bb:78:49:8f:a4',
+    //'Salon' => '00:04:20:17:82:8b',
     'Chambre' => 'b8:27:eb:31:e1:44',
     //'WC' => '00:04:20:2a:05:2e',
     //'WC' => 'b8:27:eb:78:f6:88',

diff --git a/config/tv.php b/config/tv.php
index e3b7842c8023a7a2e99eb70dca43e5fb487e025b..76d345302ac51a9abdadee14f9890928b8b2c46e 100644 (file)
--- a/config/tv.php
+++ b/config/tv.php
@@ -2,18 +2,18 @@
 $mapdvb = connectRedis()->igbget('dvbchannels');
 if (!$mapdvb) {
     $mapdvb = array();
-    $m3u = getUrlContent('http://tvheadend.home.tortuga.enhydra.fr:9981/playlist/channels', 30);
-    $lines = explode("\n", $m3u);
-    $name = '';
-    foreach ($lines as $line) {
-        $line = trim($line);
-        if (strpos($line, '#EXTINF:') === 0) {
-            $e = explode(',', $line);
-            $name = array_pop($e);
-        } else if (strpos($line, 'http') === 0) {
-            $mapdvb[$name] = $line;
-        }
-    }
+//    $m3u = getUrlContent('http://tvheadend.home.tortuga.enhydra.fr:9981/playlist/channels', 30);
+//    $lines = explode("\n", $m3u);
+//    $name = '';
+//    foreach ($lines as $line) {
+//        $line = trim($line);
+//        if (strpos($line, '#EXTINF:') === 0) {
+//            $e = explode(',', $line);
+//            $name = array_pop($e);
+//        } else if (strpos($line, 'http') === 0) {
+//            $mapdvb[$name] = $line;
+//        }
+//    }
     connectRedis()->igbsetex('dvbchannels', 3600, $mapdvb);
 }
 

diff --git a/images/rooms/medium/entree.jpg b/images/rooms/medium/entree.jpg
deleted file mode 100644 (file)
index cd25fde..0000000
Binary files a/images/rooms/medium/entree.jpg and /dev/null differ

diff --git a/images/rooms/originaux/entree.jpg b/images/rooms/originaux/entree.jpg
deleted file mode 100644 (file)
index cd25fde..0000000
Binary files a/images/rooms/originaux/entree.jpg and /dev/null differ

diff --git a/images/rooms/originaux/litjerome.jpg b/images/rooms/originaux/litjerome.jpg
deleted file mode 100644 (file)
index 78796c3..0000000
Binary files a/images/rooms/originaux/litjerome.jpg and /dev/null differ

diff --git a/images/rooms/originaux/litvincent.jpg b/images/rooms/originaux/litvincent.jpg
deleted file mode 100644 (file)
index 2f56534..0000000
Binary files a/images/rooms/originaux/litvincent.jpg and /dev/null differ

diff --git a/images/rooms/originaux/sdb.jpg b/images/rooms/originaux/sdb.jpg
deleted file mode 100644 (file)
index 9288a51..0000000
Binary files a/images/rooms/originaux/sdb.jpg and /dev/null differ

diff --git a/install.md b/install.md
new file mode 100644 (file)
index 0000000..dd8c816
--- /dev/null
+++ b/install.md
@@ -0,0 +1,72 @@
+`sudo add-apt-repository ppa:ondrej/php;sudo add-apt-repository ppa:ondrej/apache2;sudo apt-get update`
+
+`apt update;apt install composer python3-certbot-apache wakeonlan adb lynx at redis php7.4-fpm php7.4-opcache php7.4-json php7.4-xml php7.4-curl php7.4-redis php7.4-igbinary php7.4-ssh2 php7.4-soap php7.4-sockets php7.4-mysql php7.4-gd php7.4-exif php7.4-imap php7.4-mbstring `
+
+`useradd --gid www-data --shell /bin/bash tortugahome`
+`mkdir -p /var/log/tortugahome/profiles/;chown -R tortugahome:www-data /var/log/tortugahome`
+
+`pico /etc/php/7.4/fpm/pool.d/tortugahome.conf`
+[home]
+user = tortugahome
+group = www-data
+listen = 127.0.0.1:60740
+listen.owner = tortugahome
+listen.group = www-data
+listen.mode = 0666
+pm = dynamic
+pm.max_children = 50
+pm.start_servers = 12
+pm.min_spare_servers = 12
+pm.max_spare_servers = 36
+pm.max_requests = 100
+access.log = /var/log/tortugahome/fpm.access.log
+chdir = /
+catch_workers_output = yes
+php_admin_value[error_log] = /var/log/tortugahome/php-errors.log
+php_admin_flag[log_errors] = on
+
+`pico /etc/apache2/sites-available/001-home.conf`
+
+<VirtualHost *:80>
+ServerAdmin webmaster@enhydra.fr
+DocumentRoot /home/tortugahome/www
+ServerName home.tortuga.enhydra.fr
+ServerAlias entree.home.tortuga.enhydra.fr
+ServerAlias cuisine.home.tortuga.enhydra.fr
+ServerAlias salon.home.tortuga.enhydra.fr
+ServerAlias bureau.home.tortuga.enhydra.fr
+ServerAlias chambre.home.tortuga.enhydra.fr
+ServerAlias litvincent.home.tortuga.enhydra.fr
+ServerAlias litjerome.home.tortuga.enhydra.fr
+ServerAlias sdb.home.tortuga.enhydra.fr
+ServerAlias wc.home.tortuga.enhydra.fr
+ServerAlias bureausun.home.tortuga.enhydra.fr
+ServerAlias cour.home.tortuga.enhydra.fr
+ServerAlias balcon.home.tortuga.enhydra.fr
+ServerAlias cave.home.tortuga.enhydra.fr
+
+CustomLog ${APACHE_LOG_DIR}/home-access.log combined
+ErrorLog ${APACHE_LOG_DIR}/home-error.log
+<IfModule mod_headers>
+        Header set Access-Control-Allow-Origin "*"
+</IfModule>
+ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:60740/home/tortugahome/www/$1" timeout=30
+</VirtualHost>
+
+in /etc/apache2/apache2.conf add
+
+<Directory /home/tortugahome/>
+Options Indexes FollowSymLinks
+AllowOverride All
+Require all granted
+</Directory>
+
+
+`a2ensite 001-home.conf`
+`a2enmod mpm_event rewrite alias headers proxy proxy_fcgi setenvif`
+`service apache2 restart;service php7.4-fpm restart`
+`certbot`
+Copy all files
+Copy `/var/lib/redis/dump.rdb`
+`chown -R tortugahome:www-data /home/tortugahome;chmod 755 /home/tortugahome/www/servers/*`
+`monit reload`
\ No newline at end of file

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 731b1444dfe431e45c63102c4b5e0cf16fd46b76..239b97d4dfbde7466904053b92d5e52c9f673573 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -241,8 +241,8 @@ function cronWeather($cronmin)
     $res['bathroom_humidity'] = toNumber(getDomoticzDeviceStatus(1347), true);
     $res['bedroom_temp'] = toNumber(getDomoticzDeviceStatus(1356), 1);
     $res['bedroom_humidity'] = toNumber(getDomoticzDeviceStatus(1357), true);
-    $res['livingroom_temp'] = toNumber(getDomoticzDeviceStatus(1351), 1);
-    $res['livingroom_humidity'] = toNumber(getDomoticzDeviceStatus(1352), true);
+    $res['livingroom_temp'] = toNumber(getDomoticzDeviceStatus(6453), 1);
+    $res['livingroom_humidity'] = toNumber(getDomoticzDeviceStatus(6454), true);
     $res['kitchen_temp'] = toNumber(getDomoticzDeviceStatus(1506), 1);
     $res['kitchen_humidity'] = toNumber(getDomoticzDeviceStatus(1507), true);
     $res['wc_temp'] = toNumber(getDomoticzDeviceStatus(1501), 1);

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 5d02b36655e7871bd24db9ad1f010aeca32c10c9..8232b8123df65bd67eb3621d967ec91401ba154e 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -3,10 +3,12 @@
 define('TIMELIMIT', 1);
 $_GET['im'] = '5';
 
+$wcSwitch = 6448;
+
 if ($_GET['device'] == 1033 || $_GET['device'] == 1476 || $_GET['device'] == 1478) {
     $forceConfig = 'salon';
 }
-if ($_GET['device'] == 1695) {
+if ($_GET['device'] == $wcSwitch) {
     $forceConfig = 'wc';
 }
 if ($_GET['device'] == 1478) {
@@ -50,9 +52,9 @@ if ($_GET['device'] == 480) {
     }
 } else if ($_GET['device'] == 1451) {
     domoticzSwitch(1450);
-} else if ($_GET['device'] == 1695) {
+} else if ($_GET['device'] == $wcSwitch) {
     $forceConfig = 'wc';
-    switch ($_GET['state']) {
+    switch (str_replace(' ', '_', $_GET['state'])) {
         case 'Double_Click':
             execScene('wc/spa');
             setState('wc', 1);

diff --git a/scripts/lib/denon.php b/scripts/lib/denon.php
index fb5dc24458c598c77817bd7e3d690750caff0bfe..9cd45e1d2260c7f31f36987ee80e44a79a69f150 100644 (file)
--- a/scripts/lib/denon.php
+++ b/scripts/lib/denon.php
@@ -54,18 +54,18 @@ function denonAVRInput($input, $setvolume = false)
     }
 
     if ($changedInput || $setvolume) {
-        $volumes = ['Media Player' => 60, 'HEOS Music' => 50, 'CD' => 30, 'AUX' => 26];
+        $volumes = ['Media Player' => 60, 'HEOS Music' => 40, 'CD' => 30, 'AUX' => 26];
         if (isset($volumes[$input])) {
             denonAVRVolume($volumes[$input], '');
             sleep(1);
         }
     }
 
-//    $audioMode = ['Media Player' => 'DOLBY DIGITAL', 'AUX' => 'DOLBY DIGITAL', 'CD' => 'DOLBY DIGITAL'];
-//    if (isset($audioMode[$input])) {
-//        denonAVRSetAudioMode($audioMode[$input]);
-//        usleep(1000000 * 1);
-//    }
+    $audioMode = ['Media Player' => 'DOLBY DIGITAL', 'AUX' => 'DOLBY DIGITAL', 'CD' => 'DOLBY DIGITAL', 'HEOS Music' => 'MULTI CH IN 7.1'];
+    if (isset($audioMode[$input])) {
+        denonAVRSetAudioMode($audioMode[$input]);
+        usleep(1000000 * 1);
+    }
 
 
     //denonAVRSetSpeakerPreset(1);

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index f77f49828cf6ca6a691d7a16f2cf082bf2c0e421..ddd0537d150869d07a91eeb83bab0d52b4c35cce 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -370,8 +370,8 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'salon/fan/off'],
     ],
     'salon/cinemabase' => [
-        ['type' => 'scene', 'scene' => 'cuisine/tamise'],
-        ['type' => 'ecomode', 'mode' => '0'],
+       // ['type' => 'scene', 'scene' => 'cuisine/tamise'],
+//        ['type' => 'ecomode', 'mode' => '0'],
         // ['type' => 'insteon', 'command' => '0?1111=I=0=0'],
     ],
     'salon/cineclub' => [
@@ -589,9 +589,9 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'bureau/sleeppc'],
     ],
     'bureau/off' => [
-        ['type' => 'scene', 'scene' => 'bureau/base/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => array('on' => false, 'brightness' => 0)],
         ['type' => 'domoticz', 'scene' => 42, 'command' => false, 'priority' => true],
+        ['type' => 'scene', 'scene' => 'bureau/base/off'],
     ],
     'bureau/sound/on' => [
         ['type' => 'domoticz', 'device' => 24, 'switchtype' => 'scene', 'command' => true, 'priority' => true],
@@ -713,7 +713,7 @@ $scenes = [
         ['type' => 'function', 'function' => 'wcVMCOn'],
     ],
     'wc/vmc/off' => [
-        ['type' => 'domoticz', 'device' => '2205', 'command' => false, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '6449', 'command' => false, 'priority' => true],
     ],
 
     'sdb/ampli/on' => [
@@ -1169,7 +1169,7 @@ function wcVMCOn()
 {
     setState('lastVMCOn', time());
     // Start VMC
-    domoticzSwitch(2205, true, 'light', true);
+    domoticzSwitch(6449, true, 'light', true);
 }
 
 function wcVMCOff($timeout = 'auto')

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 20b488baad826f6a1aa6de13878f1ff74f85a509..cd0ca342ae1e20f3e5062cbad5437190356321da 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -145,7 +145,7 @@ function squeezePlayerOn($player)
     global $squeezeboxPlayers;
     $player = _player($player);
     if ($player == $squeezeboxPlayers['Salon']) {
-        denonAVROn('AUX');
+        denonAVROn('HEOS Music');
     } else if ($player == $squeezeboxPlayers['Salle de bains']) {
         execScene('sdb/ampli/on');
     } else if ($player == $squeezeboxPlayers['Bureau']) {

diff --git a/scripts/lib/wol.php b/scripts/lib/wol.php
new file mode 100644 (file)
index 0000000..c5fbd81
--- /dev/null
+++ b/scripts/lib/wol.php
@@ -0,0 +1,11 @@
+<?php
+function wol($device)
+{
+    global $devices;
+
+    $ip = $devices[$device]['host'];
+    $mac = $devices[$device]['mac'];
+    `wakeonlan -i $ip $mac`;
+
+    freeboxWOL($mac);
+}
\ No newline at end of file

diff --git a/scripts/wc.php b/scripts/wc.php
new file mode 100644 (file)
index 0000000..f7d677d
--- /dev/null
+++ b/scripts/wc.php
@@ -0,0 +1,3 @@
+<?php
+include "import.php";
+wcToggle();
\ No newline at end of file

diff --git a/scripts/wol.php b/scripts/wol.php
new file mode 100644 (file)
index 0000000..3a05734
--- /dev/null
+++ b/scripts/wol.php
@@ -0,0 +1,3 @@
+<?php
+include "import.php";
+wol($_GET['device']);
\ No newline at end of file

diff --git a/servers/_startdaemon.php b/servers/_startdaemon.php
index 4bbbdb8daa3b169c52e4a527a6d3c5d49f5bd201..11b652b15506b9881cf974e7b33c088957288d46 100644 (file)
--- a/servers/_startdaemon.php
+++ b/servers/_startdaemon.php
@@ -1,6 +1,6 @@
-#!/usr/bin/php
+#!/usr/bin/php7.4
 
 <?php
 $n = $argv[1];
 $path = realpath(__DIR__ . '/../servers/' . $n . '.php');
-`$path >> /var/log/home/$n.log`;
\ No newline at end of file
+`$path >> /var/log/tortugahome/$n.log`;
\ No newline at end of file

diff --git a/servers/domoticz.php b/servers/domoticz.php
index 65b2b655a99a366ebc457d23909887c1858f43c9..8474db97626076b68b1cd49fdff9019ddf668264 100644 (file)
--- a/servers/domoticz.php
+++ b/servers/domoticz.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/php7.4
 
 <?php
 

diff --git a/servers/hue.php b/servers/hue.php
index 6e6c4980a6d4b68937d0ce366788b3be31ce8464..5635f7566757381ff15ee74e6166e8d81be23a48 100644 (file)
--- a/servers/hue.php
+++ b/servers/hue.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/php7.4
 
 <?php
 require_once __DIR__ . "/../scripts/import.php";

diff --git a/servers/insteon.php b/servers/insteon.php
deleted file mode 100644 (file)
index 6693af9..0000000
--- a/servers/insteon.php
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/php
-
-<?php
-require_once __DIR__ . "/../scripts/import.php";
-
-// Set time limit to indefinite execution
-set_time_limit(0);
-ignore_user_abort(true);
-
-echo 'Run home server insteon' . "\n";
-
-$redis = connectRedis();
-handleInsteonQueue();
-
-redisEventListener('insteon_event', 'handleInsteonQueue');
-
-function handleInsteonQueue()
-{
-    global $redis;
-
-    while (true) {
-        $queue = $redis->igbget('insteon_queue');
-        if (!is_array($queue)) {
-            $queue = [];
-            $redis->igbset('insteon_queue', $queue);
-        }
-
-
-        if (!count($queue)) {
-            echo 'Queue empty ' . "\n";
-            break;
-        }
-
-        $queue = array_unique($queue);
-
-        echo 'Handle Queue : current state ' . json_encode($queue) . "\n";
-
-        $command = array_shift($queue);
-        $redis->igbset('insteon_queue', $queue);
-        echo 'Run command ' . $command . "\n";
-        if ($command == 'knock') {
-            insteonKnock();
-            continue;
-        }
-        runInsteonCommand($command);
-        usleep(1000000 * 0.5);
-    }
-    echo 'End of handling queue' . "\n";
-}
\ No newline at end of file

diff --git a/servers/logcatb.php b/servers/logcatb.php
index aed22b0c65b5ccde6c4a131bc431fa31d03dee1d..8b70ef8e306cb68a1bed0089984034ad9b507958 100644 (file)
--- a/servers/logcatb.php
+++ b/servers/logcatb.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/php7.4
 <?php
 $device = 'bureau';
 include_once "logcat.php";
\ No newline at end of file

diff --git a/servers/logcats.php b/servers/logcats.php
index de442206da93b718fe54170a362a92e6edf8f38a..4e3187503939a00fd36c2b3593cc4d7605fe8fe1 100644 (file)
--- a/servers/logcats.php
+++ b/servers/logcats.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/php7.4
 <?php
 $device = 'salon';
 include_once "logcat.php";
\ No newline at end of file

diff --git a/servers/squeezebox.php b/servers/squeezebox.php
index 9e8b56b1a934047488676131061e42a119b46c47..2f2fa77d35a990029224787fae69750cd61b3671 100644 (file)
--- a/servers/squeezebox.php
+++ b/servers/squeezebox.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/php7.4
 
 <?php
 require_once __DIR__ . "/../scripts/import.php";

diff --git a/servers/ssh.php b/servers/ssh.php
index 4b4355576f76a01e8ec41e17252d8bcad3350175..2d6186eaaa821f37fb4c82309d0ff6c727e4e558 100644 (file)
--- a/servers/ssh.php
+++ b/servers/ssh.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/php7.4
 
 <?php
 require_once __DIR__ . "/../scripts/import.php";

diff --git a/servers/startdaemon b/servers/startdaemon
index 26d318bd4301008d3a8fafd09d904da84621b9da..693ca8dc5e1957a7c9cd624b763a9697e2c0f3a6 100644 (file)
--- a/servers/startdaemon
+++ b/servers/startdaemon
@@ -1,2 +1,2 @@
 #!/bin/sh
-/sbin/start-stop-daemon --start --quiet --user tortugahome --chuid tortugahome --name home-$1 --make-pidfile --pidfile /var/run/home-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/servers/_startdaemon.php $1"
\ No newline at end of file
+/sbin/start-stop-daemon --start --quiet --user tortugahome --chuid tortugahome --name home-$1 --make-pidfile --pidfile /var/run/home-$1.pid  --background --startas /bin/bash -- -c "exec /home/tortugahome/www/servers/_startdaemon.php $1"
\ No newline at end of file