tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-15 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/modules/manage_network_components.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/massive/massive_delete_alerts.php: improved the source
	style.
	
	* include/functions_ui.php: fixed the sort of included of jquery
	base files.
	
	Fixes: #3604768




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7661 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-15 12:04:27 +00:00
parent 14e38c0003
commit 9bcd52d6ee
5 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2013-02-15 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components.php,
godmode/reporting/visual_console_builder.editor.js,
godmode/massive/massive_delete_alerts.php: improved the source
style.
* include/functions_ui.php: fixed the sort of included of jquery
base files.
Fixes: #3604768
2013-02-15 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor.php: Delete default

9
pandora_console/godmode/massive/massive_delete_alerts.php
View File

@ -74,8 +74,8 @@ function process_manage_delete ($id_alert_template, $id_agents, $module_names) {
foreach($module_names as $module){
foreach($id_agents as $id_agent) {
$module_id = modules_get_agentmodule_id($module, $id_agent);
$modules_id[] = $module_id['id_agente_modulo'];
$module_id = modules_get_agentmodule_id($module, $id_agent);
$modules_id[] = $module_id['id_agente_modulo'];
}
}
@ -122,8 +122,8 @@ function process_manage_delete ($id_alert_template, $id_agents, $module_names) {
}
ui_print_result_message ($contsuccess > 0,
__('Successfully deleted')."(".$contsuccess."/".$conttotal.")",
__('Could not be deleted'));
__('Successfully deleted')."(".$contsuccess."/".$conttotal.")",
__('Could not be deleted'));
return (bool)($contsuccess > 0);
@ -208,7 +208,6 @@ echo '<h3 class="error invisible" id="message"> </h3>';
ui_require_jquery_file ('form');
ui_require_jquery_file ('pandora.controls');
?>
<script type="text/javascript">

5
pandora_console/godmode/modules/manage_network_components.php
View File

@ -36,7 +36,9 @@ if (defined('METACONSOLE')) {
$sec = 'advanced';
}
else {
ui_print_page_header (__('Module management').' &raquo; '.__('Network component management'), "", false, "network_component", true);
ui_print_page_header (__('Module management') . ' &raquo; ' .
__('Network component management'), "", false,
"network_component", true);
$sec = 'gmodules';
}
@ -142,6 +144,7 @@ if ($create_component) {
$custom_string_3 = '';
$name_check = db_get_value ('name', 'tnetwork_component', 'name',
$name);
if ($type >= 15 && $type <= 18) {
// New support for snmp v3
$tcp_send = $snmp_version;

8
pandora_console/include/functions_ui.php
View File

@ -1306,21 +1306,21 @@ function ui_process_page_head ($string, $bitfield) {
else {
$config['jquery'] = array_merge(
array ("jquery" => "include/javascript/jquery-1.9.0.js",
"pandora" => "include/javascript/jquery.pandora.js"),
"pandora" => "include/javascript/jquery.pandora.js",
'jquery-ui' => 'include/javascript/jquery.jquery-ui-1.10.0.custom.js'),
$config['jquery']);
}
// Include the datapicker language if exists
if(file_exists('include/languages/datepicker/jquery.ui.datepicker-'.$config['language'].'.js')) {
if (file_exists('include/languages/datepicker/jquery.ui.datepicker-'.$config['language'].'.js')) {
$config['jquery']['datepicker_language'] = 'include/languages/datepicker/jquery.ui.datepicker-'.$config['language'].'.js';
}
// Include jquery UI
$config['jquery']['jquery-ui'] = 'include/javascript/jquery.jquery-ui-1.10.0.custom.js';
// Include countdown library
$config['jquery']['countdown'] = 'include/javascript/jquery.countdown.js';
//Then add each script as necessary
$loaded = array ('');
foreach ($config['jquery'] as $name => $filename) {