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

2014-03-31 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/servers/plugin.php: fixed the plugins server without
	parameters.
	
	Incident: #703




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9683 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-31 14:17:41 +00:00
parent b1f963e9bb
commit 78761727d7
2 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-03-31 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/plugin.php: fixed the plugins server without
parameters.
Incident: #703
2014-03-31 Miguel de Dios <miguel.dedios@artica.es> 2014-03-31 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_conf_gis.php, * godmode/agentes/agent_conf_gis.php,

37
pandora_console/godmode/servers/plugin.php
View File

@ -134,6 +134,8 @@ if ($filemanager) {
// END FILEMANAGER // END FILEMANAGER
// ===================================================================== // =====================================================================
// =====================================================================
// SHOW THE FORM // SHOW THE FORM
// ===================================================================== // =====================================================================
@ -147,16 +149,18 @@ if (($create != "") OR ($view != "")) {
} }
else { else {
if ($create != "") if ($create != "")
ui_print_page_header (__('Plugin creation'), "images/gm_servers.png", false, "plugin_definition", true); ui_print_page_header(__('Plugin creation'),
"images/gm_servers.png", false, "plugin_definition", true);
else { else {
ui_print_page_header (__('Plugin update'), "images/gm_servers.png", false, "plugin_definition", true); ui_print_page_header(__('Plugin update'),
"images/gm_servers.png", false, "plugin_definition", true);
} }
} }
enterprise_hook('open_meta_frame'); enterprise_hook('open_meta_frame');
if ($create == "") { if ($create == "") {
$plugin_id = get_parameter ("view",""); $plugin_id = get_parameter ("view", "");
echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&update_plugin=$plugin_id&pure=" . $config['pure'] . "'>"; echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&update_plugin=$plugin_id&pure=" . $config['pure'] . "'>";
} }
else { else {
@ -438,7 +442,7 @@ else {
$plugin_max_retries = get_parameter ("form_max_retries", ""); $plugin_max_retries = get_parameter ("form_max_retries", "");
$plugin_execute = get_parameter ("form_execute", ""); $plugin_execute = get_parameter ("form_execute", "");
$plugin_plugin_type = get_parameter ("form_plugin_type", "0"); $plugin_plugin_type = get_parameter ("form_plugin_type", "0");
$plugin_parameters = get_parameter ("form_parameters", "0"); $plugin_parameters = get_parameter ("form_parameters", "");
// Get macros // Get macros
$i = 1; $i = 1;
@ -513,7 +517,8 @@ else {
echo "<th>" . __('Name') . "</th>"; echo "<th>" . __('Name') . "</th>";
echo "<th>" . __('Type') . "</th>"; echo "<th>" . __('Type') . "</th>";
echo "<th>" . __('Command') . "</th>"; echo "<th>" . __('Command') . "</th>";
echo "<th style='width:70px;'>" . '<span title="Operations">' . __('Op.') . '</span>' . "</th>"; echo "<th style='width:70px;'>" .
'<span title="Operations">' . __('Op.') . '</span>' . "</th>";
$color = 0; $color = 0;
foreach ($rows as $row) { foreach ($rows as $row) {
@ -562,21 +567,22 @@ ui_require_javascript_file('pandora_modules');
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() {
$(document).ready(function() {
function update_preview() { function update_preview() {
var command = $('#form_execute').val(); var command = $('#form_execute').val();
var parameters = $('#form_parameters').val(); var parameters = $('#form_parameters').val();
var i = 1; var i = 1;
while(1) { while (1) {
if($('#text-field'+i+'_value').val() == undefined) { if ($('#text-field' + i + '_value').val() == undefined) {
break; break;
} }
if($('#text-field'+i+'_value').val() != '') { if ($('#text-field'+i+'_value').val() != '') {
parameters = parameters.replace('_field'+i+'_',$('#text-field'+i+'_value').val()); parameters = parameters
.replace('_field' + i + '_',
$('#text-field' + i + '_value').val());
} }
i++; i++;
@ -591,16 +597,15 @@ $(document).ready(function() {
update_preview(); update_preview();
}); });
}); });
<?php <?php
if($locked) { if ($locked) {
?> ?>
$('.command_advanced_conf').click(function() { $('.command_advanced_conf').click(function() {
alert('<?php echo __("The plugin command cannot be updated because some modules or components are using the plugin."); ?>'); alert('<?php echo __("The plugin command cannot be updated because some modules or components are using the plugin."); ?>');
}); });
<?php <?php
} }
?> ?>
</script> </script>