tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some fixes for the empty text files in the filemanager.

This commit is contained in:
mdtrooper 2014-09-08 13:45:52 +02:00
parent efacbd3480
commit 7a629e2f12
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pandora_console/include/functions_filemanager.php
View File

@ -157,7 +157,8 @@ if ($upload_file) {
$testHash = md5($real_directory . $directory . $config['dbpass']); $testHash = md5($real_directory . $directory . $config['dbpass']);
if ($hash != $testHash) { if ($hash != $testHash) {
$config['filemanager']['message'] = ui_print_error_message(__('Security error'), '', true); $config['filemanager']['message'] =
ui_print_error_message(__('Security error'), '', true);
} }
else { else {
// Copy file to directory and change name // Copy file to directory and change name
@ -295,6 +296,7 @@ if ($upload_zip) {
else { else {
$nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename;
} }
if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) {
$config['filemanager']['message'] = ui_print_error_message(__('Attach error'), '', true); $config['filemanager']['message'] = ui_print_error_message(__('Attach error'), '', true);
} }
@ -456,7 +458,10 @@ function filemanager_read_recursive_dir($dir, $relative_path = '') {
* @param boolean $download_button The flag to show download button, by default false. * @param boolean $download_button The flag to show download button, by default false.
* @param string $umask The umask as hex values to set the new files or updload. * @param string $umask The umask as hex values to set the new files or updload.
*/ */
function filemanager_file_explorer($real_directory, $relative_directory, $url, $father = '', $editor = false, $readOnly = false, $url_file = '', $download_button = false, $umask = '') { function filemanager_file_explorer($real_directory, $relative_directory,
$url, $father = '', $editor = false, $readOnly = false,
$url_file = '', $download_button = false, $umask = '') {
global $config; global $config;
// Windows compatibility // Windows compatibility
@ -557,7 +562,8 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
$table->data[1][1] = ''; $table->data[1][1] = '';
$table->data[1][1] .= '<div id="create_folder" style="display: none;">'; $table->data[1][1] .= '<div id="create_folder" style="display: none;">';
$table->data[1][1] .= html_print_button(__('Close'), 'close', false, 'show_main_buttons_folder();', "class='sub cancel' style='float: left;'", true); $table->data[1][1] .= html_print_button(__('Close'), 'close',
false, 'show_main_buttons_folder();', "class='sub cancel' style='float: left;'", true);
$table->data[1][1] .= '<form method="post" action="' . $url . '">'; $table->data[1][1] .= '<form method="post" action="' . $url . '">';
$table->data[1][1] .= html_print_input_text ('dirname', '', '', 15, 255, true); $table->data[1][1] .= html_print_input_text ('dirname', '', '', 15, 255, true);
$table->data[1][1] .= html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"', true); $table->data[1][1] .= html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"', true);
@ -603,7 +609,7 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
} }
foreach ($files as $fileinfo) { foreach ($files as $fileinfo) {
$fileinfo['realpath'] = str_replace("\\", "/", $fileinfo['realpath']); $fileinfo['realpath'] = str_replace("\\", "/", $fileinfo['realpath']);
$relative_path = str_replace($_SERVER['DOCUMENT_ROOT'], '', $fileinfo['realpath']); $relative_path = str_replace($_SERVER['DOCUMENT_ROOT'], '', $fileinfo['realpath']);
@ -622,6 +628,14 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
case MIME_TEXT: case MIME_TEXT:
$data[0] = html_print_image ('images/mimetypes/text.png', true, array('title' => __('Text file'))); $data[0] = html_print_image ('images/mimetypes/text.png', true, array('title' => __('Text file')));
break; break;
case MIME_UNKNOWN:
if ($fileinfo['size'] == 0) {
if (strstr($fileinfo['name'], '.txt') !== false) {
$fileinfo['mime'] = MIME_TEXT;
$data[0] = html_print_image ('images/mimetypes/text.png', true, array('title' => __('Text file')));
}
}
break;
default: default:
$data[0] = html_print_image ('images/mimetypes/unknown.png', true, array('title' => __('Unknown'))); $data[0] = html_print_image ('images/mimetypes/unknown.png', true, array('title' => __('Unknown')));
break; break;
@ -646,7 +660,7 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
$data[3] = ''; $data[3] = '';
} }
else { else {
$data[3] = ui_format_filesize ($fileinfo['size']); $data[3] = ui_format_filesize($fileinfo['size']);
} }
//Actions buttons //Actions buttons
@ -690,16 +704,25 @@ function filemanager_file_explorer($real_directory, $relative_directory, $url, $
if (!$readOnly) { if (!$readOnly) {
if (is_writable ($real_directory)) { if (is_writable ($real_directory)) {
//The buttons to make actions
echo "<div style='text-align: right; width: " . $table->width . ";'>"; echo "<div style='text-align: right; width: " . $table->width . ";'>";
echo "<a href='javascript:show_form_create_folder();' style='margin-right: 3px; margin-bottom: 5px;'>";
echo html_print_image('images/create_directory.png', true, array("title" => __('Create directory'))); echo "<a href='javascript: show_form_create_folder();' style='margin-right: 3px; margin-bottom: 5px;'>";
echo html_print_image('images/create_directory.png', true,
array("title" => __('Create directory')));
echo "</a>"; echo "</a>";
echo "<a href='javascript: show_create_text_file();' style='margin-right: 3px; margin-bottom: 5px;'>"; echo "<a href='javascript: show_create_text_file();' style='margin-right: 3px; margin-bottom: 5px;'>";
echo html_print_image('images/create_file.png', true, array("title" => __('Create text'))); echo html_print_image('images/create_file.png', true,
array("title" => __('Create text')));
echo "</a>"; echo "</a>";
echo "<a href='javascript: show_upload_file();'>"; echo "<a href='javascript: show_upload_file();'>";
echo html_print_image('images/upload_file.png', true, array("title" => __('Upload file/s'))); echo html_print_image('images/upload_file.png', true,
array("title" => __('Upload file/s')));
echo "</a>"; echo "</a>";
echo "</div>"; echo "</div>";
} }
else { else {