diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-08 11:59:15 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-08 11:59:15 +0000 |
| commit | f99327ef29f466bac40fdd47413d1a9cab9b3690 (patch) | |
| tree | 48748ced776efb2490b7c382dcfb7c002ffb2130 /frontends/php/screenedit.php | |
| parent | 09174fc6e94e7ff57d3d1e9f8dd134be4d7645c7 (diff) | |
| download | zabbix-f99327ef29f466bac40fdd47413d1a9cab9b3690.tar.gz zabbix-f99327ef29f466bac40fdd47413d1a9cab9b3690.tar.xz zabbix-f99327ef29f466bac40fdd47413d1a9cab9b3690.zip | |
- [DEV-50] merged rev. 4841:4843 of branches/1.4/ (Artem) [improved incoming parameters exception validation]
git-svn-id: svn://svn.zabbix.com/trunk@4847 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/screenedit.php')
| -rw-r--r-- | frontends/php/screenedit.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php index 502d384e..b41a53f7 100644 --- a/frontends/php/screenedit.php +++ b/frontends/php/screenedit.php @@ -35,7 +35,7 @@ include_once "include/page_header.php"; $fields=array( "screenid"=> array(T_ZBX_INT, O_MAND, P_SYS, DB_ID, null), - "screenitemid"=>array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, '{form}=="update"&&(!isset({x})||!isset({y}))'), + "screenitemid"=>array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, '(isset({form})&&({form}=="update"))&&(!isset({x})||!isset({y}))'), "resourcetype"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(SCREEN_RESOURCE_GRAPH,SCREEN_RESOURCE_EVENTS), 'isset({save})'), "resourceid"=> array(T_ZBX_INT, O_OPT, null, DB_ID, 'isset({save})'), @@ -51,8 +51,8 @@ include_once "include/page_header.php"; "style"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(STYLE_HORISONTAL,STYLE_VERTICAL), 'isset({save})'), "url"=> array(T_ZBX_STR, O_OPT, null, null, 'isset({save})'), - "x"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), 'isset({save})&&{form}!="update"'), - "y"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), 'isset({save})&&{form}!="update"'), + "x"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), 'isset({save})&&(isset({form})&&({form}!="update"))'), + "y"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), 'isset({save})&&(isset({form})&&({form}!="update"))'), "save"=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null), "delete"=> array(T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null), |