.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 20aa95ff8853f983d163cd644228c800d419642e..dc50d351c1390e3fa6cbba9e0a9120b034f8d37d 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +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/lit.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/lit.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/sdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/sdb.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" 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/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ssh.php" afterDir="false" />
     </list>
@@ -41,87 +45,71 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/ssh.php">
+        <entry file="file://$PROJECT_DIR$/config/tv.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="37" column="6" selection-start-line="37" selection-start-column="6" selection-end-line="37" selection-end-column="6" />
+            <state relative-caret-position="221">
+              <caret line="67" column="63" selection-start-line="67" selection-start-column="63" selection-end-line="67" selection-end-column="63" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/cron.php">
+        <entry file="file://$PROJECT_DIR$/js/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
+            <state relative-caret-position="295">
+              <caret line="138" column="56" lean-forward="true" selection-start-line="138" selection-start-column="56" selection-end-line="138" selection-end-column="56" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/composer.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/config/litvincent.php">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/ssh2/ssh2.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1615">
-              <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/config/litjerome.php">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/ssh.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="595">
-              <caret line="35" column="18" lean-forward="true" selection-start-line="35" selection-start-column="18" selection-end-line="35" selection-end-column="18" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/config/salon.php">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/seen.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/config/global.php">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/config/chambre.php">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
+        <entry file="file://$PROJECT_DIR$/config/lit.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <caret line="162" column="34" lean-forward="true" selection-start-line="162" selection-start-column="34" selection-end-line="162" selection-end-column="34" />
+            <state relative-caret-position="68">
+              <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/remote.php">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/config/sdb.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="153">
+              <caret line="9" column="29" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/bricks.php">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="714">
-              <caret line="42" column="114" selection-start-line="42" selection-start-column="114" selection-end-line="42" selection-end-column="114" />
+            <state relative-caret-position="102">
+              <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
             </state>
           </provider>
         </entry>
@@ -141,8 +129,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>9981</find>
-      <find>192.168.1.69</find>
       <find>startserver</find>
       <find>seen</find>
       <find>x264</find>
@@ -171,6 +157,8 @@
       <find>galactica</find>
       <find>S01E02</find>
       <find>cronsee</find>
+      <find>killVl</find>
+      <find>omx</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -201,13 +189,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/config/cuisine.php" />
         <option value="$PROJECT_DIR$/config/entree.php" />
-        <option value="$PROJECT_DIR$/config/lit.php" />
         <option value="$PROJECT_DIR$/config/litjerome.php" />
         <option value="$PROJECT_DIR$/config/litvincent.php" />
         <option value="$PROJECT_DIR$/config/salon.php" />
-        <option value="$PROJECT_DIR$/config/sdb.php" />
         <option value="$PROJECT_DIR$/config/wc.php" />
         <option value="$PROJECT_DIR$/config/bureausun.php" />
         <option value="$PROJECT_DIR$/scripts/lib/http.php" />
@@ -228,7 +213,6 @@
         <option value="$PROJECT_DIR$/scripts/sections.php" />
         <option value="$PROJECT_DIR$/scripts/seen.php" />
         <option value="$PROJECT_DIR$/scripts/lib/medialibrary.php" />
-        <option value="$PROJECT_DIR$/config/tv.php" />
         <option value="$PROJECT_DIR$/servers/startdaemon" />
         <option value="$PROJECT_DIR$/servers/stopdaemon" />
         <option value="$PROJECT_DIR$/servers/cron.php" />
@@ -252,6 +236,10 @@
         <option value="$PROJECT_DIR$/scripts/lib/mediarasp.php" />
         <option value="$PROJECT_DIR$/scripts/cron/cron.php" />
         <option value="$PROJECT_DIR$/scripts/lib/ssh.php" />
+        <option value="$PROJECT_DIR$/js/home.js" />
+        <option value="$PROJECT_DIR$/config/sdb.php" />
+        <option value="$PROJECT_DIR$/config/lit.php" />
+        <option value="$PROJECT_DIR$/config/tv.php" />
       </list>
     </option>
   </component>
