From 34a8473d81414e78505c9a412d1f3a5ba9a584c9 Mon Sep 17 00:00:00 2001
From: esanchezm <noreply@pandorafms.org>
Date: Wed, 4 Mar 2009 15:59:00 +0000
Subject: [PATCH] 2009-03-04  Esteban Sanchez  <estebans@artica.es>

	* godmode/agentes/manage_config.php: Fixed a javascript error that
	doesn't allow to perform any operation.

	* godmode/alerts/configure_alert_action.php: Fixed javascript file
	inclusion.

	* godmode/reporting/map_builder.php: Fixed typo when updating a
	layout.

	* images/download.png: Added to repository.

	* include/functions_agents.php: Style correction.

	* include/functions_html.php: Added additional options to
	print_input_image().

	* include/functions_ui.php: Added format_filesize().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1507 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  20 +++++++++++++++
 .../godmode/agentes/manage_config.php         |   2 +-
 .../godmode/alerts/configure_alert_action.php |   3 ++-
 .../godmode/reporting/map_builder.php         |   2 +-
 pandora_console/images/download.png           | Bin 0 -> 663 bytes
 pandora_console/include/functions_agents.php  |  24 ++++++++++--------
 pandora_console/include/functions_html.php    |  19 ++++++++++++--
 pandora_console/include/functions_ui.php      |  18 +++++++++++++
 8 files changed, 72 insertions(+), 16 deletions(-)
 create mode 100644 pandora_console/images/download.png

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index e08bcef605..83697dd1a3 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,23 @@
+2009-03-04  Esteban Sanchez  <estebans@artica.es>
+
+	* godmode/agentes/manage_config.php: Fixed a javascript error that
+	doesn't allow to perform any operation.
+
+	* godmode/alerts/configure_alert_action.php: Fixed javascript file
+	inclusion.
+
+	* godmode/reporting/map_builder.php: Fixed typo when updating a
+	layout.
+
+	* images/download.png: Added to repository.
+
+	* include/functions_agents.php: Style correction.
+
+	* include/functions_html.php: Added additional options to
+	print_input_image().
+
+	* include/functions_ui.php: Added format_filesize().
+
 2009-03-04  Evi Vanoost  <vanooste@rcbi.rochester.edu>
 
 	* include/functions_reporting.php, 
diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php
index 80e3b3f81b..63630846c9 100644
--- a/pandora_console/godmode/agentes/manage_config.php
+++ b/pandora_console/godmode/agentes/manage_config.php
@@ -294,7 +294,7 @@ $(document).ready (function () {
 			return false;
 		}
 		
-		if ($(copy_modules).attr ("checked") && $("#target_modules\\[\\]").fieldValue ().length == 0) {
+		if ($(copy_modules).attr ("checked") && $("#target_modules").fieldValue ().length == 0) {
 			$("#message").showMessage ("<?php echo __('No modules have been selected') ?>");
 			return false;
 		}
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 0dbed33fe3..e48c6fb83a 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -86,7 +86,8 @@ if ($id) {
 }
 echo '</div>';
 echo '</form>';
-$config['js'][] = 'pandora_alerts';
+
+require_javascript_file ('pandora_alerts');
 ?>
 
 <script type="text/javascript">
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index ddb4fcf1a6..9c0e1cc133 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -104,7 +104,7 @@ if ($update_layout) {
 	$result = process_sql_update ('tlayout',
 		array ('name' => $name, 'background' => $background,
 			'height' => $height, 'width' => $width),
-		array ('id' => $id));
+		array ('id' => $id_layout));
 	if ($result) {
 		echo '<h3 class="suc">'.__('Update layout successful').'</h3>';
 	} else {
diff --git a/pandora_console/images/download.png b/pandora_console/images/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c5a80385cca2f80f829819f25e943bee4fbb759
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$SDM>^@R5*>5
zQafl<VHiFCeIz$hEJRH@Bt@yOMX+`<tq2_iB^`>0i$fhnu!z>dT@ZRl2cb)*4pLDG
zZG=odu7yxbG&DksLWh*3HCi!E@4f%ybBM&$q+$>J%i-gE|2f}bM1)ohPMBp7qUZ#M
ziZjW3S}CJ#h!C}JK7mjILiv!2Lnsa|Jv>a^ZWC@70Kk}r+-e%0*oG^%;PEY-Ju=$y
zQ(8wB42=DLU;tx~itk0BkqZ%lKmgIM0>;oi(;<aKbGHtch%BWfh!ltve7Oy-d@vpE
z;9awsI@9pZAca&c($|0M@`I3}2SB7ONdk&VKo<Z6%A3nz`X$`Bdfx&8ocox`rt05+
zd`&ST!q9{{bMExT<nX{~uvmEm$$Uuo_~w?dR{I35e1Hf<8qW7#!(w5<D=z2LZzuT`
zt>G18uk)G8m+}(D!pA`x$GW$IlKT-XC=du~Fhe@}W5cL!R;jp>uMpvSGepPcH4u{1
zFCV)GvtXJgHvG>pEgb<%Lm;Fh9zKRhs1Mm!vo0wl9h=v7T*0w<K?rYrI`gQ0a9<o<
zp>CML#^(K9-8dDwfOPh0opXQOv3a5686BHXl{Qv0xety%&@%$fU@!t2&O}F$dq3~5
zSJ&non@{aHV_O3h#uf_mOTDqf@uT4c(+v&P(of1QI%OprzW-Sy$L2MXNX}+oxQB2O
x2h<5XpL^yi`NwxFSmKUBf0KK`E>-@2`~s>b4Ju;H8xa5i002ovPDHLkV1l6R8=C+C

literal 0
HcmV?d00001

diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index add191b05e..93e6e05e51 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -152,11 +152,12 @@ function process_manage_config ($source_id_agent, $destiny_id_agents, $copy_modu
 	if ($copy_alerts == false) {
 		$copy_alerts = (bool) get_parameter ('copy_alerts', $copy_alerts);
 	}
-		
+	
 	if ($copy_modules) {
 		if (empty ($target_modules)) {
 			$target_modules = (array) get_parameter ('target_modules', $target_modules);
 		}
+		
 		if (empty ($target_modules)) {
 			echo '<h3 class="error">'.__('No modules have been selected').'</h3>';
 			return false;
@@ -169,7 +170,7 @@ function process_manage_config ($source_id_agent, $destiny_id_agents, $copy_modu
 		foreach ($destiny_id_agents as $id_destiny_agent) {
 			foreach ($target_modules as $id_agent_module) {
 				$result = copy_agent_module_to_agent ($id_agent_module,
-													  $id_destiny_agent);
+					$id_destiny_agent);
 				
 				if ($result === false) {
 					$error = true;
@@ -179,19 +180,20 @@ function process_manage_config ($source_id_agent, $destiny_id_agents, $copy_modu
 				$id_destiny_module = $result;
 				if (! isset ($alerts[$id_agent_module]))
 					$alerts[$id_agent_module] = get_alerts_agent_module ($id_agent_module,
-																		 true);
+						true);
 				
 				if ($alerts[$id_agent_module] === false)
 					continue;
 				
-				if ($copy_alerts) {
-					foreach ($alerts[$id_agent_module] as $alert) {
-						$result = copy_alert_agent_module_to_agent_module ($alert['id'],
-																		   $id_destiny_module);
-						if ($result === false) {
-							$error = true;
-							break;
-						}
+				if (! $copy_alerts)
+					continue;
+				
+				foreach ($alerts[$id_agent_module] as $alert) {
+					$result = copy_alert_agent_module_to_agent_module ($alert['id'],
+						$id_destiny_module);
+					if ($result === false) {
+						$error = true;
+						break;
 					}
 				}
 			}
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 2d0d68a02b..5315ebc409 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -261,11 +261,26 @@ function print_input_text ($name, $value, $alt = '', $size = 50, $maxlength = 0,
  *
  * @return string HTML code if return parameter is true.
  */
-function print_input_image ($name, $src, $value, $style = '', $return = false) {
+function print_input_image ($name, $src, $value, $style = '', $return = false, $options = false) {
 	static $idcounter = 0;
 	
 	++$idcounter;
-	$output = '<input id="image-'.$name.$idcounter.'" src="'.$src.'" style="'.$style.'" name="'.$name.'" type="image" value="'.$value.'" />';
+	$output = '<input id="image-'.$name.$idcounter.'" src="'.$src.'" style="'.$style.'" name="'.$name.'" type="image"';
+	
+	//Valid attributes (invalid attributes get skipped)
+	$attrs = array ("alt", "accesskey", "lang", "tabindex", "title", "xml:lang",
+		"onclick", "ondblclick", "onmousedown", "onmouseup", "onmouseover", "onmousemove", 
+		"onmouseout", "onkeypress", "onkeydown", "onkeyup");
+	
+	foreach ($attrs as $attribute) {
+		if (isset ($options[$attribute])) {
+			$output .= $attribute.'="'.safe_input ($options[$attribute]).'" ';
+		}
+	}
+	
+	$output .= 'value="'.$value;
+	
+	$output .= '" />';
 	
 	if ($return)
 		return $output;
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 885b7021f9..db8d825211 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -912,4 +912,22 @@ function print_moduletype_icon ($id_moduletype, $return = false) {
 	}
 	return print_image ("images/".$type["icon"], $return, array ("border" => 0, "title" => $type["nombre"]));
 }
+
+/**
+* Format a file size from bytes to a human readable meassure.
+*
+* @param int File size in bytes
+* @return string Bytes converted to a human readable meassure.
+*/
+function format_filesize ($bytes) {
+	$bytes = (int) $bytes;
+	$strs = array ('B', 'kB', 'MB', 'GB', 'TB');
+	if ($bytes < 0) {
+		return "0 ".$strs[0];
+	}
+	$con = 1024;
+	$log = (int) (log ($bytes, $con));
+	
+	return format_numeric ($bytes / pow ($con, $log), 1).' '.$strs[$log];
+}
 ?>