From 92bf3020da3e671315d21b93ca998b6ab3305136 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 22 Oct 2007 19:48:26 +0000 Subject: - [DEV-48] improvements for script execution (Alexei) [svn merge -r4895:4896 svn://svn.zabbix.com/branches/1.4.j] git-svn-id: svn://svn.zabbix.com/trunk@4897 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/scripts_exec.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'frontends/php/scripts_exec.php') diff --git a/frontends/php/scripts_exec.php b/frontends/php/scripts_exec.php index b96d29cd..ec587c86 100644 --- a/frontends/php/scripts_exec.php +++ b/frontends/php/scripts_exec.php @@ -22,6 +22,7 @@ include_once "include/config.inc.php"; require_once "include/hosts.inc.php"; require_once "include/scripts.inc.php"; + require_once "include/forms.inc.php"; $page['title'] = "S_SCRIPTS"; $page['file'] = 'scripts_exec.php'; @@ -49,16 +50,22 @@ if(isset($_REQUEST['execute'])){ $hosts_read_write = explode(',',get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,null,null,get_current_nodeid())); if(in_array($_REQUEST['hostid'],$hosts_read_write)){ -SDI('WRITE: '.$_REQUEST['scriptid'].' : '.$_REQUEST['hostid']); - $result = execute_script($_REQUEST['scriptid'],$_REQUEST['hostid']); +//SDI('WRITE: '.$_REQUEST['scriptid'].' : '.$_REQUEST['hostid']); +// $result = execute_script($_REQUEST['scriptid'],$_REQUEST['hostid']); +// insert_command_result_form($result["flag"],$result["message"]); + insert_command_result_form($_REQUEST['scriptid'],$_REQUEST['hostid']); +/* echo nl2br(htmlspecialchars($result));*/ } } else{ $hosts_read_only = explode(',',get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid())); if(in_array($_REQUEST['hostid'],$hosts_read_only)){ -SDI('READ: '.$_REQUEST['scriptid'].' : '.$_REQUEST['hostid']); - $result = execute_script($_REQUEST['scriptid'],$_REQUEST['hostid']); +//SDI('READ: '.$_REQUEST['scriptid'].' : '.$_REQUEST['hostid']); +// $result = execute_script($_REQUEST['scriptid'],$_REQUEST['hostid']); +// insert_command_result_form($result["flag"],$result["message"]); + insert_command_result_form($_REQUEST['scriptid'],$_REQUEST['hostid']); +/* echo nl2br(htmlspecialchars($result));*/ } } } @@ -66,4 +73,4 @@ SDI('READ: '.$_REQUEST['scriptid'].' : '.$_REQUEST['hostid']); ?> \ No newline at end of file +?> -- cgit