]> git.entuzijast.net Git - freeradius-dialup-admin.git/commitdiff
projects / freeradius-dialup-admin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4a7741f)
* Use require_once instead of require when including xlat.php3
authorkkalev <kkalev>
Thu, 8 Jul 2004 11:48:18 +0000 (11:48 +0000)
committerkkalev <kkalev>
Thu, 8 Jul 2004 11:48:18 +0000 (11:48 +0000)
* Add debug statements in sql connect functions

Changelog patch | blob | blame | history
htdocs/clear_opensessions.php3 patch | blob | blame | history
htdocs/failed_logins.php3 patch | blob | blame | history
htdocs/stats.php3 patch | blob | blame | history
htdocs/user_finger.php3 patch | blob | blame | history
htdocs/user_stats.php3 patch | blob | blame | history
lib/ldap/functions.php3 patch | blob | blame | history
lib/sql/drivers/mysql/functions.php3 patch | blob | blame | history
lib/sql/drivers/pg/functions.php3 patch | blob | blame | history
lib/sql/functions.php3 patch | blob | blame | history

diff --git a/Changelog b/Changelog
index 5fb5d4af14e7c97adad7407e57b8dd07fb96a68b..e6880e4b593c501c57a0422ceac3b85baa7a6f51 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,8 @@ Ver 1.72:
 * Escape special characters in the sql password. This closes bug #96
 * Do an xlat for general_accounting_attrs_file and general_user_edit_attrs_file. That way we can
   have different mappings for each administrator.
+* Use require_once instead of require when including xlat.php3
+* Add debug statements in sql connect functions
 Ver 1.70:
 * Add the /bin postgresql compatibility patch from Guy Fraser
 * Add ldap_userdn as a configuration directive. If set we use that for
diff --git a/htdocs/clear_opensessions.php3 b/htdocs/clear_opensessions.php3
index 30254ff60bfeae990003efe738d29d9d868023ee..21b5d14f0272f6617acca003c87d2668427ab03b 100644 (file)
--- a/htdocs/clear_opensessions.php3
+++ b/htdocs/clear_opensessions.php3
@@ -1,6 +1,6 @@
 <?php
 require('../conf/config.php3');