@@ -420,6 +408,11 @@
               <item name="home" type="462c0819:PsiDirectoryNode" />
               <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="home" type="b2602c69:ProjectViewProjectNode" />
+              <item name="home" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="home" type="b2602c69:ProjectViewProjectNode" />
               <item name="home" type="462c0819:PsiDirectoryNode" />
@@ -457,8 +450,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -948,14 +941,9 @@
       <workItem from="1562430904715" duration="18334000" />
       <workItem from="1562654595102" duration="11549000" />
       <workItem from="1562710631719" duration="5146000" />
-      <workItem from="1562789994012" duration="1567000" />
-    </task>
-    <task id="LOCAL-00150" summary=".">
-      <created>1550482889870</created>
-      <option name="number" value="00150" />
-      <option name="presentableId" value="LOCAL-00150" />
-      <option name="project" value="LOCAL" />
-      <updated>1550482889870</updated>
+      <workItem from="1562789994012" duration="2499000" />
+      <workItem from="1563019005014" duration="1134000" />
+      <workItem from="1563226970016" duration="4434000" />
     </task>
     <task id="LOCAL-00151" summary=".">
       <created>1550483025206</created>
@@ -1293,11 +1281,18 @@
       <option name="project" value="LOCAL" />
       <updated>1562746751936</updated>
     </task>
-    <option name="localTasksCounter" value="199" />
+    <task id="LOCAL-00199" summary=".">
+      <created>1562828700494</created>
+      <option name="number" value="00199" />
+      <option name="presentableId" value="LOCAL-00199" />
+      <option name="project" value="LOCAL" />
+      <updated>1562828700495</updated>
+    </task>
+    <option name="localTasksCounter" value="200" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1273156000" />
+    <option name="totallyTimeSpent" value="1279656000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1318,7 +1313,7 @@
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" sideWeight="0.4576547" side_tool="true" weight="0.22506666" />
-      <window_info active="true" content_ui="combo" id="Project" order="6" sideWeight="0.49456522" visible="true" weight="0.1236089" />
+      <window_info active="true" content_ui="combo" id="Project" order="6" sideWeight="0.49456522" visible="true" weight="0.12519872" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48251194" weight="0.30444205" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4674086" weight="0.3217768" />
@@ -1343,9 +1338,9 @@
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="8" />
       <window_info anchor="right" id="Theme Preview" order="9" />
-      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.4816273" visible="true" weight="0.14825119" />
+      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48031497" visible="true" weight="0.14825119" />
       <window_info anchor="right" id="SciView" order="11" weight="0.3298887" />
-      <window_info anchor="right" id="Structure" order="12" sideWeight="0.5183727" side_tool="true" visible="true" weight="0.14825119" />
+      <window_info anchor="right" id="Structure" order="12" sideWeight="0.51968503" side_tool="true" visible="true" weight="0.14825119" />
       <window_info anchor="right" id="Data View" order="13" />
       <window_info anchor="right" id="Maven" order="14" />
     </layout>
