[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.105,1.106 class.accounts_sql.inc.php,1.84,1.85

[Mark A Peters <address@hidden>]

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

Modified Files:
        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.105
retrieving revision 1.106
diff -C2 -r1.105 -r1.106
*** class.accounts_ldap.inc.php 14 Mar 2002 02:26:21 -0000      1.105
--- class.accounts_ldap.inc.php 7 Apr 2002 14:28:43 -0000       1.106
***************
*** 557,561 ****
                }
  
!               function create($account_info)
                {
                        /* echo '<br>in create for account_lid: 
"'.$account_lid.'"'; */
--- 557,561 ----
                }
  
!               function create($account_info,$default_prefs=True)
                {
                        /* echo '<br>in create for account_lid: 
"'.$account_lid.'"'; */
***************
*** 689,697 ****
                        /* print ldap_error($this->ds); */
  
!                       if($account_id && 
is_object($GLOBALS['phpgw']->preferences))
                        {
                                
$GLOBALS['phpgw']->preferences->create_defaults($account_id);
-                               return $account_id;
                        }
                }
  
--- 689,697 ----
                        /* 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;
                }
  
***************
*** 735,747 ****
                                '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)
                        {
--- 735,742 ----
                                '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.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** class.accounts_sql.inc.php  2 Apr 2002 14:15:24 -0000       1.84
--- class.accounts_sql.inc.php  7 Apr 2002 14:28:43 -0000       1.85
***************
*** 283,287 ****
                }
  
!               function create($account_info)
                {
                        $this->db->query("insert into phpgw_accounts 
(account_lid, account_type, account_pwd, "
--- 283,287 ----
                }
  
!               function create($account_info,$default_prefs=True)
                {
                        $this->db->query("insert into phpgw_accounts 
(account_lid, account_type, account_pwd, "
***************
*** 293,301 ****
  
                        $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;
                        }
                }
  
--- 293,301 ----
  
                        $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;
                }
  
***************
*** 339,349 ****
  
                        $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)
--- 339,344 ----
  
                        $this->db->transaction_begin();
!                       $this->create($acct_info,$default_prefs);
                        $accountid = $this->name2id($accountname);
  
                        if ($default_acls == False)