mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Add some basic error handling to File Manager

Browse Source
This commit is contained in:
e107steved
2010-09-16 20:04:14 +00:00
parent 4befadac10
commit 2c587547be
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
e107_admin/filemanager.php
View File

@@ -37,6 +37,7 @@ $pubfolder = (str_replace("../","",e_QUERY) == str_replace("../","",e_UPLOAD)) ?
$imagedir = e_IMAGE."filemanager/"; $imagedir = e_IMAGE."filemanager/";
$message = '';
$dir_options[0] = FMLAN_47; $dir_options[0] = FMLAN_47;
$dir_options[1] = FMLAN_35; $dir_options[1] = FMLAN_35;
@@ -130,16 +131,42 @@ if (isset($_POST['upload']))
exit; exit;
} }
$uploadList = array(); $uploadList = array();
$pref['upload_storagetype'] = "1"; require_once(e_HANDLER.'upload_handler.php');
require_once(e_HANDLER."upload_handler.php");
$files = $_FILES['file_userfile']; $files = $_FILES['file_userfile'];
$spacer = '';
foreach($files['name'] as $key => $name) foreach($files['name'] as $key => $name)
{ {
if ($files['size'][$key]) if ($name)
{
if ($files['error'][$key])
{
$message .= $spacer.FMLAN_10.' '.$files['error'][$key].': '.$name;
}
elseif ($files['size'][$key])
{ {
$uploaded = file_upload(e_BASE.$_POST['upload_dir'][$key]); $uploaded = file_upload(e_BASE.$_POST['upload_dir'][$key]);
if (($uploaded === FALSE) || !is_array($uploaded))
{
$message .= $spacer.FMLAN_51.$name;
$spacer = '<br />';
}
else
{
foreach ($uploaded as $k => $inf)
{
if ($inf['error'] == 0)
{
$uploadList[] = $_POST['upload_dir'][$key].$uploaded[0]['name']; $uploadList[] = $_POST['upload_dir'][$key].$uploaded[0]['name'];
} }
else
{ // Most likely errors trapped earlier.
$message .= $spacer.FMLAN_10.' '.$inf['error'].' ('.$inf['message'].'): '.$inf['rawname'];
}
$spacer = '<br />';
}
}
}
}
} }
if (count($uploadList)) if (count($uploadList))
{ {
@@ -149,7 +176,7 @@ if (isset($_POST['upload']))
if (isset($message)) if ($message)
{ {
$ns->tablerender("", "<div style=\"text-align:center\"><b>".$message."</b></div>"); $ns->tablerender("", "<div style=\"text-align:center\"><b>".$message."</b></div>");
} }

3
e107_languages/English/admin/lan_filemanager.php
View File

@@ -18,7 +18,7 @@
// define("FMLAN_7", "No file was uploaded."); // define("FMLAN_7", "No file was uploaded.");
// define("FMLAN_8", "Uploaded file size 0 bytes"); // define("FMLAN_8", "Uploaded file size 0 bytes");
// define("FMLAN_9", "The file did not upload. Filename"); // define("FMLAN_9", "The file did not upload. Filename");
// define("FMLAN_10", "Error"); define('FMLAN_10', 'Error');
// define("FMLAN_11", "Probably incorrect permissions on upload directory."); // define("FMLAN_11", "Probably incorrect permissions on upload directory.");
define("FMLAN_12", "file"); define("FMLAN_12", "file");
define("FMLAN_13", "files"); define("FMLAN_13", "files");
@@ -61,6 +61,7 @@ define("FMLAN_47", "User Uploads");
define("FMLAN_48", "Move selected to"); define("FMLAN_48", "Move selected to");
define("FMLAN_49", "Please confirm you wish to move the selected files."); define("FMLAN_49", "Please confirm you wish to move the selected files.");
define("FMLAN_50", "Move"); define("FMLAN_50", "Move");
define('FMLAN_51', 'Unidentified error: ');