diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php index 1844b914..04c9fd00 100644 --- a/bureau/admin/bro_main.php +++ b/bureau/admin/bro_main.php @@ -41,13 +41,13 @@ if ($formu) { switch ($formu) { case 1: // Créer le répertoire $R.$nomfich if (!$bro->CreateDir($R,$nomfich)) { - print $err->errstr(); + $error = $err->errstr(); } $p=$bro->GetPrefs(); break; case 6: // Créer le fichier $R.$nomfich if (!$bro->CreateFile($R,$nomfich)) { - print $err->errstr(); + $error = $err->errstr(); } $p=$bro->GetPrefs(); if ($p["createfile"]==1) { @@ -60,7 +60,7 @@ if ($formu) { if ($actdel) { if ($del_confirm != "") { if (!$bro->DeleteFile($d,$R)) { - print $err->errstr(); + $error = $err->errstr(); } } elseif (!$cancel && is_array($d)) { include_once("head.php"); @@ -88,28 +88,28 @@ if ($formu) { } if ($actcopy) { if (!$bro->CopyFile($d,$R,$actmoveto)) { - print $err->errstr(); + $error = $err->errstr(); } } if ($actmove) { if (!$bro->MoveFile($d,$R,$actmoveto)) { - print $err->errstr(); + $error = $err->errstr(); } } break; case 4: // Renommage Effectif... if (!$bro->RenameFile($R,$o,$d)) { // Rename $R (directory) $o (old) $d (new) names - print $err->errstr(); + $error = $err->errstr(); } break; case 3: // Upload de fichier... if (!$bro->UploadFile($R)) { - print $err->errstr(); + $error = $err->errstr(); } break; case 7: // Changement de permissions [ML] if (!$bro->ChangePermissions($R, $d, $perm)) { - print $err->errstr(); + $error = $err->errstr(); } break; } @@ -118,8 +118,10 @@ if ($formu) { if ($actextract) { print _("extracting...")."
\n"; flush(); if ($bro->ExtractFile($R. '/' . $file, $R)) { + echo "

"; print $err->errstr(); print _("failed")."
\n"; + echo "

"; } else { print _("done")."
\n"; } @@ -135,11 +137,13 @@ if ($c===false) $error=$err->errstr();
+ + -$error"; ?> +$error

"; ?>
diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php index f6117fed..40956999 100644 --- a/bureau/class/m_bro.php +++ b/bureau/class/m_bro.php @@ -350,7 +350,7 @@ class m_bro { global $db,$err,$cuid; $file=ssla($file); $absolute=$this->convertabsolute($dir."/".$file,0); - if (!$absolute) { + if (!$absolute || file_exists($absolute)) { $err->raise("bro",1); return false; }