wip #7607 @0.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index daabd488b8f04429750539eea25a6cfb148de21a..d6800b3f93d674fc6f930a6c69bba044af354797 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -119,8 +119,8 @@ services:
 \r
 networks:\r
   extranet:\r
-    external:\r
-      name: extranet\r
+    name: extranet\r
+    external: true\r
   nginxproxy:\r
-    external:\r
-      name: nginxproxy\r
+    name: nginxproxy\r
+    external: true\r

diff --git a/.docker/images/php/overrides.conf b/.docker/images/php/overrides.conf
index 354def50352faecc5542f070b18b26429076cb92..c674817927399c94a75708e0e2f62074e7302bb3 100644 (file)
--- a/.docker/images/php/overrides.conf
+++ b/.docker/images/php/overrides.conf
@@ -30,10 +30,10 @@ user = 1001
 group = 33
 
 pm = dynamic
-pm.max_children = 8
+pm.max_children = 12
 pm.start_servers = 10
 pm.min_spare_servers = 8
-pm.max_spare_servers = 20
+pm.max_spare_servers = 10
 pm.max_requests = 100
 
 [nonblocking]

diff --git a/.docker/update b/.docker/update
index d2e8dd623cbec9e4e9f4fd58c1c5fc85ba7a688d..82341393540086dbba9c3dc33aa600661afaa8c9 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -4,8 +4,6 @@ docker plugin install ucphhpc/sshfs --grant-all-permissions
 chown root:root /home/extranet/.docker/config/cron/host;ln -sf /home/extranet/.docker/config/cron/host /etc/cron.d/extranet
 docker network create extranet
 ./build
-docker compose down
-docker volume rm extranet_fluidbook_docs
-docker volume rm extranet_fluidbook_hosting
+docker compose down -v
 docker compose up -d
-/home/extranet/www/bin/fixrights
\ No newline at end of file
+#/home/extranet/www/bin/fixrights
\ No newline at end of file

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 71c9a6a7661919832dade298b742aa6017ae4904..719db4f32e2da0398504b58c8e33e906d6f63870 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">
-  <component name="dataSourceStorageLocal" created-in="IU-243.25659.59">
+  <component name="dataSourceStorageLocal" created-in="IU-252.23591.19">
     <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/deployment.xml b/.idea/deployment.xml
index 54118ff88655ad83c1adab15cfc3c26cc7b4002c..d30bcce10446b9aecb66793eaed1aa9aab403a40 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="extranet.cubedesigners.com (Host)" promptOnLocalOverwrite="false" confirmBeforeUploading="false" confirmBeforeDeletion="false" autoUploadExternalChanges="true">
+  <component name="PublishConfigData" autoUpload="Always" serverName="extranet.cubedesigners.com" promptOnLocalOverwrite="false" confirmBeforeUploading="false" confirmBeforeDeletion="false" autoUploadExternalChanges="true">
     <option name="confirmBeforeDeletion" value="false" />
     <option name="confirmBeforeUploading" value="false" />
     <serverData>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 386e07101081d69ef294a6535ffd227c3444e830..471734f0f818ea224f0c9014c4d62fcbb228f41c 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="cce3d8fa-b2c6-47ff-8f04-45fbe0685ece" name="Changes" comment="wip #7255">
-      <change beforePath="$PROJECT_DIR$/.docker/config/php.ini" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/php.ini" afterDir="false" />
+    <list default="true" id="cce3d8fa-b2c6-47ff-8f04-45fbe0685ece" name="Changes" comment="try #7398 @0.5">
+      <change beforePath="$PROJECT_DIR$/.docker/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/docker-compose.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.docker/images/php/overrides.conf" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/images/php/overrides.conf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/update" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fluidbook/compile/_html5/style/fluidbook.css" beforeDir="false" afterPath="$PROJECT_DIR$/fluidbook/compile/_html5/style/fluidbook.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/inc/commons/class.common.tools.php" beforeDir="false" afterPath="$PROJECT_DIR$/inc/commons/class.common.tools.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/inc/extranet/Controlleur/class.extranet.url.php" beforeDir="false" afterPath="$PROJECT_DIR$/inc/extranet/Controlleur/class.extranet.url.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -110,7 +111,7 @@
   &quot;associatedIndex&quot;: 3
 }</component>
   <component name="ProjectId" id="1Q68J49b28Tx31z7d3j0IY2Mduq" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+  <component name="ProjectLevelVcsManager">
     <OptionsSetting value="false" id="Update" />
     <ConfirmationsSetting value="2" id="Add" />
     <ConfirmationsSetting value="2" id="Remove" />
