diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-14 15:21:27 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-14 15:21:27 +0000 |
| commit | 25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6 (patch) | |
| tree | 01e08dad83c7671bb8a19b9c40f2f786b033d99e /frontends/php/config.php | |
| parent | f35b829723124ac2c15defd1d5cce44b40b1c8ec (diff) | |
| download | zabbix-25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6.tar.gz zabbix-25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6.tar.xz zabbix-25036c9384fcec4d36f4cfc69fe2b86e4ef2c9c6.zip | |
- added "Data overview" for screens
- added "Triggers overview" for screens (Eugene)
- added blinking into Trigger overview (Eugene)
- added screen displaying in other screen (Eugene)
- improved Overview table header, vertical text added (Eugene)
- developed "ZABBIX Clock" module for screens (Eugene)
- developed "ZABBIX server info" module for screens (Eugene)
- developed "Triggers info" module for screens (Eugene)
- developed "Host info" module for screens (Eugene)
- improved screens displaying, added item alignment (Eugene)
- improved ZABBIX server report (Eugene)
- improved images configuration (Eugene)
- added onserver image resizing for thumbs by php (Eugene)
- developed acknowledges system (Eugene)
- added icons displaying for maps (Eugene)
- added maps displaying for maps (Eugene)
- improved maps (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2699 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/config.php')
| -rw-r--r-- | frontends/php/config.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/frontends/php/config.php b/frontends/php/config.php index 6bde4f11..d9ea9843 100644 --- a/frontends/php/config.php +++ b/frontends/php/config.php @@ -76,8 +76,6 @@ // image form "imageid"=> array(T_ZBX_INT, O_NO, P_SYS, BETWEEN(0,65535), '{config}==3&&{form}=="update"'), - "MAX_FILE_SIZE"=> array(T_ZBX_INT, O_NO, NULL, BETWEEN(0,2097152), - '{config}==3&&isset({save})'), "name"=> array(T_ZBX_STR, O_NO, NULL, NOT_EMPTY, '{config}==3&&isset({save})'), "imagetype"=> array(T_ZBX_INT, O_OPT, NULL, IN("1,2"), @@ -176,19 +174,19 @@ /* IMAGES ACTIONS */ if(isset($_REQUEST["save"])) { + $file = isset($_FILES["image"]) && $_FILES["image"]["name"] != "" ? $_FILES["image"] : NULL; if(isset($_REQUEST["imageid"])) { /* UPDATE */ $result=update_image($_REQUEST["imageid"],$_REQUEST["name"], - $_REQUEST["imagetype"],$_FILES); + $_REQUEST["imagetype"],$file); $msg_ok = S_IMAGE_UPDATED; $msg_fail = S_CANNOT_UPDATE_IMAGE; $audit_action = "Image updated"; - unset($_REQUEST["imageid"]); } else { /* ADD */ - $result=add_image($_REQUEST["name"],$_REQUEST["imagetype"],$_FILES); + $result=add_image($_REQUEST["name"],$_REQUEST["imagetype"],$file); $msg_ok = S_IMAGE_ADDED; $msg_fail = S_CANNOT_ADD_IMAGE; @@ -510,7 +508,7 @@ $name, $imagetype, $actions=new CLink( - new CImg("image.php?imageid=".$row["imageid"],"no image",NULL,"24"), + new CImg("image.php?height=24&imageid=".$row["imageid"],"no image",NULL), "image.php?imageid=".$row["imageid"]) )); } |