@@ -1381,58 +1376,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/config/global.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="36" column="58" selection-start-line="36" selection-start-column="58" selection-end-line="36" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tools/jarvis/events">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/jarvis.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/json/json.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="117" column="40" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/jarvis.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tools/jarvis/console.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/remotecmd.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tools/jarvis/commands">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/sections.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
@@ -1461,13 +1404,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/tv.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/servers/startdaemon">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="17">
@@ -1490,13 +1426,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/scripts/lib/server.php" />
-    <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1826">
-          <caret line="375" selection-start-line="375" selection-end-line="375" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -1658,6 +1587,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/servers/cron.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/composer.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="374">
@@ -1665,6 +1601,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/ssh2/ssh2.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/seen.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
@@ -1672,6 +1615,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1989">
+          <caret line="117" column="43" selection-start-line="117" selection-start-column="43" selection-end-line="117" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2754">
+          <caret line="162" column="34" selection-start-line="162" selection-start-column="34" selection-end-line="162" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/config/remote.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1682,45 +1639,67 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
+    <entry file="file://$PROJECT_DIR$/servers/ssh.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="162" column="34" lean-forward="true" selection-start-line="162" selection-start-column="34" selection-end-line="162" selection-end-column="34" />
+        <state relative-caret-position="595">
+          <caret line="35" column="18" selection-start-line="35" selection-start-column="18" selection-end-line="35" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/ssh.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/ssh.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="595">
-          <caret line="35" column="18" lean-forward="true" selection-start-line="35" selection-start-column="18" selection-end-line="35" selection-end-column="18" />
+          <caret line="41" column="4" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/cron.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
+        <state relative-caret-position="102">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+    <entry file="file://$PROJECT_DIR$/config/sdb.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
+        <state relative-caret-position="153">
+          <caret line="9" column="29" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/ssh2/ssh2.php">
+    <entry file="file://$PROJECT_DIR$/config/litvincent.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/litjerome.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/salon.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/global.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/chambre.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/lit.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1615">
-          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
+        <state relative-caret-position="68">
+          <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/ssh.php">
+    <entry file="file://$PROJECT_DIR$/js/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="37" column="6" selection-start-line="37" selection-start-column="6" selection-end-line="37" selection-end-column="6" />
+        <state relative-caret-position="295">
+          <caret line="138" column="56" lean-forward="true" selection-start-line="138" selection-start-column="56" selection-end-line="138" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/tv.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="67" column="63" selection-start-line="67" selection-start-column="63" selection-end-line="67" selection-end-column="63" />
         </state>
       </provider>
     </entry>

diff --git a/config/lit.php b/config/lit.php
index 47a42eda674a5ece87be90e16f57e75a181be597..910f25c01c3965b975def34a8f1449c04446b0cf 100644 (file)
--- a/config/lit.php
+++ b/config/lit.php
@@ -1,8 +1,8 @@
 <?php
 config('ROOM_NAME','Lit');
 config('ROOM', 'chambre');
