[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_.inc.php
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_.inc.php |
Date: |
Tue, 05 Sep 2006 13:37:51 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/09/05 13:37:51
Modified files:
inc/accounts : class.accounts_.inc.php
Log message:
E_ALL
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
Patches:
Index: class.accounts_.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/accounts/class.accounts_.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.accounts_.inc.php 3 Sep 2006 06:15:27 -0000 1.7
+++ class.accounts_.inc.php 5 Sep 2006 13:37:51 -0000 1.8
@@ -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_.inc.php,v 1.7 2006/09/03 06:15:27
skwashd Exp $
+ * @version $Id: class.accounts_.inc.php,v 1.8 2006/09/05 13:37:51
skwashd Exp $
*/
if (empty($GLOBALS['phpgw_info']['server']['account_repository']))
{
@@ -790,7 +790,18 @@
$data[$this->data['account_id']]['fullname'] =
$this->data['fullname'];
// type or account_type, this is the question
- $data[$this->data['account_id']]['type'] =
strlen($this->data['account_type']) ? $this->data['account_type'] :
$this->data['type'] ;
+ if ( isset($this->data['account_type']) &&
strlen($this->data['account_type']) )
+ {
+ $data[$this->data['account_id']]['type'] =
$this->data['account_type'];
+ }
+ else if ( isset($this->data['type']) )
+ {
+ $data[$this->data['account_id']]['type'] =
$this->data['type'];
+ }
+ else
+ {
+ $data[$this->data['account_id']]['type'] = 'u';
+ }
$data[$this->data['account_id']]['person_id'] =
$this->data['person_id'];
return $data;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_.inc.php,
Dave Hall <=