From 4427b6a9cdcdd926cdbcb3ed953f7d3ded64f41c Mon Sep 17 00:00:00 2001
From: Vincent <vincent@enhydra.fr>
Date: Sat, 24 Aug 2019 01:40:09 +0200
Subject: [PATCH] .

---
 .idea/workspace.xml        | 25 +++++++++++++------------
 index.php                  |  6 ++++--
 scripts/lib/scenes.php     |  4 +++-
 scripts/lib/squeezebox.php |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 397d972..8065092 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,9 @@
   <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/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/tmdb.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/sections.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/sections.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -710,14 +710,8 @@
       <workItem from="1566376145799" duration="4963000" />
       <workItem from="1566402117063" duration="1534000" />
       <workItem from="1566458804773" duration="6134000" />
-      <workItem from="1566546848697" duration="3684000" />
-    </task>
-    <task id="LOCAL-00163" summary=".">
-      <created>1551088282322</created>
-      <option name="number" value="00163" />
-      <option name="presentableId" value="LOCAL-00163" />
-      <option name="project" value="LOCAL" />
-      <updated>1551088282322</updated>
+      <workItem from="1566546848697" duration="3695000" />
+      <workItem from="1566602835458" duration="736000" />
     </task>
     <task id="LOCAL-00164" summary=".">
       <created>1551125943544</created>
@@ -1055,7 +1049,14 @@
       <option name="project" value="LOCAL" />
       <updated>1566548210701</updated>
     </task>
-    <option name="localTasksCounter" value="212" />
+    <task id="LOCAL-00212" summary=".">
+      <created>1566551436129</created>
+      <option name="number" value="00212" />
+      <option name="presentableId" value="LOCAL-00212" />
+      <option name="project" value="LOCAL" />
+      <updated>1566551436129</updated>
+    </task>
+    <option name="localTasksCounter" value="213" />
     <servers />
   </component>
   <component name="TodoView">
diff --git a/index.php b/index.php
index 2fc4769..c03df47 100644
--- a/index.php
+++ b/index.php
@@ -8,8 +8,10 @@ require_once "scripts/import.php";
 init();
 profile('init index', __FILE__, __LINE__);
 
-$raspberry = $_SERVER['HTTP_USER_AGENT'] == 'Tortuga Raspberry';
-$android = !!stristr($_SERVER['HTTP_USER_AGENT'], 'android');
+$ua = $_SERVER['HTTP_USER_AGENT'] ?? 'CLI';
+
+$raspberry = $ua == 'Tortuga Raspberry';
+$android = !!stristr($ua, 'android');
 
 function relativePath($p)
 {
diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 0b9e893..070c1f9 100644
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -736,7 +736,9 @@ function killCheminee($room)
 {
     // Kill current animation
     $kill = "/bin/kill $(ps aux | grep '[c]heminee_running/" . $room . "' | awk '{print $2}')";
-    return `$kill`;
+    $res = `$kill`;
+    echo 'Kill cheminée ' . $room . ' :: ' . $res;
+    return $res;
 }
 
 function chemineeLight($lightId, $room, $program = 'fire', $brightness = 1)
diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 537fe71..83273dc 100644
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -29,7 +29,7 @@ function stopSqueezebox($player)
     }
 }
 
-function squeezeRequest($params, $player)
+function squeezeRequest($params, $player = '')
 {
     $redis = connectRedis();
     $queue_name = 'squeezebox_queue';
-- 
2.39.5