From 51ccd5d31c9fead6b958d1ba2be0136c4cc56bfc Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Tue, 13 Aug 2002 16:18:21 +0000
Subject: [PATCH] Also use da_sql_error when reporting errors

---
 lib/sql/change_attrs.php3 | 6 +++---
 lib/sql/create_user.php3  | 2 +-
 lib/sql/defaults.php3     | 4 ++--
 lib/sql/group_info.php3   | 6 +++---
 lib/sql/user_info.php3    | 6 ++++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/sql/change_attrs.php3 b/lib/sql/change_attrs.php3
index fce0ba4..617caba 100644
--- a/lib/sql/change_attrs.php3
+++ b/lib/sql/change_attrs.php3
@@ -54,7 +54,7 @@ if ($link){
 				"UPDATE $table SET op = '$op_val' WHERE $query_key = '$login'
 				AND Attribute = '$sql_attr' AND Value = '$val';");
 				if (!$res || !@da_sql_affected_rows($link,$res,$config))
-					echo "<b>Operator change failed for attribute $key</b><br>\n";
+					echo "<b>Operator change failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
 			}
 
 	// 	if value is the same as that in the sql database do nothing
@@ -65,7 +65,7 @@ if ($link){
 				$res = @da_sql_query($link,$config,
 				"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</b><br>\n";
+					echo "<b>Delete failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
 			}
 	//	if value is null then don't add it 
 			else if ($val == '')
@@ -83,7 +83,7 @@ if ($link){
 					"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</b><br>\n";	
+					echo "<b>Change 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 19f996b..dd3b384 100644
--- a/lib/sql/create_user.php3
+++ b/lib/sql/create_user.php3
@@ -40,7 +40,7 @@ if ($link){
 					echo "<b>User already exists in user info table.</b><br>\n";
 			}
 			else
-				echo "<b>Could not add user information in user info table: " . da_sql_error($link,config) . "</b><br>\n";
+				echo "<b>Could not add user information in user info table: " . da_sql_error($link,$config) . "</b><br>\n";
 		}
 		if ($Fgroup != ''){
 			$res = @da_sql_query($link,$config,
diff --git a/lib/sql/defaults.php3 b/lib/sql/defaults.php3
index a997b36..1e4debc 100644
--- a/lib/sql/defaults.php3
+++ b/lib/sql/defaults.php3
@@ -56,10 +56,10 @@ if ($login != ''){
 						}
 					}
 					else
-						echo "<b>Database query failed partially</b><br>\n";
+						echo "<b>Database query failed partially: " . da_sql_error($link,$config) . "</b><br>\n";
 				}
 				else
-					echo "<b>Database query failed</b><br>\n";	
+					echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 				foreach($attrmap as $key => $val){
 					if (isset($tmp[$val])){
 						if ($tmp[$val][0] != '')
diff --git a/lib/sql/group_info.php3 b/lib/sql/group_info.php3
index 684e517..d26a912 100644
--- a/lib/sql/group_info.php3
+++ b/lib/sql/group_info.php3
@@ -51,7 +51,7 @@ if ($link){
 			}
 		}
 		else
-			echo "<b>Database query failed partially</b><br>\n";
+			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;");
 		if ($res){
@@ -63,7 +63,7 @@ if ($link){
 			}
 		}	
 		else
-			echo "<b>Database query failed partially</b><br>\n";
+			echo "<b>Database query failed partially: " . da_sql_error($link,$config) . "</b><br>\n";
 		foreach($attrmap as $key => $val){
 			if (isset($tmp[$val])){
 				$item_vals["$key"] = $tmp[$val];
@@ -76,7 +76,7 @@ if ($link){
 
 	}
 	else
-		echo "<b>Database query failed</b><br>\n";	
+		echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 }
 else
 	echo "<b>Could not connect to database</b><br>\n";
diff --git a/lib/sql/user_info.php3 b/lib/sql/user_info.php3
index b170438..e8bfdec 100644
--- a/lib/sql/user_info.php3
+++ b/lib/sql/user_info.php3
@@ -84,10 +84,12 @@ if ($link){
 						$mobile = ($row[Mobile] != '') ? $row[Mobile] : '-';
 					}
 				}			
+				else
+					echo "<b>Database query failed partially: " . da_sql_error($link,$config) . "</b><br>\n";
 			}
 		}
 		else
-			echo "<b>Database query failed partially</b><br>\n";
+			echo "<b>Database query failed partially: " . da_sql_error($link,$config) . "</b><br>\n";
 		foreach($attrmap as $key => $val){
 			if (isset($tmp[$val])){
 				$item_vals["$key"] = $tmp[$val];
@@ -100,7 +102,7 @@ if ($link){
 
 	}
 	else
-		echo "<b>Database query failed</b><br>\n";	
+		echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 }
 else
 	echo "<b>Could not connect to database</b><br>\n";
-- 
2.39.5