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

Fix: carriage return problem

Browse Source
This commit is contained in:
Regis Houssin 2011-11-12 12:59:21 +01:00
parent 659bf039c9
commit a2e2c12e66
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/admin/tools/purge.php
View File

@ -27,8 +27,11 @@ include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
$langs->load("admin");
if (! $user->admin)
accessforbidden();
$action=GETPOST('action');
$confirm=GETPOST('confirm');
$choice=GETPOST('choice');
if (! $user->admin) accessforbidden();
if ($_GET["msg"]) $message='<div class="error">'.$_GET["msg"].'</div>';
@ -44,11 +47,11 @@ if ($conf->syslog->enabled)
/*
* Actions
*/
if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice"]) && ($_REQUEST["choice"] != 'allfiles' || $_REQUEST["confirm"] == 'yes') )
if ($action=='purge' && ! preg_match('/^confirm/i',$choice) && ($choice != 'allfiles' || $confirm == 'yes') )
{
$filesarray=array();
if ($_REQUEST["choice"]=='tempfiles')
if ($choice=='tempfiles')
{
// Delete temporary files
if ($dolibarr_main_data_root)
@ -57,16 +60,16 @@ if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice
}
}
if ($_REQUEST["choice"]=='allfiles')
if ($choice=='allfiles')
{
// Delete all files
if ($dolibarr_main_data_root)
{
$filesarray=dol_dir_list($dolibarr_main_data_root,"all",0);
$filesarray=dol_dir_list($dolibarr_main_data_root,"all",0,'','install\.lock$');
}
}
if ($_REQUEST["choice"]=='logfile')
if ($choice=='logfile')
{
$filesarray[]=array('fullname'=>$filelog,'type'=>'file');
}
@ -85,7 +88,7 @@ if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice
elseif ($filesarray[$key]['type'] == 'file')
{
// If (file that is not logfile) or (if logfile with option logfile)
if ($filesarray[$key]['fullname'] != $filelog || $_POST["choice"]=='logfile')
if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
{
$count+=dol_delete_file($filesarray[$key]['fullname']);
}
@ -93,7 +96,7 @@ if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice
}
// Update cachenbofdoc
if ($conf->ecm->enabled && $_REQUEST["choice"]=='allfiles')
if ($conf->ecm->enabled && $choice=='allfiles')
{
require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
$ecmdirstatic = new ECMDirectory($db);
@ -133,21 +136,21 @@ print '<tr class="border"><td style="padding: 4px">';
if ($conf->syslog->enabled)
{
print '<input type="radio" name="choice" value="logfile"';
print ($_REQUEST["choice"] && $_REQUEST["choice"]=='logfile') ? ' checked="true"' : '';
print ($choice && $choice=='logfile') ? ' checked="checked"' : '';
print '> '.$langs->trans("PurgeDeleteLogFile",$filelog).'<br><br>';
}
print '<input type="radio" name="choice" value="tempfiles"';
print (! $_REQUEST["choice"] || $_REQUEST["choice"]=='tempfiles' || $_REQUEST["choice"]=='allfiles') ? ' checked="true"' : '';
print (! $choice || $choice=='tempfiles' || $choice=='allfiles') ? ' checked="checked"' : '';
print '> '.$langs->trans("PurgeDeleteTemporaryFiles").'<br><br>';
print '<input type="radio" name="choice" value="confirm_allfiles"';
print ($_REQUEST["choice"] && $_REQUEST["choice"]=='confirm_allfiles') ? ' checked="true"' : '';
print ($choice && $choice=='confirm_allfiles') ? ' checked="checked"' : '';
print '> '.$langs->trans("PurgeDeleteAllFilesInDocumentsDir",$dolibarr_main_data_root).'<br>';
print '</td></tr></table>';
if ($_REQUEST['choice'] != 'confirm_allfiles')
if ($choice != 'confirm_allfiles')
{
print '<br>';
print '<center><input class="button" type="submit" value="'.$langs->trans("PurgeRunNow").'"></center>';
@ -162,7 +165,7 @@ if ($message)
print "\n";
}
if (preg_match('/^confirm/i',$_REQUEST["choice"]))
if (preg_match('/^confirm/i',$choice))
{
print '<br>';
$formquestion=array();

4
htdocs/lib/pdf.lib.php
View File

@ -731,11 +731,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
{
if ($idprod)
{
if ( empty($hidedesc) ) $libelleproduitservice.=$desc;
if ( empty($hidedesc) ) $libelleproduitservice.=dol_htmlentitiesbr($desc,1);
}
else
{
$libelleproduitservice.=$desc;
$libelleproduitservice.=dol_htmlentitiesbr($desc,1);
}
}
}