wait #5669 @2

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index af2bb26522f6e078690802f8019e540e8775705c..aba0cc8322cb39ae27c55f8aec535a001a14590a 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -114,6 +114,7 @@ services:
       # PHP\r
       - '/home/extranet/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini'\r
       - '/home/extranet/sessions/:/var/lib/php/sessions/'\r
+      - '/usr/share/GeoIP/GeoIP.dat:/home/stats/www/GeoIP.dat'\r
       # Crontab\r
       - '/home/extranet/.docker/config/cron/crontab:/etc/crontab'\r
       # Passwords\r

diff --git a/bin/fixrights b/bin/fixrights
index 735a51024a907919649ef088443384089e1b1bce..ed59ed51128e7af3a629d7cef9d671b9058db18e 100644 (file)
--- 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 d901fb62494158b5405fc0f538f78fd1308ee7da..130526e188ab2a4a9c73f5768da1f4020d1a6ffe 100644 (file)
--- 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()