Fix: Add protection to not delete a root directory when deleting a

company.
Dolibarr · Dec 21, 2013 · d9c7dc8 · d9c7dc8
1 parent 4d3290e
commit d9c7dc8
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
@@ -994,6 +994,8 @@ function delete($id)
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
+        $entity=isset($this->entity)?$this->entity:$conf->entity;
+
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $error = 0;
 
@@ -1122,12 +1124,15 @@ function delete($id)
                 $this->db->commit();
 
                 // Delete directory
-                $docdir = $conf->societe->multidir_output[$this->entity] . "/" . $id;
-                if (file_exists($docdir))
+                if (! empty($conf->societe->multidir_output[$entity]))
                 {
-                    dol_delete_dir_recursive($docdir);
+                	$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+                	if (dol_is_dir($docdir))
+                	{
+                    	dol_delete_dir_recursive($docdir);
+                	}
                 }
-
+                
                 return 1;
             }
             else