Only show the personal attributes in the New User page if we have ldap or

we are using the userinfo table in sql

diff --git a/Changelog b/Changelog
index 98053ebaa2c5896354e0e20a3a6942b54ce44c62..0f79fcd0b25adb840dbf0d60d9afd1839930ce0a 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -10,6 +10,7 @@ Ver 1.63:
 * Fix a typo in lib/sql/attrmap.php3
 * Add an entry in the FAQ about the Dialup-Access attribute
 * Add an entry in the FAQ about duplicate personal attributes in the user_admin page
+* Only show the personal attributes in the New User page if we have ldap or we are using the userinfo table in sql
 Ver 1.62:
 * Remove one sql query from user_admin which was not needed.
 * Instead of a query like "LIKE 'YYYY-MM-DD%'" use "AcctStopTime >= 'YYYY-MM-DD 00:00:00 AND AcctStopTime

diff --git a/htdocs/user_new.php3 b/htdocs/user_new.php3
index 8308fbd677959267f03a2f72412a4f626a6b9b86..ef70d454ff4d7af58c96b50b1883e570c6262f40 100644 (file)
--- a/htdocs/user_new.php3
+++ b/htdocs/user_new.php3
@@ -109,7 +109,9 @@ EOM;
        </tr>
 EOM;
        }
-       echo <<<EOM
+       if ($config[general_lib_type] == 'ldap' ||
+       ($config[general_lib_type] == 'sql' && $config[sql_use_user_info_table] == 'true')){
+               echo <<<EOM
        <tr>
                <td align=right colspan=$colspan bgcolor="#d0ddb0">
                Name (First Name Surname)
@@ -153,6 +155,7 @@ EOM;
                </td>
        </tr>
 EOM;
+       }
        foreach($show_attrs as $key => $desc){
                $name = $attrmap["$key"];
                if ($name == 'none')