* Have adddress and home address in user personal info

* Set $user_info in lib/{ldap,sql}/user_info.php3 and only if the user exists and has personal info
* Show language attributes only if general_prefered_lang is not 'en'

diff --git a/Changelog b/Changelog
index 093c57036a1f882eb48b5597b5e8b25f13d4775b..2734d38d4cd26d26b1615a628222e66d9f4e0efa 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -18,6 +18,9 @@ Ver 1.50:
 * Set a few more personal information attributes to defaults in lib/sql/user_info.php3
 * Fix a typo for department
 * Set personal information attributes to defaults in lib/ldap/user_info.php3
+* Have adddress and home address in user personal info
+* Set $user_info in lib/{ldap,sql}/user_info.php3 and only if the user exists and has personal info
+* Show language attributes only if general_prefered_lang is not 'en'
 Ver 1.30:
 * Add limit of results returned in accounting.php3
 * Fix a bug in time2strclock() in lib/functions.php3. Seconds ammount more than 9 would not show.

diff --git a/htdocs/user_admin.php3 b/htdocs/user_admin.php3
index 1366275fb8ef5de34a38aef2e8712b5ee784a01a..4784af571fb06f98fcc5af42de003a587b06eaae 100644 (file)
--- a/htdocs/user_admin.php3
+++ b/htdocs/user_admin.php3
@@ -9,7 +9,6 @@ $date = strftime('%A, %e %B %Y, %T %Z');
 
 if (is_file("../lib/$config[general_lib_type]/user_info.php3")){
        include("../lib/$config[general_lib_type]/user_info.php3");
-       $user_info = 1;
        if ($user_exists == 'no'){
                echo <<<EOM
 <title>user information page</title>

diff --git a/html/user_admin.html.php3 b/html/user_admin.html.php3
index 2577fa4809447756e5d17bf399e0b3aa749521af..015784c95e4c2a46db3e9e5ecdb8bfd8437f29d2 100644 (file)
--- a/html/user_admin.html.php3
+++ b/html/user_admin.html.php3
@@ -256,7 +256,8 @@ lign=top>
 <br>
 EOM;
 
-if ($user_info) print <<<EOM
+if ($user_info){
+       echo <<<EOM
 <table border=0 width=540 cellpadding=1 cellspacing=1>
 <tr valign=top>
 <td width=340></td>
@@ -279,6 +280,9 @@ if ($user_info) print <<<EOM
        $cn
        </td>
        </tr>
+EOM;
+       if ($config[general_prefered_lang] != 'en'){
+               echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>name ($config[general_prefered_lang_name])</b>
@@ -287,6 +291,9 @@ if ($user_info) print <<<EOM
        $cn_lang
        </td>
        </tr>
+EOM;
+       }
+       echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>department</b>
@@ -295,6 +302,9 @@ if ($user_info) print <<<EOM
        $ou
        </td>
        </tr>
+EOM;
+       if ($config[general_prefered_lang] != 'en'){
+               echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>department ($config[general_prefered_lang_name])</b>
@@ -303,6 +313,9 @@ if ($user_info) print <<<EOM
        $ou_lang
        </td>
        </tr>
+EOM;
+       }
+       echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>title</b>
@@ -311,6 +324,9 @@ if ($user_info) print <<<EOM
        $title
        </td>
        </tr>
+EOM;
+       if ($config[general_prefered_lang] != 'en'){
+               echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>title ($config[general_prefered_lang_name])</b>
@@ -319,22 +335,53 @@ if ($user_info) print <<<EOM
        $title_lang
        </td>
        </tr>
+EOM;
+       }
+       echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>address</b>
        </td>
        <td>
-       $homeaddress
+       $address
        </td>
        </tr>
+EOM;
+       if ($config[general_prefered_lang] != 'en'){
+               echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>address ($config[general_prefered_lang_name])</b>
        </td>
        <td>
+       $address_lang
+       </td>
+       </tr>
+EOM;
+       }
+       echo <<<EOM
+       <tr>
+       <td align=center bgcolor="#d0ddb0">
+       <b>home address</b>
+       </td>
+       <td>
+       $homeaddress
+       </td>
+       </tr>
+EOM;
+       if ($config[general_prefered_lang] != 'en'){
+               echo <<<EOM
+       <tr>
+       <td align=center bgcolor="#d0ddb0">
+       <b>home address ($config[general_prefered_lang_name])</b>
+       </td>
+       <td>
        $homeaddress_lang
        </td>
        </tr>
+EOM;
+       }
+       echo <<<EOM
        <tr>
        <td align=center bgcolor="#d0ddb0">
        <b>phone</b>
@@ -396,6 +443,7 @@ if ($user_info) print <<<EOM
 </table>
 
 EOM;
+}
 ?>
        <tr>    <td colspan=3 height=1></td></tr>
        <tr>    <td colspan=3>

diff --git a/lib/ldap/user_info.php3 b/lib/ldap/user_info.php3
index ff56adbf7dd4915147a81dffd3bc1f9a28019804..56e069c88c11498df631e2510957dabf44d9fcac 100644 (file)
--- a/lib/ldap/user_info.php3
+++ b/lib/ldap/user_info.php3
@@ -7,6 +7,8 @@ else
 
 $cn = '-';
 $cn_lang = '-';
+$address = '-';
+$address_lang = '-';
 $homeaddress = '-';
 $homeaddress_lang = '-';
 $fax = '-';
@@ -31,6 +33,7 @@ if ($ds) {
                $user_exists = 'no';
        else{
                $user_exists = 'yes';
+               $user_info = 1;
                unset($item_vals);
                $k = init_decoder();
                $cn = ($info[0]['cn'][0]) ? $info[0]['cn'][0] : '-';
@@ -39,6 +42,10 @@ if ($ds) {
                $cn_lang = ($cn_lang) ? $cn_lang : '-';
                $telephonenumber = ($info[0]['telephonenumber'][0]) ? $info[0]['telephonenumber'][0] : '-';
                $homephone = ($info[0]['homephone'][0]) ? $info[0]['homephone'][0] : '-';
+               $address = ($info[0]['postaladdress'][0]) ? $info[0]['postaladdress'][0] : '-';
+               $address_lang = $info[0]["postaladdress;lang-$config[general_prefered_lang]"][0];
+               $address_lang = decode_string("$address_lang",$k);
+               $address_lang = ($address_lang) ? $address_lang : '-';
                $homeaddress = ($info[0]['homepostaladdress'][0]) ? $info[0]['homepostaladdress'][0] : '-';
                $homeaddress_lang = $info[0]["homepostaladdress;lang-$config[general_prefered_lang]"][0];
                $homeaddress_lang = decode_string("$homeaddress_lang", $k);

diff --git a/lib/sql/user_info.php3 b/lib/sql/user_info.php3
index 96e2f57f1b7dc5c369595e002f0973b7d997b9d3..b1704382c23175bb30bf795b9623ea90369909cd 100644 (file)
--- a/lib/sql/user_info.php3
+++ b/lib/sql/user_info.php3
@@ -17,6 +17,8 @@ $user_exists = 'no';
 
 $cn = '-';
 $cn_lang = '-';
+$address = '-';
+$address_lang = '-';
 $homeaddress = '-';
 $homeaddress_lang = '-';
 $fax = '-';
@@ -69,8 +71,10 @@ if ($link){
                                $res = @da_sql_query($link,$config,
                                "SELECT * FROM $config[sql_user_info_table] WHERE UserName = '$login';");
                                if ($res){
-                                       if (@da_sql_num_rows($res,$config))
+                                       if (@da_sql_num_rows($res,$config)){
                                                $user_exists = 'yes';
+                                               $user_info = 1;
+                                       }
                                        if (($row = @da_sql_fetch_array($res,$config))){        
                                                $cn = ($row[Name] != '') ? $row[Name] : '-';
                                                $telephonenumber = ($row[WorkPhone] != '') ? $row[WorkPhone] : '-';