X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=install%2Finstall_functions.php;h=a3bf366195ecf34af6c18204277fe4ac004f17ed;hb=4b77a62f2af5e3804b13159f44641e584825cdb1;hp=a483056952392af012be926dabbb551b2604ed5e;hpb=57068585c0a1164f1ae7ae399f3d5a68a4e9d46d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/install/install_functions.php b/install/install_functions.php
index a4830569..a3bf3661 100644
--- a/install/install_functions.php
+++ b/install/install_functions.php
@@ -78,12 +78,18 @@ function pdoDrivers() {
  * Here in case of .gitignore files
  */
 
-function delTree($dir) {
-    $files = array_diff(scandir($dir), array('.','..'));
-    foreach ($files as $file) {
-      (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
+function delTree($dir, $withdirectory=true, $hiddenfiles = true) {
+    if ($hiddenfiles) {
+        $files = array_diff(scandir($dir), array('.','..'));
+        foreach ($files as $file) {
+            (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
+        }
+    }
+    if ($withdirectory) {
+        return rmdir($dir);
+    } else {
+        return true;
     }
-    return rmdir($dir);
   }
 
 function generate_salt() {
@@ -104,4 +110,4 @@ function executeQuery($handle, $sql, $params) {
     }
 }
 
-?>
\ No newline at end of file
+?>