From e11b06bc5b852fdbfa87911369a60e5da57b3819 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Oct 2008 20:23:25 +0000 Subject: [PATCH] If upload is disabled, we see it --- htdocs/html.formfile.class.php | 88 ++++++++++++++++++---------------- htdocs/langs/en_US/main.lang | 2 + htdocs/langs/es_ES/main.lang | 1 + htdocs/langs/fr_FR/main.lang | 2 + htdocs/langs/it_IT/main.lang | 1 + 5 files changed, 54 insertions(+), 40 deletions(-) diff --git a/htdocs/html.formfile.class.php b/htdocs/html.formfile.class.php index 100e44a0d55..5b9bf0afab4 100644 --- a/htdocs/html.formfile.class.php +++ b/htdocs/html.formfile.class.php @@ -57,51 +57,59 @@ class FormFile { global $conf,$langs; - if ($conf->upload != 0) - { - print "\n\n\n"; - - if (! $titre) $titre=$langs->trans("AttachANewFile"); - print_titre($titre); + print "\n\n\n"; + + if (! $titre) $titre=$langs->trans("AttachANewFile"); + print_titre($titre); - print '
'; - print ''; - - print ''; - print '"; + print "
'; - - $max=$conf->upload; // En Kb - $maxphp=@ini_get('upload_max_filesize'); // En inconnu - if (eregi('m$',$maxphp)) $maxphp=$maxphp*1024; - if (eregi('k$',$maxphp)) $maxphp=$maxphp; - // Now $max and $maxphp are in Kb - if ($maxphp > 0) $max=min($max,$maxphp); - - if ($conf->upload > 0) - { - print ''; - } - print ''; + print ''; + print ''; + + print ''; + print '"; - print "
'; + + $max=$conf->upload; // En Kb + $maxphp=@ini_get('upload_max_filesize'); // En inconnu + if (eregi('m$',$maxphp)) $maxphp=$maxphp*1024; + if (eregi('k$',$maxphp)) $maxphp=$maxphp; + // Now $max and $maxphp are in Kb + if ($maxphp > 0) $max=min($max,$maxphp); + + if ($conf->upload > 0) + { + print ''; + } + print 'upload)?' disabled="true"':''); + print '>'; + print '   '; + print 'upload)?' disabled="true"':''); + print '>'; + + if ($addcancel) + { print '   '; - print ''; - - if ($addcancel) - { - print '   '; - print ''; - } - + print ''; + } + + if (! empty($conf->upload)) + { print ' ('.$langs->trans("MaxSize").': '.$max.' '.$langs->trans("Kb"); print ' '.info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1); print ')'; - print "
"; - - print ''; - if (empty($sectionid)) print '
'; - - print "\n\n\n"; } + else + { + print ' ('.$langs->trans("UploadDisabled").')'; + } + print "
"; + + print ''; + if (empty($sectionid)) print '
'; + + print "\n\n\n"; return 1; } @@ -402,7 +410,7 @@ class FormFile $url=$_SERVER["PHP_SELF"]; print ''; print ''; - print_liste_field_titre($langs->trans("Document"),$_SERVER["PHP_SELF"],"name","",$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 ''; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a33b743faab..dde9a9cc9eb 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -437,6 +437,8 @@ Canceled=Canceled YouCanChangeValuesForThisListFromDictionnarySetup=You can change values for this list from menu setup - dictionnary Color=Color Documents=Linked files +Documents2=Documents +UploadDisabled=Upload disabled MenuECM=Documents MenuAWStats=AWStats MenuMembers=Members diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index eb4b0ddc2c4..95cf7fd4165 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -422,6 +422,7 @@ TotalMan=Total YouCanChangeValuesForThisListFromDictionnarySetup=Puede cambiar estos valores en el menú configuración->diccionarios Color=Color Documents=Documentos +Documents2=Documentos MenuECM=Documentos MenuAWStats=AWStats MenuMembers=Members diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 977a7a10304..53bf815f2eb 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -436,6 +436,8 @@ Canceled=Annul YouCanChangeValuesForThisListFromDictionnarySetup=Vous pouvez changer ces valeurs depuis le menu configuration - dictionnaires Color=Couleur Documents=Fichiers joints +Documents2=Documents +UploadDisabled=Transfert désactivé MenuECM=Documents MenuAWStats=AWStats MenuMembers=Adhérents diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 27d84655d36..b1aa1fe56b0 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -428,6 +428,7 @@ TotalMan =Totale YouCanChangeValuesForThisListFromDictionnarySetup =È possibile modificare i valori di questo elenco dal menu di impostazione - Dizionario Color =Colore Documents =Documenti +Documents2 =Documenti MenuECM =Documenti MenuAWStats =AWStats MenuMembers =Membri