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

correct bug 364

Browse Source
This commit is contained in:
FHenry 2012-04-15 16:37:52 +02:00 committed by Regis Houssin
parent d66eb5bb23
commit bf8389144a
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/projet/class/task.class.php
View File

@ -320,8 +320,7 @@ class Task extends CommonObject
return 0;
}
//Delete associated link file
//Delete associated link file
//retreive project ref to know project folder
$sql = "SELECT p.ref";
$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid=t.fk_projet";
@ -338,24 +337,6 @@ class Task extends CommonObject
}
}
$this->db->free($resql_projref);
if ($conf->projet->dir_output)
{
$dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($projectref) . '/' . dol_sanitizeFileName($this->id);
dol_syslog(get_class($this)."::delete(retreive proj ref) dir=".$dir, LOG_DEBUG);
if (file_exists($dir))
{
require_once(DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php");
$res = @dol_delete_dir_recursive($dir);
if (!$res)
{
$this->error = 'ErrorFailToDeleteDir';
$this->db->rollback();
return 0;
}
}
}
if (! $error)
{
@ -369,8 +350,7 @@ class Task extends CommonObject
return 0;
}
}
// Delete rang of line
//$this->delRangOfLine($this->id, $this->element);
@ -406,9 +386,29 @@ class Task extends CommonObject
return -1*$error;
}
else
{
{
$this->db->commit();
$this->db->free($resql);
//Delete associated link file
if ($conf->projet->dir_output)
{
$dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($projectref) . '/' . dol_sanitizeFileName($this->id);
dol_syslog(get_class($this)."::delete(retreive proj ref) dir=".$dir, LOG_DEBUG);
if (file_exists($dir))
{
require_once(DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php");
$res = @dol_delete_dir_recursive($dir);
if (!$res)
{
$this->error = 'ErrorFailToDeleteDir';
$this->db->rollback();
return 0;
}
}
}
return 1;
}
}