kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Benjamin Sonntag 2011-03-27 15:03:42 +00:00
parent deb5498de4
commit 59b0ecac02
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bureau/admin/adm_login.php
View File

@ -44,11 +44,11 @@ if ($oldid) {
if (!$mem->setid($oldid)) { if (!$mem->setid($oldid)) {
$oldid=null; $oldid=null;
$error=$err->errstr(); $error=$err->errstr();
include("adm_list.php"); include("index.php");
exit(); exit();
} }
$oldid=null; $oldid=null;
include_once("main.php"); include_once("adm_list.php");
exit(); exit();
} }

19
bureau/admin/bro_main.php
View File

@ -31,6 +31,19 @@
require_once("../class/config.php"); require_once("../class/config.php");
include_once ("head.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(); $p=$bro->GetPrefs();
if (! isset($R)) $R=''; if (! isset($R)) $R='';
if (!$R && $p["golastdir"]) { if (!$R && $p["golastdir"]) {
@ -72,7 +85,7 @@ if (isset($formu) && $formu) {
<input type="hidden" name="actdel" value="1" /> <input type="hidden" name="actdel" value="1" />
<input type="hidden" name="R" value="<?php echo $R?>" /> <input type="hidden" name="R" value="<?php echo $R?>" />
<p class="error"><?php __("WARNING: Confirm the deletion of this files"); ?></p> <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> <p><?php echo stripslashes($file); ?></p>
<input type="hidden" name="d[]" value="<?php echo htmlentities(stripslashes($file)); ?>" /> <input type="hidden" name="d[]" value="<?php echo htmlentities(stripslashes($file)); ?>" />
<?php } ?> <?php } ?>
@ -118,7 +131,7 @@ if (isset($formu) && $formu) {
if (isset($actextract) && $actextract) { if (isset($actextract) && $actextract) {
print _("extracting...")."<br />\n"; flush(); print _("extracting...")."<br />\n"; flush();
if ($bro->ExtractFile($R. '/' . $file, $R)) { if ($bro->ExtractFile($R. '/' . $fileextract, $R)) {
echo "<p class=\"error\">"; echo "<p class=\"error\">";
print $err->errstr(); print $err->errstr();
print _("failed")."<br />\n"; print _("failed")."<br />\n";
@ -324,7 +337,7 @@ echo "<td>&nbsp;";
} }
$e = $bro->is_extractable($R,$c[$i]["name"]); $e = $bro->is_extractable($R,$c[$i]["name"]);
if ($e) { 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 _("Extract");
echo "</a>"; echo "</a>";
} }

8
bureau/admin/dom_edit.inc.php
View File

@ -112,7 +112,13 @@ $dom->unlock();
<?php } // foreach ?> <?php } // foreach ?>
<tr class="trbtn"> <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> </tr>
</table> </table>
</form> </form>

3
bureau/admin/dom_edit.php
View File

@ -94,7 +94,7 @@ if ($r['dns_action']=='UPDATE') {?>
gestion des sous-domaines gestion des sous-domaines
--> -->
<table class="tlist"> <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 <?php
$col=1; $col=1;
for($i=0;$i<$r["nsub"];$i++) { for($i=0;$i<$r["nsub"];$i++) {
@ -147,7 +147,6 @@ for($i=0;$i<$r["nsub"];$i++) {
break; break;
case 'OK': case 'OK':
default: default:
__("Up to date");
break; break;
}?></td> }?></td>