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

6 files changed, 19 insertions, 16 deletions

diff --git a/frontends/php/include/classes/ccombobox.inc.php b/frontends/php/include/classes/ccombobox.inc.php
index a3100d08..c4810736 100644
--- a/frontends/php/include/classes/ccombobox.inc.php
+++ b/frontends/php/include/classes/ccombobox.inc.php
@@ -89,7 +89,7 @@
 		function AddItem($value, $caption='', $selected=NULL, $enabled='yes')
 		{
 //			if($enabled=='no') return;	/* disable item method 1 */
-			if(strtolower(get_class($value))=='ccomboitem') {
+			if(strtolower(get_class($value))=='ccomboitem'){
 				parent::AddItem($value);
 			}
 			else{
diff --git a/frontends/php/include/classes/pie.inc.php b/frontends/php/include/classes/pie.inc.php
index 058d743d..ad92298d 100644
--- a/frontends/php/include/classes/pie.inc.php
+++ b/frontends/php/include/classes/pie.inc.php
@@ -102,7 +102,8 @@ function selectData(){
 				'SELECT h.itemid, '.
 					' avg(h.value) AS avg,min(h.value) AS min, '.
 					' max(h.value) AS max,max(h.clock) AS clock, max(i.lastvalue) as lst '.
-				' FROM history AS h LEFT JOIN items AS i ON h.itemid = i.itemid'.
+				' FROM history h '.
+					' LEFT JOIN items i ON h.itemid = i.itemid'.
 				' WHERE h.itemid='.$this->items[$i]['itemid'].
 					' AND h.clock>='.$from_time.
 					' AND h.clock<='.$to_time.
@@ -112,7 +113,8 @@ function selectData(){
 				'SELECT hu.itemid, '.
 					' avg(hu.value) AS avg,min(hu.value) AS min,'.
 					' max(hu.value) AS max,max(hu.clock) AS clock, max(i.lastvalue) as lst'.
-				' FROM history_uint AS hu LEFT JOIN items AS i ON hu.itemid = i.itemid'.
+				' FROM history_uint hu '.
+					' LEFT JOIN items i ON hu.itemid = i.itemid'.
 				' WHERE hu.itemid='.$this->items[$i]['itemid'].
 					' AND hu.clock>='.$from_time.
 					' AND hu.clock<='.$to_time.
@@ -124,7 +126,8 @@ function selectData(){
 				'SELECT t.itemid, '.
 					' avg(t.value_avg) AS avg,min(t.value_min) AS min,'.
 					' max(t.value_max) AS max,max(t.clock) AS clock, max(i.lastvalue) as lst'.
-				' FROM trends AS t LEFT JOIN items AS i ON t.itemid = i.itemid'.
+				' FROM trends t '.
+					' LEFT JOIN items i ON t.itemid = i.itemid'.
 				' WHERE t.itemid='.$this->items[$i]['itemid'].
 					' AND t.clock>='.$from_time.
 					' AND t.clock<='.$to_time.
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 9c5867ac..f4574efe 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -168,7 +168,7 @@
 		$available_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_ONLY);
 		
 		$sql = 	'SELECT g.graphid '.
-				' FROM graphs as g, graphs_items as gi, items as i '.
+				' FROM graphs g, graphs_items gi, items i '.
 				' WHERE g.graphid='.$graphid.
 					' AND g.graphid=gi.graphid '.
 					' AND i.itemid=gi.itemid '.
@@ -203,7 +203,7 @@
 		$result = array();
 		
 		$sql = 	'SELECT DISTINCT g.graphid '.
-				' FROM graphs as g, graphs_items as gi, items as i '.
+				' FROM graphs g, graphs_items gi, items i '.
 				' WHERE g.graphid=gi.graphid '.
 					(!empty($hostid)?' AND i.hostid='.$hostid:'').
 					' AND i.itemid=gi.itemid '.
@@ -215,7 +215,7 @@
 		}
 
 		$sql = 	'SELECT DISTINCT g.graphid '.
-				' FROM graphs as g, graphs_items as gi, items as i '.
+				' FROM graphs g, graphs_items gi, items i '.
 				' WHERE g.graphid=gi.graphid '.
 					(!empty($hostid)?' AND i.hostid='.$hostid:'').
 					' AND i.itemid=gi.itemid '.
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index 5f7340f2..5d26e339 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -873,9 +873,9 @@ require_once "include/items.inc.php";
  *
  * Author:
  *     Eugene Grigorjev (eugene.grigorjev@zabbix.com)
- *
+ * 
  * Comments:
- *
+ *		Modified: by Aly
  */
 	function validate_group($perm, $options = array(),$group_var=null){
 		if(is_null($group_var)) $group_var = "web.latest.groupid";
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)){
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index fc6933e4..ca83022e 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -203,7 +203,7 @@
 		$available_graphs = array();
 		
 		$sql = 	'SELECT DISTINCT t.triggerid '.
-				' FROM triggers t, functions f, items as i '.
+				' FROM triggers t, functions f, items i '.
 				' WHERE t.triggerid=f.triggerid '.
 					' AND f.itemid=i.itemid'.
 					(!empty($hostid)?' AND i.hostid='.$hostid:'').
@@ -215,7 +215,7 @@
 		}
 
 		$sql = 	'SELECT DISTINCT t.triggerid '.
-				' FROM triggers t, functions f, items as i '.
+				' FROM triggers t, functions f, items i '.
 				' WHERE t.triggerid=f.triggerid '.
 					' AND f.itemid=i.itemid'.
 					' AND i.status='.ITEM_STATUS_ACTIVE.