@@ -123,6 +124,7 @@
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;Shell Script.Docker terminal.executor&quot;: &quot;Run&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
@@ -359,54 +361,6 @@
       <option name="USE_PATTERN" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="tests" factoryName="Nosetests">
-      <module name="cubeExtranet" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_regexPattern" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;.&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="Unittests">
-      <module name="cubeExtranet" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;.&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="py.test">
-      <module name="cubeExtranet" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_parameters" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;.&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <method v="2">
@@ -455,12 +409,63 @@
       <pass-parent-envs>true</pass-parent-envs>
       <method v="2" />
     </configuration>
+    <configuration default="true" type="tests" factoryName="Nosetests">
+      <module name="cubeExtranet" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_regexPattern" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;.&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Unittests">
+      <module name="cubeExtranet" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;.&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="py.test">
+      <module name="cubeExtranet" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_parameters" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;.&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-a94e463ab2e7-intellij.indexing.shared.core-IU-243.25659.59" />
-        <option value="bundled-js-predefined-d6986cc7102b-1632447f56bf-JavaScript-IU-243.25659.59" />
+        <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" />
       </set>
     </attachedChunks>
   </component>
@@ -2535,7 +2540,13 @@
       <workItem from="1737903451206" duration="600000" />
       <workItem from="1737909023647" duration="3902000" />
       <workItem from="1738171435745" duration="364000" />
-      <workItem from="1742224113014" duration="1074000" />
+      <workItem from="1742224113014" duration="2846000" />
+      <workItem from="1742290078130" duration="4724000" />
+      <workItem from="1742995683180" duration="4470000" />
+      <workItem from="1743097804345" duration="18000" />
+      <workItem from="1743783415256" duration="5446000" />
+      <workItem from="1751911086333" duration="6321000" />
+      <workItem from="1751990664460" duration="2133000" />
     </task>
     <task id="LOCAL-01333" summary="wait #5687 @1">
       <created>1674048129043</created>
@@ -2880,7 +2891,7 @@
       <option name="project" value="LOCAL" />
       <updated>1686577901630</updated>
     </task>
-    <option name="localTasksCounter" value="1403" />
+    <option name="localTasksCounter" value="1404" />
     <option name="createBranch" value="false" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
@@ -2946,7 +2957,6 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$/../../" />
     </ignored-roots>
-    <MESSAGE value="wait #5993 @0.75" />
     <MESSAGE value="wait #5945 @0.25" />
     <MESSAGE value="wait #5993" />
     <MESSAGE value="wip #5991" />
@@ -2971,7 +2981,8 @@
     <MESSAGE value="wait #6909 @1" />
     <MESSAGE value="wip #7255 @0.5" />
     <MESSAGE value="wip #7255" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #7255" />
+    <MESSAGE value="try #7398 @0.5" />
+    <option name="LAST_COMMIT_MESSAGE" value="try #7398 @0.5" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 681eb0a7e8732bfd9cbdea77ba389771d5a4e1c0..f38ba4a02927700daa96f7acc4f22b8ae7444037 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -1554,6 +1554,8 @@ class extranetUrl
 
     public static function chiffres($args)
     {
+        header('Location: https://toolbox.fluidbook.com/extranet/totals');
+
         global $core;
         commonDroits::min(2);
         // $res = commonPage::barre(null, null, null, array('<a href="http://www.google.com/calendar/" class="blank">' . $core->typo->Favoris(__('Gérer les charges sur Google Agenda')) . '</a>'));