From 0ae90d4551221677a9dbf49fa01a07c8b25e1e36 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 13 Jul 2010 18:04:37 +0000
Subject: [PATCH] 2010-07-13  Miguel de Dios  <miguel.dedios@artica.es>

	* include/functions_filemanager.php: changed the form to upload one or more
	files to more easy. And changed other things for stetic reasons.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3003 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                       |  5 +++++
 .../include/functions_filemanager.php           | 17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 7a138dddca..82d5e4b9bd 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-13  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/functions_filemanager.php: changed the form to upload one or more
+	files to more easy. And changed other things for stetic reasons.
+
 2010-07-13  Sergio Martin <sergio.martin@artica.es>
 
 	* operation/agentes/datos_agente.php: Putted back data range
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 82819ec6a2..82dab998d3 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -108,8 +108,8 @@ if (!function_exists ('mime_content_type')) {
 $upload_file_or_zip = (bool) get_parameter('upload_file_or_zip');
 
 if ($upload_file_or_zip) {
-	$zip_or_file = get_parameter('zip_or_file');
-	if ($zip_or_file == 'file') {
+	$decompress = get_parameter('decompress');
+	if (!$decompress) {
 		$upload_file = true;
 		$upload_zip = false;
 	}
@@ -458,6 +458,7 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 	$table->data = array ();
 	$table->head = array ();
 	$table->size = array ();
+	$table->align[3] = 'right';
 	$table->align[4] = 'center';
 	
 	$table->size[0] = '24px';
@@ -510,8 +511,10 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 		$table->data[1][1] .= '<form method="post" action="' . $url . '" enctype="multipart/form-data">';
 		$table->data[1][1] .= print_help_tip (__("The zip upload in this dir, easy to upload multiple files."), true);
 		$table->data[1][1] .= print_input_file ('file', true, false);
-		$table->data[1][1] .= print_radio_button('zip_or_file', 'zip', '', false, true) . __('Multiple files zipped');
-		$table->data[1][1] .= print_radio_button('zip_or_file', 'file', '', true, true) .  __('One');
+		$table->data[1][1] .= print_checkbox('decompress', 1, false, true);
+		$table->data[1][1] .= __('Decompress');
+//		$table->data[1][1] .= print_radio_button('zip_or_file', 'zip', '', false, true) . __('Multiple files zipped');
+//		$table->data[1][1] .= print_radio_button('zip_or_file', 'file', '', true, true) .  __('One');
 		$table->data[1][1] .= '&nbsp;&nbsp;&nbsp;';
 		$table->data[1][1] .= print_submit_button (__('Go'), 'go', false, 'class="sub next"', true);
 		$table->data[1][1] .= print_input_hidden ('real_directory', $real_directory, true);
@@ -574,9 +577,10 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 		//Actions buttons
 		//Delete button
 		$data[4] = '';
+		$data[4] .= '<span style="">';
 		if (is_writable ($fileinfo['realpath'])  &&
 			(! is_dir ($fileinfo['realpath']) || count (scandir ($fileinfo['realpath'])) < 3)) {
-			$data[4] = '<form method="post" action="' . $url . '" style="float: left;">';
+			$data[4] .= '<form method="post" action="' . $url . '" style="display: inline;">';
 			$data[4] .= '<input type="image" src="images/cross.png" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
 			$data[4] .= print_input_hidden ('filename', $fileinfo['realpath'], true);
 			$data[4] .= print_input_hidden('hash', md5($fileinfo['realpath'] . $config['dbpass']), true);
@@ -585,10 +589,11 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '',
 			
 			if ($editor) {
 				if ($fileinfo['mime'] == MIME_TEXT) {
-					$data[4] .= "<a href='$url&edit_file=1&location_file=" . $fileinfo['realpath'] . "&hash=" . md5($fileinfo['realpath'] . $config['dbpass']) . "' style='float: left;'><img src='images/edit.png' style='margin-top: 2px;' /></a>";
+					$data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&location_file=" . $fileinfo['realpath'] . "&hash=" . md5($fileinfo['realpath'] . $config['dbpass']) . "' style='float: left;'><img src='images/edit.png' style='margin-top: 2px;' /></a>";
 				}
 			}
 		}
+		$data[4] .= '</span>';
 	
 		array_push ($table->data, $data);
 	}