From 59b0ecac0256866f38b1be55fdaf13e75cd128fa Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Sun, 27 Mar 2011 15:03:42 +0000
Subject: [PATCH] reparation de l'extract dans le browser en gerant (meme
 partiellement) le register_globals a off dans bro_main. Suppression de l'etat
 pending s'il n'y a rien dans les domaines, et correction de 'ajouter' ou
 'modifier' un sous-domaine selon le contexte

---
 bureau/admin/adm_login.php    |  4 ++--
 bureau/admin/bro_main.php     | 19 ++++++++++++++++---
 bureau/admin/dom_edit.inc.php |  8 +++++++-
 bureau/admin/dom_edit.php     |  3 +--
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/bureau/admin/adm_login.php b/bureau/admin/adm_login.php
index 49aff990..ba8907e2 100644
--- a/bureau/admin/adm_login.php
+++ b/bureau/admin/adm_login.php
@@ -44,11 +44,11 @@ if ($oldid) {
   if (!$mem->setid($oldid)) {
     $oldid=null;
     $error=$err->errstr();
-    include("adm_list.php");
+    include("index.php");
     exit();
   }
   $oldid=null;
-  include_once("main.php");
+  include_once("adm_list.php");
   exit();
 }
 
diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index 64c3d6ee..5a30d65a 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -31,6 +31,19 @@
 require_once("../class/config.php");
 include_once ("head.php");
 
+$fields = array (
+		 "R"    => array ("request", "string", ""),
+		 "formu"       => array ("request", "integer", ""),
+		 "actextract"    => array ("request", "string", ""),
+		 "fileextract"    => array ("request", "string", ""),
+		 "actdel"    => array ("request", "string", ""),
+		 "actcopy"    => array ("request", "string", ""),
+		 "actmove"    => array ("request", "string", ""),
+		 "actmoveto"    => array ("request", "string", ""),
+		 );
+getFields($fields);
+
+
 $p=$bro->GetPrefs();
 if (! isset($R)) $R='';
 if (!$R && $p["golastdir"]) {
@@ -72,7 +85,7 @@ if (isset($formu) && $formu) {
     <input type="hidden" name="actdel" value="1" />
     <input type="hidden" name="R" value="<?php echo $R?>" />
     <p class="error"><?php __("WARNING: Confirm the deletion of this files"); ?></p>
-<?php foreach($d as $file){ ?>
+<?php foreach($_REQUEST["d"] as $file){ ?>
 	<p><?php echo stripslashes($file); ?></p>
         <input type="hidden" name="d[]" value="<?php echo htmlentities(stripslashes($file)); ?>" />
 <?php } ?>
@@ -118,7 +131,7 @@ if (isset($formu) && $formu) {
 
 if (isset($actextract) && $actextract) {
   print _("extracting...")."<br />\n"; flush();
-  if ($bro->ExtractFile($R. '/' . $file, $R)) {
+  if ($bro->ExtractFile($R. '/' . $fileextract, $R)) {
     echo "<p class=\"error\">";
     print $err->errstr();
     print _("failed")."<br />\n";
@@ -324,7 +337,7 @@ echo "<td>&nbsp;";
 }
 $e = $bro->is_extractable($R,$c[$i]["name"]);
 if ($e) {
-  echo " <a href=\"bro_main.php?actextract=1&file=".urlencode($c[$i]["name"])."&amp;R=".urlencode($R)."\">";
+  echo " <a href=\"bro_main.php?actextract=1&amp;fileextract=".urlencode($c[$i]["name"])."&amp;R=".urlencode($R)."\">";
   echo _("Extract");
   echo "</a>";
 }
diff --git a/bureau/admin/dom_edit.inc.php b/bureau/admin/dom_edit.inc.php
index ec8e5a46..da088d75 100644
--- a/bureau/admin/dom_edit.inc.php
+++ b/bureau/admin/dom_edit.inc.php
@@ -112,7 +112,13 @@ $dom->unlock();
     <?php } // foreach ?>
 
 		<tr class="trbtn">
-			<td colspan="2"><input type="submit" class="inb" name="add" value="<?php __("Add this subdomain"); ?>" /></td>
+			<td colspan="2"><input type="submit" class="inb" name="add" value="<?php
+   if ($isedit) {
+ __("Edit this subdomain");
+} else {
+ __("Add this subdomain");
+} 
+?>" /></td>
 		</tr>
 	</table>
 </form>
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 162129db..47f3b3ca 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -94,7 +94,7 @@ if ($r['dns_action']=='UPDATE') {?>
 		 gestion des sous-domaines
  -->
 <table class="tlist">
-<tr><th colspan="2"> </th><th><?php __("Subdomain"); ?></th><th><?php __("Type");?></th><th><?php __("Status")?></th><th><?php __("Pending");?></tr>
+<tr><th colspan="2"> </th><th><?php __("Subdomain"); ?></th><th><?php __("Type");?></th><th><?php __("Status")?></th></tr>
 <?php
 $col=1;
 for($i=0;$i<$r["nsub"];$i++) {
@@ -147,7 +147,6 @@ for($i=0;$i<$r["nsub"];$i++) {
           break;
         case 'OK':
         default:
-          __("Up to date");
           break;
       }?></td>