New: Gestion plus compl�te des fichiers attach�s � une soci�t�

htdocs/docsoc.php

@@ -22,7 +22,7 @@
 
 /**
         \file       htdocs/docsoc.php
-		\brief      Fichier onglet documents liés à la société
+        \brief      Fichier onglet documents liés à la sociét
         \ingroup    societe
         \version    $Revision$
 */
@@ -78,18 +78,16 @@ if ( $_POST["sendit"] && defined('MAIN_UPLOAD_DOC') && MAIN_UPLOAD_DOC == 1)
 /*
  * Action suppression fichier
  */
-
 if ($_GET["action"]=='delete')
 {
     $file = $upload_dir . "/" . urldecode($_GET["urlfile"]);
     dol_delete_file($file);
-  $mesg = '<div class="ok">Le fichier a été supprimé</div>';
+    $mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
 }
 
 
 /*
- * Mode fiche
+ * Affichage liste
- *
  */
 
 if ($socid > 0)
@@ -147,53 +145,70 @@ if ($socid > 0)
 
         dolibarr_fiche_head($head, $hselected, $societe->nom);
 
+        // Construit liste des fichiers
+        clearstatcache();
 
-      /*
+        $totalsize=0;
-       * 
+        $filearray=array();
-       */
+        $handle=opendir($upload_dir);
+        if ($handle)
+        {
+            $i=0;
+            while (($file = readdir($handle))!==false)
+            {
+                if (!is_dir($dir.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+                {
+                    $filearray[$i]=$file;
+                    $totalsize+=filesize($upload_dir."/".$file);
+                    $i++;
+                }
+            }
+            closedir($handle);
+        }
+        else
+        {
+            print $langs->trans("ErrorCanNotReadDir",$upload_dir);
+        }
         
+        print '<table class="border"width="100%">';
+        print '<tr><td width="30%">'.$langs->trans("Name").'</td><td colspan="3">'.$societe->nom.'</td></tr>';
+        print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.sizeof($filearray).'</td></tr>';
+        print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+        print '</table>';
 
+        print '<br></div>';
+
+        if ($mesg) { print "$mesg<br>"; }
+
+        // Affiche forumlaire upload
         if (defined('MAIN_UPLOAD_DOC') && MAIN_UPLOAD_DOC == 1)
         {
+            print_titre($langs->trans("AttachANewFile"));
             echo '<form name="userfile" action="docsoc.php?socid='.$socid.'" enctype="multipart/form-data" METHOD="POST">';
 
             print '<table class="noborder" width="100%">';
             print '<tr><td width="50%" valign="top">';
 
             print '<input type="hidden" name="max_file_size" value="2000000">';
-	  print '<input type="file"   name="userfile" size="40" maxlength="80">';
+            print '<input class="flat" type="file" name="userfile" size="40" maxlength="80">';
-	  print '<br>';
+            print ' &nbsp; ';
-	  print '<input type="submit" value="'.$langs->trans("Upload").'" name="sendit"> &nbsp; ';
+            print '<input type="submit" value="'.$langs->trans("Add").'" name="sendit">';
-	  print '<input type="submit" value="'.$langs->trans("Cancel").'" name="cancelit"><br>';
 
             print "</td></tr>";
             print "</table>";
 
             print '</form>';
+            print '<br>';
         }
-      else
-	{
-	  print $langs->trans("ErrorAttachedFilesDisabled").".<br>";
-	}
-      print '<br></div>';
-
-
-      if ($mesg) { print "$mesg<br>"; }
-
 
         // Affiche liste des documents existant
         print_titre($langs->trans("AttachedFiles"));
 
-      clearstatcache();
-
-      $handle=opendir($upload_dir);
-      if ($handle)
-	{
         print '<table width="100%" class="noborder">';
         print '<tr class="liste_titre"><td>'.$langs->trans("Document").'</td><td align="right">'.$langs->trans("Size").'</td><td align="center">'.$langs->trans("Date").'</td><td>&nbsp;</td></tr>';
 
         $var=true;
-	  while (($file = readdir($handle))!==false)
+        foreach($filearray as $key => $file)
         {
             if (!is_dir($dir.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
             {
@@ -202,7 +217,7 @@ if ($socid > 0)
                 echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=societe&type=application/binary&file='.urlencode($socid.'/'.$file).'">'.$file.'</a>';
                 print "</td>\n";
 
-		  print '<td align="right">'.filesize($upload_dir."/".$file). ' bytes</td>';
+                print '<td align="right">'.filesize($upload_dir."/".$file). ' '.$langs->trans("bytes").'</td>';
                 print '<td align="center">'.dolibarr_print_date(filemtime($upload_dir."/".$file),"%d %b %Y %H:%M:%S").'</td>';
 
                 print '<td align="center">';
@@ -212,13 +227,6 @@ if ($socid > 0)
         }
 
         print "</table>";
-
-	  closedir($handle);
-	}
-      else
-	{
-	  print $langs->trans("ErrorCanNotReadDir",$upload_dir);
-	}
     }
     else
     {
@@ -232,5 +240,7 @@ else
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+
+llxFooter('$Date$ - $Revision$');
+
 ?>