projects / freeradius.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4d5e187)
Create a new function da_sql_limit() and use that to pass LIMIT arguments to the...
authorkkalev <kkalev>
Mon, 21 Mar 2005 13:16:58 +0000 (13:16 +0000)
committerkkalev <kkalev>
Mon, 21 Mar 2005 13:16:58 +0000 (13:16 +0000)
since the syntax is different between db vendors

13 files changed:
dialup_admin/Changelog patch | blob | history
dialup_admin/htdocs/accounting.php3 patch | blob | history
dialup_admin/htdocs/badusers.php3 patch | blob | history
dialup_admin/htdocs/failed_logins.php3 patch | blob | history
dialup_admin/htdocs/user_accounting.php3 patch | blob | history
dialup_admin/htdocs/user_admin.php3 patch | blob | history
dialup_admin/htdocs/user_stats.php3 patch | blob | history
dialup_admin/lib/sql/drivers/dbx/functions.php3 patch | blob | history
dialup_admin/lib/sql/drivers/mysql/functions.php3 patch | blob | history
dialup_admin/lib/sql/drivers/oracle/functions.php3 patch | blob | history
dialup_admin/lib/sql/drivers/pg/functions.php3 patch | blob | history
dialup_admin/lib/sql/drivers/sqlrelay/functions.php3 patch | blob | history
dialup_admin/lib/sql/find.php3 patch | blob | history

diff --git a/dialup_admin/Changelog b/dialup_admin/Changelog
index 2081bda..6a12acd 100644 (file)
--- a/dialup_admin/Changelog
+++ b/dialup_admin/Changelog
@@ -2,6 +2,8 @@ Ver 1.80:
 * Remove snmp_clearsession. It is replaced by clearsession which supports both snmp and telnet
   methods of removing a user from an access server. Add corresponding configuration directives
   general_sessionclear_method and nasXX_sessionclear_method
+* Create a new function da_sql_limit() and use that to pass LIMIT arguments to the database layer
+  since the syntax is different between db vendors
 Ver 1.78:
 * Add a snmp_clearsession which can disconnect a user by using the Cisco AAA Session MIB
 * Add a configuration directive general_sessionclear_bin
diff --git a/dialup_admin/htdocs/accounting.php3 b/dialup_admin/htdocs/accounting.php3
index 93d80ae..137d05a 100644 (file)
--- a/dialup_admin/htdocs/accounting.php3
+++ b/dialup_admin/htdocs/accounting.php3
@@ -238,7 +238,9 @@ unset($sql_extra_query);
 if ($config[sql_accounting_extra_query] != '')
        $sql_extra_query = xlat($config[sql_accounting_extra_query],$login,$config);
        $sql_extra_query = da_sql_escape_string($sql_extra_query);
-$query="SELECT $query_view FROM $config[sql_accounting_table] $where $sql_extra_query ORDER BY $order LIMIT $maxresults;";
+$query="SELECT da_sql_limit($maxresults,0,$config) $query_view FROM $config[sql_accounting_table]
+       $where $sql_extra_query da_sql_limit($maxresults,1,$config)
+       ORDER BY $order da_sql_limit($maxresults,2,$config);";
 
 echo <<<EOM
 <html>
diff --git a/dialup_admin/htdocs/badusers.php3 b/dialup_admin/htdocs/badusers.php3
index 631ecc3..97110fa 100644 (file)
--- a/dialup_admin/htdocs/badusers.php3
+++ b/dialup_admin/htdocs/badusers.php3
@@ -33,7 +33,7 @@ $num = 0;
 $pagesize = ($pagesize) ? $pagesize : 10;
 if (!is_numeric($pagesize) && $pagesize != 'all')
        $pagesize = 10;
-$limit = ($pagesize == 'all') ? '' : "LIMIT $pagesize";
+$limit = ($pagesize == 'all') ? '' : "$pagesize";
 $selected[$pagesize] = 'selected';
 $login = ($login != '') ? $login : 'anyone';
 $usercheck = ($login == 'anyone') ? "LIKE '%'" : "= '$login'";
