[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.accounts.inc.php, 1.10.4.2, 1.10.4
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.accounts.inc.php, 1.10.4.2, 1.10.4.3 |
|
Date: |
Tue, 04 Nov 2003 14:37:03 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6605
Modified Files:
Tag: Version-0_9_16-branch
class.accounts.inc.php
Log Message:
finished addressmaster
Index: class.accounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts.inc.php,v
retrieving revision 1.10.4.2
retrieving revision 1.10.4.3
diff -C2 -d -r1.10.4.2 -r1.10.4.3
*** class.accounts.inc.php 31 Oct 2003 23:50:59 -0000 1.10.4.2
--- class.accounts.inc.php 4 Nov 2003 14:37:01 -0000 1.10.4.3
***************
*** 128,143 ****
}
- function set_addressmaster($master)
- {
- $contacts = CreateObject('phpgwapi.contacts', False);
-
$contacts->change_owner($GLOBALS['phpgw_info']['server']['addressmaster'],
$master);
-
- $config = CreateObject('phpgwapi.config');
- $config->appname = 'phpgwapi';
- $config->read_repository();
- $config->value('addressmaster',$master);
- $config->save_repository();
- }
-
function sync_accounts_contacts()
{
--- 128,131 ----
***************
*** 347,357 ****
$GLOBALS['phpgw']->template->set_file(array('accounts_list_t' =>
'accounts_popup.tpl'));
!
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_cal','cal');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_other','other');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_all','all');
!
$GLOBALS['phpgw']->template->set_block('accounts_list_t','bla_intro','ibla');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','other_intro','iother');
!
$GLOBALS['phpgw']->template->set_block('accounts_list_t','all_intro','iall');
--- 335,345 ----
$GLOBALS['phpgw']->template->set_file(array('accounts_list_t' =>
'accounts_popup.tpl'));
!
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_select','select');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_other','other');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_all','all');
!
$GLOBALS['phpgw']->template->set_block('accounts_list_t','withperm_intro','withperm');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','other_intro','iother');
!
$GLOBALS['phpgw']->template->set_block('accounts_list_t','withoutperm_intro','withoutperm');
***************
*** 378,383 ****
$GLOBALS['phpgw']->template->set_var('select_name',"participants[]'][0]");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
!
$GLOBALS['phpgw']->template->fp('ibla','bla_intro',True);
!
$GLOBALS['phpgw']->template->fp('iall','all_intro',True);
break;
case 'admin':
--- 366,373 ----
$GLOBALS['phpgw']->template->set_var('select_name',"participants[]'][0]");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
!
$GLOBALS['phpgw']->template->fp('withperm','withperm_intro',True);
!
!
!
$GLOBALS['phpgw']->template->fp('withoutperm','withoutperm_intro',True);
break;
case 'admin':
***************
*** 386,390 ****
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
$GLOBALS['phpgw']->template->set_var('lang_perm',lang('group name'));
!
$GLOBALS['phpgw']->template->fp('iother','other_intro',True);
break;
case 'admin_acl':
--- 376,380 ----
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
$GLOBALS['phpgw']->template->set_var('lang_perm',lang('group name'));
!
$GLOBALS['phpgw']->template->fp('withperm','withperm_intro',True);
break;
case 'admin_acl':
***************
*** 393,398 ****
$GLOBALS['phpgw']->template->set_var('select_name',"account_addressmaster[]']");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
!
$GLOBALS['phpgw']->template->set_var('lang_perm',lang('group name'));
!
$GLOBALS['phpgw']->template->fp('iother','other_intro',True);
break;
case 'projects':
--- 383,388 ----
$GLOBALS['phpgw']->template->set_var('select_name',"account_addressmaster[]']");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
!
$GLOBALS['phpgw']->template->fp('withperm','withperm_intro',True);
!
$GLOBALS['phpgw']->template->fp('withoutperm','withoutperm_intro',True);
break;
case 'projects':
***************
*** 400,405 ****
$GLOBALS['phpgw']->template->set_var('select_name',"values[coordinator]']");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountText');
!
$GLOBALS['phpgw']->template->fp('iother','other_intro',True);
!
$GLOBALS['phpgw']->template->fp('iall','all_intro',True);
break;
case 'e_projects':
--- 390,395 ----
$GLOBALS['phpgw']->template->set_var('select_name',"values[coordinator]']");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountText');
!
$GLOBALS['phpgw']->template->fp('withperm','withperm_intro',True);
!
$GLOBALS['phpgw']->template->fp('withoutperm','withoutperm_intro',True);
break;
case 'e_projects':
***************
*** 408,413 ****
$GLOBALS['phpgw']->template->set_var('select_name',"employees[]']");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
!
$GLOBALS['phpgw']->template->fp('iother','other_intro',True);
!
$GLOBALS['phpgw']->template->fp('iall','all_intro',True);
break;
}
--- 398,403 ----
$GLOBALS['phpgw']->template->set_var('select_name',"employees[]']");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
!
$GLOBALS['phpgw']->template->fp('withperm','withperm_intro',True);
!
$GLOBALS['phpgw']->template->fp('withoutperm','withoutperm_intro',True);
break;
}
***************
*** 489,493 ****
switch($app)
{
! case 'calendar':
$GLOBALS['phpgw']->template->fp('cal','group_cal',True); break;
default:
$GLOBALS['phpgw']->template->fp('other','group_other',True); break;
}
--- 479,484 ----
switch($app)
{
! case 'addressbook':
! case 'calendar':
$GLOBALS['phpgw']->template->fp('select','group_select',True); break;
default:
$GLOBALS['phpgw']->template->fp('other','group_other',True); break;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.accounts.inc.php, 1.10.4.2, 1.10.4.3,
Bettina Gille <address@hidden> <=