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

Fix avoid deletion of file if we still need it

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-11 11:38:49 +02:00
parent fc886b9950
commit ab8199f71a
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/admin/company.php
View File

@ -321,25 +321,43 @@ if ($action == 'removelogo' || $action == 'removelogosquarred')
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$logofilename = $mysoc->logo; $logofilename = $mysoc->logo;
if ($action == 'removelogosquarred') $logofilename = $mysoc->logo_squarred; $logofilenamebis = $mysoc->logo_squarred;
if ($action == 'removelogosquarred')
{
$logofilename = $mysoc->logo_squarred;
$logofilenamebis = $mysoc->logo;
}
$logofile=$conf->mycompany->dir_output.'/logos/'.$logofilename; $logofile=$conf->mycompany->dir_output.'/logos/'.$logofilename;
if ($logofilename != '') dol_delete_file($logofile); if ($logofilename != '' && $logofilename != $logofilenamebis) dol_delete_file($logofile);
dolibarr_del_const($db, $constant, $conf->entity); dolibarr_del_const($db, $constant, $conf->entity);
if ($action == 'removelogosquarred') $mysoc->logo_squarred=''; if ($action == 'removelogosquarred') $mysoc->logo_squarred='';
else $mysoc->logo=''; else $mysoc->logo='';
$logofilename = $mysoc->logo_small; $logofilename = $mysoc->logo_small;
if ($action == 'removelogosquarred') $logofilename = $mysoc->logo_squarred_small; $logofilenamebis = $mysoc->logo_squarred_small;
if ($action == 'removelogosquarred')
{
$logofilename = $mysoc->logo_squarred_small;
$logofilenamebis = $mysoc->logo_small;
}
$logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$logofilename; $logosmallfile=$conf->mycompany->dir_output.'/logos/thumbs/'.$logofilename;
if ($logofilename != '') dol_delete_file($logosmallfile); if ($logofilename != '' && $logofilename != $logofilenamebis) dol_delete_file($logosmallfile);
dolibarr_del_const($db, $constant."_SMALL", $conf->entity); dolibarr_del_const($db, $constant."_SMALL", $conf->entity);
if ($action == 'removelogosquarred') $mysoc->logo_squarred_small=''; if ($action == 'removelogosquarred') $mysoc->logo_squarred_small='';
else $mysoc->logo_small=''; else $mysoc->logo_small='';
$logofilename = $mysoc->logo_mini; $logofilename = $mysoc->logo_mini;
if ($action == 'removelogosquarred') $logofilename = $mysoc->logo_squarred_mini; $logofilenamebis = $mysoc->logo_squarred_mini;
if ($action == 'removelogosquarred')
{
$logofilename = $mysoc->logo_squarred_mini;
$logofilenamebis = $mysoc->logo_mini;
}
$logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$logofilename; $logominifile=$conf->mycompany->dir_output.'/logos/thumbs/'.$logofilename;
if ($logofilename != '') dol_delete_file($logominifile); if ($logofilename != '' && $logofilename != $logofilenamebis) dol_delete_file($logominifile);
dolibarr_del_const($db, $constant."_MINI", $conf->entity); dolibarr_del_const($db, $constant."_MINI", $conf->entity);
if ($action == 'removelogosquarred') $mysoc->logo_squarred_mini=''; if ($action == 'removelogosquarred') $mysoc->logo_squarred_mini='';
else $mysoc->logo_mini=''; else $mysoc->logo_mini='';