Merge branch 'develop' into feature#new-iface-names

pandora_console/godmode/extensions.php

@@ -183,21 +183,15 @@ foreach ($extensions as $file => $extension) {
 		//Get version of this extensions
 		if ($config['extensions'][$file]['operation_menu']) {
 			$data[] = $config['extensions'][$file]['operation_menu']['version'];
-		}
+		} else if ($config['extensions'][$file]['godmode_menu']) {
-		
-		if ($config['extensions'][$file]['godmode_menu']) {
-			
 			$data[] = $config['extensions'][$file]['godmode_menu']['version'];
-		}
+		} else if ($config['extensions'][$file]['extension_ope_tab']) {
-		
-		if ($config['extensions'][$file]['extension_ope_tab']) {
 			$data[] = $config['extensions'][$file]['extension_ope_tab']['version'];
-		}
+		} else if ($config['extensions'][$file]['extension_god_tab']) {
-		else if ($config['extensions'][$file]['extension_god_tab']) {
 			$data[] = $config['extensions'][$file]['extension_god_tab']['version'];
+		} else {
+			$data[] = __('N/A');
 		}
-		
-		
 	}
 	else {
 		$data[] = $file;
@@ -205,17 +199,15 @@ foreach ($extensions as $file => $extension) {
 		//Get version of this extension
 		if ($config['extensions'][$file]['operation_menu']) {
 			$data[] = $config['extensions'][$file]['operation_menu']['version'];
-		}
+		} else if ($config['extensions'][$file]['godmode_menu']) {
-		else if ($config['extensions'][$file]['godmode_menu']) {
 			$data[] = $config['extensions'][$file]['godmode_menu']['version'];
-		}
+		} else if (isset($config['extensions'][$file]['extension_ope_tab'])) {
-		else if (isset($config['extensions'][$file]['extension_ope_tab'])) {
 			$data[] = $config['extensions'][$file]['extension_ope_tab']['version'];
-		}
+		} else if ($config['extensions'][$file]['extension_god_tab']) {
-		else if ($config['extensions'][$file]['extension_god_tab']) {
 			$data[] = $config['extensions'][$file]['extension_god_tab']['version'];
-		}
+		} else {
-		
+			$data[] = __('N/A');
+		}	
 	}
 	
 	if ($extension['enterprise']) {

pandora_console/include/functions_io.php

@@ -426,6 +426,41 @@ function __ ($string /*, variable arguments */) {
 	return vsprintf ($l10n->translate ($string), $args);
 }
 
+/**
+ * Get a translated string for extension
+ *
+ * @param string String to translate. It can have special format characters like
+ * a printf
+ * @param mixed Optional parameters to be replaced in string. Example:
+ * <code>
+ * echo ___('Hello!');
+ * echo ___('Hello, %s!', $user);
+ * </code>
+ *
+ * @return string The translated string. If not defined, the same string will be returned
+ */
+function ___ ($string /*, variable arguments */) {
+       global $config;
+
+       $trace = debug_backtrace();
+       foreach($config['extensions'] as $extension){
+               $extension_file = $extension['file'];
+               if(!isset($config['extensions'][$extension_file]['translate_function'])){
+                       continue;
+               }
+               foreach($trace as $item){
+                       if(pathinfo($item['file'], PATHINFO_BASENAME) == $extension_file){
+                               $tranlateString = call_user_func_array($config['extensions'][$extension_file]['translate_function'], func_get_args());
+                               if ($tranlateString !== false) {
+                                       return $tranlateString;
+                               }
+                       }
+               }
+       }
+
+       return call_user_func_array('__', func_get_args());
+}
+
 /*
  * json_encode for multibyte characters.
  *

pandora_console/include/functions_reporting.php

@@ -5760,7 +5760,12 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 	$return['type'] = 'custom_graph';
 	
 	if (empty($content['name'])) {
-		$content['name'] = __('Simple graph');
+		if ($type_report == "custom_graph") {
+			$content['name'] = __('Custom graph');
+		}
+		else {
+			$content['name'] = __('Simple graph');
+		}
 	}
 	
 	$return['title'] = $content['name'];

pandora_console/include/graphs/flot/pandora.flot.js

@@ -1671,8 +1671,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			plot.setSelection(ranges);
 		});
 
-	//~ var legends = $('#legend_' + graph_id + ' .legendLabel');
+	var legends = $('#legend_' + graph_id + ' .legendLabel');
-
 
 	var updateLegendTimeout = null;
 	var latestPosition = null;

pandora_server/conf/pandora_server.conf.new

@@ -548,3 +548,7 @@ warmup_unknown_interval 300
 # Directory were additional enc files for the XML parser are located.
 enc_dir /usr/share/pandora_server/enc/
 
+# The number of times dynamic_min and dynamic_max will be recalculated per dynamic_interval.
+# Go to http://wiki.pandorafms.com/ for more information.
+dynamic_updates 5
+

pandora_server/conf/pandora_server.conf.windows

@@ -522,3 +522,7 @@ warmup_unknown_interval 300
 # Directory were additional enc files for the XML parser are located.
 enc_dir /usr/share/pandora_server/enc/
 
+# The number of times dynamic_min and dynamic_max will be recalculated per dynamic_interval.
+# Go to http://wiki.pandorafms.com/ for more information.
+dynamic_updates 5
+

pandora_server/lib/PandoraFMS/Config.pm

@@ -281,6 +281,7 @@ sub pandora_load_config {
 	$pa_config->{"sync_port"} = '41121'; # 7.0
 	$pa_config->{"sync_retries"} = 2; # 7.0
 	$pa_config->{"sync_timeout"} = 5; # 7.0
+	$pa_config->{"dynamic_updates"} = 5; # 7.0
 	
 	# Internal MTA for alerts, each server need its own config.
 	$pa_config->{"mta_address"} = '127.0.0.1'; # Introduced on 2.0
@@ -1008,6 +1009,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^sync_retries\s+([0-9]*)/i) {
 			$pa_config->{'sync_retries'}= clean_blank($1);
 		}
+		elsif ($parametro =~ m/^dynamic_updates\s+([0-9]*)/i) {
+			$pa_config->{'dynamic_updates'}= clean_blank($1);
+		}
 	} # end of loop for parameter #
 
 	# Set to RDBMS' standard port