Delete trailing whitespace.

[freeradius.git] / dialup_admin / lib / sql / drivers / pg / functions.php3

diff --git a/dialup_admin/lib/sql/drivers/pg/functions.php3 b/dialup_admin/lib/sql/drivers/pg/functions.php3
index d0f885a..4f85653 100644 (file)
--- a/dialup_admin/lib/sql/drivers/pg/functions.php3
+++ b/dialup_admin/lib/sql/drivers/pg/functions.php3
@@ -1,4 +1,33 @@
 <?php
+function da_sql_limit($limit,$point,$config)
+{
+       switch($point){
+               case 0:
+                       return '';
+               case 1:
+                       return '';
+               case 2:
+                       return "LIMIT $limit";
+       }
+}
+function da_sql_host_connect($server,$config)
+{
+       if ($config[sql_use_http_credentials] == 'yes'){
+               global $HTTP_SERVER_VARS;
+               $SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
+               $SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
+       }
+       else{
+               $SQL_user = $config[sql_username];
+               $SQL_passwd = $config[sql_password];
+       }
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,PG DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
+       return @pg_connect("host=$server port=$config[sql_port]
+                       dbname=$config[sql_database] user=$SQL_user
+                       password=$SQL_passwd");
+}
+
 function da_sql_connect($config)
 {
        if ($config[sql_use_http_credentials] == 'yes'){
@@ -10,6 +39,8 @@ function da_sql_connect($config)
                $SQL_user = $config[sql_username];
                $SQL_passwd = $config[sql_password];
        }
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,PG DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
        return @pg_connect("host=$config[sql_server] port=$config[sql_port]
                        dbname=$config[sql_database] user=$SQL_user
                        password=$SQL_passwd");
@@ -17,9 +48,20 @@ function da_sql_connect($config)
 
 function da_sql_pconnect($config)
 {
+       if ($config[sql_use_http_credentials] == 'yes'){
+               global $HTTP_SERVER_VARS;
+               $SQL_user = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
+               $SQL_passwd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
+       }
+       else{
+               $SQL_user = $config[sql_username];
+               $SQL_passwd = $config[sql_password];
+       }
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,PG DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
        return @pg_pconnect("host=$config[sql_server] port=$config[sql_port]
-                       dbname=$config[sql_database] user=$config[sql_username]
-                       password=$config[sql_password]");
+                       dbname=$config[sql_database] user=$SQL_user
+                       password=$SQL_passwd");
 }
 
 function da_sql_close($link,$config)
@@ -27,11 +69,16 @@ function da_sql_close($link,$config)
        @pg_close($link);
 }
 
+function da_sql_escape_string($string)
+{
+       return addslashes($string);
+}
+
 function da_sql_query($link,$config,$query)
 {
        if ($config[sql_debug] == 'true')
-               print "<b>DEBUG(SQL,PG DRIVER): Query: $query</b><br>\n";
-       return @pg_exec($link,$query);
+               print "<b>DEBUG(SQL,PG DRIVER): Query: <i>$query</i></b><br>\n";
+       return @pg_query($link,$query);
 }
 
 function da_sql_num_rows($result,$config)
@@ -43,12 +90,12 @@ function da_sql_num_rows($result,$config)
 
 function da_sql_fetch_array($result,$config)
 {
-       if ($config[sql_debug] == 'true'){
-               print "<b>DEBUG(SQL,PG DRIVER): Query Result: ";
-               print_r(@pg_fetch_array($result,$config[tmp_pg_array_num][$result]++,PGSQL_ASSOC));
-               print  "</b><br>\n";
-       }
        $row = @pg_fetch_array($result,$config[tmp_pg_array_num][$result]++,PGSQL_ASSOC);
+       if ($row && $config[sql_debug] == 'true'){
+               print "<b>DEBUG(SQL,PG DRIVER): Query Result: <pre>";
+               print_r($row);
+               print  "</b></pre>\n";
+       }
        if (!$row)
                $config[tmp_pg_array_num][$result] = 0;
        return $row;
@@ -63,7 +110,7 @@ function da_sql_affected_rows($link,$result,$config)
 
 function da_sql_list_fields($table,$link,$config)
 {
-       $res = @pg_exec($link,
+       $res = @pg_query($link,
                "select count(*) from pg_attribute where attnum > '0' and
                attrelid = (select oid from pg_class where relname='$table');");
        if ($res){
@@ -74,7 +121,7 @@ function da_sql_list_fields($table,$link,$config)
                        $fields[num] = $row[0];
                }
        }
-       $res = @pg_exec($link,
+       $res = @pg_query($link,
                "select attname from pg_attribute where attnum > '0' and
                attrelid = (select oid from pg_class where relname='$table');");
        if ($res)
@@ -94,7 +141,7 @@ function da_sql_num_fields($fields,$config)
 function da_sql_field_name($fields,$num,$config)
 {
        if ($fields){
-               $row = @pg_fetch_row($fields[res],$num);        
+               $row = @pg_fetch_row($fields[res],$num);
                if ($row)
                        return $row[0];
        }