summaryrefslogtreecommitdiffstats
path: root/frontends/php/screenconf.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-08 11:59:15 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-08 11:59:15 +0000
commitf99327ef29f466bac40fdd47413d1a9cab9b3690 (patch)
tree48748ced776efb2490b7c382dcfb7c002ffb2130 /frontends/php/screenconf.php
parent09174fc6e94e7ff57d3d1e9f8dd134be4d7645c7 (diff)
downloadzabbix-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/screenconf.php')
-rw-r--r--frontends/php/screenconf.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/frontends/php/screenconf.php b/frontends/php/screenconf.php
index 176c63e5..46ec8d65 100644
--- a/frontends/php/screenconf.php
+++ b/frontends/php/screenconf.php
@@ -37,13 +37,13 @@ include_once "include/page_header.php";
$fields=array(
"config"=> array(T_ZBX_INT, O_OPT, P_SYS, IN("0,1"), null), // 0 - screens, 1 - slides
- "screenid"=> array(T_ZBX_INT, O_NO, P_SYS, DB_ID, '{config}==0&&{form}=="update"'),
- "hsize"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), '{config}==0&&isset({save})'),
- "vsize"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), '{config}==0&&isset({save})'),
+ "screenid"=> array(T_ZBX_INT, O_NO, P_SYS, DB_ID, '(isset({config})&&({config}==0))&&(isset({form})&&({form}=="update"))'),
+ "hsize"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), '(isset({config})&&({config}==0))&&isset({save})'),
+ "vsize"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,100), '(isset({config})&&({config}==0))&&isset({save})'),
- "slideshowid"=> array(T_ZBX_INT, O_NO, P_SYS, DB_ID, '{config}==1&&{form}=="update"'),
+ "slideshowid"=> array(T_ZBX_INT, O_NO, P_SYS, DB_ID, '(isset({config})&&({config}==1))&&(isset({form})&&({form}=="update"))'),
"name"=> array(T_ZBX_STR, O_OPT, null, NOT_EMPTY, 'isset({save})'),
- "delay"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,86400),'{config}==1&&isset({save})'),
+ "delay"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,86400),'(isset({config})&&({config}==1))&&isset({save})'),
"steps"=> array(null, O_OPT, null, null, null),
"new_step"=> array(null, O_OPT, null, null, null),