@@ -145,9 +145,9 @@ if ($config[general_restrict_badusers_access] == 'yes'){
 $link = @da_sql_pconnect($config);
 if ($link){
        $search = @da_sql_query($link,$config,
-       "SELECT * FROM $config[sql_badusers_table]
+       "SELECT da_sql_limit($limit,0,$config) * FROM $config[sql_badusers_table]
        WHERE username $usercheck $extra_query AND date <= '$now_str'
-       AND date >= '$prev_str' ORDER BY date $order $limit;");
+       AND date >= '$prev_str' da_sql_limit($limit,1,$config) ORDER BY date $order da_sql_limit($limit,2,$config);");
        if ($search){
                while( $row = @da_sql_fetch_array($search,$config) ){
                        $num++;
diff --git a/dialup_admin/htdocs/failed_logins.php3 b/dialup_admin/htdocs/failed_logins.php3
index 9aa6c1b..8214265 100644 (file)
--- a/dialup_admin/htdocs/failed_logins.php3
+++ b/dialup_admin/htdocs/failed_logins.php3
@@ -39,7 +39,7 @@ $prev_str = da_sql_escape_string($prev_str);
 $pagesize = ($pagesize) ? $pagesize : 10;
 if (!is_numeric($pagesize) && $pagesize != 'all')
        $pagesize = 10;
-$limit = ($pagesize == 'all') ? '' : "LIMIT $pagesize";
+$limit = ($pagesize == 'all') ? '' : "$pagesize";
 $selected[$pagesize] = 'selected';
 $order = ($order != '') ? $order : $config[general_accounting_info_order];
 if ($order != 'desc' && $order != 'asc')
@@ -115,13 +115,13 @@ if ($config[sql_accounting_extra_query] != ''){
 $link = @da_sql_pconnect($config);
 if ($link){
        $search = @da_sql_query($link,$config,
-       "SELECT acctstoptime,username,nasipaddress,nasportid,acctterminatecause,callingstationid
+       "SELECT da_sql_limit($limit,0,$config) acctstoptime,username,nasipaddress,nasportid,acctterminatecause,callingstationid
        FROM $config[sql_accounting_table]
        WHERE acctstoptime <= '$now_str' AND acctstoptime >= '$prev_str'
        AND (acctterminatecause LIKE 'Login-Incorrect%' OR
        acctterminatecause LIKE 'Invalid-User%' OR
-       acctterminatecause LIKE 'Multiple-Logins%') $callerid_str $server_str $sql_extra_query
-       ORDER BY acctstoptime $order $limit;");
+       acctterminatecause LIKE 'Multiple-Logins%') $callerid_str $server_str $sql_extra_query da_sql_limit($limit,1,$config)
+       ORDER BY acctstoptime $order da_sql_limit($limit,2,$config);");
        if ($search){
                while( $row = @da_sql_fetch_array($search,$config) ){
                        $num++;
diff --git a/dialup_admin/htdocs/user_accounting.php3 b/dialup_admin/htdocs/user_accounting.php3
index 7742784..3f1c8ce 100644 (file)
--- a/dialup_admin/htdocs/user_accounting.php3
+++ b/dialup_admin/htdocs/user_accounting.php3
@@ -31,7 +31,7 @@ $num = 0;
 $pagesize = ($pagesize) ? $pagesize : 10;
 if (!is_numeric($pagesize) && $pagesize != 'all')
        $pagesize = 10;
-$limit = ($pagesize == 'all') ? '' : "LIMIT $pagesize";
+$limit = ($pagesize == 'all') ? '' : "$pagesize";
 $selected[$pagesize] = 'selected';
 $order = ($order != '') ? $order : $config[general_accounting_info_order];
 if ($order != 'desc' && $order != 'asc')
@@ -102,9 +102,10 @@ if ($config[sql_accounting_extra_query] != '')
 $link = @da_sql_pconnect($config);
 if ($link){
        $search = @da_sql_query($link,$config,
-       "SELECT * FROM $config[sql_accounting_table]
+       "SELECT da_sql_limit($limit,0,$config) * FROM $config[sql_accounting_table]
        WHERE username = '$login' AND acctstarttime <= '$now_str'
-       AND acctstarttime >= '$prev_str' $sql_extra_query ORDER BY acctstarttime $order $limit;");
+       AND acctstarttime >= '$prev_str' $sql_extra_query da_sql_limit($limit,1,$config)
+       ORDER BY acctstarttime $order da_sql_limit($limit,2,$config);");
        if ($search){
                while( $row = @da_sql_fetch_array($search,$config) ){
                        $tr_color='white';
diff --git a/dialup_admin/htdocs/user_admin.php3 b/dialup_admin/htdocs/user_admin.php3
index d98945b..d72ece8 100644 (file)
--- a/dialup_admin/htdocs/user_admin.php3
+++ b/dialup_admin/htdocs/user_admin.php3
@@ -214,9 +214,9 @@ if ($link){
        }
 
        $search = @da_sql_query($link,$config,
-       "SELECT * FROM $config[sql_accounting_table]
-       WHERE username = '$login' AND acctstoptime IS NULL
-       ORDER BY acctstarttime DESC LIMIT 1;");
+       "SELECT da_sql_limit(1,0,$config) * FROM $config[sql_accounting_table]
+       WHERE username = '$login' AND acctstoptime IS NULL da_sql_limit(1,1,$config)
+       ORDER BY acctstarttime DESC da_sql_limit(1,2,$config);");
        if ($search){
                if (@da_sql_num_rows($search,$config)){
                        $logged_now = 1;
@@ -255,9 +255,9 @@ if ($link){
                echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
        if (! $logged_now){
                $search = @da_sql_query($link,$config,
-               "SELECT * FROM $config[sql_accounting_table]
-               WHERE username = '$login' AND acctsessiontime != '0'
-               ORDER BY acctstoptime DESC LIMIT 1;");
+               "SELECT da_sql_limit(1,0,$config) * FROM $config[sql_accounting_table]
+               WHERE username = '$login' AND acctsessiontime != '0' da_sql_limit(1,1,$config)
+               ORDER BY acctstoptime DESC da_sql_limit(1,2,$config);");
                if ($search){
                        if (@da_sql_num_rows($search,$config)){
                                $row = @da_sql_fetch_array($search,$config);
diff --git a/dialup_admin/htdocs/user_stats.php3 b/dialup_admin/htdocs/user_stats.php3
index 0ba2b18..d277032 100644 (file)
--- a/dialup_admin/htdocs/user_stats.php3
+++ b/dialup_admin/htdocs/user_stats.php3
@@ -37,7 +37,7 @@ if (!is_numeric($pagesize) && $pagesize != 'all')
        $pagezise = 10;
 if ($pagesize > 100)
        $pagesize = 100;
-$limit = ($pagesize == 'all') ? 'LIMIT 100' : "LIMIT $pagesize";
+$limit = ($pagesize == 'all') ? '100' : "$pagesize";
 $selected[$pagesize] = 'selected';
 $order = ($order) ? $order : $config[general_accounting_info_order];
 if ($order != 'desc' && $order != 'asc')
@@ -110,9 +110,9 @@ EOM;
 $link = @da_sql_pconnect($config);
 if ($link){
        $search = @da_sql_query($link,$config,
-       "SELECT * FROM $config[sql_total_accounting_table]
-       WHERE acctdate >= '$start' AND acctdate <= '$stop' $server_str $login_str $sql_extra_query
-       ORDER BY $order_attr $order $limit;");
+       "SELECT da_sql_limit($limit,0,$config) * FROM $config[sql_total_accounting_table]
+       WHERE acctdate >= '$start' AND acctdate <= '$stop' $server_str $login_str $sql_extra_query da_sql_limit($limit,1,$config)
+       ORDER BY $order_attr $order da_sql_limit($limit,2,$config);");
 
        if ($search){
                while( $row = @da_sql_fetch_array($search,$config) ){
diff --git a/dialup_admin/lib/sql/drivers/dbx/functions.php3 b/dialup_admin/lib/sql/drivers/dbx/functions.php3
index 655aedd..a968fd8 100644 (file)
--- a/dialup_admin/lib/sql/drivers/dbx/functions.php3
+++ b/dialup_admin/lib/sql/drivers/dbx/functions.php3
@@ -1,4 +1,16 @@
 <?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'){
diff --git a/dialup_admin/lib/sql/drivers/mysql/functions.php3 b/dialup_admin/lib/sql/drivers/mysql/functions.php3
index 76a3b7c..8eb12db 100644 (file)
--- a/dialup_admin/lib/sql/drivers/mysql/functions.php3
+++ b/dialup_admin/lib/sql/drivers/mysql/functions.php3
@@ -1,4 +1,15 @@
 <?php
+function da_sql_limit($limit,$point,$config)
+{
+       switch($point){
+               case 0:
+                       return '';
+               case 1:
+                       return '';
+               case 3:
+                       return "LIMIT $limit";
+}
+
 function da_sql_host_connect($server,$config)
 {
        if ($config[sql_use_http_credentials] == 'yes'){
diff --git a/dialup_admin/lib/sql/drivers/oracle/functions.php3 b/dialup_admin/lib/sql/drivers/oracle/functions.php3
index 22388dc..05aae29 100644 (file)
--- a/dialup_admin/lib/sql/drivers/oracle/functions.php3
+++ b/dialup_admin/lib/sql/drivers/oracle/functions.php3
@@ -1,5 +1,17 @@
 <?php
 // $Id$
+function da_sql_limit($limit,$point,$config)
+{
+       switch($point){
+               case 0:
+                       return '';
+               case 1:
+                       return "AND ROWNUM <= $limit";
+               case 2:
+                       return '';
+       }
+}
+
 function da_sql_host_connect($server,$config)
 {
        if ($config[sql_use_http_credentials] == 'yes'){
diff --git a/dialup_admin/lib/sql/drivers/pg/functions.php3 b/dialup_admin/lib/sql/drivers/pg/functions.php3
index 3a43276..68ad17c 100644 (file)
--- a/dialup_admin/lib/sql/drivers/pg/functions.php3
+++ b/dialup_admin/lib/sql/drivers/pg/functions.php3
@@ -1,4 +1,15 @@
 <?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'){
diff --git a/dialup_admin/lib/sql/drivers/sqlrelay/functions.php3 b/dialup_admin/lib/sql/drivers/sqlrelay/functions.php3
index 55ee242..8c5fd9d 100644 (file)
--- a/dialup_admin/lib/sql/drivers/sqlrelay/functions.php3
+++ b/dialup_admin/lib/sql/drivers/sqlrelay/functions.php3
@@ -1,4 +1,16 @@
 <?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)
 {
        $retrytime = 0;
diff --git a/dialup_admin/lib/sql/find.php3 b/dialup_admin/lib/sql/find.php3
index 754fba9..04bb354 100644 (file)
--- a/dialup_admin/lib/sql/find.php3
+++ b/dialup_admin/lib/sql/find.php3
@@ -18,8 +18,9 @@ if ($link){
        if (($search_IN == 'name' || $search_IN == 'department' || $search_IN == 'username') && 
                        $config[sql_use_user_info_table] == 'true'){
                $res = @da_sql_query($link,$config,
-               "SELECT username FROM $config[sql_user_info_table] WHERE
-               lower($search_IN) LIKE '%$search%' LIMIT $max_results;");
+               "SELECT da_sql_limit($max_results,0,$config) username FROM $config[sql_user_info_table] WHERE
+               lower($search_IN) LIKE '%$search%'
+               da_sql_limit($max_results,1,$config) da_sql_limit($max_results,2,$config);");
                if ($res){
                        while(($row = @da_sql_fetch_array($res,$config)))
                                $found_users[] = $row[username];
@@ -37,7 +38,8 @@ if ($link){
                $attr = $attrmap[$radius_attr];
                $attr = da_sql_escape_string($attr);
                $res = @da_sql_query($link,$config,
-               "SELECT username FROM $table WHERE attribute = '$attr' AND value LIKE '%$search%' LIMIT $max_results;");
+               "SELECT da_sql_limit($max_results,0,$config) username FROM $table WHERE attribute = '$attr'
+               AND value LIKE '%$search%' da_sql_limit($max_results,1,$config) da_sql_limit($max_results,2,$config);");
                if ($res){
                        while(($row = @da_sql_fetch_array($res,$config)))
                                $found_users[] = $row[username];
Unnamed repository; edit this file 'description' to name the repository.