From fb1034c8a7118d873c8b680c6188388482cc2579 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Jul 2012 14:30:05 +0200
Subject: [PATCH] Fix: sort in ecm module

---
 htdocs/core/ajax/ajaxdirpreview.php       | 35 ++++++----
 htdocs/core/class/html.formfile.class.php | 80 +++++++++++------------
 2 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 7d4ed81e772..05f667be112 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -45,6 +45,16 @@ if (! isset($mode) || $mode != 'noajax')    // For ajax call
     $module=GETPOST("module");
     $urlsource=GETPOST("urlsource");
 
+    $sortfield = GETPOST("sortfield",'alpha');
+    $sortorder = GETPOST("sortorder",'alpha');
+    $page = GETPOST("page",'int');
+    if ($page == -1) { $page = 0; }
+    $offset = $conf->liste_limit * $page;
+    $pageprev = $page - 1;
+    $pagenext = $page + 1;
+    if (! $sortorder) $sortorder="ASC";
+    if (! $sortfield) $sortfield="name";
+    
     $upload_dir = dirname(str_replace("../","/", $conf->ecm->dir_output.'/'.$file));
 
     $ecmdir = new EcmDirectory($db);
@@ -130,13 +140,14 @@ print '<!-- TYPE='.$type.' -->'."\n";
 print '<!-- Page called with mode='.$mode.' url='.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
 
 $param='';
