From: kkalev Date: Tue, 13 Aug 2002 15:42:45 +0000 (+0000) Subject: When reporting sql errors also print the output of da_sql_error X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=3aca364b3b1e71ac07bba71be9baed16ec6c04fb;p=freeradius-dialup-admin.git When reporting sql errors also print the output of da_sql_error --- diff --git a/Changelog b/Changelog index 96dc917..fd5aeda 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ Ver 1.53: * html fixes in show_groups.php3 +* When reporting sql errors also print the output of da_sql_error Ver 1.52: * Add Reply-Message in conf/user_edit.attrs so that it appears in the user/group edit pages * Allow the administrator to specify a group in the New User page. Update lib/sql/create_user.php3 to add diff --git a/htdocs/show_groups.php3 b/htdocs/show_groups.php3 index 54ea524..e9b7661 100644 --- a/htdocs/show_groups.php3 +++ b/htdocs/show_groups.php3 @@ -74,8 +74,10 @@ EOM; echo "Could not find any groups
\n"; } else - echo "Search failed. SQL Error
\n"; + echo "Search failed. SQL Error: " . da_sql_error($link,$config) . "
\n"; } +else + echo "Could not connect to SQL database
\n"; ?> diff --git a/lib/add_badusers.php3 b/lib/add_badusers.php3 index 2235772..9ee31a6 100644 --- a/lib/add_badusers.php3 +++ b/lib/add_badusers.php3 @@ -21,6 +21,6 @@ else{ echo "SQL Error:" . da_sql_error($link) . "
\n"; } else - echo "SQL Error: Could not connect to sql server(" . da_sql_error($link) . ")
\n"; + echo "SQL Error: Could not connect to SQL database
\n"; } ?> diff --git a/lib/sql/change_info.php3 b/lib/sql/change_info.php3 index ddf05dd..4f913e7 100644 --- a/lib/sql/change_info.php3 +++ b/lib/sql/change_info.php3 @@ -19,7 +19,7 @@ if ($link){ (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 "Could not add user information in user info table
\n"; + echo "Could not add user information in user info table: " . da_sql_error($link,$config) . "
\n"; $fail = 1; } } @@ -29,13 +29,13 @@ if ($link){ Department = '$Fou', HomePhone = '$Fhomephone', WorkPhone = '$Ftelephonenumber', Mobile = '$Fmobile';"); if (!$res || !@da_sql_affected_rows($link,$res,$config)){ - echo "Could not update user information in user info table
\n"; + echo "Could not update user information in user info table: " . da_sql_error($link,$config) . "
\n"; $fail = 1; } } } else{ - echo "Could not find user in user info table. SQL Error
\n"; + echo "Could not find user in user info table: " . da_sql_error($link,$config) . "
\n"; $fail = 1; } if ($fail == 0) diff --git a/lib/sql/change_passwd.php3 b/lib/sql/change_passwd.php3 index dbe9080..7b43c0d 100644 --- a/lib/sql/change_passwd.php3 +++ b/lib/sql/change_passwd.php3 @@ -25,18 +25,18 @@ if ($link){ "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 "Error while changing password
\n"; + echo "Error while changing password: " . da_sql_error($link,$config) . "
\n"; } else{ $res = @da_sql_query($link,$config, "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 "Error while changing password
\n"; + echo "Error while changing password: " . da_sql_error($link,$config) . "
\n"; } } else - echo "Error while executing query
\n"; + echo "Error while executing query: " . da_sql_error($link,$config) . "
\n"; } else echo "Could not open encryption library file
\n"; diff --git a/lib/sql/create_group.php3 b/lib/sql/create_group.php3 index 4fdebe4..9a0bdb2 100644 --- a/lib/sql/create_group.php3 +++ b/lib/sql/create_group.php3 @@ -20,7 +20,7 @@ if ($link){ "INSERT INTO $config[sql_usergroup_table] (UserName,GroupName) VALUES ('$member','$login');"); if (!$res || !@da_sql_affected_rows($link,$res,$config)){ - echo "Unable to add user $member in group $login. SQL error
\n"; + echo "Unable to add user $member in group $login: " . da_sql_error($link,$config) . "
\n"; $da_abort=1; } } @@ -53,7 +53,7 @@ if ($link){ "INSERT INTO $table (Attribute,Value,GroupName $text) VALUES ('$attrmap[$key]','$val','$login' $op_val);"); if (!$res || !@da_sql_affected_rows($link,$res,$config)) - echo "Query failed for attribute $key
\n"; + echo "Query failed for attribute $key: " . da_sql_error($link,$config) . "
\n"; } } echo "Group created successfully
\n"; diff --git a/lib/sql/create_user.php3 b/lib/sql/create_user.php3 index b4392d6..19f996b 100644 --- a/lib/sql/create_user.php3 +++ b/lib/sql/create_user.php3 @@ -20,7 +20,7 @@ if ($link){ "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 "Unable to add user $login. SQL error
\n"; + echo "Unable to add user $login: " . da_sql_error($link,$config) . "
\n"; $da_abort=1; } if ($config[sql_use_user_info_table] == 'true' && !$da_abort){ @@ -34,13 +34,13 @@ if ($link){ (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 "Could not add user information in user info table
\n"; + echo "Could not add user information in user info table: " . da_sql_error($link,$config) . "
\n"; } else echo "User already exists in user info table.
\n"; } else - echo "Could not add user information in user info table
\n"; + echo "Could not add user information in user info table: " . da_sql_error($link,config) . "
\n"; } if ($Fgroup != ''){ $res = @da_sql_query($link,$config, @@ -58,7 +58,7 @@ if ($link){ echo "User already is a member of group $Fgroup
\n"; } else - echo "Could not add user to group $Fgroup. SQL Error
\n"; + echo "Could not add user to group $Fgroup: " . da_sql_error($link,$config) . "
\n"; } if (!$da_abort){ foreach($show_attrs as $key => $attr){ @@ -88,7 +88,7 @@ if ($link){ "INSERT INTO $table (Attribute,Value,UserName $text) VALUES ('$attrmap[$key]','$val','$login' $op_val);"); if (!$res || !@da_sql_affected_rows($link,$res,$config)) - echo "Query failed for attribute $key
\n"; + echo "Query failed for attribute $key: " . da_sql_error($link,$config) . "
\n"; } } echo "User created successfully
\n"; diff --git a/lib/sql/delete_group.php3 b/lib/sql/delete_group.php3 index 917a13e..cad79b6 100644 --- a/lib/sql/delete_group.php3 +++ b/lib/sql/delete_group.php3 @@ -18,13 +18,13 @@ if ($link){ if ($res) echo "Group $login deleted successfully
\n"; else - echo "Error deleting group $login from usergroup table
\n"; + echo "Error deleting group $login from usergroup table: " . da_sql_error($link,$config) . "
\n"; } else - echo "Error deleting group $login from group check table
\n"; + echo "Error deleting group $login from group check table: " . da_sql_error($link,$config) . "
\n"; } else - echo "Error deleting group $login from group reply table
\n"; + echo "Error deleting group $login from group reply table: " . da_sql_error($link,$config) . "
\n"; } else echo "Could not connect to database
\n"; diff --git a/lib/sql/delete_user.php3 b/lib/sql/delete_user.php3 index c068e1f..b7431a6 100644 --- a/lib/sql/delete_user.php3 +++ b/lib/sql/delete_user.php3 @@ -16,21 +16,21 @@ if ($link){ $res = @da_sql_query($link,$config, "DELETE FROM $config[sql_usergroup_table] WHERE UserName = '$login';"); if (!$res) - echo "Error deleting user $login from user group table
\n"; + echo "Error deleting user $login from user group table: " . da_sql_error($link,$config) . "
\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';"); if ($res) echo "User $login deleted successfully
\n"; else - echo "Error deleting user $login from user info table
\n"; + echo "Error deleting user $login from user info table: " . da_sql_error($link,$config) . "
\n"; } } else - echo "Error deleting user $login from check table
\n"; + echo "Error deleting user $login from check table: " . da_sql_error($link,$config) . "
\n"; } else - echo "Error deleting user $login from reply table
\n"; + echo "Error deleting user $login from reply table: " . da_sql_error($link,$config) . "
\n"; } else echo "Could not connect to database
\n"; diff --git a/lib/sql/group_admin.php3 b/lib/sql/group_admin.php3 index 1e75eb9..94b78cc 100644 --- a/lib/sql/group_admin.php3 +++ b/lib/sql/group_admin.php3 @@ -12,7 +12,7 @@ if ($link){ $res = @da_sql_query($link,$config, "DELETE FROM $config[sql_usergroup_table] WHERE UserName = '$del' AND GroupName = '$login';"); if (!$res) - echo "Could not delete user $del from group. SQL Error
\n"; + echo "Could not delete user $del from group: " . da_sql_error($link,$config) . "
\n"; } } if ($new_members != ''){ @@ -30,11 +30,11 @@ if ($link){ "INSERT INTO $config[sql_usergroup_table] (GroupName,UserName) VALUES ('$login','$new_member');"); if (!$res) - echo "Error while adding user $new_member to group
\n"; + echo "Error while adding user $new_member to group: " . da_sql_error($link,$config) . "
\n"; } } else - echo "Could not add new member $new_member. SQL Error
\n"; + echo "Could not add new member $new_member: " . da_sql_error($link,$config) . "
\n"; } } }