[Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_ldap.inc.p...

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/04/11 21:32:38

Modified files:
        inc/accounts   : class.accounts_ldap.inc.php 
                         class.accounts_sql.inc.php 

Log message:
        make id2name more secure, use full name not login ids

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/accounts/class.accounts_ldap.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/accounts/class.accounts_sql.inc.php.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: phpgwapi/inc/accounts/class.accounts_ldap.inc.php
diff -u phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.5 
phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.6
--- phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.5       Wed Mar 22 
12:42:19 2006
+++ phpgwapi/inc/accounts/class.accounts_ldap.inc.php   Tue Apr 11 21:32:38 2006
@@ -11,7 +11,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.accounts_ldap.inc.php,v 1.5 2006/03/22 12:42:19 
skwashd Exp $
+       * @version $Id: class.accounts_ldap.inc.php,v 1.6 2006/04/11 21:32:38 
skwashd Exp $
        */
 
        /**
@@ -388,7 +388,7 @@
                        elseif ($type == 'u')
                        {
                                $account = $this->account_exists($id);
-                               $name = $account['uid'][0];
+                               $name = $account['cn'][0];
                        }
                        else
                        {
Index: phpgwapi/inc/accounts/class.accounts_sql.inc.php
diff -u phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.10 
phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.11
--- phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.10       Wed Mar 22 
12:42:19 2006
+++ phpgwapi/inc/accounts/class.accounts_sql.inc.php    Tue Apr 11 21:32:38 2006
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.accounts_sql.inc.php,v 1.10 2006/03/22 12:42:19 
skwashd Exp $
+       * @version $Id: class.accounts_sql.inc.php,v 1.11 2006/04/11 21:32:38 
skwashd Exp $
        */
 
        /**
@@ -256,11 +256,11 @@
                                return $id_list[$account_id];
                        }
 
-                       $this->db->query('SELECT account_lid FROM 
phpgw_accounts WHERE account_id=' . intval($account_id),__LINE__,__FILE__);
+                       $this->db->query('SELECT account_lid, 
account_firstname, account_lastname FROM phpgw_accounts WHERE account_id=' . 
intval($account_id),__LINE__,__FILE__);
                        if($this->db->num_rows())
                        {
                                $this->db->next_record();
-                               $id_list[$account_id] = 
$this->db->f('account_lid');
+                               $id_list[$account_id] = 
$GLOBALS['phpgw']->common->display_fullname($this->db->f('account_lid'), 
$this->db->f('account_firstname'), $this->db->f('account_lastname') );
                        }
                        else
                        {