- [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

9 files changed, 24 insertions, 21 deletions

diff --git a/frontends/php/exp_imp.php b/frontends/php/exp_imp.php
index 27255442..a3950e85 100644
--- a/frontends/php/exp_imp.php
+++ b/frontends/php/exp_imp.php
@@ -145,11 +145,11 @@ include_once "include/page_header.php";
 			
 			$importer = new CZabbixXMLImport();
 			$importer->SetRules($rules['host'],$rules['template'],$rules['item'],$rules['trigger'],$rules['graph']);
-			$importer->Parse($_FILES['import_file']['tmp_name']);
+			$result = $importer->Parse($_FILES['import_file']['tmp_name']);
 
 			unset($importer);
 			
-			$result = DBend();
+			$result = DBend($result);
 			
 			show_messages($result, S_IMPORTED.SPACE.S_SUCCESSEFULLY_SMALL, S_IMPORT.SPACE.S_FAILED_SMALL);
 		}
diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index 8443449c..1846b9a5 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -279,7 +279,7 @@ function make_system_summary(){
 			
 					$event_sql = 'SELECT e.eventid, e.value, e.clock, e.objectid as triggerid, e.acknowledged, t.type '.
 								' FROM events e, triggers t '.
-								' WHERE e.object=0 '.
+								' WHERE e.object='.EVENT_SOURCE_TRIGGERS.
 									' AND e.objectid='.$row_inf['triggerid'].
 									' AND t.triggerid=e.objectid '.
 									' AND e.value='.TRIGGER_VALUE_TRUE.
@@ -506,7 +506,7 @@ function make_latest_issues(){
 
 		$event_sql = 'SELECT e.eventid, e.value, e.clock, e.objectid as triggerid, e.acknowledged, t.type '.
 					' FROM events e, triggers t '.
-					' WHERE e.object=0 '.
+					' WHERE e.object='.EVENT_SOURCE_TRIGGERS.
 						' AND e.objectid='.$row['triggerid'].
 						' AND t.triggerid=e.objectid '.
 						' AND e.value='.TRIGGER_VALUE_TRUE.
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index b6716cd7..f07d5a8f 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1444,6 +1444,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 	 */
 	function zbx_unsetcookie($name){
 		zbx_setcookie($name, null, -99999);
+		unset($_COOKIE[$name]);
 	}
 	
 	/* function:
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 71a69bd9..0251b177 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -645,7 +645,7 @@
 		/* delete graph */
 		$result &= DBexecute('DELETE FROM graphs_items WHERE graphid='.$graphid);
 		$result &= DBexecute('DELETE FROM graphs WHERE graphid='.$graphid);
-		$result &= DBexecute('DELETE FROM profiles WHERE idx="web.favorite.graphids" AND source="graphid" AND value='.$graphid);
+		$result &= DBexecute("DELETE FROM profiles WHERE idx='web.favorite.graphids' AND source='graphid' AND value='$graphid'");
 		
 		if($result){
 			info('Graph "'.$graph['name'].'" deleted from hosts '.implode(',',$host_list));
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index e066b33d..8329f5a8 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -119,6 +119,7 @@
 							array(),
 							null,
 							array());
+							
 					}
 					break; // case
 				case XML_TAG_GRAPH:
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 4334d7d4..5ebc692a 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -800,7 +800,7 @@
 		$result = delete_history_by_itemid($itemid, 1 /* use housekeeper */);
 		if(!$result)	return	$result;
 
-		$result &= DBexecute('delete from screens_items where resourceid='.$itemid.' and resourcetype in ('.
+		$result &= DBexecute('DELETE FROM screens_items WHERE resourceid='.$itemid.' AND resourcetype IN ('.
 					(implode(',',array(
 						SCREEN_RESOURCE_SIMPLE_GRAPH,
 						SCREEN_RESOURCE_PLAIN_TEXT)
@@ -809,7 +809,7 @@
 
 		$result &= DBexecute('delete from items_applications where itemid='.$itemid);
 		$result &= DBexecute('delete from items where itemid='.$itemid);
-		$result &= DBexecute('DELETE FROM profiles WHERE idx="web.favorite.graphids" AND source="itemid" AND value='.$itemid);
+		$result &= DBexecute("DELETE FROM profiles WHERE idx='web.favorite.graphids' AND source='itemid' AND value='$itemid'");
 		
 		if($result){
 			info("Item '".$host["host"].":".$item["key_"]."' deleted");
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 27d27737..41267fb1 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -193,8 +193,8 @@
 			$result&=delete_link($rows['linkid']);
 		}
 
-		$result = DBexecute('delete FROM sysmaps_elements WHERE sysmapid='.$sysmapid);
-		$result &= DBexecute('DELETE FROM profiles WHERE idx="web.favorite.sysmapids" AND source="sysmapid" AND value='.$sysmapid);
+		$result = DBexecute('DELETE FROM sysmaps_elements WHERE sysmapid='.$sysmapid);
+		$result &= DBexecute("DELETE FROM profiles WHERE idx='web.favorite.sysmapids' AND source='sysmapid' AND value='$sysmapid'");
 		$result &= DBexecute('DELETE FROM sysmaps WHERE sysmapid='.$sysmapid);
 		
 	return $result;
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;
 	}
diff --git a/frontends/php/index.php b/frontends/php/index.php
index 14de05bc..831dba6d 100644
--- a/frontends/php/index.php
+++ b/frontends/php/index.php
@@ -59,7 +59,8 @@
 	if($config['authentication_type'] == ZBX_AUTH_HTTP){
 		
 		if(isset($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_USER'])){
-			$_REQUEST['enter'] = 'Enter';
+			if(!isset($sessionid)) $_REQUEST['enter'] = 'Enter';
+			
 			$_REQUEST['name'] = $_SERVER["PHP_AUTH_USER"];
 //			$_REQUEST['password'] = $_SERVER["PHP_AUTH_PW"];
 		}