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

fin de la correction du bug. See #691

This commit is contained in:
Benjamin Sonntag 2010-06-24 00:17:20 +00:00
parent 6ddf9fe6d6
commit 22935e9b68
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bureau/admin/bro_main.php
View File

@ -41,13 +41,13 @@ if ($formu) {
switch ($formu) { switch ($formu) {
case 1: // Créer le répertoire $R.$nomfich case 1: // Créer le répertoire $R.$nomfich
if (!$bro->CreateDir($R,$nomfich)) { if (!$bro->CreateDir($R,$nomfich)) {
print $err->errstr(); $error = $err->errstr();
} }
$p=$bro->GetPrefs(); $p=$bro->GetPrefs();
break; break;
case 6: // Créer le fichier $R.$nomfich case 6: // Créer le fichier $R.$nomfich
if (!$bro->CreateFile($R,$nomfich)) { if (!$bro->CreateFile($R,$nomfich)) {
print $err->errstr(); $error = $err->errstr();
} }
$p=$bro->GetPrefs(); $p=$bro->GetPrefs();
if ($p["createfile"]==1) { if ($p["createfile"]==1) {
@ -60,7 +60,7 @@ if ($formu) {
if ($actdel) { if ($actdel) {
if ($del_confirm != "") { if ($del_confirm != "") {
if (!$bro->DeleteFile($d,$R)) { if (!$bro->DeleteFile($d,$R)) {
print $err->errstr(); $error = $err->errstr();
} }
} elseif (!$cancel && is_array($d)) { } elseif (!$cancel && is_array($d)) {
include_once("head.php"); include_once("head.php");
@ -88,28 +88,28 @@ if ($formu) {
} }
if ($actcopy) { if ($actcopy) {
if (!$bro->CopyFile($d,$R,$actmoveto)) { if (!$bro->CopyFile($d,$R,$actmoveto)) {
print $err->errstr(); $error = $err->errstr();
} }
} }
if ($actmove) { if ($actmove) {
if (!$bro->MoveFile($d,$R,$actmoveto)) { if (!$bro->MoveFile($d,$R,$actmoveto)) {
print $err->errstr(); $error = $err->errstr();
} }
} }
break; break;
case 4: // Renommage Effectif... case 4: // Renommage Effectif...
if (!$bro->RenameFile($R,$o,$d)) { // Rename $R (directory) $o (old) $d (new) names if (!$bro->RenameFile($R,$o,$d)) { // Rename $R (directory) $o (old) $d (new) names
print $err->errstr(); $error = $err->errstr();
} }
break; break;
case 3: // Upload de fichier... case 3: // Upload de fichier...
if (!$bro->UploadFile($R)) { if (!$bro->UploadFile($R)) {
print $err->errstr(); $error = $err->errstr();
} }
break; break;
case 7: // Changement de permissions [ML] case 7: // Changement de permissions [ML]
if (!$bro->ChangePermissions($R, $d, $perm)) { if (!$bro->ChangePermissions($R, $d, $perm)) {
print $err->errstr(); $error = $err->errstr();
} }
break; break;
} }
@ -118,8 +118,10 @@ if ($formu) {
if ($actextract) { if ($actextract) {
print _("extracting...")."<br />\n"; flush(); print _("extracting...")."<br />\n"; flush();
if ($bro->ExtractFile($R. '/' . $file, $R)) { if ($bro->ExtractFile($R. '/' . $file, $R)) {
echo "<p class=\"error\">";
print $err->errstr(); print $err->errstr();
print _("failed")."<br />\n"; print _("failed")."<br />\n";
echo "</p>";
} else { } else {
print _("done")."<br />\n"; print _("done")."<br />\n";
} }
@ -135,11 +137,13 @@ if ($c===false) $error=$err->errstr();
<tr><td> <tr><td>
<hr /> <hr />
<p class="breadcrumb"> <p class="breadcrumb">
<?php __("Path"); ?> / <a href="bro_main.php?R=/"><?php echo $mem->user["login"]; ?></a>&nbsp;/&nbsp;<?php echo $bro->PathList($R,"bro_main.php") ?> <?php __("Path"); ?> / <a href="bro_main.php?R=/"><?php echo $mem->user["login"]; ?></a>&nbsp;/&nbsp;<?php echo $bro->PathList($R,"bro_main.php") ?>
</p> </p>
<?php if ($error) echo "<font color=\"red\">$error</font>"; ?> <?php if ($error) echo "<p class=\"error\">$error</p>"; ?>
<table><tr> <table><tr>
<td class="formcell"> <td class="formcell">

2
bureau/class/m_bro.php
View File

@ -350,7 +350,7 @@ class m_bro {
global $db,$err,$cuid; global $db,$err,$cuid;
$file=ssla($file); $file=ssla($file);
$absolute=$this->convertabsolute($dir."/".$file,0); $absolute=$this->convertabsolute($dir."/".$file,0);
if (!$absolute) { if (!$absolute || file_exists($absolute)) {
$err->raise("bro",1); $err->raise("bro",1);
return false; return false;
} }