From 18756274b4328599aa09e56a97488833715be0ec Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Mon, 15 Dec 2003 16:55:28 +0000
Subject: [PATCH] * Huge PostgreSQL compatibility patch by Guy Fraser
 <guy@incentre.net> * Also support the Crypt-Password attribute in
 lib/sql/password_check.php3. Patch by Guy Fraser <guy@incentre.net>

---
 Changelog                            |  3 +
 htdocs/accounting.php3               | 15 +++--
 htdocs/badusers.php3                 | 14 ++--
 htdocs/clear_opensessions.php3       |  8 +--
 htdocs/failed_logins.php3            | 34 +++++-----
 htdocs/show_groups.php3              |  6 +-
 htdocs/stats.php3                    | 38 +++++------
 htdocs/user_accounting.php3          | 32 ++++-----
 htdocs/user_admin.php3               | 99 +++++++++++++++-------------
 htdocs/user_finger.php3              | 16 ++---
 htdocs/user_state.php3               | 20 +++---
 htdocs/user_stats.php3               | 30 ++++-----
 lib/acctshow.php3                    |  6 +-
 lib/add_badusers.php3                |  2 +-
 lib/sql/change_attrs.php3            | 12 ++--
 lib/sql/change_info.php3             | 12 ++--
 lib/sql/change_passwd.php3           | 10 +--
 lib/sql/create_group.php3            |  4 +-
 lib/sql/create_user.php3             | 16 ++---
 lib/sql/defaults.php3                | 24 +++----
 lib/sql/delete_group.php3            |  6 +-
 lib/sql/delete_user.php3             |  8 +--
 lib/sql/drivers/mysql/functions.php3 |  7 +-
 lib/sql/drivers/pg/functions.php3    |  4 +-
 lib/sql/find.php3                    | 12 ++--
 lib/sql/functions.php3               |  4 +-
 lib/sql/group_admin.php3             |  8 +--
 lib/sql/group_info.php3              | 16 ++---
 lib/sql/password_check.php3          | 10 +--
 lib/sql/user_info.php3               | 26 ++++----
 30 files changed, 258 insertions(+), 244 deletions(-)

diff --git a/Changelog b/Changelog
index e0abac0..cae9c70 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+Ver 1.68:
+* Huge PostgreSQL compatibility patch by Guy Fraser <guy@incentre.net>
+* Also support the Crypt-Password attribute in lib/sql/password_check.php3. Patch by Guy Fraser <guy@incentre.net>
 Ver 1.65:
 * Add a captions.conf file with a few configurable captions for now
 * Move the nas list to a separate file called naslist.conf
diff --git a/htdocs/accounting.php3 b/htdocs/accounting.php3
index 49c43a2..88646d5 100644
--- a/htdocs/accounting.php3
+++ b/htdocs/accounting.php3
@@ -24,13 +24,16 @@ EOM;
 }
 
 $operators=array( '=','<', '>', '<=', '>=', 'regexp', 'like' );
