wait #7711 @0:05

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 719db4f32e2da0398504b58c8e33e906d6f63870..b9b90901c9dd7a4892da4af49431a971a370451b 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">

-  <component name="dataSourceStorageLocal" created-in="IU-252.23591.19">
+  <component name="dataSourceStorageLocal" created-in="IU-252.25557.131">

     <data-source name="MySQL - extranet@localhost" uuid="dcccbe5a-9bcc-499d-9016-6a2adfb6a5e1">
       <database-info product="MySQL" version="8.0.18-0ubuntu0.19.10.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.46 ( Revision: 9cc87a48e75c2d2e87c1a293b2862ce651cb256e )" dbms="MYSQL" exact-version="8.0.18" exact-driver-version="5.1">
         <extra-name-characters>#@</extra-name-characters>
     <data-source name="MySQL - extranet@localhost" uuid="dcccbe5a-9bcc-499d-9016-6a2adfb6a5e1">
       <database-info product="MySQL" version="8.0.18-0ubuntu0.19.10.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.46 ( Revision: 9cc87a48e75c2d2e87c1a293b2862ce651cb256e )" dbms="MYSQL" exact-version="8.0.18" exact-driver-version="5.1">
         <extra-name-characters>#@</extra-name-characters>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ce898353f77b8b9503be93dd03e61e8a15dc8034..7ceff118b0957a2f52208b45a6e93e2ef0322220 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">

-    <list default="true" id="cce3d8fa-b2c6-47ff-8f04-45fbe0685ece" name="Changes" comment="wip #7607 @0.5" />
+    <list default="true" id="cce3d8fa-b2c6-47ff-8f04-45fbe0685ece" name="Changes" comment="wait #7432 @0:20">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>

     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />


@@ -129,7 +131,7 @@
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
     &quot;ignore_missing_gitignore&quot;: &quot;true&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
     &quot;ignore_missing_gitignore&quot;: &quot;true&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,

-    &quot;last_opened_file_path&quot;: &quot;D:/Works/cubeExtranet&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/cubeExtranet/images/extranet/docs&quot;,

     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,


@@ -145,11 +147,11 @@
 }</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
 }</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">

+      <recent name="D:\Works\cubeExtranet\images\extranet\docs" />

       <recent name="D:\Works\cubeExtranet\fonts" />
       <recent name="D:\Works\cubeExtranet\.docker\config\ssh" />
       <recent name="D:\Works\cubeExtranet\.docker\images" />
       <recent name="D:\Works\cubeExtranet\.docker\config\httpd" />
       <recent name="D:\Works\cubeExtranet\fonts" />
       <recent name="D:\Works\cubeExtranet\.docker\config\ssh" />
       <recent name="D:\Works\cubeExtranet\.docker\images" />
       <recent name="D:\Works\cubeExtranet\.docker\config\httpd" />

-      <recent name="D:\Works\cubeExtranet\.docker\config\monit\conf.d" />

     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Works\cubeExtranet\images\extranet\docs" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Works\cubeExtranet\images\extranet\docs" />


@@ -456,8 +458,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>

-        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.23591.19" />
-        <option value="bundled-js-predefined-d6986cc7102b-6be00b7b0f42-JavaScript-IU-252.23591.19" />
+        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.25557.131" />
+        <option value="bundled-js-predefined-d6986cc7102b-b598e85cdad2-JavaScript-IU-252.25557.131" />

       </set>
     </attachedChunks>
   </component>
       </set>
     </attachedChunks>
   </component>


@@ -2539,6 +2541,8 @@
       <workItem from="1743783415256" duration="5446000" />
       <workItem from="1751911086333" duration="6321000" />
       <workItem from="1751990664460" duration="2240000" />
       <workItem from="1743783415256" duration="5446000" />
       <workItem from="1751911086333" duration="6321000" />
       <workItem from="1751990664460" duration="2240000" />

+      <workItem from="1752077729413" duration="2449000" />
+      <workItem from="1756986290115" duration="131000" />

     </task>
     <task id="LOCAL-01333" summary="wait #5687 @1">
       <created>1674048129043</created>
     </task>
     <task id="LOCAL-01333" summary="wait #5687 @1">
       <created>1674048129043</created>


@@ -2883,7 +2887,7 @@
       <option name="project" value="LOCAL" />
       <updated>1686577901630</updated>
     </task>
       <option name="project" value="LOCAL" />
       <updated>1686577901630</updated>
     </task>

-    <option name="localTasksCounter" value="1405" />
+    <option name="localTasksCounter" value="1406" />

     <option name="createBranch" value="false" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
     <option name="createBranch" value="false" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">


@@ -2910,6 +2914,11 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>

+  <component name="UnknownFeatures">
+    <option featureType="dependencySupport" implementationName="executable:docker" />
+    <option featureType="dependencySupport" implementationName="javascript:npm:webpack" />
+    <option featureType="dependencySupport" implementationName="javascript:npm:vue" />
+  </component>

   <component name="Vcs.Log.History.Properties">
     <option name="COLUMN_ID_ORDER">
       <list>
   <component name="Vcs.Log.History.Properties">
     <option name="COLUMN_ID_ORDER">
       <list>


@@ -2949,7 +2958,6 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$/../../" />
     </ignored-roots>
     <ignored-roots>
       <path value="$PROJECT_DIR$/../../" />
     </ignored-roots>

-    <MESSAGE value="wait #5993" />

     <MESSAGE value="wip #5991" />
     <MESSAGE value="wait #6017 @0.25" />
     <MESSAGE value="wip #6068 @0.25" />
     <MESSAGE value="wip #5991" />
     <MESSAGE value="wait #6017 @0.25" />
     <MESSAGE value="wip #6068 @0.25" />


@@ -2974,7 +2982,8 @@
     <MESSAGE value="wip #7255" />
     <MESSAGE value="try #7398 @0.5" />
     <MESSAGE value="wip #7607 @0.5" />
     <MESSAGE value="wip #7255" />
     <MESSAGE value="try #7398 @0.5" />
     <MESSAGE value="wip #7607 @0.5" />

-    <option name="LAST_COMMIT_MESSAGE" value="wip #7607 @0.5" />
+    <MESSAGE value="wait #7432 @0:20" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #7432 @0:20" />

   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index ab44d1ddb0148b428915a2cbce91fe200c472f85..cab2c54d45d67e46b0e643dcf4eea5adacca574e 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -40,7 +40,7 @@ class commonTools
         $ue = array_diff(cubeCountry::getUECountries(), array('FR'));
 
         $countries = "'" . implode("','", $ue) . "'";
         $ue = array_diff(cubeCountry::getUECountries(), array('FR'));
 
         $countries = "'" . implode("','", $ue) . "'";

-        $limit = TIME - (3600 * 24 * 400);
+        $limit = TIME - (3600 * 24 * 730);

 
         $limit = mktime(0, 0, 0, date('m', $limit), 1, date('y', $limit));
 
 
         $limit = mktime(0, 0, 0, date('m', $limit), 1, date('y', $limit));