diff --git a/.gitattributes b/.gitattributes index b9463935..5bcca827 100644 --- a/.gitattributes +++ b/.gitattributes @@ -232,6 +232,7 @@ bureau/admin/mxlist.php -text bureau/admin/phpinfo.php -text bureau/admin/powered2.jpg -text bureau/admin/quota_show.php -text +bureau/admin/quotas_oneuser.php -text bureau/admin/quotas_users.php -text bureau/admin/sql_add.php -text bureau/admin/sql_addmain.php -text diff --git a/bureau/admin/main.php b/bureau/admin/main.php index 1fae434d..f01130cc 100644 --- a/bureau/admin/main.php +++ b/bureau/admin/main.php @@ -94,152 +94,9 @@ if($admin->enabled) { $c=@mysql_fetch_array(mysql_query("SELECT * FROM membres WHERE uid='".$cuid."';")); -?> -
-"._("WEB Space:")." "; - echo sprintf("%.1f", $totalweb / 1024)." Mo"; - echo "

"; ?> -
- - - - - - - -"; - echo ""; - echo ""; - $ms=$e["size"]; - if ($totalmail) - $pc=intval(100*$ms/$totalmail); - else - $pc=0; - if ($mode==0) { - echo sprintf("%.1f", $ms / 1024)." Mo"; - } elseif ($mode==1) { - echo sprintf("%.1f", $pc)." %"; - } else { - echo "\"".$pc."%\""; - } - echo ""; - } - } -?> -
DomaineMailEspace
".$d["domaine"]."".str_replace("_","@",$e["alias"])."
- -

 

- - - - - - -"; - $ds=$d["size"]; - if ($totaldb) - $pc=intval(100*$ds/$totaldb); - else - $pc=0; - if ($mode==0) { - echo sprintf("%.1f", $ds / 1024/1024)." Mo"; - } elseif ($mode==1) { - echo sprintf("%.1f", $pc)." %"; - } else { - echo "\"".$pc."%\""; - } - echo ""; - } -?> -
DBEspace
".$d["db"]."
- -

 

- - - - - - -"; - $ds=$d["size"]; - if ($totallist) - $pc=intval(100*$ds/$totallist); - else - $pc=0; - if ($mode==0) { - echo sprintf("%.1f", $ds / 1024)." Mo"; - } elseif ($mode==1) { - echo sprintf("%.1f", $pc)." %"; - } else { - echo "\"".$pc."%\""; - } - echo ""; - } -?> -
ListeEspace
".$d["list"]."
- -
-
diff --git a/bureau/admin/quotas_oneuser.php b/bureau/admin/quotas_oneuser.php new file mode 100644 index 00000000..5aa5664e --- /dev/null +++ b/bureau/admin/quotas_oneuser.php @@ -0,0 +1,144 @@ + +
+

+"._("Web Space:")." "; + echo sprintf("%.1f", $totalweb / 1024)." "._("MB"); + echo "

"; + +?> +
+ + + + + + + + + +"; + echo ""; + echo ""; + $ms=$e["size"]; + if ($totalmail) + $pc=intval(100*$ms/$totalmail); + else + $pc=0; + if ($mode==0) { + echo sprintf("%.1f", $ms / 1024)." "._("MB"); + } elseif ($mode==1) { + echo sprintf("%.1f", $pc)." %"; + } else { + echo "\"".$pc."%\""; + } + echo ""; + } + } +?> + +
".$d["domaine"]."".str_replace("_","@",$e["alias"])."
+

 

+ + + + + + + + + +"; + $ds=$d["size"]; + if ($totaldb) + $pc=intval(100*$ds/$totaldb); + else + $pc=0; + if ($mode==0) { + echo sprintf("%.1f", $ds / 1024/1024)." "._("MB"); + } elseif ($mode==1) { + echo sprintf("%.1f", $pc)." %"; + } else { + echo "\"".$pc."%\""; + } + echo ""; + } +?> + +
".$d["db"]."
+ + +

 

+ + + + + + + + + +"; + $ds=$d["size"]; + if ($totallist) + $pc=intval(100*$ds/$totallist); + else + $pc=0; + if ($mode==0) { + echo sprintf("%.1f", $ds / 1024)." "._("MB"); + } elseif ($mode==1) { + echo sprintf("%.1f", $pc)." %"; + } else { + echo "\"".$pc."%\""; + } + echo ""; + } +?> + +
".$d["list"]."
+ + +
+
diff --git a/bureau/admin/quotas_users.php b/bureau/admin/quotas_users.php index 7ca16a07..1a40eaae 100644 --- a/bureau/admin/quotas_users.php +++ b/bureau/admin/quotas_users.php @@ -23,31 +23,31 @@ if ($error) { } ?>