+if ($config[sql_type] == 'pg'){
+	$operators=array( '=','<', '>', '<=', '>=', '~', 'like', '~*', '~~*', '<<=' );
+}
 
 $link = @da_sql_pconnect ($config) or die('cannot connect to sql databse');
 $fields = @da_sql_list_fields($config[sql_accounting_table],$link,$config);
 $no_fields = @da_sql_num_fields($fields,$config);
 
 for($i=0;$i<$no_fields;$i++){
-	$key = @da_sql_field_name($fields,$i,$config);
+	$key = strtolower(@da_sql_field_name($fields,$i,$config));
 	$val = $sql_attrs[$key][desc];
 	if ($val == '')
 		continue;
@@ -130,7 +133,7 @@ echo <<<EOM
 EOM;
 
 foreach($items as $key => $val)
-	if ($val == 'UserName')
+	if ($val == 'username')
 		echo <<<EOM
 	<option selected value="$key">$val</option>
 EOM;
@@ -200,12 +203,12 @@ EOM;
 if ($queryflag == 1){
 $i = 1;
 while (${"item_of_w$i"}){
-	$where .= ($i == 1) ? ' WHERE ' . ${"item_of_w$i"} . ${"operator_of_w$i"} . "'" . ${"value_of_w$i"} . "'" :
-				' AND ' . ${"item_of_w$i"} . ${"operator_of_w$i"} . "'" . ${"value_of_w$i"} . "'" ;
+	$where .= ($i == 1) ? ' WHERE ' . ${"item_of_w$i"} . ' ' . ${"operator_of_w$i"} . " '" . ${"value_of_w$i"} . "'" :
+				' AND ' . ${"item_of_w$i"} . ' ' . ${"operator_of_w$i"} . " '" . ${"value_of_w$i"} . "'" ;
 	$i++;
 }
 
-$order = ($order_by != '') ? "$order_by" : 'UserName';
+$order = ($order_by != '') ? "$order_by" : 'username';
 
 foreach ($accounting_show_attrs as $val)
 	$query_view .= $val . ',';
@@ -253,7 +256,7 @@ echo "</tr>\n";
 				if ($info == '')
 					$info = '-';
 				$info = $sql_attrs[$val][func]($info);
-				if ($val == 'UserName')
+				if ($val == 'username')
 					$info = "<a href=\"user_admin.php3?login=$info\" title=\"Edit user $info\">$info<a/>";
 				echo <<<EOM
 			<td>$info</td>
diff --git a/htdocs/badusers.php3 b/htdocs/badusers.php3
index bcec1d4..cb01648 100644
--- a/htdocs/badusers.php3
+++ b/htdocs/badusers.php3
@@ -24,7 +24,7 @@ EOM;
 
 $now = time();
 $now_str = ($now_str != '') ? "$now_str" : date($config[sql_date_format],$now + 86400);
-$prev_str = ($prev_str != '') ? "$prev_str" : "0000-00-00 00:00:00";
+$prev_str = ($prev_str != '') ? "$prev_str" : "0001-01-01 00:00:00";
 $num = 0;
 $pagesize = ($pagesize) ? $pagesize : 10;
 $limit = ($pagesize == 'all') ? '' : "LIMIT $pagesize";
@@ -93,15 +93,15 @@ $link = @da_sql_pconnect($config);
 if ($link){
 	$search = @da_sql_query($link,$config,
 	"SELECT * FROM $config[sql_badusers_table]
-	WHERE UserName $usercheck AND Date <= '$now_str'
-	AND Date >= '$prev_str' ORDER BY Date $order $limit;");
+	WHERE username $usercheck AND date <= '$now_str'
+	AND date >= '$prev_str' ORDER BY date $order $limit;");
 	if ($search){
 		while( $row = @da_sql_fetch_array($search,$config) ){
 			$num++;
-			$user = "$row[UserName]";
-			$date = "$row[Date]";
-			$reason = "$row[Reason]";
-			$admin = "$row[Admin]";
+			$user = "$row[username]";
+			$date = "$row[date]";
+			$reason = "$row[reason]";
+			$admin = "$row[admin]";
 			if ($admin == '')
 				$admin = '-';
 			if ($reason == '')
diff --git a/htdocs/clear_opensessions.php3 b/htdocs/clear_opensessions.php3
index 79d3958..b450418 100644
--- a/htdocs/clear_opensessions.php3
+++ b/htdocs/clear_opensessions.php3
@@ -63,7 +63,7 @@ if ($clear_sessions == 1){
 	if ($link){
 		$res = @da_sql_query($link,$config,
 		"DELETE FROM $config[sql_accounting_table]
-		WHERE UserName='$login' AND AcctStopTime = 0;");
+		WHERE username='$login' AND acctstoptime = 0;");
 		if ($res)
 			echo "<b>Deleted open sessions from accounting table</b><br>\n";
 		else
@@ -85,11 +85,11 @@ else{
 	$link = @da_sql_pconnect($config);
 	if ($link){
 		$search = @da_sql_query($link,$config,
-		"SELECT COUNT(*) FROM $config[sql_accounting_table]
-		WHERE UserName = '$login' AND AcctStopTime IS NULL;");
+		"SELECT COUNT(*) AS counter FROM $config[sql_accounting_table]
+		WHERE username = '$login' AND acctstoptime IS NULL;");
 		if ($search){
 			if ($row = @da_sql_fetch_array($search,$config))
-				$open_sessions = $row['COUNT(*)'];
+				$open_sessions = $row[counter];
 		}
 		else
 			echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/htdocs/failed_logins.php3 b/htdocs/failed_logins.php3
index b3cfc1e..a4436c0 100644
--- a/htdocs/failed_logins.php3
+++ b/htdocs/failed_logins.php3
@@ -36,9 +36,9 @@ if ($order != 'desc' && $order != 'asc')
 	$order = 'desc';
 $selected[$order] = 'selected';
 if ($callerid != '')
-	$callerid_str = "AND CallingStationId = '$callerid'";
+	$callerid_str = "AND callingstationid = '$callerid'";
 if ($server != '' && $server != 'all')
-	$server_str = "AND NASIPAddress = '$server'";
+	$server_str = "AND nasipaddress = '$server'";
 
 ?>
 
@@ -92,43 +92,43 @@ if ($acct_attrs['fl'][9] != '') echo "<th>" . $acct_attrs['fl'][9] . "</th>\n";
 $link = @da_sql_pconnect($config);
 if ($link){
 	$search = @da_sql_query($link,$config,
-	"SELECT AcctStopTime,UserName,NASIPAddress,NASPortId,AcctTerminateCause,CallingStationId
+	"SELECT 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
-	ORDER BY AcctStopTime $order $limit;");
+	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
+	ORDER BY acctstoptime $order $limit;");
 	if ($search){
 		while( $row = @da_sql_fetch_array($search,$config) ){
 			$num++;
-			$acct_login = $row[UserName];
+			$acct_login = $row[username];
 			if ($acct_login == '')
 				$acct_login = '-';
 			else
 				$acct_login = "<a href=\"user_admin.php3?login=$acct_login\" title=\"Edit user $acct_login\">$acct_login</a>";
-			$acct_time = $row[AcctStopTime];
-			$acct_server = $row[NASIPAddress];
+			$acct_time = $row[acctstoptime];
+			$acct_server = $row[nasipaddress];
 			if ($acct_server != ''){
 				$acct_server = $da_name_cache[$acct_server];
 				if (!isset($acct_server)){
-					$acct_server = $row[NASIPAddress];
+					$acct_server = $row[nasipaddress];
 					$acct_server = @gethostbyaddr($acct_server);
 					if (!isset($da_name_cache) && $config[general_use_session] == 'yes'){
-						$da_name_cache[$row[NASIPAddress]] = $acct_server;
+						$da_name_cache[$row[nasipaddress]] = $acct_server;
 						session_register('da_name_cache');
 					}
 					else
-						$da_name_cache[$row[NASIPAddress]] = $acct_server;
+						$da_name_cache[$row[nasipaddress]] = $acct_server;
 				}
 			}
 			else
 				$acct_server = '-';
-			$acct_server = "$acct_server:$row[NASPortId]";
-			$acct_terminate_cause = "$row[AcctTerminateCause]";
+			$acct_server = "$acct_server:$row[nasportid]";
+			$acct_terminate_cause = "$row[acctterminatecause]";
 			if ($acct_terminate_cause == '')
 				$acct_terminate_cause = '-';
-			$acct_callerid = "$row[CallingStationId]";
+			$acct_callerid = "$row[callingstationid]";
 			if ($acct_callerid == '')
 				$acct_callerid = '-';
 			echo <<<EOM
diff --git a/htdocs/show_groups.php3 b/htdocs/show_groups.php3
index 101f052..eba5f5a 100644
--- a/htdocs/show_groups.php3
+++ b/htdocs/show_groups.php3
@@ -58,13 +58,13 @@ EOM;
 $link = @da_sql_pconnect($config);
 if ($link){
 	$search = @da_sql_query($link,$config,
-	"SELECT COUNT(*),GroupName FROM $config[sql_usergroup_table] GROUP BY GroupName;");
+	"SELECT COUNT(*) as counter,groupname FROM $config[sql_usergroup_table] GROUP BY groupname;");
 	if ($search){
 		if (@da_sql_num_rows($search,$config)){
 			while( $row = @da_sql_fetch_array($search,$config) ){
 				$num++;
-				$group = $row[GroupName];
-				$num_members = $row['COUNT(*)'];
+				$group = $row[groupname];
+				$num_members = $row[counter];
 				echo <<<EOM
 		<tr align=center>
 			<td>$num</td>
diff --git a/htdocs/stats.php3 b/htdocs/stats.php3
index 4925a54..806846e 100644
--- a/htdocs/stats.php3
+++ b/htdocs/stats.php3
@@ -58,24 +58,24 @@ $message['usage'] = 'total usage time';
 $message['upload'] = 'uploads';
 $message['download'] = 'downloads';
 if ($config[general_stats_use_totacct] == 'yes'){
-	$sql_val['sessions'] = 'ConnNum';
-	$sql_val['usage'] = 'ConnTotDuration';
-	$sql_val['upload'] = 'InputOctets';
-	$sql_val['download'] = 'OutputOctets';
+	$sql_val['sessions'] = 'connnum';
+	$sql_val['usage'] = 'conntotduration';
+	$sql_val['upload'] = 'inputoctets';
+	$sql_val['download'] = 'outputoctets';
 }
 else{
-	$sql_val['usage'] = 'AcctSessionTime';
-	$sql_val['upload'] = 'AcctInputOctets';
-	$sql_val['download'] = 'AcctOutputOctets';
+	$sql_val['usage'] = 'acctsessiontime';
+	$sql_val['upload'] = 'acctinputoctets';
+	$sql_val['download'] = 'acctoutputoctets';
 }
 $fun['sessions'] = nothing;
 $fun['usage'] = time2strclock;
 $fun['upload'] = bytes2str;
 $fun['download'] = bytes2str;
-$sql_val['user'] = ($login == '') ? "WHERE UserName LIKE '%'" : "WHERE UserName = '$login'";
+$sql_val['user'] = ($login == '') ? "WHERE username LIKE '%'" : "WHERE username = '$login'";
 for ($j = 1; $j <= 3; $j++){
 	$tmp = "{$sql_val[$column[$j]]}";
-	$res[$j] = ($tmp == "") ? 'COUNT(RadAcctId)' : "sum($tmp)";
+	$res[$j] = ($tmp == "") ? "COUNT(radacctid) AS res_$j" : "sum($tmp) AS res_$j";
 }
 $i = 1;
 $servers[all] = 'all';
@@ -90,7 +90,7 @@ while(1){
 	$i++;
 }
 if ($server != 'all' && $server != '')
-	$s = "AND NASIPAddress = '$server'";
+	$s = "AND nasipaddress = '$server'";
 
 $link = @da_sql_pconnect($config);
 if ($link){
@@ -99,22 +99,22 @@ if ($link){
 		if ($config[general_stats_use_totacct] == 'yes')
 			$search = @da_sql_query($link,$config,
 			"SELECT $res[1],$res[2],$res[3] FROM $config[sql_total_accounting_table]
-			$sql_val[user] AND AcctDate = '$day' $s;");
+			$sql_val[user] AND acctdate = '$day' $s;");
 		else
 			$search = @da_sql_query($link,$config,
 			"SELECT $res[1],$res[2],$res[3] FROM $config[sql_accounting_table]
-			$sql_val[user] AND AcctStopTime >= '$day 00:00:00' 
-			AND AcctStopTime <= '$day 23:59:59' $s;");
+			$sql_val[user] AND acctstoptime >= '$day 00:00:00' 
+			AND acctstoptime <= '$day 23:59:59' $s;");
 		if ($search){
 			$row = @da_sql_fetch_array($search,$config);
-			$data[$day][1] = $row["$res[1]"];
-			$data[sum][1] += $row["$res[1]"];
+			$data[$day][1] = $row[res_1];
+			$data[sum][1] += $row[res_1];
 			$num[1] = ($data[$day][1]) ? $num[1] + 1 : $num[1];
-			$data[$day][2] = $row["$res[2]"];
-			$data[sum][2] += $row["$res[2]"];
+			$data[$day][2] = $row[res_2];
+			$data[sum][2] += $row[res_2];
 			$num[2] = ($data[$day][2]) ? $num[2] + 1 : $num[2];
-			$data[$day][3] = $row["$res[3]"];
-			$data[sum][3] += $row["$res[3]"];
+			$data[$day][3] = $row[res_3];
+			$data[sum][3] += $row[res_3];
 			$num[3] = ($data[$day][3]) ? $num[3] + 1 : $num[3];
 		}
 		else
diff --git a/htdocs/user_accounting.php3 b/htdocs/user_accounting.php3
index 43ff092..5188565 100644
--- a/htdocs/user_accounting.php3
+++ b/htdocs/user_accounting.php3
@@ -91,51 +91,51 @@ $link = @da_sql_pconnect($config);
 if ($link){
 	$search = @da_sql_query($link,$config,
 	"SELECT * FROM $config[sql_accounting_table]
-	WHERE UserName = '$login' AND AcctStartTime <= '$now_str'
-	AND AcctStartTime >= '$prev_str' ORDER BY AcctStartTime $order $limit;");
+	WHERE username = '$login' AND acctstarttime <= '$now_str'
+	AND acctstarttime >= '$prev_str' ORDER BY acctstarttime $order $limit;");
 	if ($search){
 		while( $row = @da_sql_fetch_array($search,$config) ){
 			$tr_color='white';
 			$num++;
-			$acct_type = "$row[FramedProtocol]/$row[NASPortType]";
+			$acct_type = "$row[framedprotocol]/$row[nasporttype]";
 			if ($acct_type == '')
 				$acct_type = '-';
-			$acct_logedin = $row[AcctStartTime];
-			$acct_sessiontime = $row[AcctSessionTime];
+			$acct_logedin = $row[acctstarttime];
+			$acct_sessiontime = $row[acctsessiontime];
 			$acct_sessiontime_sum += $acct_sessiontime;
 			$acct_sessiontime = time2str($acct_sessiontime);
-			$acct_ip = $row[FramedIPAddress];
+			$acct_ip = $row[framedipaddress];
 			if ($acct_ip == '')
 				$acct_ip = '-';
-			$acct_upload = $row[AcctInputOctets];
+			$acct_upload = $row[acctinputoctets];
 			$acct_upload_sum += $acct_upload;
 			$acct_upload = bytes2str($acct_upload);
-			$acct_download = $row[AcctOutputOctets];
+			$acct_download = $row[acctoutputoctets];
 			$acct_download_sum += $acct_download;
 			$acct_download = bytes2str($acct_download);
-			$acct_server = $row[NASIPAddress];
+			$acct_server = $row[nasipaddress];
 			if ($acct_server != ''){
-				$acct_server = $da_name_cache[$row[NASIPAddress]];
+				$acct_server = $da_name_cache[$row[nasipaddress]];
 				if (!isset($acct_server)){
-					$acct_server = @gethostbyaddr($row[NASIPAddress]);
+					$acct_server = @gethostbyaddr($row[nasipaddress]);
 					if (!isset($da_name_cache) && $config[general_use_session] == 'yes'){
-						$da_name_cache[$row[NASIPAddress]] = $acct_server;
+						$da_name_cache[$row[nasipaddress]] = $acct_server;
 						session_register('da_name_cache');
 					}
 					else
-						$da_name_cache[$row[NASIPAddress]] = $acct_server;
+						$da_name_cache[$row[nasipaddress]] = $acct_server;
 				}
 			}
 			else
 				$acct_server = '-';
-			$acct_server = "$acct_server:$row[NASPortId]";
-			$acct_terminate_cause = "$row[AcctTerminateCause]";
+			$acct_server = "$acct_server:$row[nasportid]";
+			$acct_terminate_cause = "$row[acctterminatecause]";
 			if ($acct_terminate_cause == '')
 				$acct_terminate_cause = '-';
 			if (ereg('Login-Incorrect',$acct_terminate_cause) ||
 				ereg('Multiple-Logins', $acct_terminate_cause) || ereg('Invalid-User',$acct_terminate_cause))
 				$tr_color='#ffe8e0';
-			$acct_callerid = "$row[CallingStationId]";
+			$acct_callerid = "$row[callingstationid]";
 			if ($acct_callerid == '')
 				$acct_callerid = '-';
 			echo <<<EOM
diff --git a/htdocs/user_admin.php3 b/htdocs/user_admin.php3
index 9fb972d..8c21348 100644
--- a/htdocs/user_admin.php3
+++ b/htdocs/user_admin.php3
@@ -88,51 +88,56 @@ $used = array('-','-','-','-','-','-','-');
 $link = @da_sql_pconnect($config);
 if ($link){
 	$search = @da_sql_query($link,$config,
-	"SELECT sum(AcctSessionTime),sum(AcctInputOctets),sum(AcctOutputOctets),
-	avg(AcctSessionTime),avg(AcctInputOctets),avg(AcctOutputOctets),COUNT(*) FROM
-	$config[sql_accounting_table] WHERE UserName = '$login'
-	AND AcctStartTime >= '$week_str' AND AcctStartTime <= '$now_str';");
+	"SELECT sum(acctsessiontime) AS sum_sess_time,
+	sum(acctinputoctets) AS sum_in_octets,
+	sum(acctoutputoctets) AS sum_out_octets,
+	avg(acctsessiontime) AS avg_sess_time,
+	avg(acctinputoctets) AS avg_in_octets,
+	avg(acctoutputoctets) AS avg_out_octets,
+	COUNT(*) as counter FROM
+	$config[sql_accounting_table] WHERE username = '$login'
+	AND acctstarttime >= '$week_str' AND acctstarttime <= '$now_str';");
 	if ($search){
 		$row = @da_sql_fetch_array($search,$config);
-		$tot_time = time2str($row['sum(AcctSessionTime)']);
-		$tot_input = bytes2str($row['sum(AcctInputOctets)']);
-		$tot_output = bytes2str($row['sum(AcctOutputOctets)']);
-		$avg_time = time2str($row['avg(AcctSessionTime)']);
-		$avg_input = bytes2str($row['avg(AcctInputOctets)']);
-		$avg_output = bytes2str($row['avg(AcctOutputOctets)']);
-		$tot_conns = $row['COUNT(*)'];
+		$tot_time = time2str($row[sum_sess_time]);
+		$tot_input = bytes2str($row[sum_in_octets]);
+		$tot_output = bytes2str($row[sum_out_octets]);
+		$avg_time = time2str($row[avg_sess_time]);
+		$avg_input = bytes2str($row[avg_in_octets]);
+		$avg_output = bytes2str($row[avg_out_octets]);
+		$tot_conns = $row[counter];
 	}
 	else
 		echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 	$search = @da_sql_query($link,$config,
-	"SELECT sum(AcctSessionTime) FROM $config[sql_accounting_table] WHERE UserName = '$login'
-	AND AcctStartTime >= '$week_start' AND AcctStartTime <= '$now_str';");
+	"SELECT sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE username = '$login'
+	AND acctstarttime >= '$week_start' AND acctstarttime <= '$now_str';");
 	if ($search){
 		$row = @da_sql_fetch_array($search,$config);
-		$weekly_used = $row['sum(AcctSessionTime)'];
+		$weekly_used = $row[sum_sess_time];
 	}
 	else
 		echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 	if ($monthly_limit != 'none' || $config[counter_monthly_calculate_usage] == 'true'){
 		$search = @da_sql_query($link,$config,
-		"SELECT sum(AcctSessionTime) FROM $config[sql_accounting_table] WHERE UserName = '$login'
-		AND AcctStartTime >= '$month_start' AND AcctStartTime <= '$now_str';");
+		"SELECT sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE username = '$login'
+		AND acctstarttime >= '$month_start' AND acctstarttime <= '$now_str';");
 		if ($search){
 			$row = @da_sql_fetch_array($search,$config);
-			$monthly_used = $row['sum(AcctSessionTime)'];
+			$monthly_used = $row[sum_sess_time];
 		}
 		else
 			echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 	}
 	$search = @da_sql_query($link,$config,
-	"SELECT COUNT(*) FROM $config[sql_accounting_table] WHERE UserName = '$login'
-	AND AcctStopTime >= '$week_str' AND AcctStopTime <= '$now_str'
-	AND (AcctTerminateCause LIKE 'Login-Incorrect%' OR
-	AcctTerminateCause LIKE 'Invalid-User%' OR
-	AcctTerminateCause LIKE 'Multiple-Logins%');");
+	"SELECT COUNT(*) AS counter FROM $config[sql_accounting_table] WHERE username = '$login'
+	AND acctstoptime >= '$week_str' AND acctstoptime <= '$now_str'
+	AND (acctterminatecause LIKE 'Login-Incorrect%' OR
+	acctterminatecause LIKE 'Invalid-User%' OR
+	acctterminatecause LIKE 'Multiple-Logins%');");
 	if ($search){
 		$row = @da_sql_fetch_array($search,$config);
-		$tot_badlogins = $row['COUNT(*)'];
+		$tot_badlogins = $row[counter];
 	}
 	else
 		echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
@@ -140,18 +145,18 @@ if ($link){
 		if ($days[$i] == '')
 			continue;
 		$search = @da_sql_query($link,$config,
-		"SELECT sum(AcctSessionTime) FROM $config[sql_accounting_table] WHERE
-		UserName = '$login' AND AcctStopTime >= '$days[$i] 00:00:00'
-		AND AcctStopTime <= '$days[$i] 23:59:59';");
+		"SELECT sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE
+		username = '$login' AND acctstoptime >= '$days[$i] 00:00:00'
+		AND acctstoptime <= '$days[$i] 23:59:59';");
 		if ($search){
 			$row = @da_sql_fetch_array($search,$config);
-			$used[$i] = $row['sum(AcctSessionTime)'];
+			$used[$i] = $row[sum_sess_time];
 			if ($daily_limit != 'none' && $used[$i] > $daily_limit)
 				$used[$i] = "<font color=red>" . time2str($used[$i]) . "</font>";
 			else
 				$used[$i] = time2str($used[$i]);
 			if ($today == $i){
-				$daily_used = $row['sum(AcctSessionTime)'];
+				$daily_used = $row[sum_sess_time];
 				if ($daily_limit != 'none'){
 					$remaining = $daily_limit - $daily_used;
 					if ($remaining <=0)
@@ -210,15 +215,15 @@ 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;");
+	WHERE username = '$login' AND acctstoptime IS NULL
+	ORDER BY acctstarttime DESC LIMIT 1;");
 	if ($search){
 		if (@da_sql_num_rows($search,$config)){
 			$logged_now = 1;
 			$row = @da_sql_fetch_array($search,$config);
-			$lastlog_time = $row['AcctStartTime'];
-			$lastlog_server_ip = $row['NASIPAddress'];
-			$lastlog_server_port = $row['NASPortId'];
+			$lastlog_time = $row['acctstarttime'];
+			$lastlog_server_ip = $row['nasipaddress'];
+			$lastlog_server_port = $row['nasportid'];
 			$lastlog_session_time = date2timediv($lastlog_time,0);
 			if ($daily_limit != 'none'){
 				$remaining = $remaining - $lastlog_session_time;
@@ -228,18 +233,18 @@ if ($link){
 			}
 			$lastlog_session_time_jvs = 1000 * $lastlog_session_time;
 			$lastlog_session_time = time2strclock($lastlog_session_time);
-			$lastlog_client_ip = $row['FramedIPAddress'];	
+			$lastlog_client_ip = $row['framedipaddress'];	
 			$lastlog_server_name = @gethostbyaddr($lastlog_server_ip);
 			$lastlog_client_name = @gethostbyaddr($lastlog_client_ip);
-			$lastlog_callerid = $row['CallingStationId'];
+			$lastlog_callerid = $row['callingstationid'];
 			if ($lastlog_callerid == '')
 				$lastlog_callerid = 'not available';
-			$lastlog_input = $row['AcctInputOctets'];
+			$lastlog_input = $row['acctinputoctets'];
 			if ($lastlog_input)
 				$lastlog_input = bytes2str($lastlog_input);
 			else
 				$lastlog_input = 'not available';
-			$lastlog_output = $row['AcctOutputOctets'];
+			$lastlog_output = $row['acctoutputoctets'];
 			if ($lastlog_output)
 				$lastlog_input = bytes2str($lastlog_output);
 			else
@@ -251,24 +256,24 @@ if ($link){
 	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;");
+		WHERE username = '$login' AND acctsessiontime != '0'
+		ORDER BY acctstoptime DESC LIMIT 1;");
 		if ($search){
 			if (@da_sql_num_rows($search,$config)){
 				$row = @da_sql_fetch_array($search,$config);
-				$lastlog_time = $row['AcctStartTime'];
-				$lastlog_server_ip = $row['NASIPAddress'];
-				$lastlog_server_port = $row['NASPortId'];
-				$lastlog_session_time = time2str($row['AcctSessionTime']);
-				$lastlog_client_ip = $row['FramedIPAddress'];	
+				$lastlog_time = $row['acctstarttime'];
+				$lastlog_server_ip = $row['nasipaddress'];
+				$lastlog_server_port = $row['nasportid'];
+				$lastlog_session_time = time2str($row['acctsessiontime']);
+				$lastlog_client_ip = $row['framedipaddress'];	
 		$lastlog_server_name = ($lastlog_server_ip != '') ? @gethostbyaddr($lastlog_server_ip) : '-';
 		$lastlog_client_name = ($lastlog_client_ip != '') ? @gethostbyaddr($lastlog_client_ip) : '-';
-				$lastlog_callerid = $row['CallingStationId'];
+				$lastlog_callerid = $row['callingstationid'];
 				if ($lastlog_callerid == '')
 					$lastlog_callerid = 'not available';
-				$lastlog_input = $row['AcctInputOctets'];
+				$lastlog_input = $row['acctinputoctets'];
 				$lastlog_input = bytes2str($lastlog_input);
-				$lastlog_output = $row['AcctOutputOctets'];
+				$lastlog_output = $row['acctoutputoctets'];
 				$lastlog_output = bytes2str($lastlog_output);
 			}
 			else
diff --git a/htdocs/user_finger.php3 b/htdocs/user_finger.php3
index 8da1c10..a899abb 100644
--- a/htdocs/user_finger.php3
+++ b/htdocs/user_finger.php3
@@ -87,27 +87,27 @@ if ($link){
 
 			$users=exec("$config[general_snmpfinger_bin] $name_data $community_data $nas_type");
 			if (strlen($users))
-				$extra = "AND UserName IN ($users)";
+				$extra = "AND username IN ($users)";
 		}
 		$search = @da_sql_query($link,$config,
-		"SELECT DISTINCT UserName,AcctStartTime,FramedIPAddress,CallingStationId
+		"SELECT DISTINCT username,acctstarttime,framedipaddress,callingstationid
 		FROM $config[sql_accounting_table] WHERE
-		AcctStopTime IS NULL AND NASIPAddress = '$name_data' $extra
-		GROUP BY UserName ORDER BY AcctStartTime;");
+		acctstoptime IS NULL AND nasipaddress = '$name_data' $extra
+		GROUP BY username ORDER BY acctstarttime;");
 		if ($search){
 			$now = time();
 			while($row = @da_sql_fetch_array($search,$config)){
 				$num++;
 				$h += 21;
-				$user = $row['UserName'];
-				$finger_info[$servers_num][$num]['ip'] = $row['FramedIPAddress'];
+				$user = $row['username'];
+				$finger_info[$servers_num][$num]['ip'] = $row['framedipaddress'];
 				if ($finger_info[$servers_num][$num]['ip'] == '')
 					$finger_info[$servers_num][$num]['ip'] = '-';
-				$session_time = $row['AcctStartTime'];
+				$session_time = $row['acctstarttime'];
 				$session_time = date2timediv($session_time,$now);
 				$finger_info[$servers_num][$num]['session_time'] = time2strclock($session_time);
 				$finger_info[$servers_num][$num]['user'] = $user;
-				$finger_info[$servers_num][$num]['callerid'] = $row['CallingStationId'];
+				$finger_info[$servers_num][$num]['callerid'] = $row['callingstationid'];
 				if ($finger_info[$servers_num][$num]['callerid'] == '')
 					$finger_info[$servers_num][$num]['callerid'] = '-';
 				if ($user_info["$user"] == ''){
diff --git a/htdocs/user_state.php3 b/htdocs/user_state.php3
index 7ea4f79..233c19d 100644
--- a/htdocs/user_state.php3
+++ b/htdocs/user_state.php3
@@ -29,22 +29,22 @@ $today = date("$config[sql_date_format]",$now);
 $link = @da_sql_pconnect($config);
 if ($link){
 	$search = @da_sql_query($link,$config,
-	"SELECT COUNT(*), sum(AcctSessionTime) FROM $config[sql_accounting_table] WHERE
-	UserName = '$login' AND AcctStopTime >= '$week_str' AND
-	AcctStopTime <= '$now_str';");
+	"SELECT COUNT(*) AS counter, sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE
+	username = '$login' AND acctstoptime >= '$week_str' AND
+	acctstoptime <= '$now_str';");
 	if ($search){
 		$row = @da_sql_fetch_array($search,$config);
-		$weekly_used = time2strclock($row['sum(AcctSessionTime)']);
-		$weekly_conns = $row['COUNT(*)'];
+		$weekly_used = time2strclock($row[sum_sess_time]);
+		$weekly_conns = $row[counter];
 	}
 	$search = @da_sql_query($link,$config,
-	"SELECT COUNT(*),sum(AcctSessionTime) FROM $config[sql_accounting_table] WHERE
-	UserName = '$login' AND AcctStopTime >= '$today 00:00:00'
-	AND AcctStopTime <= '$today 23:59:59';");
+	"SELECT COUNT(*) AS counter,sum(acctsessiontime) AS sum_sess_time FROM $config[sql_accounting_table] WHERE
+	username = '$login' AND acctstoptime >= '$today 00:00:00'
+	AND acctstoptime <= '$today 23:59:59';");
 	if ($search){
 		$row = @da_sql_fetch_array($search,$config);
-		$daily_used = time2strclock($row['sum(AcctSessionTime)']);
-		$daily_conns = $row['COUNT(*)'];
+		$daily_used = time2strclock($row[sum_sess_time]);
+		$daily_conns = $row[counter];
 	}
 }
 
diff --git a/htdocs/user_stats.php3 b/htdocs/user_stats.php3
index 2182cba..786ddb2 100644
--- a/htdocs/user_stats.php3
+++ b/htdocs/user_stats.php3
@@ -35,12 +35,12 @@ $order = ($order) ? $order : $config[general_accounting_info_order];
 if ($order != 'desc' && $order != 'asc')
 	$order = 'desc';
 if ($sortby != '')
-	$order_attr = ($sortby == 'num') ? 'ConnNum' : 'ConnTotDuration';
+	$order_attr = ($sortby == 'num') ? 'connnum' : 'conntotduration';
 else
-	$order_attr = 'ConnNum';
+	$order_attr = 'connnum';
 if ($server != '' && $server != 'all')
-	$server_str = "AND NASIPAddress = '$server'";
-$login_str = ($login) ? "AND UserName = '$login' " : '';
+	$server_str = "AND nasipaddress = '$server'";
+$login_str = ($login) ? "AND username = '$login' " : '';
 
 $selected[$order] = 'selected';
 $selected[$sortby] = 'selected';
@@ -91,34 +91,34 @@ $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
+	WHERE acctdate >= '$start' AND acctdate <= '$stop' $server_str $login_str
 	ORDER BY $order_attr $order $limit;");
 
 	if ($search){
 		while( $row = @da_sql_fetch_array($search,$config) ){
 			$num++;
-			$acct_login = $row[UserName];
+			$acct_login = $row[username];
 			if ($acct_login == '')
 				$acct_login = '-';
 			else
 				$acct_login = "<a href=\"user_admin.php3?login=$acct_login\" title=\"Edit user $acct_login\">$acct_login</a>";
-			$acct_time = $row[ConnTotDuration];
+			$acct_time = $row[conntotduration];
 			$acct_time = time2str($acct_time);
-			$acct_conn_num = $row[ConnNum];
-			$acct_date = $row[AcctDate];
-			$acct_upload = $row[InputOctets];
-			$acct_download = $row[OutputOctets];
+			$acct_conn_num = $row[connnum];
+			$acct_date = $row[acctdate];
+			$acct_upload = $row[inputoctets];
+			$acct_download = $row[outputoctets];
 			$acct_upload = bytes2str($acct_upload);
 			$acct_download = bytes2str($acct_download);
-			$acct_server = $da_name_cache[$row[NASIPAddress]];
+			$acct_server = $da_name_cache[$row[nasipaddress]];
 			if (!isset($acct_server)){
-				$acct_server = @gethostbyaddr($row[NASIPAddress]);
+				$acct_server = @gethostbyaddr($row[nasipaddress]);
 				if (!isset($da_name_cache) && $config[general_use_session] == 'yes'){
-					$da_name_cache[$row[NASIPAddress]] = $acct_server;
+					$da_name_cache[$row[nasipaddress]] = $acct_server;
 					session_register('da_name_cache');
 				}
 				else
-					$da_name_cache[$row[NASIPAddress]] = $acct_server;
+					$da_name_cache[$row[nasipaddress]] = $acct_server;
 			}
 			if ($acct_server == '')
 				$acct_server = '-';
diff --git a/lib/acctshow.php3 b/lib/acctshow.php3
index a5d5c64..bb2b0e3 100644
--- a/lib/acctshow.php3
+++ b/lib/acctshow.php3
@@ -7,9 +7,9 @@ if (!isset($sql_attrs)){
 		if (ereg('^[[:space:]]*#',$val) || ereg('^[[:space:]]*$',$val))
 			continue;
 		list($key,$desc,$show,$func)=split("\t+",$val);
-		$sql_attrs["$key"][desc] = "$desc";
-		$sql_attrs["$key"][show] = "$show";
-		$sql_attrs["$key"][func] = ($func == "") ? "nothing" : "$func";
+		$sql_attrs[strtolower($key)][desc] = "$desc";
+		$sql_attrs[strtolower($key)][show] = "$show";
+		$sql_attrs[strtolower($key)][func] = ($func == "") ? "nothing" : "$func";
 	}
 	if ($config[general_use_session] == 'yes')
 		session_register('sql_attrs');
diff --git a/lib/add_badusers.php3 b/lib/add_badusers.php3
index 517d866..e458fed 100644
--- a/lib/add_badusers.php3
+++ b/lib/add_badusers.php3
@@ -23,7 +23,7 @@ else{
 		$link = @da_sql_host_connect($server,$config);
 		if ($link){
 			$r = da_sql_query($link,$config,
-			"INSERT INTO $config[sql_badusers_table] (UserName,Date,Admin,Reason)
+			"INSERT INTO $config[sql_badusers_table] (username,date,admin,reason)
 			VALUES ('$login','$date','$admin','$msg');");
 			if (!$r)
 				echo "<b>SQL Error:" . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/change_attrs.php3 b/lib/sql/change_attrs.php3
index 3f9ea6f..829707e 100644
--- a/lib/sql/change_attrs.php3
+++ b/lib/sql/change_attrs.php3
@@ -33,7 +33,7 @@ if ($link){
 			$name = $attrmap["$key"] . $i;
 
 			$sql_attr=$attrmap["$key"];
-			$query_key = ($user_type == 'group') ? 'GroupName' : 'UserName';
+			$query_key = ($user_type == 'group') ? 'groupname' : 'username';
 			if ($attr_type["$key"] == 'checkItem'){
 				$table = ($user_type == 'group') ? $config[sql_groupcheck_table] : $config[sql_check_table];
 				$type = 1;
@@ -58,7 +58,7 @@ if ($link){
 				$op_val != $item_vals["$key"][operator][$j] ){
 				$res = @da_sql_query($link,$config,
 				"UPDATE $table SET op = '$op_val' WHERE $query_key = '$login'
-				AND Attribute = '$sql_attr' AND Value = '$val';");
+				AND attribute = '$sql_attr' AND value = '$val';");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config))
 					echo "<b>Operator change failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
 			}
@@ -69,7 +69,7 @@ if ($link){
 	//	if value is null or equals the default value and corresponding value exists then delete
 			else if ((check_defaults($val,$op_val,$default_vals["$key"]) || $val == '') && isset($item_vals["$key"][$j])){
 				$res = @da_sql_query($link,$config,
-				"DELETE FROM $table WHERE $query_key = '$login' AND Attribute = '$sql_attr';");
+				"DELETE FROM $table WHERE $query_key = '$login' AND attribute = '$sql_attr';");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config))
 					echo "<b>Delete failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
 			}
@@ -81,12 +81,12 @@ if ($link){
 				if (isset($item_vals["$key"][$j])){
 					$old_val = $item_vals["$key"][$j];
 					$res = @da_sql_query($link,$config,
-					"UPDATE $table SET Value = '$val' WHERE $query_key = '$login' AND
-					Attribute = '$sql_attr' AND Value = '$old_val';");
+					"UPDATE $table SET value = '$val' WHERE $query_key = '$login' AND
+					attribute = '$sql_attr' AND value = '$old_val';");
 				}
 				else
 					$res = @da_sql_query($link,$config,
-					"INSERT INTO $table ($query_key,Attribute,Value $text2)
+					"INSERT INTO $table ($query_key,attribute,value $text2)
 					VALUES ('$login','$sql_attr','$val' $op_val2);");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config))
 					echo "<b>Change failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/change_info.php3 b/lib/sql/change_info.php3
index b50c0a6..8fc63dc 100644
--- a/lib/sql/change_info.php3
+++ b/lib/sql/change_info.php3
@@ -10,13 +10,13 @@ $fail = 0;
 if ($link){
 	if ($config[sql_use_user_info_table] == 'true'){
 		$res = @da_sql_query($link,$config,
-		"SELECT UserName FROM $config[sql_user_info_table] WHERE
-		UserName = '$login';");
+		"SELECT username FROM $config[sql_user_info_table] WHERE
+		username = '$login';");
 		if ($res){
 			if (!@da_sql_num_rows($res,$config)){
 				$res = @da_sql_query($link,$config,
 				"INSERT INTO $config[sql_user_info_table]
-				(UserName,Name,Mail,Department,HomePhone,WorkPhone,Mobile) VALUES
+				(username,name,mail,department,homephone,workphone,mobile) VALUES
 				('$login','$Fcn','$Fmail','$Fou','$Ftelephonenumber','$Fhomephone','$Fmobile');");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config)){
 					echo "<b>Could not add user information in user info table: " . da_sql_error($link,$config) . "</b><br>\n";
@@ -25,9 +25,9 @@ if ($link){
 			}
 			else{
 				$res = @da_sql_query($link,$config,
-				"UPDATE $config[sql_user_info_table] SET Name = '$Fcn',Mail = '$Fmail',
-				Department = '$Fou', HomePhone = '$Fhomephone', WorkPhone = '$Ftelephonenumber',
-				Mobile = '$Fmobile' WHERE UserName = '$login';");
+				"UPDATE $config[sql_user_info_table] SET name = '$Fcn',Mail = '$Fmail',
+				department = '$Fou', homephone = '$Fhomephone', workphone = '$Ftelephonenumber',
+				mobile = '$Fmobile' WHERE username = '$login';");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config)){
 					echo "<b>Could not update user information in user info table: " . da_sql_error($link,$config) . "</b><br>\n";
 					$fail = 1;
diff --git a/lib/sql/change_passwd.php3 b/lib/sql/change_passwd.php3
index 26dae6d..856b17b 100644
--- a/lib/sql/change_passwd.php3
+++ b/lib/sql/change_passwd.php3
@@ -21,20 +21,20 @@ if ($link){
 		include("../lib/crypt/$config[general_encryption_method].php3");
 		$passwd = da_encrypt($passwd);
 		$res = @da_sql_query($link,$config,
-			"SELECT Value FROM $config[sql_check_table] WHERE UserName = '$login'
-			AND Attribute = '$config[sql_password_attribute]';");
+			"SELECT value FROM $config[sql_check_table] WHERE username = '$login'
+			AND attribute = '$config[sql_password_attribute]';");
 		if ($res){
 			$row = @da_sql_fetch_array($res,$config);
 			if ($row){
 				$res = @da_sql_query($link,$config,
-				"UPDATE $config[sql_check_table] SET Value = '$passwd' $text3 WHERE
-				Attribute = '$config[sql_password_attribute]' AND UserName = '$login';");
+				"UPDATE $config[sql_check_table] SET value = '$passwd' $text3 WHERE
+				attribute = '$config[sql_password_attribute]' AND username = '$login';");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config))
 					echo "<b>Error while changing password: " . da_sql_error($link,$config) . "</b><br>\n";	
 			}
 			else{
 				$res = @da_sql_query($link,$config,
-					"INSERT INTO $config[sql_check_table] (Attribute,Value,UserName $text1)
+					"INSERT INTO $config[sql_check_table] (attribute,value,username $text1)
 					VALUES ('$config[sql_password_attribute]','$passwd','$login' $text2);");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config))
 					echo "<b>Error while changing password: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/create_group.php3 b/lib/sql/create_group.php3
index 335d8ef..0f434c9 100644
--- a/lib/sql/create_group.php3
+++ b/lib/sql/create_group.php3
@@ -18,7 +18,7 @@ if ($link){
 	if (!empty($Members)){
 		foreach ($Members as $member){
 			$res = @da_sql_query($link,$config,
-			"INSERT INTO $config[sql_usergroup_table] (UserName,GroupName)
+			"INSERT INTO $config[sql_usergroup_table] (username,groupname)
 			VALUES ('$member','$login');");
 			if (!$res || !@da_sql_affected_rows($link,$res,$config)){
 				echo "<b>Unable to add user $member in group $login: " . da_sql_error($link,$config) . "</b><br>\n";
@@ -56,7 +56,7 @@ if ($link){
 			if ($val == '' || check_defaults($val,$op_val,$default_vals["$key"]))
 				continue;
 			$res = @da_sql_query($link,$config,
-			"INSERT INTO $table (Attribute,Value,GroupName $text)
+			"INSERT INTO $table (attribute,value,groupname $text)
 			VALUES ('$attrmap[$key]','$val','$login' $op_val2);");
 			if (!$res || !@da_sql_affected_rows($link,$res,$config))
 				echo "<b>Query failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/create_user.php3 b/lib/sql/create_user.php3
index 1ec8ca9..e271012 100644
--- a/lib/sql/create_user.php3
+++ b/lib/sql/create_user.php3
@@ -18,7 +18,7 @@ if ($link){
 		include("../lib/crypt/$config[general_encryption_method].php3");
 		$passwd = da_encrypt($passwd);
 		$res = @da_sql_query($link,$config,
-		"INSERT INTO $config[sql_check_table] (Attribute,Value,UserName $text)
+		"INSERT INTO $config[sql_check_table] (attribute,value,username $text)
 		VALUES ('$config[sql_password_attribute]','$passwd','$login' $passwd_op);");
 		if (!$res || !@da_sql_affected_rows($link,$res,$config)){
 			echo "<b>Unable to add user $login: " . da_sql_error($link,$config) . "</b><br>\n";
@@ -26,13 +26,13 @@ if ($link){
 		}
 		if ($config[sql_use_user_info_table] == 'true' && !$da_abort){
 			$res = @da_sql_query($link,$config,
-			"SELECT UserName FROM $config[sql_user_info_table] WHERE
-			UserName = '$login';");
+			"SELECT username FROM $config[sql_user_info_table] WHERE
+			username = '$login';");
 			if ($res){
 				if (!@da_sql_num_rows($res,$config)){
 					$res = @da_sql_query($link,$config,
 					"INSERT INTO $config[sql_user_info_table]
-					(UserName,Name,Mail,Department,HomePhone,WorkPhone,Mobile) VALUES
+					(username,name,mail,department,homephone,workphone,mobile) VALUES
 					('$login','$Fcn','$Fmail','$Fou','$Fhomephone','$Ftelephonenumber','$Fmobile');");
 					if (!$res || !@da_sql_affected_rows($link,$res,$config))
 						echo "<b>Could not add user information in user info table: " . da_sql_error($link,$config) . "</b><br>\n";
@@ -45,13 +45,13 @@ if ($link){
 		}
 		if ($Fgroup != ''){
 			$res = @da_sql_query($link,$config,
-			"SELECT UserName FROM $config[sql_usergroup_table]
-			WHERE UserName = '$login' AND GroupName = '$Fgroup';");
+			"SELECT username FROM $config[sql_usergroup_table]
+			WHERE username = '$login' AND groupname = '$Fgroup';");
 			if ($res){
 				if (!@da_sql_num_rows($res,$config)){
 					$res = @da_sql_query($link,$config,
 					"INSERT INTO $config[sql_usergroup_table]
-					(UserName,GroupName) VALUES ('$login','$Fgroup');");
+					(username,groupname) VALUES ('$login','$Fgroup');");
 					if (!$res || !@da_sql_affected_rows($link,$res,$config))
 						echo "<b>Could not add user to group $Fgroup. SQL Error</b><br>\n";
 				}
@@ -93,7 +93,7 @@ if ($link){
 				if ($val == '' || check_defaults($val,$op_val,$default_vals["$key"]))
 					continue;
 				$res = @da_sql_query($link,$config,
-				"INSERT INTO $table (Attribute,Value,UserName $text)
+				"INSERT INTO $table (attribute,value,username $text)
 				VALUES ('$attrmap[$key]','$val','$login' $op_val2);");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config))
 					echo "<b>Query failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/defaults.php3 b/lib/sql/defaults.php3
index d144bc3..f201ebe 100644
--- a/lib/sql/defaults.php3
+++ b/lib/sql/defaults.php3
@@ -25,10 +25,10 @@ if ($login != ''){
 		$link = @da_sql_pconnect($config);
 		if ($link){
 			$res = @da_sql_query($link,$config,
-			"SELECT GroupName FROM $config[sql_usergroup_table] WHERE UserName = '$login';");
+			"SELECT groupname FROM $config[sql_usergroup_table] WHERE username = '$login';");
 			if ($res){
 				while(($row = @da_sql_fetch_array($res,$config)))
-					$member_groups[] = $row[GroupName];
+					$member_groups[] = $row[groupname];
 			}
 			if (isset($member_groups)){
 				$in = '(';
@@ -37,12 +37,12 @@ if ($login != ''){
 				$in = substr($in,0,-1);
 				$in .= ')';	
 				$res = @da_sql_query($link,$config,
-				"SELECT Attribute,Value $op FROM $config[sql_groupcheck_table]
-				WHERE GroupName IN $in;");
+				"SELECT attribute,value $op FROM $config[sql_groupcheck_table]
+				WHERE groupname IN $in;");
 				if ($res){
 					while(($row = @da_sql_fetch_array($res,$config))){
-						$attr = $row[Attribute];
-						$val = $row[Value];
+						$attr = $row[attribute];
+						$val = $row[value];
 						if ($use_op){
 							$oper = $row[op];
 							$tmp["$attr"][operator][]="$oper";
@@ -51,12 +51,12 @@ if ($login != ''){
 						$tmp["$attr"][count]++;
 					}
 					$res = @da_sql_query($link,$config,
-					"SELECT Attribute,Value $op FROM $config[sql_groupreply_table]
-					WHERE GroupName IN $in;");
+					"SELECT attribute,value $op FROM $config[sql_groupreply_table]
+					WHERE groupname IN $in;");
 					if ($res){
 						while(($row = @da_sql_fetch_array($res,$config))){
-							$attr = $row[Attribute];
-							$val = $row[Value];
+							$attr = $row[attribute];
+							$val = $row[value];
 							if ($use_op){
 								$oper = $row[op];
 								$tmp["$attr"][operator][]="$oper";
@@ -121,10 +121,10 @@ else{
 	$link = @da_sql_pconnect($config);
 	if ($link){
 		$res = @da_sql_query($link,$config,
-		"SELECT DISTINCT GroupName FROM $config[sql_usergroup_table];");
+		"SELECT DISTINCT groupname FROM $config[sql_usergroup_table];");
 		if ($res){
 			while(($row = @da_sql_fetch_array($res,$config)))
-				$member_groups[] = $row[GroupName];
+				$member_groups[] = $row[groupname];
 		}
 		else
 			echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/delete_group.php3 b/lib/sql/delete_group.php3
index b400586..5ac66e0 100644
--- a/lib/sql/delete_group.php3
+++ b/lib/sql/delete_group.php3
@@ -8,13 +8,13 @@ else{
 $link = @da_sql_pconnect($config);
 if ($link){
 	$res = @da_sql_query($link,$config,
-		"DELETE FROM $config[sql_groupreply_table] WHERE GroupName = '$login';");
+		"DELETE FROM $config[sql_groupreply_table] WHERE groupname = '$login';");
 	if ($res){
 		$res = @da_sql_query($link,$config,
-			"DELETE FROM $config[sql_groupcheck_table] WHERE GroupName = '$login';");
+			"DELETE FROM $config[sql_groupcheck_table] WHERE groupname = '$login';");
 		if ($res){
 			$res = @da_sql_query($link,$config,
-				"DELETE FROM $config[sql_usergroup_table] WHERE GroupName = '$login';");
+				"DELETE FROM $config[sql_usergroup_table] WHERE groupname = '$login';");
 				if ($res)
 					echo "<b>Group $login deleted successfully</b><br>\n";
 				else
diff --git a/lib/sql/delete_user.php3 b/lib/sql/delete_user.php3
index 97109de..2eef660 100644
--- a/lib/sql/delete_user.php3
+++ b/lib/sql/delete_user.php3
@@ -8,18 +8,18 @@ else{
 $link = @da_sql_pconnect($config);
 if ($link){
 	$res = @da_sql_query($link,$config,
-		"DELETE FROM $config[sql_reply_table] WHERE UserName = '$login';");
+		"DELETE FROM $config[sql_reply_table] WHERE username = '$login';");
 	if ($res){
 		$res = @da_sql_query($link,$config,
-			"DELETE FROM $config[sql_check_table] WHERE UserName = '$login';");
+			"DELETE FROM $config[sql_check_table] WHERE username = '$login';");
 		if ($res){
 			$res = @da_sql_query($link,$config,
-				"DELETE FROM $config[sql_usergroup_table] WHERE UserName = '$login';");
+				"DELETE FROM $config[sql_usergroup_table] WHERE username = '$login';");
 			if (!$res)
 				echo "<b>Error deleting user $login from user group table: " . da_sql_error($link,$config) . "</b><br>\n";
 			if ($config[sql_use_user_info_table] == 'true'){
 				$res = @da_sql_query($link,$config,
-				"DELETE FROM $config[sql_user_info_table] WHERE UserName = '$login';");
+				"DELETE FROM $config[sql_user_info_table] WHERE username = '$login';");
 				if ($res)
 					echo "<b>User $login deleted successfully</b><br>\n";
 				else
diff --git a/lib/sql/drivers/mysql/functions.php3 b/lib/sql/drivers/mysql/functions.php3
index 1731f27..3c393f9 100644
--- a/lib/sql/drivers/mysql/functions.php3
+++ b/lib/sql/drivers/mysql/functions.php3
@@ -70,11 +70,12 @@ function da_sql_num_rows($result,$config)
 
 function da_sql_fetch_array($result,$config)
 {
-	$row = @mysql_fetch_array($result);
+	$row = array_change_key_case(@mysql_fetch_array($result,
+		MYSQL_ASSOC),CASE_LOWER);
 	if ($config[sql_debug] == 'true'){
-		print "<b>DEBUG(SQL,MYSQL DRIVER): Query Result: ";
+		print "<b>DEBUG(SQL,MYSQL DRIVER): Query Result: <pre>";
 		print_r($row);
-		print "</b><br>\n";
+		print "</b></pre>\n";
 	}
 	return $row;
 }
diff --git a/lib/sql/drivers/pg/functions.php3 b/lib/sql/drivers/pg/functions.php3
index 94fadd8..243eb32 100644
--- a/lib/sql/drivers/pg/functions.php3
+++ b/lib/sql/drivers/pg/functions.php3
@@ -70,9 +70,9 @@ function da_sql_fetch_array($result,$config)
 {
 	$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: ";
+		print "<b>DEBUG(SQL,PG DRIVER): Query Result: <pre>";
 		print_r($row);
-		print  "</b><br>\n";
+		print  "</b></pre>\n";
 	}
 	if (!$row)
 		$config[tmp_pg_array_num][$result] = 0;
diff --git a/lib/sql/find.php3 b/lib/sql/find.php3
index d4291f1..f3b0c94 100644
--- a/lib/sql/find.php3
+++ b/lib/sql/find.php3
@@ -9,13 +9,13 @@ else{
 $link = @da_sql_pconnect($config);
 if ($link){
 	if (($search_IN == 'name' || $search_IN == 'ou') && $config[sql_use_user_info_table] == 'true'){
-		$attr = ($search_IN == 'name') ? 'Name' : 'Department';
+		$attr = ($search_IN == 'name') ? 'name' : 'department';
 		$res = @da_sql_query($link,$config,
-		"SELECT UserName FROM $config[sql_user_info_table] WHERE
-		$attr LIKE '%$search%' LIMIT $max_results;");
+		"SELECT username FROM $config[sql_user_info_table] WHERE
+		lower($attr) LIKE '%$search%' LIMIT $max_results;");
 		if ($res){
 			while(($row = @da_sql_fetch_array($res,$config)))
-				$found_users[] = $row[UserName];
+				$found_users[] = $row[username];
 		}
 		else
 			"<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
@@ -29,10 +29,10 @@ if ($link){
 		$table = ($attr_type[$radius_attr] == 'checkItem') ? $config[sql_check_table] : $config[sql_reply_table];
 		$attr = $attrmap[$radius_attr];
 		$res = @da_sql_query($link,$config,
-		"SELECT UserName FROM $table WHERE Attribute = '$attr' AND Value LIKE '%$search%' LIMIT $max_results;");
+		"SELECT username FROM $table WHERE attribute = '$attr' AND value LIKE '%$search%' LIMIT $max_results;");
 		if ($res){
 			while(($row = @da_sql_fetch_array($res,$config)))
-				$found_users[] = $row[UserName];
+				$found_users[] = $row[username];
 		}
 		else
 			"<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/functions.php3 b/lib/sql/functions.php3
index 11f8cec..aea26cd 100644
--- a/lib/sql/functions.php3
+++ b/lib/sql/functions.php3
@@ -17,11 +17,11 @@ function get_user_info($link,$user,$config)
 {
 	if ($link && $config[sql_use_user_info_table] == 'true'){
 		$res=@da_sql_query($link,$config,
-		"SELECT Name FROM $config[sql_user_info_table] WHERE UserName = '$user';");
+		"SELECT name FROM $config[sql_user_info_table] WHERE username = '$user';");
 		if ($res){
 			$row = @da_sql_fetch_array($res,$config);
 			if ($row)
-				return $row[Name];
+				return $row[name];
 		}	
 	}
 }
diff --git a/lib/sql/group_admin.php3 b/lib/sql/group_admin.php3
index 012b4e0..d7b3516 100644
--- a/lib/sql/group_admin.php3
+++ b/lib/sql/group_admin.php3
@@ -10,7 +10,7 @@ if ($link){
 	if (isset($del_members)){
 		foreach ($del_members as $del){
 			$res = @da_sql_query($link,$config,
-			"DELETE FROM $config[sql_usergroup_table] WHERE UserName = '$del' AND GroupName = '$login';");
+			"DELETE FROM $config[sql_usergroup_table] WHERE username = '$del' AND groupname = '$login';");
 			if (!$res)
 				echo "<b>Could not delete user $del from group: " . da_sql_error($link,$config) . "</b><br>\n";
 		}
@@ -20,14 +20,14 @@ if ($link){
 		if (!empty($Members)){
 			foreach ($Members as $new_member){
 				$res = @da_sql_query($link,$config,
-				"SELECT UserName FROM $config[sql_usergroup_table] WHERE
-				UserName = '$new_member' AND GroupName = '$login';");
+				"SELECT username FROM $config[sql_usergroup_table] WHERE
+				username = '$new_member' AND groupname = '$login';");
 				if ($res){
 					if (@da_sql_num_rows($res,$config))
 						echo "<b>User $new_member already is a member of the group</b><br>\n";
 					else{	
 						$res = @da_sql_query($link,$config,
-						"INSERT INTO $config[sql_usergroup_table] (GroupName,UserName)
+						"INSERT INTO $config[sql_usergroup_table] (groupname,username)
 						VALUES ('$login','$new_member');");
 						if (!$res)
 							echo "<b>Error while adding user $new_member to group: " . da_sql_error($link,$config) . "</b><br>\n";
diff --git a/lib/sql/group_info.php3 b/lib/sql/group_info.php3
index d9cd060..fda77a6 100644
--- a/lib/sql/group_info.php3
+++ b/lib/sql/group_info.php3
@@ -20,13 +20,13 @@ unset($group_members);
 $link = @da_sql_pconnect($config);
 if ($link){
 	$res = @da_sql_query($link,$config,
-	"SELECT Attribute,Value $op FROM $config[sql_groupcheck_table] WHERE GroupName = '$login';");
+	"SELECT attribute,value $op FROM $config[sql_groupcheck_table] WHERE groupname = '$login';");
 	if ($res){
 		if (@da_sql_num_rows($res,$config))
 			$group_exists = 'yes';
 		while(($row = @da_sql_fetch_array($res,$config))){
-			$attr = $row[Attribute];
-			$val = $row[Value];
+			$attr = $row[attribute];
+			$val = $row[value];
 			if ($use_op){
 				$oper = $row[op];
 				$tmp["$attr"][operator][]="$oper";
@@ -35,13 +35,13 @@ if ($link){
 			$tmp["$attr"][count]++;
 		}
 		$res = @da_sql_query($link,$config,
-		"SELECT Attribute,Value $op FROM $config[sql_groupreply_table] WHERE GroupName = '$login';");
+		"SELECT attribute,value $op FROM $config[sql_groupreply_table] WHERE groupname = '$login';");
 		if ($res){
 			if (@da_sql_num_rows($res,$config))
 				$group_exists = 'yes';
 			while(($row = @da_sql_fetch_array($res,$config))){
-				$attr = $row[Attribute];
-				$val = $row[Value];
+				$attr = $row[attribute];
+				$val = $row[value];
 				if ($use_op){
 					$oper = $row[op];
 					$tmp["$attr"][operator][]="$oper";
@@ -53,12 +53,12 @@ if ($link){
 		else
 			echo "<b>Database query failed partially: " . da_sql_error($link,$config) . "</b><br>\n";
 		$res = @da_sql_query($link,$config,
-		"SELECT UserName FROM $config[sql_usergroup_table] WHERE GroupName = '$login' ORDER BY UserName;");
+		"SELECT username FROM $config[sql_usergroup_table] WHERE groupname = '$login' ORDER BY username;");
 		if ($res){
 			if (@da_sql_num_rows($res,$config))
 				$group_exists = 'yes';
 			while(($row = @da_sql_fetch_array($res,$config))){
-				$member = $row[UserName];
+				$member = $row[username];
 				$group_members[] = "$member";
 			}
 		}	
diff --git a/lib/sql/password_check.php3 b/lib/sql/password_check.php3
index 58c90ff..a2f8f11 100644
--- a/lib/sql/password_check.php3
+++ b/lib/sql/password_check.php3
@@ -11,14 +11,16 @@ if ($action == 'checkpass'){
 	$link = @da_sql_pconnect($config);
 	if ($link){
 		$res = @da_sql_query($link,$config,
-			"SELECT Value FROM $config[sql_check_table] WHERE UserName = '$login'
-			AND Attribute = '$config[sql_password_attribute]';");
+			"SELECT attribute,value FROM $config[sql_check_table] WHERE username = '$login'
+			AND (attribute = 'User-Password' OR attribute = 'Crypt-Password');");
 		if ($res){
 			$row = @da_sql_fetch_array($res,$config);
 			if (is_file("../lib/crypt/$config[general_encryption_method].php3")){
 				include("../lib/crypt/$config[general_encryption_method].php3");
-				$enc_passwd = $row[Value];
-				$passwd = da_encrypt($passwd,$enc_passwd);
+				$enc_passwd = $row[value];
+				if ($row[attribute] == 'Crypt-Password') {
+					$passwd = da_encrypt($passwd,$enc_passwd);
+				}
 				if ($passwd == $enc_passwd)
 					$msg = '<font color=blue><b>YES It is that</b></font>';
 				else
diff --git a/lib/sql/user_info.php3 b/lib/sql/user_info.php3
index 415ad33..4c56a29 100644
--- a/lib/sql/user_info.php3
+++ b/lib/sql/user_info.php3
@@ -39,13 +39,13 @@ unset($tmp);
 $link = @da_sql_pconnect($config);
 if ($link){
 	$res = @da_sql_query($link,$config,
-	"SELECT Attribute,Value $op FROM $config[sql_check_table] WHERE UserName = '$login';");
+	"SELECT attribute,value $op FROM $config[sql_check_table] WHERE username = '$login';");
 	if ($res){
 		if (@da_sql_num_rows($res,$config))
 			$user_exists = 'yes';
 		while(($row = @da_sql_fetch_array($res,$config))){
-			$attr = $row[Attribute];
-			$val = $row[Value];
+			$attr = $row[attribute];
+			$val = $row[value];
 			if ($attr == $config[sql_password_attribute] && $val != '')
 				$user_password_exists = 'yes';
 			if ($use_op){
@@ -56,13 +56,13 @@ if ($link){
 			$tmp["$attr"][count]++;
 		}
 		$res = @da_sql_query($link,$config,
-		"SELECT Attribute,Value $op FROM $config[sql_reply_table] WHERE UserName = '$login';");
+		"SELECT attribute,value $op FROM $config[sql_reply_table] WHERE username = '$login';");
 		if ($res){
 			if (@da_sql_num_rows($res,$config))
 				$user_exists = 'yes';
 			while(($row = @da_sql_fetch_array($res,$config))){
-				$attr = $row[Attribute];
-				$val = $row[Value];
+				$attr = $row[attribute];
+				$val = $row[value];
 				if ($use_op){
 					$oper = $row[op];
 					$tmp["$attr"][operator][]="$oper";
@@ -72,19 +72,19 @@ if ($link){
 			}
 			if ($config[sql_use_user_info_table] == 'true'){
 				$res = @da_sql_query($link,$config,
-				"SELECT * FROM $config[sql_user_info_table] WHERE UserName = '$login';");
+				"SELECT * FROM $config[sql_user_info_table] WHERE username = '$login';");
 				if ($res){
 					if (@da_sql_num_rows($res,$config)){
 						$user_exists = 'yes';
 						$user_info = 1;
 					}
 					if (($row = @da_sql_fetch_array($res,$config))){	
-						$cn = ($row[Name] != '') ? $row[Name] : '-';
-						$telephonenumber = ($row[WorkPhone] != '') ? $row[WorkPhone] : '-';
-						$homephone = ($row[HomePhone] != '') ? $row[HomePhone] : '-';
-						$ou = ($row[Department] != '') ? $row[Department] : '-';
-						$mail = ($row[Mail] != '') ? $row[Mail] : '-';
-						$mobile = ($row[Mobile] != '') ? $row[Mobile] : '-';
+						$cn = ($row[name] != '') ? $row[name] : '-';
+						$telephonenumber = ($row[workphone] != '') ? $row[workphone] : '-';
+						$homephone = ($row[homephone] != '') ? $row[homephone] : '-';
+						$ou = ($row[department] != '') ? $row[department] : '-';
+						$mail = ($row[mail] != '') ? $row[mail] : '-';
+						$mobile = ($row[mobile] != '') ? $row[mobile] : '-';
 					}
 				}			
 				else
-- 
2.39.5