some fixes, ogw design

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2348 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_pgsql_opengw.inc b/include/class_pgsql_opengw.inc
index 7e53cb805bfcc63da0bccafa0d33ff0fa15c2a29..d3432226f7de549aaac8fbc52b6b2e9a70a6cbfb 100644 (file)
--- a/include/class_pgsql_opengw.inc
+++ b/include/class_pgsql_opengw.inc
@@ -2,107 +2,109 @@
 
 class pgre_sql{
 
-  var $handle;
-  var $query_log;
-  var $user;
-  var $server;
-  var $db;
-  var $pwd;
-  var $is_connected = false;
-
-  function pgre_sql($user,$pwd,$server,$db)
-  {
-    $this->user   = $user;
-    $this->pwd  = $pwd;
-    $this->server = $server;
-    $this->db   = $db;
-
-    if($this->_connect()){
-      $this->is_connected = true;
-    }else{
-      $this->is_connected = false;
-       }
-  }
-
-  function _connect()
-  {
-       error_reporting(E_ALL);
-       if(is_callable("pg_connect")){
-               if(!empty($this->pwd)){
-                       $this->handle = @pg_connect("dbname=".$this->db." host=".$this->server." user=".$this->user);
+       var $handle;
+       var $query_log;
+       var $user;
+       var $server;
+       var $db;
+       var $pwd;
+       var $is_connected = false;
+
+       function pgre_sql($user,$pwd,$server,$db)
+       {
+               $this->user   = $user;
+               $this->pwd  = $pwd;
+               $this->server = $server;
+               $this->db   = $db;
+
+               if($this->_connect()){
+                       $this->is_connected = true;
                }else{
-                       $this->handle = @pg_connect("dbname=".$this->db." host=".$this->server." user=".$this->user." password=".$this->pwd);
+                       $this->is_connected = false;
                }
-               if(!$this->handle){
+       }
+
+       function _connect()
+       {
+               error_reporting(E_ALL);
+               if(is_callable("pg_connect")){
+                       if(!empty($this->pwd)){
+                               $this->handle = @pg_connect("dbname=".$this->db." host=".$this->server." user=".$this->user);
+                       }else{
+                               $this->handle = @pg_connect("dbname=".$this->db." host=".$this->server." user=".$this->user." password=".$this->pwd);
+                       }
+                       if(!$this->handle){
+                               $this->handle = false;
+                       }
+               }else{
                        $this->handle = false;
                }
-       }else{
-               $this->handle = false;
+               return($this->handle);
+       }
+
+       function Query($a_query)
+       {
+               if(is_array($a_query)){
+                       foreach($a_query as $nr => $query){
+                               return($this->_query($query));
+                       }
+               }else{
+                       return($this->_query($a_query));
+               }
+       }
+
+       function _query($query)
+       {
+               return(pg_query($this->handle,$query));
+       }
+
+       function FetchAllRows($res)
+       {
+               return(pg_fetch_all($res))  ;
+       }
+
+       function gen_id()
+       {
+               $tmp = $this->_query("select nextval('key_generator');");
+               $tmp = ($this->FetchAllRows($tmp));
+               return($tmp[0]['nextval']);
+       }
+
+
+       function GetTemplateUser(){
+               $data = array();
+               $qry = "SELECT description,name,company_id FROM company WHERE is_template_user=1;";
+               $res = $this->_query($qry);
+               $tmp = $this->FetchAllRows($res);
+               foreach($tmp as $attr){
+                       $data[$attr['name']] = $attr;
+               }
+               return $data;
+       }
+       function GetLocationTeam(){
+               $data = array();
+               $qry = "SELECT description,name,company_id FROM team WHERE is_location_team=1;";
+               $res = $this->_query($qry);
+               $tmp = $this->FetchAllRows($res);
+               if(is_array($tmp)){
+                       foreach($tmp as $attr){
+                               $data[$attr['description']] = $attr;
+                       }
+               }
+               return $data;
+       }
+       function GetTeams(){
+               $data = array();
+               $qry = "SELECT description,name,company_id FROM team 
+                       WHERE (is_team=1) AND company_id 
+                       NOT IN (SELECT company_id FROM company WHERE is_location_team=1);";
+               $res = $this->_query($qry);
+               $tmp = $this->FetchAllRows($res);
+               foreach($tmp as $attr){
+                       $data[$attr['description']] = $attr;
+               }
+               return $data;
        }
-       return($this->handle);
-  }
-
-  function Query($a_query)
-  {
-    if(is_array($a_query)){
-      foreach($a_query as $nr => $query){
-        return($this->_query($query));
-      }
-    }else{
-      return($this->_query($a_query));
-    }
-  }
-       
-  function _query($query)
-  {
-    return(pg_query($this->handle,$query));
-  }
-
-  function FetchAllRows($res)
-  {
-    return(pg_fetch_all($res))  ;
-  }
-
-  function gen_id()
-  {
-         $tmp = $this->_query("select nextval('key_generator');");
-         $tmp = ($this->FetchAllRows($tmp));
-         return($tmp[0]['nextval']);
-  }
-
-
-  function GetTemplateUser(){
-         $data = array();
-         $qry = "SELECT description,name,company_id FROM company WHERE is_template_user=1;";
-         $res = $this->_query($qry);
-         $tmp = $this->FetchAllRows($res);
-         foreach($tmp as $attr){
-                 $data[$attr['name']] = $attr;
-         }
-         return $data;
-  }
-  function GetLocationTeam(){
-         $data = array();
-         $qry = "SELECT description,name,company_id FROM team WHERE is_location_team=1;";
-         $res = $this->_query($qry);
-         $tmp = $this->FetchAllRows($res);
-         foreach($tmp as $attr){
-                 $data[$attr['description']] = $attr;
-         }
-         return $data;
-  }
-  function GetTeams(){
-         $data = array();
-         $qry = "SELECT description,name,company_id FROM team 
-                               WHERE (is_team=1) AND company_id 
-                                       NOT IN (SELECT company_id FROM company WHERE is_location_team=1);";
-         $res = $this->_query($qry);
-         $tmp = $this->FetchAllRows($res);
-         foreach($tmp as $attr){
-                 $data[$attr['description']] = $attr;
-         }
-         return $data;
-  }
 }
 
 
@@ -114,7 +116,7 @@ function gen_syntax($array,$tablename,$act,$ist)
 
                foreach($array as $name => $value){
                        if((empty($value))&&(!preg_match("/^is_/i",$name))) continue;
-       
+
                        if((empty($value))&&(preg_match("/^is_/i",$name))){
                                $value= 0;
                        }
@@ -135,7 +137,7 @@ function gen_syntax($array,$tablename,$act,$ist)
                $values = "";
                foreach($array as $name => $attribute){
                        if((empty($attribute))&&(!preg_match("/^is_/i",$name))) continue;
-       
+
                        if((empty($attribute))&&(preg_match("/^is_/i",$name))){
                                $attribute= 0;
                        }
@@ -154,5 +156,5 @@ function gen_syntax($array,$tablename,$act,$ist)
                return $str;
        }
 }
-
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>