tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-12-17 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/alerts/alert_list.php,
	godmode/alerts/configure_alert_template.php,
	godmode/alerts/alert_templates.php,
	godmode/alerts/alert_list.builder.php,
	operation/messages/message_edit.php, include/functions_api.php,
	operation/reporting/reporting_xml.php,
	godmode/reporting/graph_builder.graph_editor.php: cleaned source
	code style.
	
	* include/functions_io.php: improved the function "__" for to hook
	the translations from metaconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7292 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-12-17 16:50:38 +00:00
parent f4ab620a23
commit 276dc53b02
10 changed files with 101 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2012-12-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/alert_list.php,
godmode/alerts/configure_alert_template.php,
godmode/alerts/alert_templates.php,
godmode/alerts/alert_list.builder.php,
operation/messages/message_edit.php, include/functions_api.php,
operation/reporting/reporting_xml.php,
godmode/reporting/graph_builder.graph_editor.php: cleaned source
code style.
* include/functions_io.php: improved the function "__" for to hook
the translations from metaconsole.
2012-12-17 Miguel de Dios <miguel.dedios@artica.es> 2012-12-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/setup/file_manager.php, include/functions_filemanager.php: * godmode/setup/file_manager.php, include/functions_filemanager.php:

9
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -105,7 +105,8 @@ if ($a_template !== false) {
} }
} }
// This prevents to duplicate the header in case duplicate/edit_template action is performed // This prevents to duplicate the header in case duplicate/edit_template action is performed
} else { }
else {
// Header // Header
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
@ -280,7 +281,8 @@ function update_template ($step) {
$default_action = NULL; $default_action = NULL;
} }
$values = array ('monday' => $monday, $values = array (
'monday' => $monday,
'tuesday' => $tuesday, 'tuesday' => $tuesday,
'wednesday' => $wednesday, 'wednesday' => $wednesday,
'thursday' => $thursday, 'thursday' => $thursday,
@ -291,8 +293,7 @@ function update_template ($step) {
'time_threshold' => $threshold, 'time_threshold' => $threshold,
'id_alert_action' => $default_action, 'id_alert_action' => $default_action,
'max_alerts' => $max_alerts, 'max_alerts' => $max_alerts,
'min_alerts' => $min_alerts 'min_alerts' => $min_alerts);
);
$fields = array(); $fields = array();
for($i=1;$i<=10;$i++) { for($i=1;$i<=10;$i++) {

2
pandora_console/include/functions_api.php
View File

@ -2681,7 +2681,7 @@ function api_set_validate_all_policy_alerts($id, $thrash1, $other, $thrash3) {
foreach ($result_alerts as $result_alert){ foreach ($result_alerts as $result_alert){
$result = alerts_validate_alert_agent_module($result_alert, true); $result = alerts_validate_alert_agent_module($result_alert, true);
if ($result){ if ($result) {
$count_results++; $count_results++;
} }
} }

14
pandora_console/include/functions_io.php
View File

@ -365,11 +365,21 @@ function __ ($string /*, variable arguments */) {
global $l10n; global $l10n;
$extensions = extensions_get_extensions(); $extensions = extensions_get_extensions();
if (empty($extensions)) $extensions = array(); if (empty($extensions))
$extensions = array();
global $config; global $config;
if ($config['enterprise_installed'] && if (defined('METACONSOLE')) {
enterprise_include_once ('meta/include/functions_meta.php');
$tranlateString = meta_get_defined_translation($string);
if ($tranlateString !== false) {
return $tranlateString;
}
}
elseif ($config['enterprise_installed'] &&
isset($config['translate_string_extension_installed']) && isset($config['translate_string_extension_installed']) &&
$config['translate_string_extension_installed'] == 1 && $config['translate_string_extension_installed'] == 1 &&
array_key_exists('translate_string.php', $extensions)) { array_key_exists('translate_string.php', $extensions)) {