-Cette page résume les informations d`hébergement des comptes AlternC
-Les tailles sont exprimées en + +

-Global

-Détail: +

+ -En pourcentage -En graphique + + -En Mo -En graphique + + -En Mo -En pourcentage + + -Afficher les domaines + -Cacher les domaines + -Tous les comptes +

@@ -122,34 +122,36 @@ D ?>
- +
- + - - - + + + - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + +
 NombreEspace
 
Domaines Mo Mo
Mails Mo Mo
 Mo
 Mo
Listes Mo
Bases Mo
Total Mo Mo
@@ -161,18 +163,18 @@ D
- +
- + - - - - - - - - + + + + + + + + @@ -281,7 +283,7 @@ if ($sd) echo "   - ".$d["domaine"]."
\n"; $pc=0; if ($mode==0) { - echo sprintf("%.1f", $ws / 1024)." Mo"; + echo sprintf("%.1f", $ws / 1024)." "._("MB"); } elseif ($mode==1) { echo sprintf("%.1f",$pc)." %"; } else { @@ -317,7 +319,7 @@ else $pc=0; if ($mode==0) { - echo sprintf("%.1f", $mls / 1024)." Mo"; + echo sprintf("%.1f", $mls / 1024)." "._("MB"); } elseif ($mode==1) { echo sprintf("%.1f",$pc)." %"; } else { @@ -337,7 +339,7 @@ else $pc=0; if ($mode==0) { - echo sprintf("%.1f", $ds / 1024/1024)." Mo"; + echo sprintf("%.1f", $ds / 1024/1024)." "._("MB"); } elseif ($mode==1) { echo sprintf("%.1f",$pc)." %"; } else { @@ -350,7 +352,7 @@ echo ">"; $ts=$ds/1024+$ws+$ms+$mls; if ($mode==0) { - echo sprintf("%.1f", $ts/1024)." Mo"; + echo sprintf("%.1f", $ts/1024)." "._("MB"); } elseif ($mode==1) { echo sprintf("%.1f",(100*$ts/$totaltotal))." %"; } else { @@ -390,144 +392,11 @@ echo ""; if (!empty($c)) { -?> - -
-

Compte

-Espace WEB: "; - echo sprintf("%.1f", $totalweb / 1024)." Mo"; - echo "

"; - -?> -
-
CompteNombre deEspace
DomMailsListesWebMailListesBasesTotal
- - - - - - - - -"; - echo ""; - echo ""; - $ms=$e["size"]; - if ($totalmail) - $pc=intval(100*$ms/$totalmail); - else - $pc=0; - if ($mode==0) { - echo sprintf("%.1f", $ms / 1024)." Mo"; - } elseif ($mode==1) { - echo sprintf("%.1f", $pc)." %"; - } else { - echo "\"".$pc."%\""; - } - echo ""; - } - } -?> - -
DomaineMailEspace
".$d["domaine"]."".str_replace("_","@",$e["alias"])."
-

 

- - - - - - - - - -"; - $ds=$d["size"]; - if ($totaldb) - $pc=intval(100*$ds/$totaldb); - else - $pc=0; - if ($mode==0) { - echo sprintf("%.1f", $ds / 1024/1024)." Mo"; - } elseif ($mode==1) { - echo sprintf("%.1f", $pc)." %"; - } else { - echo "\"".$pc."%\""; - } - echo ""; - } -?> - -
DBEspace
".$d["db"]."
- -

 

- - - - - - - - - -"; - $ds=$d["size"]; - if ($totallist) - $pc=intval(100*$ds/$totallist); - else - $pc=0; - if ($mode==0) { - echo sprintf("%.1f", $ds / 1024)." Mo"; - } elseif ($mode==1) { - echo sprintf("%.1f", $pc)." %"; - } else { - echo "\"".$pc."%\""; - } - echo ""; - } -?> - -
ListeEspace
".$d["list"]."
- -
-
- + } ?> diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po index 404c3ded..1622233c 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po @@ -2890,5 +2890,57 @@ msgstr "Ce compte est maintenant un compte normal" msgid "This account is now an administrator account" msgstr "Ce compte est maintenant un compte administrateur" +msgid "This page shows the space and service count of your AlternC server and each AlternC accounts." +msgstr "Cette page montre l'espace et le nombre de service utilisé sur AlternC et pour chaque compte." +msgid "Sizes are shown as %s" +msgstr "Les tailles sont exprimées en %s" + +msgid "MB." +msgstr "Mo." + +msgid "% of the total." +msgstr "% du total." + +msgid "Percentage" +msgstr "En pourcentages" + +msgid "In MB" +msgstr "En Mo" + +msgid "Graphical" +msgstr "En graphique" + +msgid "Show the domain names" +msgstr "Afficher les domaines" + +msgid "Hide the domain names" +msgstr "Cacher les domaines" + +msgid "All accounts" +msgstr "Tous les comptes" + +msgid "Server-side view:" +msgstr "Vue générale du serveur :" + +msgid "Detailed view:" +msgstr "Vue détaillée par compte :" + +msgid "Count" +msgstr "Nombre" + +msgid "Space" +msgstr "Espace" + +msgid "Email addresses" +msgstr "Adresses email" + +msgid "Mailman lists" +msgstr "Listes Mailman" + +msgid "Lists" +msgstr "Listes" + +msgid "DB" +msgstr "Bases"