.

diff --git a/.htaccess b/.htaccess
index b036ae4fdc5bae9cb17cb2d74f007cd6fc07c578..ab87c1754e2915ecfe53d392aad0275864f32306 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-Require ip 192.168.1.0/24 127.0.0.0/8 88.190.245.49
+Require ip 192.168.1.0/24 192.168.13.0/24 127.0.0.0/8 88.190.245.49
 <IfModule mod_rewrite.c>
         Options +FollowSymlinks
         RewriteEngine on

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dc50d351c1390e3fa6cbba9e0a9120b034f8d37d..4d882ebf6e3c4cfc0ba0a16d1bdd3fb4cb042d67 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change afterPath="$PROJECT_DIR$/scripts/lib/cachemedia.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/scripts/media.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.htaccess" beforeDir="false" afterPath="$PROJECT_DIR$/.htaccess" afterDir="false" />
       <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/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$/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" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.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/insteon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/insteon.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/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/tmdb.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/tmdb.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/startserver" beforeDir="false" afterPath="$PROJECT_DIR$/servers/startserver" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/stopserver" beforeDir="false" afterPath="$PROJECT_DIR$/servers/stopserver" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -42,141 +50,17 @@
   <component name="FavoritesManager">
     <favorites_list name="home" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/home.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <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$/config/litvincent.php">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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$/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$/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$/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$/config/lit.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <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/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/lib.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Python Script" />
-        <option value="HTML File" />
         <option value="Less File" />
         <option value="JavaScript File" />
         <option value="Setup Script" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>startserver</find>
