From 5f5b00694a2972b89c950dad9bb4044b7883872a Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Fri, 19 Apr 2013 11:28:47 +0000
Subject: [PATCH] HTML au propre
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rajout d'un lien pour remonter dans le répertoire parent dans le browser
---
 bureau/admin/adm_authip_whitelist.php |  2 +-
 bureau/admin/bro_main.php             | 15 +++++++--------
 bureau/admin/cron.php                 |  4 ++--
 bureau/admin/ftp_list.php             |  2 --
 bureau/admin/mail_edit.php            |  2 +-
 bureau/admin/mail_manage_catchall.php |  2 +-
 bureau/admin/main.php                 |  2 +-
 bureau/admin/menu.php                 |  4 ++--
 bureau/admin/styles/style.css         |  1 +
 bureau/class/m_bro.php                |  5 ++++-
 10 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/bureau/admin/adm_authip_whitelist.php b/bureau/admin/adm_authip_whitelist.php
index 490c0f73..5a255a93 100644
--- a/bureau/admin/adm_authip_whitelist.php
+++ b/bureau/admin/adm_authip_whitelist.php
@@ -61,7 +61,7 @@ $list_ip = $authip->list_ip_whitelist();
  
 </p>
       <table class='tlist'>
-      <tr><th><?php __("Type"); ?></th><th><?php __("IP"); ?></th><th><?php __("Informations"); ?></th><th colspan=2/></tr>
+      <tr><th><?php __("Type"); ?></th><th><?php __("IP"); ?></th><th><?php __("Informations"); ?></th><th colspan='2' /></tr>
       <?php 
       $col=1;
       foreach($list_ip as $i) {
diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index a6c5dafd..80b0453c 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></th>
+              <th><?php if (!empty($R)) { echo "<a href=''>".$bro->PathList($R,"bro_main.php",true)."</a>";  }?></th>
               <?php } ?>
               <th><?php __("Filename"); ?></th>
               <th><?php __("Size"); ?></th>
@@ -349,7 +349,8 @@ function actmoveto_not_empty() {
             } else {
               echo "bro_downloadfile.php?dir=".urlencode($R)."&amp;file=".urlencode($c[$i]["name"]);
             }
