diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 471cfb343e..3c7b042ca5 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,18 @@
+
+2009-03-26  Sancho Lerena <slerena@artica.es>
+
+	* pandoradb.sql: SLA parameters now accept float values.
+	
+	* extras/pandoradb_migrate_v2.x_to_v3.0.sql: SLA parameters now accept 
+	float values after a table update.
+	
+	* godmode/setup/filemgr.php: New feature: a file manager, accesible only by
+	pandora Administrators. Have some security checks but is not intended to be
+	used by anyone not admin.
+	
+	* godmode/menu.php: Added filemanager and fixed minor problem under SNMP
+	Godmode (fake submenu).
+
 2009-03-26  Esteban Sanchez  <estebans@artica.es>
 
 	* include/javascript/jquery.ui.dialog.js: Added to repository.
diff --git a/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql b/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql
index 9230f6ac8d..6f712bc31b 100644
--- a/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql
+++ b/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql
@@ -1,3 +1,10 @@
+ALTER TABLE treport_content_sla_combined CHANGE sla_max `sla_max` double(18,2) NOT NULL default 0;
+
+ALTER TABLE treport_content_sla_combined CHANGE sla_min `sla_min` double(18,2) NOT NULL default 0;
+
+ALTER TABLE treport_content_sla_combined CHANGE sla_limit `sla_limit` double(18,2) NOT NULL default 0;
+
+
 ALTER TABLE ttrap add `priority` tinyint(4) unsigned NOT NULL default '2';
 
 INSERT INTO `tconfig` VALUES (24, 'loginhash_pwd', '');
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 34869f9c94..befa56bd37 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -94,9 +94,8 @@ if (give_acl($config['id_user'], 0, "AW")) {
 	$menu["gsnmpconsole"]["sec2"] = "godmode/snmpconsole/snmp_alert";
 	$menu["gsnmpconsole"]["id"] = "god-snmpc";
 	
-	//SNMP Console alert
 	$sub = array ();
-	$sub["godmode/snmpconsole/snmp_alert"]["text"] = __('Component groups');
+	//$sub["godmode/snmpconsole/snmp_alert"]["text"] = __('Component groups');
 	
 	enterprise_hook ('snmpconsole_submenu');
 
@@ -153,6 +152,9 @@ if (give_acl ($config['id_user'], 0, "PM")) {
 	$menu["gsetup"]["id"] = "god-setup";
 	
 	$sub = array ();
+	
+	$sub["godmode/setup/filemgr"]["text"] = __('File Manager');
+	
 	$sub["godmode/setup/links"]["text"] = __('Links');
 	
 	$sub["godmode/setup/news"]["text"] = __('Site news');
diff --git a/pandora_console/godmode/setup/filemgr.php b/pandora_console/godmode/setup/filemgr.php
new file mode 100644
index 0000000000..1d124ccdfd
--- /dev/null
+++ b/pandora_console/godmode/setup/filemgr.php
@@ -0,0 +1,266 @@
+<?php 
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2009 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation for version 2.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+// Load global vars
+require_once ("include/config.php");
+
+check_login ();
+
+if (! give_acl ($config['id_user'], 0, "PM") || ! is_user_admin ($config['id_user'])) {
+	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access File manager");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// Upload file
+if (isset($_GET["upload_file"])) {
+
+	if (isset($_FILES["userfile"]) && ( $_FILES['userfile']['name'] != "" )){ //if file
+		$tipo = $_FILES['userfile']['type'];
+
+		$filename= $_FILES['userfile']['name'];
+		$filesize = $_FILES['userfile']['size'];
+		$directory = get_parameter ("directory","");
+		
+		// Copy file to directory and change name
+		$nombre_archivo = $config["homedir"]."/".$directory."/".$filename;
+		if (!(copy($_FILES['userfile']['tmp_name'], $nombre_archivo ))){
+			echo "<h3 class=error>".__("attach_error")."</h3>";
+		} else {
+			// Delete temporal file
+			unlink ($_FILES['userfile']['tmp_name']);
+		}
+		
+	}
+}
+
+// Delete file
+$delete = get_parameter ("delete", "");
+if ($delete != ""){
+	echo "<h1>".__("Deleting file")."</h1>";
+	$file = get_parameter ("delete", "");
+	$directory = get_parameter ("directory", "");
+
+	$full_filename = $directory . "/". $file;
+	if (!is_dir ($full_filename)){
+		echo "<h3>".__("Deleting")." ".$full_filename."</h3>";
+		unlink ($full_filename);
+	}
+}
+
+echo "<h1>".__("File manager")."</h1>";
+
+$current_directory = get_parameter ("directory", "/");
+
+// CREATE DIR
+// Upload file
+if (isset($_GET["create_dir"])) {
+	$newdir = get_parameter ("newdir","");
+	if ($newdir != ""){
+		mkdir($current_directory."/".$newdir);
+		echo "<h3>".__("Created directory '$newdir'")."</h3>";
+	}
+
+}
+
+
+// A miminal security check to avoid directory traversal
+if (preg_match("/\.\./", $current_directory))
+	$current_directory = "images";
+if (preg_match("/^\//", $current_directory))
+	$current_directory = "images";
+if (preg_match("/^manager/", $current_directory))
+	$current_directory = "images";
+
+echo "<form method='post' action='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&upload_file' enctype='multipart/form-data'>";
+echo "<table cellpadding='4' cellspacing='4' width='550' class='databox'>";
+
+echo "<tr><td class='datos'>";
+echo __("Base directory");
+echo "<td class='datos'>";
+
+
+/* Add custom directories here */
+$fallback_directory = "images";
+
+$available_directory["images"] = "images";
+$available_directory["attachment"] = "attachment";
+$available_directory["include/languages"] = "languages";
+
+$banned_directory["include"] = 1;
+$banned_directory["godmode"] = 1;
+$banned_directory["operation"] = 1;
+$banned_directory["reporting"] = 1;
+$banned_directory["general"] = 1;
+$banned_directory["enterprise"] = 1;
+
+if (isset($banned_directory[$current_directory]))
+	$current_directory = $fallback_directory;
+
+// Current directory
+$available_directory[$current_directory] = $current_directory;
+
+print_select ($available_directory, 'directory', $current_directory, '', '', '',  false, false);
+echo "&nbsp;&nbsp;<input type=submit value='".__("Go")."'>";
+
+$real_directory = $config["homedir"] . "/". $current_directory;
+
+if (is_writable($real_directory)) {
+	echo "<tr><td class='datos'>";
+	echo __("Upload new file");
+	echo "<td class='datos'>";
+	echo "<input type='file' size=25 name='userfile' value='userfile'>";
+	echo "&nbsp;&nbsp;";
+	echo "<input type=submit value='".__("Upload")."'>";
+	echo "</form>";
+	echo "</table>";
+} else {
+	echo "</form>";
+	echo "</table>";
+	echo "<h3 class='error'>".__('Current directory is not writtable by HTTP Server')."</h3>";
+	echo '<p>';
+	echo __('Please check that current directory has write rights for HTTP server');
+	echo "</p>";
+}
+
+
+echo "<h2>".__("Current directory"). " : ".$current_directory . " <a href='index.php?manager=filemgr&directory=$current_directory'><img src='images/arrow_refresh.png' border=0></a></h2>";
+// Upload form
+
+	// List files
+	
+	$directoryHandler = "";
+	$result = array ();
+	if (! $directoryHandler = @opendir ($real_directory)) {
+		echo ("<pre>\nerror: directory \"$current_directory\" doesn't exist!\n</pre>\n");
+		return 0;
+	}
+	
+	while (false !== ($fileName = @readdir ($directoryHandler))) {
+		$result[$fileName] = $fileName;
+		// TODO: Read filetype (image, directory)
+		//       If directory create a link to navigate.
+	}
+	asort($result, SORT_STRING);
+	
+	if (@count ($result) === 0) {
+		echo __ ("No files found");
+	} else {
+		asort ($result);
+		
+		echo "<table width='750' class='listing'>";
+		
+		$prev_dir = split( "/", $current_directory );
+		$prev_dir_str = "";
+		for ($ax = 0; $ax < (count($prev_dir)-1); $ax++){
+
+			$prev_dir_str .= $prev_dir[$ax];
+			if ($ax < (count($prev_dir)-2))
+				$prev_dir_str .= "/";
+		}
+
+		if ($prev_dir_str != ""){
+			echo "<tr><td colspan=6>";
+			echo "<a href='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&directory=$prev_dir_str'>".__("Go prev. directory")." <img src='images/go-previous.png' border=0></a>";
+			echo "</th></tr>";
+		}
+		echo "<tr><th>";
+		echo __ ("Filename");
+		echo "<th>";
+		echo __ ("Image info");
+		echo "<th>";
+		echo __ ("Last update");
+		echo "<th>";
+		echo __ ("Owner");
+		echo "<th>";
+		echo __ ("Perms");
+		echo "<th>";
+		echo __ ("Filesize");
+		echo "<th>";
+		echo __ ("File type");
+		echo "<th>";
+		echo __ ("Directory");
+		echo "<th>";
+		echo __ ("Del");
+		while (@count($result) > 0){
+			$temp = array_shift ($result);
+			$fullfilename = $current_directory.'/'.$temp;
+			$mimetype = "";
+			if (($temp != "..") AND ($temp != ".")){
+				echo "<tr><td>";
+				if (!is_dir ($current_directory.'/'.$temp)){	
+					echo "<a href='$fullfilename'>$temp</A>";
+				} else
+					echo "<a href='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&directory=$current_directory/$temp'>/$temp</a>";
+
+				echo "<td>";
+				if (preg_match("/image/", $mimetype)){
+					list($ancho, $altura, $tipo, $atr) = getimagesize($fullfilename);
+					echo $ancho."x".$altura;
+				}	
+				echo "<td>";
+				if (!is_dir ($fullfilename))
+					echo date("F d Y H:i:s.", filemtime($fullfilename));
+				echo "<td>";
+				if (!is_dir ($fullfilename))
+					echo fileowner($fullfilename);
+
+				echo "<td>";
+				if (!is_dir ($fullfilename))
+					if (!is_readable($fullfilename))
+						echo "<font color=#ff0000>";
+					echo __("Read");				
+
+				echo "<td>";
+				if (!is_dir ($fullfilename))
+					echo filesize($fullfilename);
+				else
+					echo "&lt;DIR&gt;";
+
+				echo "<td>";
+				if (!is_dir ($fullfilename))
+					echo $mimetype;
+				else
+					echo "&lt;DIR&gt;";
+
+				echo "<td align=center>";
+				if (!is_dir ($fullfilename))
+					echo "<img src='images/disk.png' border=0>";
+				else
+					echo "<img src='images/drive_network.png' border=0>";
+				echo "<td>";
+				echo "<a href='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&directory=$current_directory&delete=$temp'><img src='images/cross.png' border=0></a>";
+			}
+		}
+		echo "</table>";
+
+		if (is_writable($current_directory)){
+			echo "<br><br>";
+			echo "<form method='post' action='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&create_dir=1&directory=$current_directory'>";
+			echo __("Create directory");
+			echo "&nbsp;&nbsp;";
+			echo "<input type=text size=15 name='newdir'>";
+			echo "&nbsp;&nbsp;";
+			echo "<input type=submit value='Make dir'>";
+			echo "</form>";
+		}
+	}
+
+
+?>
+
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 93352030cb..e824432c22 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -716,9 +716,9 @@ CREATE TABLE IF NOT EXISTS `treport_content_sla_combined` (
   `id` INTEGER UNSIGNED NOT NULL auto_increment,
   `id_report_content` INTEGER UNSIGNED NOT NULL,
   `id_agent_module` int(10) unsigned NOT NULL,
-  `sla_max` int(11) NOT NULL default 0,
-  `sla_min` int(11) NOT NULL default 0,
-  `sla_limit` int(11) NOT NULL default 0,
+  `sla_max` double(18,2) NOT NULL default 0,
+  `sla_min` double(18,2) NOT NULL default 0,
+  `sla_limit` double(18,2) NOT NULL default 0,  
   PRIMARY KEY(`id`),
   FOREIGN KEY (`id_report_content`) REFERENCES treport_content(`id_rc`)
      ON UPDATE CASCADE ON DELETE CASCADE,