-      <find>seen</find>
-      <find>x264</find>
-      <find>display</find>
-      <find>OMXcmd</find>
-      <find>VLCPl</find>
-      <find>VLCCmd</find>
-      <find>OMX</find>
-      <find>@ead</find>
-      <find>cmd</find>
-      <find>cheminee</find>
-      <find>sudo at</find>
-      <find>sudo</find>
-      <find>domoticzCmd</find>
-      <find>domoticz</find>
-      <find>jarvis</find>
-      <find>connectRedis()</find>
-      <find>setex(</find>
-      <find>set_time_limit</find>
-      <find>ssh</find>
-      <find>matin</find>
-      <find>tvShowLibra</find>
-      <find>connectRedis()-&gt;</find>
-      <find>tmdb.</find>
-      <find>Galactica</find>
-      <find>galactica</find>
-      <find>S01E02</find>
-      <find>cronsee</find>
-      <find>killVl</find>
-      <find>omx</find>
-    </findStrings>
-    <replaceStrings>
-      <replace />
-      <replace>ecomode</replace>
-    </replaceStrings>
-    <dirStrings>
-      <dir>D:\CloudStation\Works\home\config</dir>
-      <dir>D:\CloudStation\Works\home\scripts</dir>
-      <dir>T:\CloudStation\Drive\Works\home\config</dir>
-      <dir>T:\CloudStation\Drive\Works\home\style</dir>
-      <dir>T:\CloudStation\Drive\Works\home\scripts</dir>
-      <dir>Y:\Works\home</dir>
-      <dir>D:\CloudStation\Works\home</dir>
-      <dir>T:\CloudStation\Drive\Works\home</dir>
-      <dir>T:\Drive\Works\home\scripts</dir>
-      <dir>T:\Drive\Works\home</dir>
-    </dirStrings>
-  </component>
   <component name="Git.Settings">
     <option name="ROOT_SYNC" value="DONT_SYNC" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -186,63 +70,6 @@
       </map>
     </option>
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/config/entree.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/wc.php" />
-        <option value="$PROJECT_DIR$/config/bureausun.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/http.php" />
-        <option value="$PROJECT_DIR$/style/style.less" />
-        <option value="$PROJECT_DIR$/scripts/transcode.php" />
-        <option value="$PROJECT_DIR$/gradient.php" />
-        <option value="$PROJECT_DIR$/servers/startserver" />
-        <option value="$PROJECT_DIR$/servers/stopserver" />
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/scripts/lib/ecomode.php" />
-        <option value="$PROJECT_DIR$/scripts/raspberrycast.php" />
-        <option value="$PROJECT_DIR$/config/global.php" />
-        <option value="$PROJECT_DIR$/scripts/jarvis.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/jarvis.php" />
-        <option value="$PROJECT_DIR$/tools/jarvis/console.php" />
-        <option value="$PROJECT_DIR$/tools/jarvis/commands" />
-        <option value="$APPLICATION_CONFIG_DIR$/Composer Log/Composer Log.composerLog" />
-        <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$/servers/startdaemon" />
-        <option value="$PROJECT_DIR$/servers/stopdaemon" />
-        <option value="$PROJECT_DIR$/servers/cron.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/lib.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/scenes.php" />
-        <option value="$PROJECT_DIR$/servers/insteon.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/insteon.php" />
-        <option value="$PROJECT_DIR$/servers/domoticz.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/domoticz.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/state.php" />
-        <option value="$PROJECT_DIR$/config/music.php" />
-        <option value="$PROJECT_DIR$/config/media.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/remoteinfos.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/redis.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/tmdb.php" />
-        <option value="$PROJECT_DIR$/scripts/tmdb.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/harmony.php" />
-        <option value="$PROJECT_DIR$/composer.json" />
-        <option value="$PROJECT_DIR$/servers/ssh.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/bricks.php" />
-        <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>
   <component name="JsFlowSettings">
     <service-enabled>true</service-enabled>
     <exe-path />
@@ -378,12 +205,7 @@
       <path value="$PROJECT_DIR$/vendor/predis/predis" />
     </include_path>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="956" />
-    <option name="y" value="114" />
-    <option name="width" value="1436" />
-    <option name="height" value="771" />
-  </component>
+  <component name="ProjectId" id="1PFC0igWIhrgYSSHbpcyuWkyTcm" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="false" id="Update" />
     <ConfirmationsSetting value="1" id="Add" />
@@ -391,69 +213,6 @@
   <component name="ProjectReloadState">
     <option name="STATE" value="1" />
   </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="home" type="b2602c69:ProjectViewProjectNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="home" type="b2602c69:ProjectViewProjectNode" />
-              <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" />
-              <item name="scripts" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="home" type="b2602c69:ProjectViewProjectNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
-              <item name="scripts" type="462c0819:PsiDirectoryNode" />
-              <item name="cron" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="home" type="b2602c69:ProjectViewProjectNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
-              <item name="scripts" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="home" type="b2602c69:ProjectViewProjectNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
-              <item name="servers" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="home" type="b2602c69:ProjectViewProjectNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
-              <item name="tools" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="home" type="b2602c69:ProjectViewProjectNode" />
-              <item name="home" type="462c0819:PsiDirectoryNode" />
-              <item name="tools" type="462c0819:PsiDirectoryNode" />
-              <item name="jarvis" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-    </panes>
-  </component>
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
@@ -469,7 +228,7 @@
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553247665857" />
     <property name="dumpAutoload T:/Drive/Works/home/composer.json" value="--no-interaction --ansi --verbose --optimize" />
     <property name="editor.config.ad.shown" value="true" />
-    <property name="last_opened_file_path" value="D:/Works" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="list.type.of.created.stylesheet" value="Less" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Problems" />
@@ -943,14 +702,10 @@
       <workItem from="1562710631719" duration="5146000" />
       <workItem from="1562789994012" duration="2499000" />
       <workItem from="1563019005014" duration="1134000" />
-      <workItem from="1563226970016" duration="4434000" />
-    </task>
-    <task id="LOCAL-00151" summary=".">
-      <created>1550483025206</created>
-      <option name="number" value="00151" />
-      <option name="presentableId" value="LOCAL-00151" />
-      <option name="project" value="LOCAL" />
-      <updated>1550483025206</updated>
+      <workItem from="1563226970016" duration="4448000" />
+      <workItem from="1563519793746" duration="1393000" />
+      <workItem from="1565460240768" duration="6405000" />
+      <workItem from="1565597022811" duration="1470000" />
     </task>
     <task id="LOCAL-00152" summary=".">
       <created>1550561095121</created>
@@ -1288,12 +1043,16 @@
       <option name="project" value="LOCAL" />
       <updated>1562828700495</updated>
     </task>
-    <option name="localTasksCounter" value="200" />
+    <task id="LOCAL-00200" summary=".">
+      <created>1563349220382</created>
+      <option name="number" value="00200" />
+      <option name="presentableId" value="LOCAL-00200" />
+      <option name="project" value="LOCAL" />
+      <updated>1563349220383</updated>
+    </task>
+    <option name="localTasksCounter" value="201" />
     <servers />
   </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1279656000" />
-  </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
       <is-autoscroll-to-source value="true" />
@@ -1303,48 +1062,6 @@
       <is-autoscroll-to-source value="true" />
     </todo-panel>
   </component>
-  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="2576" height="1056" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Nl-Palette" order="0" />
-      <window_info id="Image Layers" order="1" />
-      <window_info id="Capture Tool" order="2" />
-      <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.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" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49920508" weight="0.32936078" />
-      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49801272" weight="0.32936078" />
-      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.44395867" weight="0.2383532" />
-      <window_info anchor="bottom" id="File Transfer" order="9" sideWeight="0.43759936" visible="true" weight="0.1744312" />
-      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Docker" order="11" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Messages" order="12" />
-      <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.56240064" weight="0.25460455" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.24959481" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Maven Projects" order="4" />
-      <window_info anchor="right" id="Properties" order="5" />
-      <window_info anchor="right" id="Database" order="6" sideWeight="0.49868765" weight="0.22058824" />
-      <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.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.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>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
@@ -1358,6 +1075,19 @@
       </list>
     </option>
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
@@ -1375,335 +1105,6 @@
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/scripts/sections.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/import.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/servers/startserver">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="64" selection-start-line="2" selection-start-column="64" selection-end-line="2" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/servers/startdaemon">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="43" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/servers/stopdaemon">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Client.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6171">
-          <caret line="384" column="20" selection-start-line="384" selection-start-column="20" selection-end-line="384" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/server.php" />
-    <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="31" selection-start-line="31" selection-end-line="31" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/servers/insteon.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="36" column="36" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="21" column="25" lean-forward="true" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/clearcache.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="476">
-          <caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Connection/StreamConnection.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="654">
-          <caret line="389" selection-start-line="389" selection-end-line="389" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/state.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/standard/standard_5.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="310" column="50" lean-forward="true" selection-start-line="310" selection-start-column="50" selection-end-line="310" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/igbinary/igbinary.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="629">
-          <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/music.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/media.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="44" column="1" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/remoteinfos.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="23" lean-forward="true" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/php-tmdb/api/lib/Tmdb/Api/Tv.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="29" column="20" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/playing.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/redis.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Command/StringSet.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Command/Command.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/transcode.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/tmdb.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/harmony.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/freeboxchannel.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="30" lean-forward="true" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
-        </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">
-          <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
-        </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">
-          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
-        </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>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/bricks.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>
-      </provider>
-    </entry>
-    <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" selection-start-line="35" selection-start-column="18" selection-end-line="35" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/ssh.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="595">
-          <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$/scripts/lib/lib.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <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$/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>
-    <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="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$/js/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <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>
-  </component>
   <component name="masterDetails">
     <states>
       <state key="ArtifactsStructureConfigurable.UI">

diff --git a/config/global.php b/config/global.php
index 100df5fb5852b784c21e95bcc4c72e63470b1a6d..5579df165dc62e8a4abf34e1df76cb999faaf0a0 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -2,8 +2,8 @@
 ini_set('display_errors', true);
 
 define('WEB_ROOT', 'https://home.tortuga.enhydra.fr/');
-define("SQUEEZEBOX_SERVER", 'http://192.168.1.68:9000');
-define('HUE_BRIDGE', '192.168.1.37');
+define("SQUEEZEBOX_SERVER", 'http://192.168.13.68:9000');
+define('HUE_BRIDGE', '192.168.13.85');
 define('HUE_USER', 'zZigF7nPQq9nTZ3GTB1zkntn98trOJVFHWAwFiqQ');
 
 $squeezeboxPlayers = array(
@@ -22,24 +22,24 @@ $squeezeboxPlayers = array(
 );
 
 $phones = array('vincent' => array(
-       'ip' => '192.168.1.53',
+       'ip' => '192.168.13.31',
        'key' => 'APA91bHeWfPc86eVpVzYDfQHdolELsdHdlNou2a2YoMWhBuAG9odAlfZLBjve9zDBq4U04e_zd2tA864El8Z2NfUh7XJktOHbU4F1mdmAVczklg5ZFRClvhX4f8fqfZ9YLG94NdBQbGn',
        'password' => '4pyA?Rnyeyc1$44M')
 );
 
 $devices = [
-    'cerveau' => ['host' => '192.168.1.60', 'user' => 'pi', 'password' => 'atacama'],
-       'litvincent' => ['host' => '192.168.1.61', 'user' => 'pi', 'password' => 'atacama'],
-       'litjerome' => ['host' => '192.168.1.62', 'user' => 'pi', 'password' => 'atacama'],
-       'sdb' => ['host' => '192.168.1.63', 'user' => 'pi', 'password' => 'atacama'],
-       'entree' => ['host' => '192.168.1.64', 'user' => 'pi', 'password' => 'atacama'],
-       'jarvis' => ['host' => '192.168.1.60', 'user' => 'jarvis', 'password' => 'atacama'],
-       'minitel1' => ['host' => '192.168.1.65', 'user' => 'pi', 'password' => 'atacama'],
-       'salon' => ['host' => '192.168.1.66', 'user' => 'pi', 'password' => 'atacama'],
-       'bureau' => ['host' => '192.168.1.67', 'user' => 'pi', 'password' => 'atacama'],
-       'cuisine' => ['host' => '192.168.1.68', 'user' => 'pi', 'password' => 'atacama'],
-       'bureausun' => ['host' => '192.168.1.70', 'user' => 'pi', 'password' => 'atacama'],
-       'avion' => ['host' => '192.168.1.5', 'user' => 'Tortuga', 'password' => 's77vpo*wu', 'mac' => 'E0:D5:5E:68:67:B9'],
+    'cerveau' => ['host' => '192.168.13.60', 'user' => 'pi', 'password' => 'atacama'],
+       'litvincent' => ['host' => '192.168.13.61', 'user' => 'pi', 'password' => 'atacama'],
+       'litjerome' => ['host' => '192.168.13.62', 'user' => 'pi', 'password' => 'atacama'],
+       'sdb' => ['host' => '192.168.13.63', 'user' => 'pi', 'password' => 'atacama'],
+       'entree' => ['host' => '192.168.13.64', 'user' => 'pi', 'password' => 'atacama'],
+       'jarvis' => ['host' => '192.168.13.60', 'user' => 'jarvis', 'password' => 'atacama'],
+       'minitel1' => ['host' => '192.168.13.65', 'user' => 'pi', 'password' => 'atacama'],
+       'salon' => ['host' => '192.168.13.66', 'user' => 'pi', 'password' => 'atacama'],
+       'bureau' => ['host' => '192.168.13.67', 'user' => 'pi', 'password' => 'atacama'],
+       'cuisine' => ['host' => '192.168.13.68', 'user' => 'pi', 'password' => 'atacama'],
+       'bureausun' => ['host' => '192.168.13.70', 'user' => 'pi', 'password' => 'atacama'],
+       'avion' => ['host' => '192.168.13.5', 'user' => 'Tortuga', 'password' => 's77vpo*wu', 'mac' => 'E0:D5:5E:68:67:B9'],
 ];
 
 // Browse media files on NAS

diff --git a/config/tv.php b/config/tv.php
index a29c9f077c577aec281531ce54e7b953acbc58bc..e444d39853910232d6f9aaea32f919aaf7a6be8f 100644 (file)
--- a/config/tv.php
+++ b/config/tv.php
@@ -2,7 +2,7 @@
 $mapdvb = connectRedis()->igbget('dvbchannels');
 if (!$mapdvb) {
     $mapdvb = array();
-    $m3u = getUrlContent('http://192.168.1.60:9981/playlist/channels', 30);
+    $m3u = getUrlContent('http://192.168.13.60:9981/playlist/channels', 30);
     $lines = explode("\n", $m3u);
     $name = '';
     foreach ($lines as $line) {
@@ -65,7 +65,7 @@ foreach ($tv as $name => $service) {
     if (is_numeric($name)) {
         $shortcuts['sub-tv'][] = array('type' => 'separator', 'label' => $service);
     } else {
-        if ($tvplayer == 'omxplayer' || $tvplayer == 'mediarasp') {
+        if ($tvplayer == 'omxplayer' || $tvplayer == 'mediarasp' || $tvplayer == 'vlciframe') {
             $e = explode(':', $service['stream'], 3);
             $protocol = $e[0];
             $id = $e[1];
@@ -77,11 +77,14 @@ foreach ($tv as $name => $service) {
                     $id .= ':';
                 }
             }
+
+            $type = $tvplayer == 'vlciframe' ? 'vlciframe' : 'omx';
+
             if ($protocol == 'fbx') {
-                $shortcuts['sub-tv'][] = array('type' => 'omx', 'url' => 'rtsp://mafreebox.freebox.fr/fbxtv_pub/stream?namespace=1&service=' . $id . $definition, 'label' => $name);
+                $shortcuts['sub-tv'][] = array('type' => $type, 'url' => 'rtsp://mafreebox.freebox.fr/fbxtv_pub/stream?namespace=1&service=' . $id . $definition, 'label' => $name);
             } else {
                 if (isset($mapdvb[$id])) {
-                    $shortcuts['sub-tv'][] = array('type' => 'omx', 'url' => $mapdvb[$id], 'label' => $name);
+                    $shortcuts['sub-tv'][] = array('type' => $type, 'url' => $mapdvb[$id], 'label' => $name);
                 }
             }
         } elseif ($tvplayer == 'freebox') {

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 67e85c420873bb0ff6d44f064fe283a58f61e9a8..195a108737b4d784d77c165ac763984ee30b6129 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -108,7 +108,8 @@ function cronFlowerPower($cronmin)
 function cronPing($cronmin)
 {
     global $devices;
-    setState('vincenthere', ping('192.168.1.53') ? '1' : '0');
+    setState('vincenthere', ping('192.168.13.31') ? '1' : '0');
+    setState('hasnetwork', ping('1.1.1.1', 443) ? '1' : '0');
     foreach ($devices as $name => $device) {
         $result = ping($device['host'], 3, 22) ? '1' : '0';
         setState('device_' . $name . '_awake', $result);

diff --git a/scripts/lib/cachemedia.php b/scripts/lib/cachemedia.php
new file mode 100644 (file)
index 0000000..3dd53b8
--- /dev/null
+++ b/scripts/lib/cachemedia.php
@@ -0,0 +1,18 @@
+<?php
+function cacheMedia($url)
+{
+    $e = explode('.', $url);
+    $ext = array_pop($e);
+    $cachedURL = '/cache/media/' . sha1($url) . '.' . $ext;
+    $cachedFile = ROOT . $cachedURL;
+
+    if (!hasNetwork()) {
+        return $cachedURL;
+    }
+
+    $limit = time() - 604800;
+    if (!file_exists($cachedFile) || filemtime($cachedFile) < $limit) {
+        copy($url, $cachedFile);
+    }
+    return $cachedURL;
+}
\ No newline at end of file

diff --git a/scripts/lib/domoticz.php b/scripts/lib/domoticz.php
index c1bb9893847fac9eeb43595d2108bbe1126176d5..d7396db5b40a4e394a6f930521fdc2f09107de64 100644 (file)
--- a/scripts/lib/domoticz.php
+++ b/scripts/lib/domoticz.php
@@ -4,7 +4,7 @@ function runDomoticzCommand($params)
     $default = ['type' => 'command', 'passcode' => ''];
     $params = array_merge($default, $params);
 
-    return httpRequest('http://192.168.1.60:8084/json.htm', 'GET', $params);
+    return httpRequest('http://192.168.13.60:8084/json.htm', 'GET', $params);
 }
 
 function domoticzSwitch($device, $cmd, $type = 'light', $priority = false)

diff --git a/scripts/lib/harmony.php b/scripts/lib/harmony.php
index fcfa452e4dbefa1776f3e7b39273bef224b7357c..e43ddbd6a2d0ec3879c0f2a54ab4043493f52f69 100644 (file)
--- a/scripts/lib/harmony.php
+++ b/scripts/lib/harmony.php
@@ -5,7 +5,7 @@ function harmonyRequest($uri, $method = 'GET', $hub = 'salon')
 {
     global $harmonyClient;
 
-    $ip = '192.168.1.66';
+    $ip = '192.168.13.66';
 
     $uri = 'http://' . $ip . ':8282/hubs/' . $hub . '/' . ltrim($uri, '/');
 

diff --git a/scripts/lib/insteon.php b/scripts/lib/insteon.php
index 5946c65dcdba124beb429ad4542be3651609635c..3912422c3f234eea7f4dc556a119c2615e3fc5d7 100644 (file)
--- a/scripts/lib/insteon.php
+++ b/scripts/lib/insteon.php
@@ -1,6 +1,6 @@
 <?php
 
-$insteonBaseURL = 'http://192.168.1.32:25105';
+$insteonBaseURL = 'http://192.168.13.83:25105';
 $insteonAuth = array('t1Kx8wuNWG', 'NA4Hq3v9cM');
 $insteonCommandTimeout = 15;
 $insteonHasKnocked = false;

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index de1c541cd2cf7b231dc66110f69c6efbf6777c4b..9e79b5151e9bf5275a3cb53c29ceb6e690ba615f 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -39,6 +39,7 @@ require_once ROOT . '/scripts/lib/traffic.php';
 require_once ROOT . '/scripts/lib/medialibrary.php';
 require_once ROOT . '/scripts/lib/heartbeats.php';
 require_once ROOT . '/scripts/lib/ssh.php';
+require_once ROOT . '/scripts/lib/cachemedia.php';
 
 
 profile('Loaded libraries', __FILE__, __LINE__);
@@ -359,12 +360,17 @@ function getSynologyInstance()
 {
     global $syno;
     if (!isset($syno)) {
-        $syno = new Synology_Api('192.168.1.96', 5002, 'https', 1);
+        $syno = new Synology_Api('192.168.13.3', 5002, 'https', 1);
         $syno->connect('Vincent', 'xxxx');
     }
     return $syno;
 }
 
+function hasNetwork()
+{
+    return true;
+}
+
 function ping($ip, $timeout = 5, $port = 1817)
 {
     $res = @fsockopen($ip, $port, $errno, $errstr, $timeout);

diff --git a/scripts/lib/tmdb.php b/scripts/lib/tmdb.php
index fe51e375595b565ea214584a1486e604f103188c..9321c24d944f420ef66662c622d1969041b227e8 100644 (file)
--- a/scripts/lib/tmdb.php
+++ b/scripts/lib/tmdb.php
@@ -152,11 +152,14 @@ class tvShowLibrary extends mediaLibrary
         }
 
         if ($res === false) {
+            if (!hasNetwork()) {
+                return null;
+            }
             $client = getTmbdClient();
 
             try {
                 $tv = $client->getTvApi()->getTvshow($id, ['language' => 'fr-FR']);
-                connectRedis()->igbsetex('tmdb.tv.' . $id, 86400, $tv);
+                connectRedis()->igbset('tmdb.tv.' . $id, $tv);
                 return $tv;
             } catch (Exception $e) {
                 echo $e->getMessage();
@@ -189,7 +192,7 @@ class tvShowLibrary extends mediaLibrary
     {
         global $videoExt;
         $subname = $prefix . 'tvshow-' . $tvShow['id'];
-        $res['shortcuts'][] = ['label' => $tvShow['data']['name'], 'type' => 'sub', 'sub' => $subname, 'poster' => 'https://image.tmdb.org/t/p/w500' . $tvShow['data']['poster_path']];
+        $res['shortcuts'][] = ['label' => $tvShow['data']['name'], 'type' => 'sub', 'sub' => $subname, 'poster' => cacheMedia('https://image.tmdb.org/t/p/w500' . $tvShow['data']['poster_path'])];
 
         $res['subs']['sub-' . $subname] = ['size' => 'poster'];
         $res['subs']['sub-' . $subname][] = ['label' => $tvShow['data']['name'], 'type' => 'back'];
@@ -440,7 +443,7 @@ class moviesLibrary extends mediaLibrary
     public function shortcut($movie, $prefix, &$res)
     {
         $path = $this->_path($movie['path']);
-        $res[] = ['label' => $movie['data']['title'], 'type' => 'media', 'seen' => $this->_seen($path), 'path' => $path, 'poster' => 'https://image.tmdb.org/t/p/w500' . $movie['data']['poster_path']];
+        $res[] = ['label' => $movie['data']['title'], 'type' => 'media', 'seen' => $this->_seen($path), 'path' => $path, 'poster' => cacheMedia('https://image.tmdb.org/t/p/w500' . $movie['data']['poster_path'])];
     }
 
     public function _orderMovies($a, $b)
@@ -509,10 +512,13 @@ class moviesLibrary extends mediaLibrary
             $res = false;
         }
         if ($res === false) {
+            if (!hasNetwork()) {
+                return null;
+            }
             $client = getTmbdClient();
             try {
                 $movie = $client->getMoviesApi()->getMovie($id, ['language' => 'fr-FR']);
-                connectRedis()->igbsetex('tmdb.movie.' . $id, 86400, $movie);
+                connectRedis()->igbset('tmdb.movie.' . $id, $movie);
                 return $movie;
             } catch (Exception $e) {
                 return null;

diff --git a/scripts/media.php b/scripts/media.php
new file mode 100644 (file)
index 0000000..8812378
--- /dev/null
+++ b/scripts/media.php
@@ -0,0 +1,6 @@
+<?php
+$u=$_GET['url'];
+$e=explode('.',$u);
+$ext=array_pop($e);
+
+$cached=ROOT.'/cache/media'
\ No newline at end of file

diff --git a/scripts/tmdb.php b/scripts/tmdb.php
index d0d8edfa72f55c2035b53dee26bf800331bfe106..fe8fda0c9e874782b5aeb31afbf824b14a1aab3c 100644 (file)
--- a/scripts/tmdb.php
+++ b/scripts/tmdb.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'import.php';
-//_getTVShows(true,true);
-//_getMovies(true);
-//_getMediaRecentAdded(true);
-//parseMoviesLibrary();
\ No newline at end of file
+_getTVShows(true,true);
+_getMovies(true);
+_getMediaRecentAdded(true);
+parseMoviesLibrary();
\ No newline at end of file

diff --git a/servers/startserver b/servers/startserver
index 74de26659fd38ee3e56a2ab041adc82d104df5e9..ac9a70e5a4e82fe659371abb37adf5a2fd43a46a 100644 (file)
--- a/servers/startserver
+++ b/servers/startserver
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /var/www/home
-php -S 192.168.1.60:$2 "/var/www/home" >> "/var/log/home/$1.log"
\ No newline at end of file
+php -S 192.168.13.60:$2 "/var/www/home" >> "/var/log/home/$1.log"
\ No newline at end of file

diff --git a/servers/stopserver b/servers/stopserver
index 5f46974506958f7960173b76628f3554f2cefad7..75a10d2da7daa91c12a35ffd23616e49d9d90284 100644 (file)
--- a/servers/stopserver
+++ b/servers/stopserver
@@ -1,4 +1,4 @@
 #!/usr/bin/php
 <?php
 $port = $argv[2];
-`kill $(ps aux | grep '[p]hp -S 192.168.1.60:$port' | awk '{print $2}')`;
\ No newline at end of file
+`kill $(ps aux | grep '[p]hp -S 192.168.13.60:$port' | awk '{print $2}')`;
\ No newline at end of file