[Phpgroupware-cvs] CVS: vmailmgr/inc class.vmailmgr.inc.php,1.1.1.1,1.2 hook_addaccount.inc.php,1.1.1.1,1.2 hook_deleteaccount.inc.php,1.1.1.1,1.2

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/vmailmgr/inc
In directory subversions:/tmp/cvs-serv8604/inc

Modified Files:
        class.vmailmgr.inc.php hook_addaccount.inc.php 
        hook_deleteaccount.inc.php 
Log Message:
many improvements. Now has the admin hook for configing it.

Index: class.vmailmgr.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/vmailmgr/inc/class.vmailmgr.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.vmailmgr.inc.php      1 May 2002 23:53:07 -0000       1.1.1.1
--- class.vmailmgr.inc.php      2 May 2002 01:29:52 -0000       1.2
***************
*** 33,40 ****
                function vmailmgr()
                {
!                       $this->domain = 
$GLOBALS['phpgw_info']['server']['vmailmgr_domain'];
!                       $this->domainpass = 
$GLOBALS['phpgw_info']['server']['vmailmgr_domainpass'];
!                       $this->vm_tcphost = 
$GLOBALS['phpgw_info']['server']['vmailmgr_tcphost'];
!                       $this->vm_tcphost_port = 
$GLOBALS['phpgw_info']['server']['vmailmgr_tcphost_port'];
                }
  
--- 33,42 ----
                function vmailmgr()
                {
!                       $config = CreateObject('phpgwapi.config', 'vmailmgr');
!                       $config->read_repository();
!                       $this->domain = $config->config_data['vmailmgr_domain'];
!                       $this->domainpass = 
$config->config_data['vmailmgr_domainpass'];
!                       $this->vm_tcphost = 
$config->config_data['vmailmgr_tcphost'];
!                       $this->vm_tcphost_port = 
$config->config_data['vmailmgr_tcphost_port'];
                }
  

Index: hook_addaccount.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/vmailmgr/inc/hook_addaccount.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hook_addaccount.inc.php     1 May 2002 23:53:07 -0000       1.1.1.1
--- hook_addaccount.inc.php     2 May 2002 01:29:52 -0000       1.2
***************
*** 14,18 ****
        
        // Add matching vmailmgr user account
!       $account_lid = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['hook_values']['account_id']);
        $GLOBALS['phpgw']->vmailmgr = CreateObject('vmailmgr.vmailmgr');
        $returnvals = $GLOBALS['phpgw']->vmailmgr->vadduser($account_lid, 
$GLOBALS['hook_values']['new_passwd']);
--- 14,25 ----
        
        // Add matching vmailmgr user account
!       if ($GLOBALS['hook_values']['account_id'] == 0)
!       {
!               $account_lid = $GLOBALS['hook_values']['account_lid'];
!       }
!       else
!       {
!               $account_lid = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['hook_values']['account_id']);
!       }
        $GLOBALS['phpgw']->vmailmgr = CreateObject('vmailmgr.vmailmgr');
        $returnvals = $GLOBALS['phpgw']->vmailmgr->vadduser($account_lid, 
$GLOBALS['hook_values']['new_passwd']);

Index: hook_deleteaccount.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/vmailmgr/inc/hook_deleteaccount.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hook_deleteaccount.inc.php  1 May 2002 23:53:07 -0000       1.1.1.1
--- hook_deleteaccount.inc.php  2 May 2002 01:29:52 -0000       1.2
***************
*** 14,19 ****
        
        // Delete matching vmailmgr user account
!       $account_lid = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['hook_values']['account_id']);
        $GLOBALS['phpgw']->vmailmgr = CreateObject('vmailmgr.vmailmgr');
!       $returnvals = $GLOBALS['phpgw']->vmailmgr->vdeluser($account_lid);
  ?>
--- 14,26 ----
        
        // Delete matching vmailmgr user account
!       if ($GLOBALS['hook_values']['account_id'] == 0)
!       {
!               $account_lid = $GLOBALS['hook_values']['account_lid'];
!       }
!       else
!       {
!               $account_lid = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['hook_values']['account_id']);
!       }
        $GLOBALS['phpgw']->vmailmgr = CreateObject('vmailmgr.vmailmgr');
!       $returnvals = $GLOBALS['phpgw']->vmailmgr->vdeluser($account_lid)
  ?>