lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
company.
This commit is contained in:
Laurent Destailleur 2013-12-21 12:04:39 +01:00
parent 4d3290e4bf
commit d9c7dc8697
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/societe/class/societe.class.php
View File

@ -994,6 +994,8 @@ class Societe extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; 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); dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$error = 0; $error = 0;
@ -1122,12 +1124,15 @@ class Societe extends CommonObject
$this->db->commit(); $this->db->commit();
// Delete directory // Delete directory
$docdir = $conf->societe->multidir_output[$this->entity] . "/" . $id; if (! empty($conf->societe->multidir_output[$entity]))
if (file_exists($docdir))
{ {
dol_delete_dir_recursive($docdir); $docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
if (dol_is_dir($docdir))
{
dol_delete_dir_recursive($docdir);
}
} }
return 1; return 1;
} }
else else