-config('VIDEOPLAYER', 'omxplayer');
-config('TVPLAYER', 'omxplayer');
+config('VIDEOPLAYER', 'mediarasp');
+config('TVPLAYER', 'mediarasp');
 config('HIDEMASK_TIMEOUT',250);
 
 if(DISPLAYINTERFACE) {

diff --git a/config/sdb.php b/config/sdb.php
index 6854db870a59819e517492fb4da4717d75e4804c..e21e0fbd509c024a33398d7025d325a4fb6236e6 100644 (file)
--- a/config/sdb.php
+++ b/config/sdb.php
@@ -6,8 +6,8 @@ config('SLEEPSCREEN', 30);
 config('SCREENSAVER_BRIGHTNESS', 100);
 config('SLEEPTYPE', 'screensaver');
 config('SCREENSAVER','weatherstation');
-config('VIDEOPLAYER', 'omxplayer');
-config('TVPLAYER', 'omxplayer');
+config('VIDEOPLAYER', 'mediarasp');
+config('TVPLAYER', 'mediarasp');
 config('VOLUME', 60);
 config('VOLUME_DEVICE', 'RaspberryPi');
 config('HIDEMASK_TIMEOUT',250);

diff --git a/config/tv.php b/config/tv.php
index d226ab83f64130c196ea49a20899c68aaf4efdcb..a29c9f077c577aec281531ce54e7b953acbc58bc 100644 (file)
--- a/config/tv.php
+++ b/config/tv.php
@@ -1,24 +1,22 @@
 <?php
 $mapdvb = connectRedis()->igbget('dvbchannels');
-if ($mapdvb === false) {
+if (!$mapdvb) {
     $mapdvb = array();
-    $m3u = getUrlContent('http://192.168.1.60:9981/playlist/channels', 30, ['admin', 'hUu6UKdQX9t6']);
+    $m3u = getUrlContent('http://192.168.1.60: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] = str_replace('http://192.168.1.60:9981/', 'http://admin:hUu6UKdQX9t6@192.168.1.60:9981/', $line);
+            $mapdvb[$name] = $line;
         }
     }
-
     connectRedis()->igbsetex('dvbchannels', 3600, $mapdvb);
-
 }
 
-
 $tv = array(
     'Replay' => array('freebox' => 'replay'),
     'Infos',
@@ -67,7 +65,7 @@ foreach ($tv as $name => $service) {
     if (is_numeric($name)) {
         $shortcuts['sub-tv'][] = array('type' => 'separator', 'label' => $service);
     } else {
-        if ($tvplayer == 'omxplayer') {
+        if ($tvplayer == 'omxplayer' || $tvplayer == 'mediarasp') {
             $e = explode(':', $service['stream'], 3);
             $protocol = $e[0];
             $id = $e[1];

diff --git a/js/home.js b/js/home.js
index 43cb0b001f10ffd5d52bd1be170c77f82e99d725..96f7d04edae77bce2e792126d65b53ac734ee057 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -98,9 +98,6 @@ $(function () {
     });
 
     $(document).on(clicktouchevent, 'a[data-menu]', function () {
-        if (raspberry) {
-            killVLC();
-        }
         $("#iframeHolder").hide();
         window.location.hash = "#/section/" + $(this).data('menu');
         return false;
@@ -193,7 +190,6 @@ $(function () {
                 $.get('/scripts/off.php');
                 soundsOff();
                 screenOff();
-                killVLC();
                 break;
             case 'sound-off':
                 soundsOff();
@@ -405,7 +401,7 @@ function runSSHQueue() {
 }
 
 function soundsOff() {
-    killVLC();
+
     $("#iframeHolder").remove();
     stopSqueeze();
 }
@@ -764,11 +760,6 @@ function hideLoader() {
     $("#loader").hide();
 }
 
-function killVLC() {
-    videoPlaying = false;
-    sshCommand("kill $(ps aux | grep '[o]mxplayer' | awk '{print $2}')", true);
-}
-
 function resize() {
     var ww = $(window).outerWidth();
     var hh = $(window).outerHeight();

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 4898cb0ace935581c38a97928bc52a9151cd357c..67e85c420873bb0ff6d44f064fe283a58f61e9a8 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -114,8 +114,8 @@ function cronPing($cronmin)
         setState('device_' . $name . '_awake', $result);
         echo 'device_' . $name . '_awake : ' . getState('device_' . $name . '_awake') . "\n";
         if ($result) {
-            sshCommand('pwd', $device, false, false);
-            sshCommand('pwd', $device, false, true);
+            sshCommand('pwd', $device['host'], false, false);
+            sshCommand('pwd', $device['host'], false, true);
         }
     }
     echo 'vincenthere : ' . getState('vincenthere') . "\n";

diff --git a/scripts/lib/ssh.php b/scripts/lib/ssh.php
index bf87908f8962b95a4c435cd7aa4800e8bfc7a7c9..25dc3ca680a469db182b40984d46891c4fa43d3b 100644 (file)
--- a/scripts/lib/ssh.php
+++ b/scripts/lib/ssh.php
@@ -17,7 +17,11 @@ function getSSHInstance($device = null, $sudo = false, $force = false)
         if (!isset($devices[$device])) {
             $ssh[$instance_key] = false;
         } else {
-            $d = $devices[$device];
+            if (is_array($device) && isset($device['host'])) {
+                $d = $device;
+            } else {
+                $d = $devices[$device];
+            }
             $user = $sudo ? 'root' : $d['user'];
             //if (getState('device_' . $device . '_awake') == '1') {
             $ssh[$instance_key] = ssh2_connect($d['host'], 22);
@@ -35,7 +39,7 @@ function getSSHInstance($device = null, $sudo = false, $force = false)
 
 function sshCommand($command, $device = null, $blocking = true, $sudo = false)
 {
-    //return sshRunCommand($command, $device, $blocking, $sudo);
+    return sshRunCommand($command, $device, $blocking, $sudo);
     $redis = connectRedis();
     $queue = $redis->get('ssh_queue');
     if (!is_array($queue)) {