Commit d63da16f authored by Antoine Beaupré's avatar Antoine Beaupré

don't translate mimetypes in m_bro::mime(). revert hooking tarball extraction from the last commit

parent 6b07f7f6
......@@ -103,13 +103,8 @@ if ($formu) {
}
break;
case 3: // Upload de fichier...
$target = $bro->UploadFile($R);
if (!$target) {
if (!$bro->UploadFile($R)) {
print $err->errstr();
} elseif ($_POST['extract']) {
if (!$bro->ExtractFile($target)) {
print $err->errstr();
}
}
break;
}
......@@ -220,7 +215,7 @@ echo "\">".htmlentities($c[$i]["name"])."</a></td>\n";
echo " <td>".format_size($c[$i]["size"])."</td>";
echo "<td>".format_date('%3$d-%2$d-%1$d %4$d:%5$d',date("Y-m-d H:i:s",$c[$i]["date"]))."<br /></td>";
if ($p["showtype"]) {
echo "<td>".$bro->mime($c[$i]["name"])."</td>";
echo "<td>"._($bro->mime($c[$i]["name"]))."</td>";
}
$vu=$bro->viewurl($R,$c[$i]["name"]);
if ($vu) {
......
......@@ -227,7 +227,7 @@ class m_bro {
function mime($file) {
global $bro_type;
if (!strpos($file,".") && substr($file,0,1)!=".") {
return _("File");
return "File";
}
$t=explode(".",$file);
if (!is_array($t))
......@@ -236,9 +236,9 @@ class m_bro {
$ext=$t[count($t)-1];
// Now seek the extension
if (!$bro_type[$ext]) {
return _("File");
return "File";
} else {
return _($bro_type[$ext]);
return $bro_type[$ext];
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment