delete hidden file - use scandir in deltree

Elena.Budnik
1 parent 1be10ccb
Showing 1 changed file with 10 additions and 6 deletions Show diff stats
php/classes/Guest.php
@@ -117,17 +117,21 @@ class Guest {
     }
-   public function deltree($f) {
-
+    public function deltree($f) {
+ 
         if (is_dir($f)) {
-            foreach(glob($f.'/*') as $sf) {
-                if (is_dir($sf) && !is_link($sf)) {
-                    $this->deltree($sf);
+
+            $files = array_diff(scandir($f), array('.','..'));
+
+            foreach($files as $sf) {
+                if (is_dir("$f/$sf") && !is_link("$f/$sf")) {
+                    $this->deltree("$f/$sf");
                 } else {
-                    unlink($sf);
+                    unlink("$f/$sf");
                 } 
             } 
         }
+
         if (is_dir($f)) rmdir($f);
     }