* Now the create user page should work with sql

* Make the default general_lib_type sql instead of ldap

diff --git a/Changelog b/Changelog
index 32301a10dc13a4492c5a7478ff863e166f052e68..552554b3d4a014c9ba0e4a127558c65fb2ec748c 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,8 @@ Ver 1.61:
 * Allow selecting a specific access server in the failed logins page
 * In the user admin page use AcctStartTime not AcctStopTime when calculating usage for the last 7 days
 * Also show server:port in the user test page (so that it shows when used for server checks)
+* Now the create user page should work with sql
+* Make the default general_lib_type sql instead of ldap
 Ver 1.60:
 * Use require_once when including lib/functions.php3 in lib/sql
 * In the buttons toolbar Edit User should not be clickable.

diff --git a/conf/admin.conf b/conf/admin.conf
index c281e99964cd83b750e9aca9708461aa8524e581..d54e15e14564963c5d3fb9ff48c868a3bc877d71 100644 (file)
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -56,7 +56,7 @@ general_extra_ldap_attrmap: %{general_base_dir}/conf/extra.ldap-attrmap
 #
 # it can be either ldap or sql
 #
-general_lib_type: ldap
+general_lib_type: sql
 general_user_edit_attrs_file: %{general_base_dir}/conf/user_edit.attrs
 general_sql_attrs_file: %{general_base_dir}/conf/sql.attrs
 general_default_file: %{general_base_dir}/conf/default.vals

diff --git a/lib/sql/create_user.php3 b/lib/sql/create_user.php3
index fd723ef9b0d222d934f926dfa51c8b0260c2d37f..8e16d134db6531d8024d8914ff46db8b9eced2c7 100644 (file)
--- a/lib/sql/create_user.php3
+++ b/lib/sql/create_user.php3
@@ -5,6 +5,7 @@ else{
        echo "<b>Could not include SQL library</b><br>\n";
        exit();
 }
+include_once('../lib/functions.php3');
 if ($config[sql_use_operators] == 'true'){
        include("../lib/operators.php3");
        $text = ',op';

diff --git a/lib/sql/defaults.php3 b/lib/sql/defaults.php3
index c0a85e6eb3cf86ed1feb8f71c092bc5e054f1cef..9b1f5f9dacb94f6788ea0ada8459892abccb6e0f 100644 (file)
--- a/lib/sql/defaults.php3
+++ b/lib/sql/defaults.php3
@@ -1,6 +1,6 @@
 <?php
+require('../lib/sql/attrmap.php3');
 if ($login != ''){
-       require('../lib/sql/attrmap.php3');
        if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3"))
                include_once("../lib/sql/drivers/$config[sql_type]/functions.php3");
        else{