Message d'erreurs explicite dans m_bro

This commit is contained in:
Alan Garcia 2012-08-26 10:17:27 +00:00
parent 9d78919b51
commit e51f1cd451
1 changed files with 22 additions and 22 deletions

View File

@ -332,13 +332,13 @@ class m_bro {
#echo "$absolute"; #echo "$absolute";
if ($absolute && (!file_exists($absolute))) { if ($absolute && (!file_exists($absolute))) {
if (!mkdir($absolute,00777)) { if (!mkdir($absolute,00777)) {
$err->raise("bro",4); $err->raise("bro",_("Cannot create the requested directory. Please check permissions."));
return false; return false;
} }
$db->query("UPDATE browser SET crff=1 WHERE uid='$cuid';"); $db->query("UPDATE browser SET crff=1 WHERE uid='$cuid';");
return true; return true;
} else { } else {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
} }
@ -355,12 +355,12 @@ class m_bro {
$file=ssla($file); $file=ssla($file);
$absolute=$this->convertabsolute($dir."/".$file,0); $absolute=$this->convertabsolute($dir."/".$file,0);
if (!$absolute || file_exists($absolute)) { if (!$absolute || file_exists($absolute)) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
if (!file_exists($absolute)) { if (!file_exists($absolute)) {
if (!@touch($absolute)) { if (!@touch($absolute)) {
$err->raise("bro",3); $err->raise("bro",_("Cannot create the requested file. Please check permissions."));
return false; return false;
} }
} }
@ -380,7 +380,7 @@ class m_bro {
$root=realpath(getuserpath()); $root=realpath(getuserpath());
$absolute=$this->convertabsolute($R,0); $absolute=$this->convertabsolute($R,0);
if (!$absolute && strpos($root,$absolute) === 0 && strlen($absolute) > (strlen($root)+1) ) { if (!$absolute && strpos($root,$absolute) === 0 && strlen($absolute) > (strlen($root)+1) ) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
for ($i=0;$i<count($file_list);$i++) { for ($i=0;$i<count($file_list);$i++) {
@ -404,7 +404,7 @@ class m_bro {
global $err; global $err;
$absolute=$this->convertabsolute($R,0); $absolute=$this->convertabsolute($R,0);
if (!$absolute) { if (!$absolute) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
$alea=".".time().rand(1000,9999); $alea=".".time().rand(1000,9999);
@ -436,7 +436,7 @@ class m_bro {
global $err; global $err;
$old=$this->convertabsolute($old,0); $old=$this->convertabsolute($old,0);
if (!$old) { if (!$old) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
@ -447,11 +447,11 @@ class m_bro {
} }
if (!$new) { if (!$new) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
if ($old==$new) { if ($old==$new) {
$err->raise("bro",2); $err->raise("bro",_("You cannot move or copy a file to the same folder."));
return false; return false;
} }
for ($i=0;$i<count($d);$i++) { for ($i=0;$i<count($d);$i++) {
@ -475,7 +475,7 @@ class m_bro {
global $err; global $err;
$absolute=$this->convertabsolute($R,0); $absolute=$this->convertabsolute($R,0);
if (!$absolute) { if (!$absolute) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
for ($i=0;$i<count($d);$i++) { for ($i=0;$i<count($d);$i++) {
@ -512,7 +512,7 @@ class m_bro {
global $_FILES,$err,$cuid; global $_FILES,$err,$cuid;
$absolute=$this->convertabsolute($R,0); $absolute=$this->convertabsolute($R,0);
if (!$absolute) { if (!$absolute) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
if (!strpos($_FILES['userfile']['name'],"/")) { if (!strpos($_FILES['userfile']['name'],"/")) {
@ -524,7 +524,7 @@ class m_bro {
exec("sudo /usr/lib/alternc/fixperms.sh -u ".$cuid." -f ".$absolute."/".$_FILES['userfile']['name']); exec("sudo /usr/lib/alternc/fixperms.sh -u ".$cuid." -f ".$absolute."/".$_FILES['userfile']['name']);
return $absolute."/".$_FILES['userfile']['name']; return $absolute."/".$_FILES['userfile']['name'];
} else { } else {
$err->raise("bro",3); $err->raise("bro",("Cannot create the requested file. Please check permissions."));
return false; return false;
} }
} else { } else {
@ -552,7 +552,7 @@ class m_bro {
$dest = $this->convertabsolute($dest,0); $dest = $this->convertabsolute($dest,0);
} }
if (!$file || !$dest) { if (!$file || !$dest) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return 1; return 1;
} }
$file = escapeshellarg($file); $file = escapeshellarg($file);
@ -590,16 +590,16 @@ class m_bro {
global $err; global $err;
$old=$this->convertabsolute($old,0); $old=$this->convertabsolute($old,0);
if (!$old) { if (!$old) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
$new=$this->convertabsolute($new,0); $new=$this->convertabsolute($new,0);
if (!$new) { if (!$new) {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
if ($old==$new) { if ($old==$new) {
$err->raise("bro",2); $err->raise("bro",_("You cannot move or copy a file to the same folder"));
return false; return false;
} }
for ($i=0;$i<count($d);$i++) { for ($i=0;$i<count($d);$i++) {
@ -677,11 +677,11 @@ class m_bro {
if (file_exists($absolute)) { if (file_exists($absolute)) {
$std=str_replace("<","&lt;",str_replace("&","&amp;",file_get_contents($absolute))); $std=str_replace("<","&lt;",str_replace("&","&amp;",file_get_contents($absolute)));
} else { } else {
$err->raise("bro",6); $err->raise("bro",_("Cannot read the requested file. Please check permissions."));
return false; return false;
} }
} else { } else {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
return $std; return $std;
@ -782,7 +782,7 @@ class m_bro {
readfile($absolute); readfile($absolute);
} }
} else { } else {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
} }
@ -809,12 +809,12 @@ class m_bro {
fputs($f,$texte,strlen($texte)); fputs($f,$texte,strlen($texte));
fclose($f); fclose($f);
} else { } else {
$err->raise("bro",5); $err->raise("bro",("Cannot edit the requested file. Please check permissions."));
return false; return false;
} }
} }
} else { } else {
$err->raise("bro",1); $err->raise("bro",_("File or folder name is incorrect"));
return false; return false;
} }
} }
@ -953,7 +953,7 @@ function alternc_export_data($dir){
$dir.="html/"; $dir.="html/";
if(!is_dir($dir)){ if(!is_dir($dir)){
if(!mkdir($dir)) if(!mkdir($dir))
$err->raise("bro",4); $err->raise("bro",_("Cannot create the requested directory. Please check permissions."));
} }
$timestamp=date("H:i:s"); $timestamp=date("H:i:s");