From 6fb587cc229e09850fcbb4f92a6ad19eba52c6aa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 28 Oct 2011 23:27:40 +0200 Subject: [PATCH 1/3] Fix: Order by title --- htdocs/lib/project.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php index d3eef74bbe6..61b02a8fc0f 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/lib/project.lib.php @@ -651,7 +651,8 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0) $sql.= " AND ec.fk_socpeople = ".$user->id; } $sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut"; - + $sql.= " ORDER BY p.title, p.ref"; + $var=true; $resql = $db->query($sql); if ( $resql ) From 9e6aaf702190eba721f9aca05465c60c77d553ce Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 29 Oct 2011 00:00:35 +0200 Subject: [PATCH 2/3] Fix: Filter on third party --- htdocs/compta/bank/account.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index fa65b87d64b..6e5907ff13f 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -48,7 +48,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,'banque',$id,'bank_account','','',$fieldid); $req_nb=GETPOST("req_nb",'',3); -$thirdarty=GETPOST("thirdparty",'',3); +$thirdparty=GETPOST("thirdparty",'',3); $account=GETPOST("account"); $vline=GETPOST("vline"); $action=GETPOST("action"); @@ -211,7 +211,7 @@ if ($account || $_GET["ref"]) } if ($thirdparty) { - $sql_rech.=" AND s.nom LIKE '%".$db->escape($thirdparty)."%')"; + $sql_rech.=" AND s.nom LIKE '%".$db->escape($thirdparty)."%'"; $param.='&thirdparty='.urlencode($thirdparty); $mode_search = 1; } From a2e2c12e664fdd73bf4dac4e7165c16ec3e0c89c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 12 Nov 2011 12:59:21 +0100 Subject: [PATCH 3/3] Fix: carriage return problem --- htdocs/admin/tools/purge.php | 31 +++++++++++++++++-------------- htdocs/lib/pdf.lib.php | 4 ++-- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index 414bbbc641e..88db706378f 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -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='
'.$_GET["msg"].'
'; @@ -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 ''; if ($conf->syslog->enabled) { print ' '.$langs->trans("PurgeDeleteLogFile",$filelog).'

'; } print ' '.$langs->trans("PurgeDeleteTemporaryFiles").'

'; print ' '.$langs->trans("PurgeDeleteAllFilesInDocumentsDir",$dolibarr_main_data_root).'
'; print ''; -if ($_REQUEST['choice'] != 'confirm_allfiles') +if ($choice != 'confirm_allfiles') { print '
'; print '
'; @@ -162,7 +165,7 @@ if ($message) print "\n"; } -if (preg_match('/^confirm/i',$_REQUEST["choice"])) +if (preg_match('/^confirm/i',$choice)) { print '
'; $formquestion=array(); diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 6786ac36a01..9e77a559842 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -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); } } }