* Only call user_info.php3 in user_new.php3 when we are creating a user

* Fix a bug with personal information attributes in user_new.php3

diff --git a/Changelog b/Changelog
index 2734d38d4cd26d26b1615a628222e66d9f4e0efa..d16b6a4bb4976c56f352bb1d829f57393b5e87c5 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+Ver 1.51:
+* Only call user_info.php3 in user_new.php3 when we are creating a user
+* Fix a bug with personal information attributes in user_new.php3
 Ver 1.50:
 * Add support for groups in SQL. Added several new files and modified a few more.
 * Default values in SQL are now extracted from the group membership. Added a lib/sql/defaults.php3 file.

diff --git a/htdocs/user_new.php3 b/htdocs/user_new.php3
index 7ba519e4aaa07338b91a74cf25e1a26c8f2b70d8..5936537bffe5a3e3ac765042bee6207bd0953ebb 100644 (file)
--- a/htdocs/user_new.php3
+++ b/htdocs/user_new.php3
@@ -51,9 +51,9 @@ include("password_generator.jsc");
        <tr><td>
    
 <?php
-if (is_file("../lib/$config[general_lib_type]/user_info.php3"))
-       include("../lib/$config[general_lib_type]/user_info.php3");
 if ($create == 1){
+       if (is_file("../lib/$config[general_lib_type]/user_info.php3"))
+               include("../lib/$config[general_lib_type]/user_info.php3");
        if ($user_exists != "no"){
                echo <<<EOM
 <b>The username <i>$login</i> already exists in the user database</b>
@@ -89,42 +89,42 @@ EOM;
                <td align=right colspan=$colspan bgcolor="#d0ddb0">
                Name (First Name Surname)
                </td><td>
-               <input type=text name="cn" value="$cn" size=35>
+               <input type=text name="Fcn" value="$cn" size=35>
                </td>
        </tr>
        <tr>
                <td align=right colspan=$colspan bgcolor="#d0ddb0">
                Mail
                </td><td>
-               <input type=text name="mail" value="$mail" size=35>
+               <input type=text name="Fmail" value="$mail" size=35>
                </td>
        </tr>
        <tr>
                <td align=right colspan=$colspan bgcolor="#d0ddb0">
                Department
                </td><td>
-               <input type=text name="ou" value="$ou" size=35>
+               <input type=text name="Fou" value="$ou" size=35>
                </td>
        </tr>
        <tr>
                <td align=right colspan=$colspan bgcolor="#d0ddb0">
                Home Phone
                </td><td>
-               <input type=text name="homephone" value="$homephone" size=35>
+               <input type=text name="Fhomephone" value="$homephone" size=35>
                </td>
        </tr>
        <tr>
                <td align=right colspan=$colspan bgcolor="#d0ddb0">
                Work Phone
                </td><td>
-               <input type=text name="telephonenumber" value="$telephonenumber" size=35>
+               <input type=text name="Ftelephonenumber" value="$telephonenumber" size=35>
                </td>
        </tr>
        <tr>
                <td align=right colspan=$colspan bgcolor="#d0ddb0">
                Mobile Phone
                </td><td>
-               <input type=text name="mobile" value="$mobile" size=35>
+               <input type=text name="Fmobile" value="$mobile" size=35>
                </td>
        </tr>
 EOM;

diff --git a/lib/ldap/create_user.php3 b/lib/ldap/create_user.php3
index d18f1176f7668069ac76507704e5144f82d95ec5..c2837ba131e31e3a0bc1c49d1982d1363031d2f1 100644 (file)
--- a/lib/ldap/create_user.php3
+++ b/lib/ldap/create_user.php3
@@ -3,21 +3,21 @@
        if ($ds){
                $r = @ldap_bind($ds,"$config[ldap_binddn]",$config[ldap_bindpw]);
                if ($r){
-                       list ($givenname,$sn) = split(' ',$cn,3);
+                       list ($givenname,$sn) = split(' ',$Fcn,3);
                        $dn = 'uid=' . $login . ',' . $config[ldap_default_new_entry_suffix];
                        $new_user_entry["objectclass"][0]="top";
                        $new_user_entry["objectclass"][1]="person";
                        $new_user_entry["objectclass"][2]="organizationalPerson";
                        $new_user_entry["objectclass"][3]="inetOrgPerson";
                        $new_user_entry["objectclass"][4]="radiusprofile";
-                       $new_user_entry["cn"]="$cn";
+                       $new_user_entry["cn"]="$Fcn";
                        $new_user_entry["sn"]="$sn";
                        $new_user_entry["givenname"]="$givenname";
-                       $new_user_entry["mail"]="$mail";
-                       $new_user_entry["telephonenumber"]="$telephonenumber";
-                       $new_user_entry["homephone"]="$homephone";
-                       $new_user_entry["mobile"]="$mobile";
-                       $new_user_entry["ou"]="$ou";
+                       $new_user_entry["mail"]="$Fmail";
+                       $new_user_entry["telephonenumber"]="$Ftelephonenumber";
+                       $new_user_entry["homephone"]="$Fhomephone";
+                       $new_user_entry["mobile"]="$Fmobile";
+                       $new_user_entry["ou"]="$Fou";
                        $new_user_entry["uid"]="$login";
                        if (is_file("../lib/crypt/$config[general_encryption_method].php3")){
                                include("../lib/crypt/$config[general_encryption_method].php3");

diff --git a/lib/sql/create_user.php3 b/lib/sql/create_user.php3
index 3a26ce3ae77aa3a60b1e667d34b453ca5ca7e4b7..39f5a2e903dc9a4fe716d40a81f405ca23e04c4d 100644 (file)
--- a/lib/sql/create_user.php3
+++ b/lib/sql/create_user.php3
@@ -32,7 +32,7 @@ if ($link){
                                        $res = @da_sql_query($link,$config,
                                        "INSERT INTO $config[sql_user_info_table]
                                        (UserName,Name,Mail,Department,HomePhone,WorkPhone,Mobile) VALUES
-                                       ('$login','$cn','$mail','$ou','$homephone','$telephonenumber','$mobile');");
+                                       ('$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</b><br>\n";
                                }