FEAT #9716 set cookie logout + gitlab 7.3

.gitlab-ci.yml

@@ -30,31 +30,25 @@ before_script:
   - bash ci/docker_install_php.sh > /dev/null
   - bash ci/docker_install_database.sh > /dev/null
 
-# job_php-7.3:
-#   image: php:7.3-apache
-#   stage: test
-#   script:
-#     - mkdir -p /opt/maarch/docservers/indexes/{letterbox_coll,attachments_coll,version_attachments_coll}
-#     - mkdir -p /opt/maarch/docservers/{ai,manual,manual_attachments,templates}
-#     - mkdir -p /opt/maarch/docservers/{convert_attachments,convert_attachments_version,convert_mlb}
-#     - mkdir -p /opt/maarch/docservers/{fulltext_attachments,fulltext_attachments_version,fulltext_mlb}
-#     - mkdir -p /opt/maarch/docservers/{thumbnails_attachments,thumbnails_attachments_version,thumbnails_mlb}
-#     - mkdir -p /var/www/html/
-#     - cp -R /builds/maarch/MaarchCourrier/ /var/www/html/
-#     - cd /var/www/html/MaarchCourrier
-#     - mkdir -p /var/www/html/MaarchCourrier
-#     #- curl -sL https://deb.nodesource.com/setup_7.x | bash - 
-#     #- apt-get install -yqq nodejs 
-#     #- npm install npm@latest -g 
-#     #- npm set registry https://registry.npmjs.org/ 
-#     #- npm install
-#     - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
-#     - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
-#     - chmod +x /usr/local/bin/phpunit
-#     #- cd App/MaarchRM
-#     - phpunit --coverage-text --colors=never -c phpunit.xml
-#   only:
-#     - develop
+job_php-7.3:
+ image: php:7.3-apache
+ stage: test
+ script:
+   - mkdir -p /opt/maarch/docservers/indexes/{letterbox_coll,attachments_coll,version_attachments_coll}
+   - mkdir -p /opt/maarch/docservers/{ai,manual,manual_attachments,templates}
+   - mkdir -p /opt/maarch/docservers/{convert_attachments,convert_attachments_version,convert_mlb}
+   - mkdir -p /opt/maarch/docservers/{fulltext_attachments,fulltext_attachments_version,fulltext_mlb}
+   - mkdir -p /opt/maarch/docservers/{thumbnails_attachments,thumbnails_attachments_version,thumbnails_mlb}
+   - mkdir -p /var/www/html/
+   - cp -R /builds/maarch/MaarchCourrier/ /var/www/html/
+   - cd /var/www/html/MaarchCourrier
+   - mkdir -p /var/www/html/MaarchCourrier
+   - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
+   - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
+   - chmod +x /usr/local/bin/phpunit
+   - phpunit --coverage-text --colors=never -c phpunit.xml
+ only:
+   - develop
 
 job_php-7.2:
   image: php:7.2-apache
@@ -77,7 +71,6 @@ job_php-7.2:
     - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
     - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
     - chmod +x /usr/local/bin/phpunit
-    #- cd App/MaarchRM
     - phpunit --coverage-text --colors=never -c phpunit.xml
   only:
     - develop
@@ -103,7 +96,6 @@ job_php-7.1:
     - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
     - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar
     - chmod +x /usr/local/bin/phpunit
-    #- cd App/MaarchRM
     - phpunit --coverage-text --colors=never -c phpunit.xml
   only:
     - develop
@@ -129,7 +121,6 @@ job_php-7.0:
     - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
     - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-6.phar
     - chmod +x /usr/local/bin/phpunit
-    #- cd App/MaarchRM
     - phpunit --coverage-text --colors=never -c phpunit.xml
   only:
     - develop

apps/maarch_entreprise/logout.php

@@ -58,9 +58,8 @@ $appUrl   = $_SESSION['config']['businessappurl'];
 $appId    = $_SESSION['config']['app_id'];
 
 // Destruction du cookie. La session est entièrement détruite et revenir sur le site attribuera un nouvel identifiant
-$args = array_merge(array(session_name(), ''), array_values(session_get_cookie_params()));
-$args[2] = time() - 3600;
-$args = array_slice($args, 0, 7);
+$args = [session_name(), '', session_get_cookie_params()];
+$args[2]['lifetime'] = time() - 3600;
 call_user_func_array('setcookie', $args);
 
 if (isset($_SESSION['web_sso_url'])) {