From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 1 Sep 2009 11:25:35 +0000 (+0000)
Subject: Company directory was not deleted after company removal.
X-Git-Tag: v2.4.2~19^2~1277
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=a7559145b810836325f80baf3e129224411a1794;p=fa-stable.git

Company directory was not deleted after company removal.
---

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 5200f2df..684369c5 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -163,7 +163,7 @@ function handle_delete()
 	$id = $_GET['id'];
 
 	$cdir = $comp_path.'/'.$id;
-	@flush_dir($cdir);
+	@flush_dir($cdir, true);
 	if (!rmdir($cdir))
 	{
 		display_error(_("Cannot remove company data directory ") . $cdir);
diff --git a/includes/main.inc b/includes/main.inc
index 8c0fc8d3..ee4417e2 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -57,17 +57,17 @@ function end_page($no_menu=false, $is_index=false)
     	page_footer($no_menu, $is_index);
 }
 
-function flush_dir($path) 
+function flush_dir($path, $wipe = false) 
 {
 	$dir = opendir($path);
 	while(false !== ($fname = readdir($dir))) {
-		if($fname=='.' || $fname=='..' || $fname=='index.php') continue;
+		if($fname=='.' || $fname=='..' || (!$wipe && $fname=='index.php')) continue;
   		if(is_dir($path.'/'.$fname)) {
-		    flush_dir($path.'/'.$fname);
-		    @rmdir($path.'/'.$fname);
+		    flush_dir($path.'/'.$fname, $wipe);
+		    if ($wipe) @rmdir($path.'/'.$fname);
 		} else
 		    @unlink($path.'/'.$fname);
-  	}
+	}
 }
 
 function cache_js_file($fpath, $text)