From f9764380930c63145a59d02afa7489aa975bafbd Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Fri, 19 Apr 2013 12:39:51 +0000
Subject: [PATCH] Continue la mise au propre

---
 bureau/admin/bro_main.php             |  6 +++---
 bureau/admin/mail_manage_catchall.php | 12 ++++++------
 bureau/admin/main.php                 | 19 ++++++++++---------
 bureau/admin/quotas_oneuser.php       |  5 +----
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index 80b0453c..b7060736 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -321,7 +321,7 @@ function actmoveto_not_empty() {
         </script>
           </th>
           <?php if ($p["showicons"]) { ?>
-              <th><?php if (!empty($R)) { echo "<a href=''>".$bro->PathList($R,"bro_main.php",true)."</a>";  }?></th>
+              <th style="text-align: center;"><?php if (!empty($R)) { echo $bro->PathList($R,"bro_main.php",true);  }?></th>
               <?php } ?>
               <th><?php __("Filename"); ?></th>
               <th><?php __("Size"); ?></th>
@@ -340,7 +340,7 @@ function actmoveto_not_empty() {
           if ($c[$i]["type"]) {
             echo "  <td width=\"28\"><input type=\"checkbox\" class=\"inc\" name=\"d[]\" value=\"".htmlentities($c[$i]["name"])."\" /></td>";
             if ($p["showicons"]) {
-              echo "<td width=\"28\"><img src=\"icon/".$bro->icon($c[$i]["name"])."\" width=\"16\" height=\"16\" alt=\"\" /></td>";
+              echo "<td style='text-align: center;' width=\"28\"><img src=\"icon/".$bro->icon($c[$i]["name"])."\" width=\"16\" height=\"16\" alt=\"\" /></td>";
             }
             echo "<td><a href=\"";
             $canedit = $bro->can_edit($R,$c[$i]["name"]);
@@ -613,7 +613,7 @@ if ($id=$ftp->is_ftp($R)) {
 else {
   ?>
     <span class="ina">
-    <a href="ftp_edit.php?create=1&dir=<?php ehe($R); ?>"><?php __("Create an ftp account in this folder"); ?></a>
+    <a href="ftp_edit.php?create=1&amp;dir=<?php ehe($R); ?>"><?php __("Create an ftp account in this folder"); ?></a>
     </span> &nbsp;
   <?php
 }
diff --git a/bureau/admin/mail_manage_catchall.php b/bureau/admin/mail_manage_catchall.php
index 3618eefb..614250e0 100644
--- a/bureau/admin/mail_manage_catchall.php
+++ b/bureau/admin/mail_manage_catchall.php
@@ -80,16 +80,16 @@ __("You can choose what to do with emails sent to unexisting address of this dom
     <th colspan="3"><b><?php __("No catch-all");?></b></th>
   </tr>
   <tr>
-    <td width=1px><input type="radio" name="target_type" id='target_type_none' value="none" <?php if ($catch['type']=='none') {echo 'checked';}?> /></td>
-    <td colspan='2' style="width: 50%; text-align: justify"><label for='target_type_none'/><?php echo __("No catch-all for this domain.");?></label></td>
+    <td width="1px"><input type="radio" name="target_type" id='target_type_none' value="none" <?php if ($catch['type']=='none') {echo 'checked="checked"';}?> /></td>
+    <td colspan='2' style="width: 50%; text-align: justify"><label for='target_type_none'><?php echo __("No catch-all for this domain.");?></label></td>
   </tr>
 
   <tr>
     <th colspan="3"><b><?php __("Redirect to same address on a different domain");?></b></th>
   </tr>
   <tr>
-    <td width=1px><input type="radio" name="target_type" id='target_type_domain' value="domain" <?php if ($catch['type']=='domain') {echo 'checked';}?> />
-    <td style="width: 50%; text-align: justify"><label for='target_type_domain'/><?php echo sprintf(_("Mails sent to john.doe@%s will be redirect to john.doe@anotherdomain.tld"),$catch['domain']);?></label></td>
+    <td width="1px"><input type="radio" name="target_type" id='target_type_domain' value="domain" <?php if ($catch['type']=='domain') {echo 'checked="checked"';}?> /></td>
+    <td style="width: 50%; text-align: justify"><label for='target_type_domain'><?php echo sprintf(_("Mails sent to john.doe@%s will be redirect to john.doe@anotherdomain.tld"),$catch['domain']);?></label></td>
     <td>
       <p>
 	<i><?php __("Enter the 'target' domain"); ?></i><br/>
@@ -106,8 +106,8 @@ __("You can choose what to do with emails sent to unexisting address of this dom
     <th colspan="3"><b><?php __("Redirect to a specific email");?></b></th>
   </tr>
   <tr>
-    <td width=1px><input type="radio" name="target_type" id='target_type_mail' value="mail" <?php if ($catch['type']=='mail') {echo 'checked';}?> />
-    <td style="width: 50%; text-align: justify"><label for='target_type_mail'/><?php echo sprintf(_("Mails sent to an unexisting email on '@%s' will be redirect to user@example.tld."),$catch['domain']);?></label></td>
+    <td width="1px"><input type="radio" name="target_type" id='target_type_mail' value="mail" <?php if ($catch['type']=='mail') {echo 'checked="checked"';}?> /></td>
+    <td style="width: 50%; text-align: justify"><label for='target_type_mail'><?php echo sprintf(_("Mails sent to an unexisting email on '@%s' will be redirect to user@example.tld."),$catch['domain']);?></label></td>
     <td>
       <p>
         <input type="text" name="target_mail" size="30" value="<?php if($catch['type']=='mail') { echo $catch['target']; } ?>" placeholder="<?php __("john.doe@example.tld");?>" />
diff --git a/bureau/admin/main.php b/bureau/admin/main.php
index 4d1a2e3b..111c19fc 100644
--- a/bureau/admin/main.php
+++ b/bureau/admin/main.php
@@ -69,8 +69,8 @@ foreach ($xml->channel->item as $val) {
 if ($count < $max) {
   echo '
   <tr>
-    <td '.(empty($val->pubDate)?'colpan=2':'').'><a target=_blank href="'.$val->link.'">'.$val->title.'</a></td>';
-    if (!empty($val->pubDate)) { echo '<td>'.strftime("%d/%m/%Y" , strtotime($val->pubDate)).'</td></td>'; }
+    <td '.(empty($val->pubDate)?'colpan=2':'').'><a target="_blank" href="'.$val->link.'">'.$val->title.'</a></td>';
+    if (!empty($val->pubDate)) { echo '<td>'.strftime("%d/%m/%Y" , strtotime($val->pubDate)).'</td>'; }
   echo '</tr>';
 }
 $count++;
@@ -88,12 +88,13 @@ if($admin->enabled) {
     echo "<table cellspacing=\"2\" cellpadding=\"4\">\n";
     echo "<tr><th>"._("uid")."</th><th>"._("Last name, surname")."</th><th>"._("Expiry")."</th></tr>\n";
     if (is_array($expiring)) {
-	    foreach($expiring as $account) {
-      echo "<tr class=\"exp{$account['status']}\"><td>{$account['uid']}</td>";
-      if($admin->checkcreator($account['uid']))
-	echo "<td><a href=\"adm_edit.php?uid={$account['uid']}\">{$account['nom']}, {$account['prenom']}</a></td>";
-      else
-	echo "<td>{$account['nom']}, {$account['prenom']}</td>";
+      foreach($expiring as $account) {
+        echo "<tr class=\"exp{$account['status']}\"><td>{$account['uid']}</td>";
+        if($admin->checkcreator($account['uid'])) {
+          echo "<td><a href=\"adm_edit.php?uid={$account['uid']}\">{$account['nom']}, {$account['prenom']}</a></td>";
+        }else{
+          echo "<td>{$account['nom']}, {$account['prenom']}</td>";
+        }
         echo "<td>{$account['expiry']}</td></tr>\n";
       }
     }
@@ -102,7 +103,7 @@ if($admin->enabled) {
 
   echo "<hr/><p>";
   __("You are using the AlternC Panel. You can contact the AlternC community for information or feedback by joining the mailing-list");
-  echo "&nbsp;<a target=_blank href='http://lists.alternc.org/listinfo/users'>users@alternc.org</a>";
+  echo "&nbsp;<a target='_blank' href='http://lists.alternc.org/listinfo/users'>users@alternc.org</a>";
   echo "</p>";
 } // if $admin->enabled
 
diff --git a/bureau/admin/quotas_oneuser.php b/bureau/admin/quotas_oneuser.php
index af07f275..578dc90d 100644
--- a/bureau/admin/quotas_oneuser.php
+++ b/bureau/admin/quotas_oneuser.php
@@ -10,7 +10,7 @@ if (!isset($mode)) { # when included from adm_login, mode is not set
 ?>
 <center>
 
-<h3><center><?php printf(_("<b>%s</b> account"),$mem->user["login"]); ?></center></h3>
+<h3 style="text-align:center;"><?php printf(_("<b>%s</b> account"),$mem->user["login"]); ?></h3>
 
 <div style="width: 550px">
 
@@ -48,9 +48,6 @@ if (!isset($mode)) { # when included from adm_login, mode is not set
   }
 
   $t=$quota->get_size_unit($totalmail);
-  echo "<p>"._("Mailboxes size:")." ";
-  echo sprintf("%.1f", $t['size'])."&nbsp;".$t['unit'];
-  echo "</p>";
 
   foreach ($domaines_user as $domaine) { 
     $alias_sizes = $quota->get_size_mail_details_domain($domaine);