From 0aa9d7c3f98c45f0a9cb3a74b7cea06f4cb86ceb Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 11 Jan 2023 18:18:33 +0000
Subject: [PATCH] wait #5669 @2

---
 .docker/docker-compose.yml                  |  1 +
 bin/fixrights                               |  1 +
 inc/ws/Controlleur/class.ws.maintenance.php | 15 ++++++++-------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index af2bb2652..aba0cc832 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -114,6 +114,7 @@ services:
       # PHP
       - '/home/extranet/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini'
       - '/home/extranet/sessions/:/var/lib/php/sessions/'
+      - '/usr/share/GeoIP/GeoIP.dat:/home/stats/www/GeoIP.dat'
       # Crontab
       - '/home/extranet/.docker/config/cron/crontab:/etc/crontab'
       # Passwords
diff --git a/bin/fixrights b/bin/fixrights
index 735a51024..ed59ed511 100644
--- a/bin/fixrights
+++ b/bin/fixrights
@@ -22,3 +22,4 @@ chmod -R 775 /data/extranet
 chmod -R 777 /home/extranet/share
 chmod -R 777 /home/extranet/www/fluidbook/packager/
 chmod -R 777 /home/toolbox/www/resources/fluidbookpublication/player
+chmod -R 777 /home/stats/www
diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index d901fb624..130526e18 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -159,23 +159,23 @@ class wsMaintenance
             $dr = opendir($dir);
             while ($file = readdir($dr)) {
                 if ($file == '.' || $file == '..') {
-                    echo 'skip '.$file." (dot)\n";
+                    echo 'skip ' . $file . " (dot)\n";
                     continue;
                 }
                 $f = $dir . $file;
-                if ($file == 'download' || $file=='nwbuild') {
-                    echo 'skip '.$file." (base)\n";
+                if ($file == 'download' || $file == 'nwbuild') {
+                    echo 'skip ' . $file . " (base)\n";
                     continue;
                 }
                 if (!is_dir($f)) {
-                    echo 'skip '.$file." (file)\n";
+                    echo 'skip ' . $file . " (file)\n";
                     continue;
                 }
                 if (filemtime($f) > $limit) {
-                    echo 'skip '.$file." (time)\n";
+                    echo 'skip ' . $file . " (time)\n";
                     continue;
                 }
-                echo 'clean '.$file."\n";
+                echo 'clean ' . $file . "\n";
                 `rm -rf $f`;
             }
 
@@ -1051,7 +1051,8 @@ class wsMaintenance
             return false;
         }
 
-        `rm -rf /home/stats/www/objects/$book*;/home/stats/www/FWStats.sh /home/stats/www redobook=$book`;
+        $cmd = "rm -rf /home/stats/www/objects/$book*;/home/stats/www/FWStats.sh /home/stats/www redobook=$book";
+        `$cmd`;
     }
 
     public static function processInbox()
-- 
2.39.5