-            echo "\">"; ehe($c[$i]["name"]); echo"</a></td>\n";
+            echo "\">"; ehe($c[$i]["name"]); 
+            echo"</a></td>\n";
             echo "  <td>".format_size($c[$i]["size"])."</td>";
             echo "<td>".format_date(_('%3$d-%2$d-%1$d %4$d:%5$d'),date("Y-m-d H:i:s",$c[$i]["date"]))."<br /></td>";
             if ($p["showtype"]) {
@@ -377,8 +378,7 @@ function actmoveto_not_empty() {
               echo "<input type='hidden' name ='filename' value='".htmlentities($R."/".$c[$i]["name"])."' />";
               $dbl=array(); foreach ($mysql->get_dblist() as $v) { $dbl[]=$v['db'];}
               echo "<select id='db_name_$i'>"; eoption($dbl,'',true); echo "</select>" ;
-              echo "<a href='javascript:;' onClick='window.location=\"sql_restore.php?filename=".urlencode($R."/".$c[$i]["name"])."&id=\"+encodeURIComponent($(\"#db_name_$i\").val()) ;'>"._("Restore it")."</a>";
-              echo "</form>";
+              echo "<a href='javascript:;' onClick='window.location=\"sql_restore.php?filename=".urlencode($R."/".$c[$i]["name"])."&amp;id=\"+encodeURIComponent($(\"#db_name_$i\").val()) ;'>"._("Restore it")."</a>";
               echo "</fieldset></div>";
             }
 
@@ -390,7 +390,7 @@ function actmoveto_not_empty() {
             }
             echo "<td><b><a href=\"";
             echo "bro_main.php?R=".urlencode($R."/".$c[$i]["name"]);
-            echo "\">"; ehe($c[$i]["name"]) ;"/</a></b></td>\n";
+            echo "\">"; ehe($c[$i]["name"]); echo "/</a></b></td>\n";
             echo "  <td>".format_size($c[$i]["size"])."</td>";
             echo "<td>".format_date(_('%3$d-%2$d-%1$d %4$d:%5$d'),date("Y-m-d h:i:s",$c[$i]["date"]))."<br /></td>";
             if ($p["showtype"]) {
@@ -585,7 +585,7 @@ else {
 <br/>
 
 <p>
-<span class="ina"><a href="bro_main.php?R=<?php echo $R; ?>&showdirsize=1"><?php __("Show size of directories"); ?></a></span> <?php __("(slow)"); ?>
+<span class="ina"><a href="bro_main.php?R=<?php echo $R; ?>&amp;showdirsize=1"><?php __("Show size of directories"); ?></a></span> <?php __("(slow)"); ?>
 </p><p>&nbsp;</p><p>
 <span class="ina"><?php
 if ($hta->is_protected($R)) {
@@ -600,14 +600,13 @@ else {
 <a href="bro_tgzdown.php?dir=<?php echo $R; ?>"><?php __("Download this folder"); ?></a>
 </span> &nbsp; 
 <?php printf(_("as a %s file"),$bro->l_tgz[$p["downfmt"]]); ?>
-</span>
 </p>  
 <?php
 
 if ($id=$ftp->is_ftp($R)) {
   ?>
     <span class="ina">
-    <a href="ftp_edit.php?id=<?php ehe($id); ?>"><?php __("Edit the ftp account"); ?></a> 
+    <a href="ftp_edit.php?amp;id=<?php ehe($id); ?>"><?php __("Edit the ftp account"); ?></a> 
     </span> &nbsp; <?php __("that exists in this folder"); ?>
     <?php
 }
diff --git a/bureau/admin/cron.php b/bureau/admin/cron.php
index 51f50607..251d9401 100644
--- a/bureau/admin/cron.php
+++ b/bureau/admin/cron.php
@@ -49,11 +49,11 @@ for ($i=0; $i < $max_cron ; $i++) {
 ?>
   <tr class="<?php echo ($i%2)?"lst1":"lst2"; ?>">
     <?php if (isset($lst_cron[$i])) echo "<input type='hidden' name='cronupdate[$i][id]' value='".$lst_cron[$i]['id']."' />"; ?> 
-    <td rowspan=2>
+    <td rowspan='2'>
       <?php if (isset($lst_cron[$i])) { echo '#'.$lst_cron[$i]['id']; } ?><br/>
       <a href="javascript:cleancron('<?php echo $i ?>');"><img src="images/delete.png" alt="<?php __("Delete");?>" title="<?php __("Delete");?>"/></a>
     </td>
-    <td colspan=2>
+    <td colspan='2'>
       <input type="text" placeholder="<?php __("Called URL"); ?>" id="crup_url_<?php echo $i?>" name="<?php echo "cronupdate[$i][url]";?>" size="40" maxlength="255" value="<?php if (isset($lst_cron[$i]['url'])) { echo htmlentities($lst_cron[$i]['url']);} ?>"/>
     </td>
     <td>
diff --git a/bureau/admin/ftp_list.php b/bureau/admin/ftp_list.php
index 65a4c1bf..6c54c8df 100644
--- a/bureau/admin/ftp_list.php
+++ b/bureau/admin/ftp_list.php
@@ -109,13 +109,11 @@ if ( $val['enabled']) {
 
 <?php __("Here are some configuration informations you'll need to configure your FTP application.");?>
 
-<p>
 <ul>
   <li><?php echo '<b>'._("Server:").'</b> '.$ftp->srv_name; ?></li>
   <li><?php echo '<b>'._("FTP mode for data transfert:").'</b> '._("passive");?></li>
   <li><?php echo '<b>'._("User/password:").'</b> '._("the one you specified when you created the account. You can edit them in the panel.");?></li>
 </ul>
-</p>
 
 <?php
 $mem->show_help("ftp_list");
diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php
index 450632ae..53326d12 100644
--- a/bureau/admin/mail_edit.php
+++ b/bureau/admin/mail_edit.php
@@ -92,7 +92,7 @@ if (isset($error)) {
       </p>
       <div id="poptbl">
 	<table class="tedit" >
-          <tr id='mail_edit_pass' style='display: none;'><td colspan=2><a href='javascript:mail_edit_pass();'><?php __("Click here to edit the existing password");?></a></td></tr>
+          <tr id='mail_edit_pass' style='display: none;'><td colspan='2'><a href='javascript:mail_edit_pass();'><?php __("Click here to edit the existing password");?></a></td></tr>
 	  <tr id='mail_edit_pass1'><td><label for="pass"><?php __("Enter a POP/IMAP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="" size="20" maxlength="32" /><?php display_div_generate_password(DEFAULT_PASS_SIZE,"#pass","#passconf"); ?></td></tr>
 	  <tr id='mail_edit_pass2'><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="passconf" id="passconf" value="" size="20" maxlength="32" /></td></tr>
 	  <tr><td><label for="quotamb"><?php __("Maximum allowed size of this Mailbox"); ?></label></td><td><input type="text" class="int intleft" style="text-align: right" name="quotamb" id="quotamb" value="<?php ehe($quotamb); ?>" size="7" maxlength="6" /><span class="int intright"><?php __("MB"); ?></span></td></tr>
diff --git a/bureau/admin/mail_manage_catchall.php b/bureau/admin/mail_manage_catchall.php
index c03b4414..3618eefb 100644
--- a/bureau/admin/mail_manage_catchall.php
+++ b/bureau/admin/mail_manage_catchall.php
@@ -81,7 +81,7 @@ __("You can choose what to do with emails sent to unexisting address of this dom
   </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 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>
diff --git a/bureau/admin/main.php b/bureau/admin/main.php
index d8bf8236..4d1a2e3b 100644
--- a/bureau/admin/main.php
+++ b/bureau/admin/main.php
@@ -61,7 +61,7 @@ if (file_exists($cache_file) && $timedif < $cache_time) {
 $xml = @simplexml_load_string($string);
 
 echo '<div align="center"><table class="tedit" cellspacing="0" cellpadding="6">';
-echo "<tr><th colspan=2><a target='_blank' style='font-size: 18px;font-weight: bold;color: #10507C;' href='".$xml->channel->link."'>".$xml->channel->title."</a><br/><i>".$xml->channel->description."</i></th></tr>";
+echo "<tr><th colspan='2'><a target='_blank' style='font-size: 18px;font-weight: bold;color: #10507C;' href='".$xml->channel->link."'>".$xml->channel->title."</a><br/><i>".$xml->channel->description."</i></th></tr>";
 //echo '<tr><th>'._("Title").'</th><th>'._("Date").'</th></tr>';
 $count = 0;
 $max = 5;
diff --git a/bureau/admin/menu.php b/bureau/admin/menu.php
index 4dc558f0..0866e43f 100644
--- a/bureau/admin/menu.php
+++ b/bureau/admin/menu.php
@@ -45,7 +45,7 @@ foreach ($obj_menu as $k => $m ) {
   echo "  <a href=\"".$m['link']."\"";
   if (!empty($m['target'])) echo " target='". $m['target']."' ";
   echo ">\n";
-  echo "    <div class='menu-title'>\n";
+  echo "    <span class='menu-title'>\n";
   echo "      <img src='".$m['ico']."' alt=\"".$m['title']."\" width='16' height='16' />&nbsp;";
   echo "        <span class='";
   if (!empty($m['class'])) echo $m['class']." ";
@@ -68,7 +68,7 @@ foreach ($obj_menu as $k => $m ) {
   }
   echo "      <img src='$i' alt='' style='float:right;' id='menu-$k-img'/>\n";
   echo "      </span>";
-  echo "    </div>\n";
+  echo "    </span>\n";
   echo "  </a>\n";
 
   if (!empty($m['links'])) {
diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index 70b70943..88bfe255 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -327,6 +327,7 @@ img {
 }
 
 .menu-box .menu-title {
+  display: block;
   color: #000000;
   border-bottom: 2px solid #AAA;
   background-color: #CFE3F1;
diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php
index 7e483395..34e70d11 100644
--- a/bureau/class/m_bro.php
+++ b/bureau/class/m_bro.php
@@ -676,12 +676,15 @@ class m_bro {
    * @param string $action Page web de destination des liens
    * @return string le code HTML ainsi obtenu.
    */
-  function PathList($path,$action) {
+  function PathList($path,$action, $justparent=false) {
     $path=$this->convertabsolute($path,1);
     $a=explode("/",$path);
     if (!is_array($a)) $a=array($a);
     $c='';
     $R='';
+    if ($justparent) {
+      return "<a href=\"$action?R=".urlencode($a[count($a)-2].'/')."\">&uarr;</a>";
+    }
     for($i=0;$i<count($a);$i++) {
       if ($a[$i]) {
 	$R.=$a[$i]."/";