[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.101,1.101.2.1 class.accounts_sql.inc.php,1.80.2.1,1.80.2.2

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv3444/phpgwapi/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.accounts_ldap.inc.php class.accounts_sql.inc.php 
Log Message:
GNU Patch #127 - create_defaults being called twice.

Index: class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php,v
retrieving revision 1.101
retrieving revision 1.101.2.1
diff -C2 -r1.101 -r1.101.2.1
*** class.accounts_ldap.inc.php 6 Jan 2002 06:06:30 -0000       1.101
--- class.accounts_ldap.inc.php 7 Apr 2002 14:28:31 -0000       1.101.2.1
***************
*** 559,563 ****
                }
  
!               function create($account_info)
                {
                        /* echo '<br>in create for account_lid: 
"'.$account_lid.'"'; */
--- 559,563 ----
                }
  
!               function create($account_info,$default_prefs=True)
                {
                        /* echo '<br>in create for account_lid: 
"'.$account_lid.'"'; */
***************
*** 690,698 ****
                        /* print ldap_error($this->ds); */
  
!                       if($account_id && 
is_object($GLOBALS['phpgw']->preferences))
                        {
                                
$GLOBALS['phpgw']->preferences->create_defaults($account_id);
-                               return $account_id;
                        }
                }
  
--- 690,698 ----
                        /* print ldap_error($this->ds); */
  
!                       if($account_id && 
is_object($GLOBALS['phpgw']->preferences) && $default_prefs)
                        {
                                
$GLOBALS['phpgw']->preferences->create_defaults($account_id);
                        }
+                       return $account_id;
                }
  
***************
*** 736,748 ****
                                'account_expires'   => $expires
                        );
!                       $this->create($acct_info);
                        $accountid = $this->name2id($accountname);
  
                        $this->db->transaction_begin();
-                       if($default_prefs)
-                       {
-                               
$GLOBALS['phpgw']->preferences->create_defaults($accountid);
-                       }
- 
                        if ($default_acls == False)
                        {
--- 736,743 ----
                                'account_expires'   => $expires
                        );
!                       $this->create($acct_info,$default_prefs);
                        $accountid = $this->name2id($accountname);
  
                        $this->db->transaction_begin();
                        if ($default_acls == False)
                        {

Index: class.accounts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_sql.inc.php,v
retrieving revision 1.80.2.1
retrieving revision 1.80.2.2
diff -C2 -r1.80.2.1 -r1.80.2.2
*** class.accounts_sql.inc.php  2 Apr 2002 14:15:13 -0000       1.80.2.1
--- class.accounts_sql.inc.php  7 Apr 2002 14:28:31 -0000       1.80.2.2
***************
*** 281,285 ****
                }
  
!               function create($account_info)
                {
                        $this->db->query("insert into phpgw_accounts 
(account_lid, account_type, account_pwd, "
--- 281,285 ----
                }
  
!               function create($account_info,$default_prefs=True)
                {
                        $this->db->query("insert into phpgw_accounts 
(account_lid, account_type, account_pwd, "
***************
*** 291,299 ****
  
                        $accountid = 
$this->db->get_last_insert_id('phpgw_accounts','account_id');
!                       if($accountid && 
is_object($GLOBALS['phpgw']->preferences))
                        {
                                
$GLOBALS['phpgw']->preferences->create_defaults($accountid);
-                               return $accountid;
                        }
                }
  
--- 291,299 ----
  
                        $accountid = 
$this->db->get_last_insert_id('phpgw_accounts','account_id');
!                       if($accountid && 
is_object($GLOBALS['phpgw']->preferences) && $default_prefs)
                        {
                                
$GLOBALS['phpgw']->preferences->create_defaults($accountid);
                        }
+                       return $accountid;
                }
  
***************
*** 337,347 ****
  
                        $this->db->transaction_begin();
!                       $this->create($acct_info);
                        $accountid = $this->name2id($accountname);
- 
-                       if($default_prefs)
-                       {
-                               
$GLOBALS['phpgw']->preferences->create_defaults($accountid);
-                       }
  
                        if ($default_acls == False)
--- 337,342 ----
  
                        $this->db->transaction_begin();
!                       $this->create($acct_info,$default_prefs);
                        $accountid = $this->name2id($accountname);
  
                        if ($default_acls == False)