-require('../lib/xlat.php3');
+require_once('../lib/xlat.php3');
 if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3"))
        include_once("../lib/sql/drivers/$config[sql_type]/functions.php3");
 else{
diff --git a/htdocs/failed_logins.php3 b/htdocs/failed_logins.php3
index b02491d30ed38c2fc7b1ba98129ca93491d79427..f9dc7b93142dd0a267eb3ea97bd7e33dcd2ca7cf 100644 (file)
--- a/htdocs/failed_logins.php3
+++ b/htdocs/failed_logins.php3
@@ -2,7 +2,7 @@
 require('../conf/config.php3');
 require('../lib/attrshow.php3');
 require('../lib/sql/nas_list.php3');
-require('../lib/xlat.php3');
+require_once('../lib/xlat.php3');
 ?>
 <html>
 <?php
diff --git a/htdocs/stats.php3 b/htdocs/stats.php3
index fbd2825dff7aaa9ad26c4a5546df2d3ed87ae31a..a9333500d5848950219d32c9cdd87b80fc65cf62 100644 (file)
--- a/htdocs/stats.php3
+++ b/htdocs/stats.php3
@@ -1,7 +1,7 @@
 <?php
 require('../conf/config.php3');
 require('../lib/sql/nas_list.php3');
-require('../lib/xlat.php3');
+require_once('../lib/xlat.php3');
 ?>
 <html>
 <head>
diff --git a/htdocs/user_finger.php3 b/htdocs/user_finger.php3
index 2439111a971f861b2e154951b8078919e99add6e..f9da8418d467841af2cebd8d534b7dabd7659567 100644 (file)
--- a/htdocs/user_finger.php3
+++ b/htdocs/user_finger.php3
@@ -86,7 +86,8 @@ if ($link){
                "SELECT DISTINCT username,acctstarttime,framedipaddress,callingstationid
                FROM $config[sql_accounting_table] WHERE
                acctstoptime IS NULL AND nasipaddress = '$name_data' $extra $sql_extra_query
-               GROUP BY username ORDER BY acctstarttime;");
+               GROUP BY username,acctstarttime,framedipaddress,callingstationid
+               ORDER BY acctstarttime;");
                if ($search){
                        $now = time();
                        while($row = @da_sql_fetch_array($search,$config)){
diff --git a/htdocs/user_stats.php3 b/htdocs/user_stats.php3
index dfbb2bbabaa5d541e029c28f3dd9d20f88e67d77..041cf51fa3385429fb26886d9eed27bb0cfe6227 100644 (file)
--- a/htdocs/user_stats.php3
+++ b/htdocs/user_stats.php3
@@ -2,7 +2,7 @@
 require('../conf/config.php3');
 require('../lib/functions.php3');
 require('../lib/sql/nas_list.php3');
-require('../lib/xlat.php3');
+require_once('../lib/xlat.php3');
 ?>
 <html>
 <?php
diff --git a/lib/ldap/functions.php3 b/lib/ldap/functions.php3
index 910d1f283bac1754b5740bd9189db5e5d6bfe903..be67ca065262ba53247871ebd63c399188faca52 100644 (file)
--- a/lib/ldap/functions.php3
+++ b/lib/ldap/functions.php3
@@ -1,5 +1,5 @@
 <?php
-require('../lib/xlat.php3');
+require_once('../lib/xlat.php3');
 
 function da_ldap_bind($ds,$config)
 {
diff --git a/lib/sql/drivers/mysql/functions.php3 b/lib/sql/drivers/mysql/functions.php3
index 8f313c6a2ef9cdf76aa9c86698ed0c5d93a9b726..76a3b7cd5087794057d7edc03bfff75556caad65 100644 (file)
--- a/lib/sql/drivers/mysql/functions.php3
+++ b/lib/sql/drivers/mysql/functions.php3
@@ -11,6 +11,10 @@ function da_sql_host_connect($server,$config)
                $SQL_passwd = $config[sql_password];
        }
 
+       if ($config[sql_connect_timeout] != 0)
+               @ini_set('mysql.connect_timeout',$config[sql_connect_timeout]);
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
        return @mysql_connect("$server:$config[sql_port]",$SQL_user,$SQL_passwd);
 }
 
@@ -28,6 +32,8 @@ function da_sql_connect($config)
 
        if ($config[sql_connect_timeout] != 0)
                @ini_set('mysql.connect_timeout',$config[sql_connect_timeout]);
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
        return @mysql_connect("$config[sql_server]:$config[sql_port]",$SQL_user,$SQL_passwd);
 }
 
@@ -45,6 +51,8 @@ function da_sql_pconnect($config)
 
        if ($config[sql_connect_timeout] != 0)
                @ini_set('mysql.connect_timeout',$config[sql_connect_timeout]);
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
        return @mysql_pconnect("$config[sql_server]:$config[sql_port]",$SQL_user,$SQL_passwd);
 }
 
diff --git a/lib/sql/drivers/pg/functions.php3 b/lib/sql/drivers/pg/functions.php3
index ec2031918a9769b329e355b354a5708917e6635f..f3cfc62a931c9be8fa649df7e489a49c962a6b91 100644 (file)
--- a/lib/sql/drivers/pg/functions.php3
+++ b/lib/sql/drivers/pg/functions.php3
@@ -10,6 +10,8 @@ function da_sql_host_connect($server,$config)
                $SQL_user = $config[sql_username];
                $SQL_passwd = $config[sql_password];
        }
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,MYSQL 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");
@@ -26,6 +28,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,MYSQL 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");
@@ -42,6 +46,8 @@ function da_sql_pconnect($config)
                $SQL_user = $config[sql_username];
                $SQL_passwd = $config[sql_password];
        }
+       if ($config[sql_debug] == 'true')
+               print "<b>DEBUG(SQL,MYSQL 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=$SQL_user
                        password=$SQL_passwd");
diff --git a/lib/sql/functions.php3 b/lib/sql/functions.php3
index d42a6ebbecb2fdc46e20c46b1d338425f1ed6b87..7d6b61353a155f2c73f9faa0c4308d1b9eccd46d 100644 (file)
--- a/lib/sql/functions.php3
+++ b/lib/sql/functions.php3
@@ -5,7 +5,7 @@ else{
        echo "<b>Could not include SQL library</b><br>\n";
        exit();
 }
-require('../lib/xlat.php3');
+require_once('../lib/xlat.php3');
 
 function connect2db($config)
 {
FreeRADIUS dialup_admin