mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

File manager - start of code cleanup ($messages), see notes

Browse Source
This commit is contained in:
Tijn Kuyper
2013-02-25 15:02:38 +01:00
parent 5304b4a18b
commit 1ea4a3de5c
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e107_admin/filemanager.php
View File

@@ -27,11 +27,10 @@ $e_sub_cat = 'filemanage';
require_once("auth.php"); require_once("auth.php");
require_once(e_HANDLER.'upload_handler.php'); require_once(e_HANDLER.'upload_handler.php');
require_once(e_HANDLER."form_handler.php"); require_once(e_HANDLER."form_handler.php");
$frm = new e_form(); $frm = e107::getForm();
require_once (e_HANDLER."message_handler.php"); require_once (e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance(); $mes = e107::getMessage(); //FIXME
//FIXME - messages
$pubfolder = (str_replace("../","",e_QUERY) == str_replace("../","",e_UPLOAD)) ? TRUE : FALSE; $pubfolder = (str_replace("../","",e_QUERY) == str_replace("../","",e_UPLOAD)) ? TRUE : FALSE;
@@ -82,11 +81,13 @@ if (isset($_POST['deleteconfirm']))
if (@unlink($destination_file)) if (@unlink($destination_file))
{ {
$message .= FMLAN_26." '".$destination_file."' ".FMLAN_27.".<br />"; $message .= FMLAN_26." '".$destination_file."' ".FMLAN_27.".<br />";
//$mes->addSuccess(LAN_DELETED.": <br />."$destination_file."<br />") // FIXME syntax
$deleteList[] = $destination_file; $deleteList[] = $destination_file;
} }
else else
{ {
$message .= FMLAN_28." '".$destination_file."'.<br />"; $message .= FMLAN_28." '".$destination_file."'.<br />";
//$mes->addError(LAN_DELETED_FAILED.": <br />."$destination_file."<br />) // FIXME syntax
} }
} }
@@ -101,12 +102,12 @@ if (isset($_POST['deleteconfirm']))
$newpath = $_POST['movepath']; $newpath = $_POST['movepath'];
if (rename(e_BASE.$delfile,$newpath.$newfile)) if (rename(e_BASE.$delfile,$newpath.$newfile))
{ {
$message .= FMLAN_38." ".$newpath.$newfile."<br />"; $message .= FMLAN_38." ".$newpath.$newfile."<br />"; // FIXME
$moveList[] = e_BASE.$delfile.'=>'.$newpath.$newfile; $moveList[] = e_BASE.$delfile.'=>'.$newpath.$newfile;
} }
else else
{ {
$message .= FMLAN_39." ".$newpath.$newfile."<br />"; $message .= FMLAN_39." ".$newpath.$newfile."<br />"; // FIXME
$message .= (!is_writable($newpath)) ? $newpath.LAN_NOTWRITABLE : ""; $message .= (!is_writable($newpath)) ? $newpath.LAN_NOTWRITABLE : "";
} }
} }
@@ -140,14 +141,14 @@ if (isset($_POST['upload']))
{ {
if ($files['error'][$key]) if ($files['error'][$key])
{ {
$message .= $spacer.FMLAN_10.' '.$files['error'][$key].': '.$name; $message .= $spacer.FMLAN_10.' '.$files['error'][$key].': '.$name; // FIXME
} }
elseif ($files['size'][$key]) 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)) if (($uploaded === FALSE) || !is_array($uploaded))
{ {
$message .= $spacer.FMLAN_51.$name; $message .= $spacer.FMLAN_51.$name; // FIXME
$spacer = '<br />'; $spacer = '<br />';
} }
else else
@@ -160,7 +161,7 @@ if (isset($_POST['upload']))
} }
else else
{ // Most likely errors trapped earlier. { // Most likely errors trapped earlier.
$message .= $spacer.FMLAN_10.' '.$inf['error'].' ('.$inf['message'].'): '.$inf['rawname']; $message .= $spacer.FMLAN_10.' '.$inf['error'].' ('.$inf['message'].'): '.$inf['rawname']; // FIXME
} }
$spacer = '<br />'; $spacer = '<br />';
} }
@@ -176,7 +177,7 @@ if (isset($_POST['upload']))
if ($message) if ($message) // FIXME
{ {
$ns->tablerender("", "<div style=\"text-align:center\"><b>".$message."</b></div>"); $ns->tablerender("", "<div style=\"text-align:center\"><b>".$message."</b></div>");
} }

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

@@ -32,8 +32,8 @@ define("FMLAN_19", "Last Modified");
define("FMLAN_21", "Upload file to this dir"); define("FMLAN_21", "Upload file to this dir");
define("FMLAN_22", "Upload"); define("FMLAN_22", "Upload");
define("FMLAN_26", "Deleted"); //define("FMLAN_26", "Deleted");
define("FMLAN_27", "successfully"); //define("FMLAN_27", "successfully");
define("FMLAN_28", "Unable to delete"); define("FMLAN_28", "Unable to delete");
define("FMLAN_29", "Path"); define("FMLAN_29", "Path");
define("FMLAN_30", "Up level"); define("FMLAN_30", "Up level");