diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-12 08:55:06 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-12 08:55:06 +0000 |
| commit | 5240ec718c5c9a6befee0c421e224396fc7b747a (patch) | |
| tree | eb006bf74560b61e82a37e60c46b8448a8c8a511 /frontends/php/include/screens.inc.php | |
| parent | 412fd1bca83c5bb8229a9bfa3b9a77a5573db3ba (diff) | |
| download | zabbix-5240ec718c5c9a6befee0c421e224396fc7b747a.tar.gz zabbix-5240ec718c5c9a6befee0c421e224396fc7b747a.tar.xz zabbix-5240ec718c5c9a6befee0c421e224396fc7b747a.zip | |
- [DEV-137] fixed SQL error for PGSQL8.3 (Artem)
- [DEV-137] fixed Apache Auth loop problem (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5759 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/screens.inc.php')
| -rw-r--r-- | frontends/php/include/screens.inc.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php index 7a420e63..d13411b4 100644 --- a/frontends/php/include/screens.inc.php +++ b/frontends/php/include/screens.inc.php @@ -105,11 +105,11 @@ } function delete_screen($screenid){ - $result=DBexecute('delete from screens_items where screenid='.$screenid); - $result&=DBexecute('delete from screens_items where resourceid='.$screenid.' and resourcetype='.SCREEN_RESOURCE_SCREEN); - $result&=DBexecute('delete from slides where screenid='.$screenid); - $result&=DBexecute('DELETE FROM profiles WHERE idx="web.favorite.screenids" AND source="screenid" AND value='.$screenid); - $result&=DBexecute('delete from screens where screenid='.$screenid); + $result=DBexecute('DELETE FROM screens_items where screenid='.$screenid); + $result&=DBexecute('DELETE FROM screens_items where resourceid='.$screenid.' and resourcetype='.SCREEN_RESOURCE_SCREEN); + $result&=DBexecute('DELETE FROM slides where screenid='.$screenid); + $result&=DBexecute("DELETE FROM profiles WHERE idx='web.favorite.screenids' AND source='screenid' AND value='$screenid'"); + $result&=DBexecute('DELETE FROM screens where screenid='.$screenid); return $result; } @@ -139,7 +139,7 @@ function delete_screen_item($screenitemid) { - $sql="delete from screens_items where screenitemid=$screenitemid"; + $sql="DELETE FROM screens_items where screenitemid=$screenitemid"; return DBexecute($sql); } @@ -615,7 +615,7 @@ if(!$result = DBexecute('update slideshows set name='.zbx_dbstr($name).',delay='.$delay.' where slideshowid='.$slideshowid)) return false; - DBexecute('delete from slides where slideshowid='.$slideshowid); + DBexecute('DELETE FROM slides where slideshowid='.$slideshowid); $i = 0; foreach($slides as $slide){ @@ -629,11 +629,11 @@ return true; } - function delete_slideshow($slideshowid){ + function delete_slideshow($slideshowid){ - $result = DBexecute('delete from slideshows where slideshowid='.$slideshowid); - $result &= DBexecute('delete from slides where slideshowid='.$slideshowid); - $result &= DBexecute('DELETE FROM profiles WHERE idx="web.favorite.screenids" AND source="slideshowid" AND value='.$slideshowid); + $result = DBexecute('DELETE FROM slideshows where slideshowid='.$slideshowid); + $result &= DBexecute('DELETE FROM slides where slideshowid='.$slideshowid); + $result &= DBexecute("DELETE FROM profiles WHERE idx='web.favorite.screenids' AND source='slideshowid' AND value='$slideshowid'"); return $result; } |