From de74fa75cf5ae347b354b5fa207cd0bd83ce45d3 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Fri, 19 Apr 2013 15:31:04 +0000
Subject: [PATCH] De plus en plus propre

---
 bureau/admin/adm_edit.php  | 24 +++++++++++++-----------
 bureau/admin/bro_main.php  |  2 +-
 bureau/admin/bro_pref.php  | 28 ++++++++++++++--------------
 bureau/admin/cron.php      |  4 ++--
 bureau/admin/ftp_list.php  |  5 ++++-
 bureau/class/functions.php |  2 +-
 6 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/bureau/admin/adm_edit.php b/bureau/admin/adm_edit.php
index f511e04d..f548e290 100644
--- a/bureau/admin/adm_edit.php
+++ b/bureau/admin/adm_edit.php
@@ -70,13 +70,13 @@ if (!$r=$admin->get($uid)) {
 	<td><?php echo $r["login"]; ?></td>
 </tr>
 <tr>
-	<th><label for="enabled"><?php __("Account Enabled?"); ?></label></th>
+	<th><label><?php __("Account Enabled?"); ?></label></th>
 	<td>
 	<?php if ($r["uid"]==$mem->user["uid"]) { ?>
   <?php __("You cannot disable your own account."); ?>
   <?php } else { ?>
-        <input type="radio" class="inc" id="enabled0" name="enabled" value="0"<?php cbox($r["enabled"]==0); ?>><label for="enabled0"><?php __("No"); ?></label><br />
-	<input type="radio" class="inc" id="enabled1" name="enabled" value="1"<?php cbox($r["enabled"]==1); ?>><label for="enabled1"><?php __("Yes"); ?></label><br />	
+        <input type="radio" class="inc" id="enabled0" name="enabled" value="0"<?php cbox($r["enabled"]==0); ?> /><label for="enabled0"><?php __("No"); ?></label><br />
+	<input type="radio" class="inc" id="enabled1" name="enabled" value="1"<?php cbox($r["enabled"]==1); ?> /><label for="enabled1"><?php __("Yes"); ?></label><br />	
 	<?php } ?>
 	</td>
 </tr>
@@ -90,10 +90,10 @@ if (!$r=$admin->get($uid)) {
 	<td><input type="password" class="int" id="passconf" name="passconf" value="" size="20" maxlength="64" /></td>
 </tr>
 <tr>
-	<th><label for="canpass"><?php __("Password change allowed?"); ?></label></th>
+	<th><label><?php __("Password change allowed?"); ?></label></th>
 	<td>
-        <input type="radio" class="inc" id="canpass0" name="canpass" value="0"<?php cbox($r["canpass"]==0); ?>><label for="canpass0"><?php __("No"); ?></label><br />
-	<input type="radio" class="inc" id="canpass1" name="canpass" value="1"<?php cbox($r["canpass"]==1); ?>><label for="canpass1"><?php __("Yes"); ?></label><br />	
+        <input type="radio" class="inc" id="canpass0" name="canpass" value="0"<?php cbox($r["canpass"]==0); ?>/><label for="canpass0"><?php __("No"); ?></label><br />
+	<input type="radio" class="inc" id="canpass1" name="canpass" value="1"<?php cbox($r["canpass"]==1); ?>/><label for="canpass1"><?php __("Yes"); ?></label><br />	
 	</td>
 </tr>
  <tr>
@@ -127,8 +127,9 @@ if (!$r=$admin->get($uid)) {
 </table>
 </form>
 
+<br/>
+
 <?php if($r['duration']) { ?>
-<p>
 <form method="post" action="adm_dorenew.php">
 <input type="hidden" name="uid" value="<?php echo $uid ?>" />
 <table border="1" cellspacing="0" cellpadding="4" class="tedit">
@@ -142,7 +143,6 @@ if (!$r=$admin->get($uid)) {
 </tr>
 </table>
 </form>
-</p>
 <?php } /* Renouvellement */ ?>
 
 <p>
@@ -150,15 +150,17 @@ if (!$r=$admin->get($uid)) {
 if ($mem->user["uid"]==2000 && $r["uid"]!=2000) {  // Only ADMIN (2000) can change the admin status of accounts
 if ($r["su"]) {
 ?>
-<p><b><?php __("This account is a super-admin account"); ?></b></p>
+<b><?php __("This account is a super-admin account"); ?></b>
+<br/>
+<br/>
 <?php if ($admin->onesu()) {
   __("There is only one administrator account, you cannot turn this account back to normal");
 } else {
 ?>
-<p><span class="ina"><a href="adm_donosu.php?uid=<?php echo $r["uid"]; ?>"><?php __("Turn this account back to normal"); ?></a></span></p>
+<span class="ina"><a href="adm_donosu.php?uid=<?php echo $r["uid"]; ?>"><?php __("Turn this account back to normal"); ?></a></span>
 <?php }
 } else { ?>
-<p><span class="ina"><a href="adm_dosu.php?uid=<?php echo $r["uid"]; ?>"><?php __("Make this account a super admin one"); ?></a></span></p>
+<span class="ina"><a href="adm_dosu.php?uid=<?php echo $r["uid"]; ?>"><?php __("Make this account a super admin one"); ?></a></span>
 <?php } ?>
 </p>
 
diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index b7060736..43981cf4 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -386,7 +386,7 @@ function actmoveto_not_empty() {
           } else {           // DOSSIER :
             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/folder.png\" width=\"16\" height=\"16\" alt=\"\" /></td>";
+              echo "<td width=\"28\" style='text-align: center;'><img src=\"icon/folder.png\" width=\"16\" height=\"16\" alt=\"\" /></td>";
             }
             echo "<td><b><a href=\"";
             echo "bro_main.php?R=".urlencode($R."/".$c[$i]["name"]);
diff --git a/bureau/admin/bro_pref.php b/bureau/admin/bro_pref.php
index d7d1b347..0c284079 100644
--- a/bureau/admin/bro_pref.php
+++ b/bureau/admin/bro_pref.php
@@ -67,39 +67,39 @@ include_once("head.php");
 <?php
 for($i=50;$i<=200;$i+=10) {
 	echo "<option";
-	if ($p["editsizex"]==$i) echo " selected";
-	echo ">$i";
+	if ($p["editsizex"]==$i) echo " selected='selected'";
+	echo ">$i</option>";
 }
 ?></select></td></tr>
 <tr><th><?php __("Vertical window size"); ?></th><td><select class="inl" name="editsizey">
 <?php
 for($i=4;$i<=80;$i+=2) {
 	echo "<option";
-	if ($p["editsizey"]==$i) echo " selected";
-	echo ">$i";
+	if ($p["editsizey"]==$i) echo " selected='selected'";
+	echo ">$i</option>";
 }
 ?></select></td></tr>
 <tr><th><?php __("File editor font name"); ?></th><td><select class="inl" name="editor_font">
 <?php
 for($i=0;$i<count($bro->l_editor_font);$i++) {
 	echo "<option";
-	if ($p["editor_font"]==$bro->l_editor_font[$i]) echo " selected";
-	echo ">"._($bro->l_editor_font[$i]);
+	if ($p["editor_font"]==$bro->l_editor_font[$i]) echo " selected='selected'";
+	echo ">"._($bro->l_editor_font[$i])."</option>";
 }
 ?></select></td></tr>
 <tr><th><?php __("File editor font size"); ?></th><td><select class="inl" name="editor_size">
 <?php
 for($i=0;$i<count($bro->l_editor_size);$i++) {
 	echo "<option";
-	if ($p["editor_size"]==$bro->l_editor_size[$i]) echo " selected";
-	echo ">"._($bro->l_editor_size[$i]);
+	if ($p["editor_size"]==$bro->l_editor_size[$i]) echo " selected='selected'";
+	echo ">"._($bro->l_editor_size[$i])."</option>";
 }
 ?></select></td></tr>
 <tr><th><?php __("File list view"); ?></th><td><select class="inl" name="listmode">
 <?php
 for($i=0;$i<count($bro->l_mode);$i++) {
 	echo "<option";
-	if ($p["listmode"]==$i) echo " selected";
+	if ($p["listmode"]==$i) echo " selected='selected'";
 	echo " value=\"$i\">"._($bro->l_mode[$i])."</option>";
 }
 ?></select></td></tr>
@@ -107,7 +107,7 @@ for($i=0;$i<count($bro->l_mode);$i++) {
 <?php
 for($i=0;$i<count($bro->l_tgz);$i++) {
 	echo "<option";
-	if ($p["downfmt"]==$i) echo " selected";
+	if ($p["downfmt"]==$i) echo " selected='selected'";
 	echo " value=\"$i\">"._($bro->l_tgz[$i])."</option>";
 }
 ?></select></td></tr>
@@ -115,7 +115,7 @@ for($i=0;$i<count($bro->l_tgz);$i++) {
 <?php
 for($i=0;$i<count($bro->l_createfile);$i++) {
 	echo "<option";
-	if ($p["createfile"]==$i) echo " selected";
+	if ($p["createfile"]==$i) echo " selected='selected'";
 	echo " value=\"$i\">"._($bro->l_createfile[$i])."</option>";
 }
 ?></select></td></tr>
@@ -123,7 +123,7 @@ for($i=0;$i<count($bro->l_createfile);$i++) {
 <?php
 for($i=0;$i<count($bro->l_icons);$i++) {
 	echo "<option";
-	if ($p["showicons"]==$i) echo " selected";
+	if ($p["showicons"]==$i) echo " selected='selected'";
 	echo " value=\"$i\">"._($bro->l_icons[$i])."</option>";
 }
 ?></select></td></tr>
@@ -131,7 +131,7 @@ for($i=0;$i<count($bro->l_icons);$i++) {
 <?php
 for($i=0;$i<count($bro->l_icons);$i++) {
 	echo "<option";
-	if ($p["showtype"]==$i) echo " selected";
+	if ($p["showtype"]==$i) echo " selected='selected'";
 	echo " value=\"$i\">"._($bro->l_icons[$i])."</option>";
 }
 ?></select></td></tr>
@@ -139,7 +139,7 @@ for($i=0;$i<count($bro->l_icons);$i++) {
 <?php
 for($i=0;$i<count($bro->l_icons);$i++) {
 	echo "<option";
-	if ($p["golastdir"]==$i) echo " selected";
+	if ($p["golastdir"]==$i) echo " selected='selected'";
 	echo " value=\"$i\">"._($bro->l_icons[$i])."</option>";
 }
 ?></select></td></tr>
diff --git a/bureau/admin/cron.php b/bureau/admin/cron.php
index 251d9401..2513e971 100644
--- a/bureau/admin/cron.php
+++ b/bureau/admin/cron.php
@@ -48,8 +48,8 @@ if ( sizeof($lst_cron) > $max_cron ) $max_cron=sizeof($lst_cron);
 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'>
+      <?php if (isset($lst_cron[$i])) echo "<input type='hidden' name='cronupdate[$i][id]' value='".$lst_cron[$i]['id']."' />"; ?> 
       <?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>
@@ -62,7 +62,7 @@ for ($i=0; $i < $max_cron ; $i++) {
 foreach ($cron->schedule() as $cs) {
   echo "<option value='".$cs['unit']."'";
   if (isset($lst_cron[$i]['schedule']) && ($lst_cron[$i]['schedule'] == $cs['unit'])){  
-  echo " selected ";
+  echo " selected='selected' ";
   }
   echo " >".$cs['name'];
   echo "</option>";
diff --git a/bureau/admin/ftp_list.php b/bureau/admin/ftp_list.php
index 6c54c8df..6ae4a24d 100644
--- a/bureau/admin/ftp_list.php
+++ b/bureau/admin/ftp_list.php
@@ -93,7 +93,10 @@ if ( $val['enabled']) {
 		<td><label for="del_<?php echo $val["id"]; ?>"><?php echo $val["login"] ?></label>
                   <input type='hidden' name='names[<?php echo $val['id'];?>]' value='<?php echo $val["login"] ?>' />
                 </td>
-		<td><code><?php echo str_replace(getuserpath(),'', $val["dir"]) ?></code></td>
+		<td>
+                  <a href="bro_main.php?R=<?php echo urlencode(str_replace(getuserpath(),'', $val["dir"])); ?>"><code><?php echo str_replace(getuserpath(),'', $val["dir"]) ?></code></a>
+                  <?php if ( ! file_exists($val['dir'])) { echo " <span class=\"alerte\">"._("Directory not found")."</span>"; } ?>
+                </td>
 	</tr>
 <?php
 	}
diff --git a/bureau/class/functions.php b/bureau/class/functions.php
index 517d3c1d..6b860eda 100644
--- a/bureau/class/functions.php
+++ b/bureau/class/functions.php
@@ -406,7 +406,7 @@ function duration_list($name, $selected=0) {
   foreach(array(0, 1, 2, 3, 4, 6, 12, 24) as $dur) {
     $res .= "<option value=\"$dur\"";
     if($selected == $dur) {
-      $res .= ' selected';
+      $res .= ' selected="selected" ';
     }
 
     $res .= '>';