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

2013-01-30 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/agentes/planned_downtime.list.php, include/db/oracle.php,
	include/Image/image_functions.php,
	operation/events/events.build_table.php,
	operation/messages/message_edit.php, operation/users/user_edit.php,
	operation/tree.php: improved the source style.
	
	* include/constants.php: added constants for the subtype of modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7550 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-01-30 13:53:02 +00:00
parent 470864b136
commit 4b174a29b0
9 changed files with 85 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-01-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/planned_downtime.list.php, include/db/oracle.php,
include/Image/image_functions.php,
operation/events/events.build_table.php,
operation/messages/message_edit.php, operation/users/user_edit.php,
operation/tree.php: improved the source style.
* include/constants.php: added constants for the subtype of modules.
2013-01-30 Sergio Martin <sergio.martin@artica.es> 2013-01-30 Sergio Martin <sergio.martin@artica.es>
* godmode/events/event_responses.editor.php: Little fix * godmode/events/event_responses.editor.php: Little fix

7
pandora_console/include/constants.php
View File

@ -208,6 +208,8 @@ define ('STATUS_ALERT_DISABLED', 'alert_disabled.png');
define ('STATUS_SERVER_OK', 'server_ok.png'); define ('STATUS_SERVER_OK', 'server_ok.png');
define ('STATUS_SERVER_DOWN', 'server_down.png'); define ('STATUS_SERVER_DOWN', 'server_down.png');
/* Events criticity */ /* Events criticity */
define ('EVENT_CRIT_MAINTENANCE', 0); define ('EVENT_CRIT_MAINTENANCE', 0);
define ('EVENT_CRIT_INFORMATIONAL', 1); define ('EVENT_CRIT_INFORMATIONAL', 1);
@ -219,4 +221,9 @@ define ('EVENT_CRIT_CRITICAL', 4);
define ('EVENT_CRIT_WARNING_OR_CRITICAL', 34); define ('EVENT_CRIT_WARNING_OR_CRITICAL', 34);
define ('EVENT_CRIT_NOT_NORMAL', 20); define ('EVENT_CRIT_NOT_NORMAL', 20);
/* Id Module (more use in component)*/
define ('MODULE_WMI', 6);
define ('MODULE_NETWORK', 2);
define ('MODULE_PLUGIN', 4);
define ('MODULE_WEB', 7);
?> ?>

1
pandora_console/include/db/oracle.php
View File

@ -1224,6 +1224,7 @@ function oracle_db_process_sql_delete_temp ($table, $where, $where_join = 'AND')
} }
$result = ''; $result = '';
return db_process_sql ($query, "affected_rows", '', true, $result, false); return db_process_sql ($query, "affected_rows", '', true, $result, false);
} }

9
pandora_console/operation/tree.php
View File

@ -586,7 +586,8 @@ if(tags_has_user_acl_tags()) {
echo "<br>"; echo "<br>";
if (! defined ('METACONSOLE')) { if (! defined ('METACONSOLE')) {
echo '<form id="tree_search" method="post" action="index.php?extension_in_menu=estado&sec=estado&sec2=operation/tree&refr=0&sort_by='.$activeTab.'&pure='.$pure.'">'; echo '<form id="tree_search" method="post" action="index.php?extension_in_menu=estado&sec=estado&sec2=operation/tree&refr=0&sort_by='.$activeTab.'&pure='.$pure.'">';
} else { }
else {
echo '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$activeTab.'&pure='.$pure.'">'; echo '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$activeTab.'&pure='.$pure.'">';
} }
echo "<b>" . __('Agent status') . "</b>"; echo "<b>" . __('Agent status') . "</b>";
@ -690,9 +691,11 @@ treeview_printTree($activeTab);
}); });
} }
else { else {
<?php if (! defined ('METACONSOLE')) { <?php
if (! defined ('METACONSOLE')) {
echo 'var icon_path = \'operation/tree\';'; echo 'var icon_path = \'operation/tree\';';
} else { }
else {
echo 'var icon_path = \'../../operation/tree\';'; echo 'var icon_path = \'../../operation/tree\';';
} }
?> ?>

1
pandora_console/operation/users/user_edit.php
View File

@ -238,7 +238,6 @@ $id_usr = $config['id_user'];
// User only can change skins if has more than one group // User only can change skins if has more than one group
if (count($usr_groups) > 1) { if (count($usr_groups) > 1) {
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
echo '</td></tr><tr><td class="datos">' . __('Skin') . '</td><td class="datos2">'; echo '</td></tr><tr><td class="datos">' . __('Skin') . '</td><td class="datos2">';