-[DEV-137] fixes for oracle (Artem)

 -[HAN-4] selects first host-group in overview screen (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5707 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 5 insertions, 5 deletions

diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index 8b8e211a..58c0f231 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -218,7 +218,7 @@
 		}
 
 		$sql = 'SELECT max(s.serviceid) as serviceid '.
-					' FROM services as s, services_links as sl '.
+					' FROM services s, services_links sl '.
 					' WHERE s.serviceid = sl.serviceupid '.
 					  ' AND NOT(s.triggerid IS NULL) '.
 					' GROUP BY s.serviceid;';
@@ -827,8 +827,8 @@ function update_services_status_all(){
 	clear_parents_from_trigger();	
 
 	$result = DBselect('SELECT s.serviceid,s.algorithm,s.triggerid '.
-						' FROM services as s '.
-						' WHERE s.serviceid NOT IN (select distinct sl.serviceupid from services_links as sl)');
+						' FROM services s '.
+						' WHERE s.serviceid NOT IN (select distinct sl.serviceupid from services_links sl)');
 
 	while($rows=DBfetch($result)){
 		$status = get_service_status($rows['serviceid'],$rows['algorithm'],$rows['triggerid']);
@@ -838,8 +838,8 @@ function update_services_status_all(){
 	}	
 
 	$result = DBselect('SELECT MAX(sl.servicedownid) as serviceid, sl.serviceupid '.
-						' FROM services_links AS sl '.
-						' WHERE sl.servicedownid NOT IN (select distinct sl.serviceupid from services_links as sl) '.
+						' FROM services_links sl '.
+						' WHERE sl.servicedownid NOT IN (select distinct sl.serviceupid from services_links sl) '.
 						' GROUP BY sl.serviceupid');
 
 	while($rows=DBfetch($result)){