+$param.=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
+$url=DOL_URL_ROOT.'/ecm/index.php';
 
 // Dir scan
 if ($type == 'directory')
 {
     $formfile=new FormFile($db);
 
-    $param.=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
     $maxlengthname=40;
 
     // Right area. If module is defined, we are in automatic ecm.
@@ -148,7 +159,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else if ($module == 'invoice')  // Auto area for suppliers invoices
     {
@@ -158,7 +169,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else if ($module == 'invoice_supplier')  // Auto area for suppliers invoices
     {
@@ -169,7 +180,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else if ($module == 'propal')  // Auto area for customers orders
     {
@@ -179,7 +190,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else if ($module == 'order')  // Auto area for customers orders
     {
@@ -189,7 +200,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else if ($module == 'order_supplier')  // Auto area for suppliers orders
     {
@@ -200,7 +211,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else if ($module == 'contract')  // Auto area for suppliers invoices
     {
@@ -210,7 +221,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else if ($module == 'tax')  // Auto area for suppliers invoices
     {
@@ -220,7 +231,7 @@ if ($type == 'directory')
         $param.='&module='.$module;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
     }
     else    // Manual area
     {
@@ -231,7 +242,7 @@ if ($type == 'directory')
         if ($section) $param.='&section='.$section;
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection")));
 
-        $formfile->list_of_documents($filearray,'','ecm',$param,1,$relativepath,$user->rights->ecm->upload,1,$textifempty,$maxlengthname);
+        $formfile->list_of_documents($filearray,'','ecm',$param,1,$relativepath,$user->rights->ecm->upload,1,$textifempty,$maxlengthname,'',$url);
     }
 
 }
@@ -240,11 +251,13 @@ if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 {
     if ($section)
     {
+    	$param.=($param?'?':'').(preg_replace('/^&/','',$param));
+    	
         require_once(DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php');
         $useglobalvars=1;
         $form = new Form($db);
         $formquestion=array('urlfile'=>array('type'=>'hidden','value'=>'','name'=>'urlfile'));
-        print $form->formconfirm(DOL_URL_ROOT.'/ecm/index.php'.($param?'?':'').(preg_replace('/^&/','',$param)),$langs->trans("DeleteFile"),$langs->trans("ConfirmDeleteFile"),'confirm_deletefile',$formquestion,"no",'deletefile');
+        print $form->formconfirm($url,$langs->trans("DeleteFile"),$langs->trans("ConfirmDeleteFile"),'confirm_deletefile',$formquestion,"no",'deletefile');
 
         // Enable jquery handlers on new generated HTML objects
         print '<script type="text/javascript">'."\n";
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 41508534847..c6c84229d5e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -534,22 +534,23 @@ class FormFile
 
 
     /**
-     *      Show list of documents in a directory
+     *  Show list of documents in a directory
      *
-     *      @param	array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this
-     * 		@param	Object	$object				Object on which document is linked to
-     * 		@param	string	$modulepart			Value for modulepart used by download or viewimage wrapper
-     * 		@param	string	$param				Parameters on sort links
-     * 		@param	int		$forcedownload		Force to open dialog box "Save As" when clicking on file
-     * 		@param	string	$relativepath		Relative path of docs (autodefined if not provided)
-     * 		@param	int		$permtodelete		Permission to delete
-     * 		@param	int		$useinecm			Change output for use in ecm module
-     * 		@param	string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
-     *      @param  int		$maxlength          Maximum length of file name shown
-     *      @param	string	$title				Title before list
-     * 		@return	int							<0 if KO, nb of files shown if OK
+     *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this
+     * 	@param	 Object	$object				Object on which document is linked to
+     * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper
+     * 	@param	 string	$param				Parameters on sort links
+     * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file
+     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided)
+     * 	@param	 int	$permtodelete		Permission to delete
+     * 	@param	 int	$useinecm			Change output for use in ecm module
+     * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
+     *  @param  int		$maxlength          Maximum length of file name shown
+     *  @param	 string	$title				Title before list
+     *  @param	 string $url				Full url to use for click links ('' = autodetect)
+     * 	@return	 int						<0 if KO, nb of files shown if OK
      */
-    function list_of_documents($filearray,$object,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$title='')
+    function list_of_documents($filearray,$object,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='')
     {
         global $user, $conf, $langs;
         global $bc;
@@ -557,14 +558,13 @@ class FormFile
 
         // Show list of existing files
         if (empty($useinecm)) print_titre($title?$title:$langs->trans("AttachedFiles"));
-        //else { $bc[true]=''; $bc[false]=''; };
-        $url=$_SERVER["PHP_SELF"];
+        if (empty($url)) $url=$_SERVER["PHP_SELF"];
         print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').'">';
         print '<tr class="liste_titre">';
-        print_liste_field_titre($langs->trans("Documents2"),$_SERVER["PHP_SELF"],"name","",$param,'align="left"',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans("Size"),$_SERVER["PHP_SELF"],"size","",$param,'align="right"',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"date","",$param,'align="center"',$sortfield,$sortorder);
-        if (empty($useinecm)) print_liste_field_titre('',$_SERVER["PHP_SELF"],"","",$param,'align="center"');
+        print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Date"),$url,"date","",$param,'align="center"',$sortfield,$sortorder);
+        if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');
         print_liste_field_titre('','','');
         print '</tr>';
 
@@ -630,21 +630,22 @@ class FormFile
 
 
     /**
-     *      Show list of documents in a directory
+     *	Show list of documents in a directory
      *
-     *      @param	string	$upload_dir         Directory that was scanned
-     *      @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
-     *      @param  string	$modulepart         Value for modulepart used by download wrapper
-     *      @param  string	$param              Parameters on sort links
-     *      @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
-     *      @param  string	$relativepath       Relative path of docs (autodefined if not provided)
-     *      @param  int		$permtodelete       Permission to delete
-     *      @param  int		$useinecm           Change output for use in ecm module
-     *      @param  int		$textifempty        Text to show if filearray is empty
-     *      @param  int		$maxlength          Maximum length of file name shown
-     *      @return int                 		<0 if KO, nb of files shown if OK
+     *  @param	 string	$upload_dir         Directory that was scanned
+     *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
+     *  @param  string	$modulepart         Value for modulepart used by download wrapper
+     *  @param  string	$param              Parameters on sort links
+     *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
+     *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
+     *  @param  int		$permtodelete       Permission to delete
+     *  @param  int		$useinecm           Change output for use in ecm module
+     *  @param  int		$textifempty        Text to show if filearray is empty
+     *  @param  int		$maxlength          Maximum length of file name shown
+     *  @param	 string $url				Full url to use for click links ('' = autodetect)
+     *  @return int                 		<0 if KO, nb of files shown if OK
      */
-    function list_of_autoecmfiles($upload_dir,$filearray,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0)
+    function list_of_autoecmfiles($upload_dir,$filearray,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$url='')
     {
         global $user, $conf, $langs;
         global $bc;
@@ -652,18 +653,17 @@ class FormFile
 
         dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
 
-        // Affiche liste des documents existant
+        // Show list of documents
         if (empty($useinecm)) print_titre($langs->trans("AttachedFiles"));
-        //else { $bc[true]=''; $bc[false]=''; };
-        $url=$_SERVER["PHP_SELF"];
+        if (empty($url)) $url=$_SERVER["PHP_SELF"];
         print '<table width="100%" class="nobordernopadding">';
         print '<tr class="liste_titre">';
         $sortref="fullname";
         if ($modulepart == 'invoice_supplier') $sortref='';    // No sort for supplier invoices as path name is not
-        print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],$sortref,"",$param,'align="left"',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans("Documents2"),$_SERVER["PHP_SELF"],"name","",$param,'align="left"',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans("Size"),$_SERVER["PHP_SELF"],"size","",$param,'align="right"',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"date","",$param,'align="center"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Ref"),$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Date"),$url,"date","",$param,'align="center"',$sortfield,$sortorder);
         print_liste_field_titre('','','');
         print '</tr>';