diff --git a/addressbook/inc/class.boXport.inc.php b/addressbook/inc/class.boXport.inc.php
index 07f4e0ad45..64b6205505 100644
--- a/addressbook/inc/class.boXport.inc.php
+++ b/addressbook/inc/class.boXport.inc.php
@@ -35,7 +35,7 @@
function boXport($session=False)
{
- $this->contacts = &$GLOBALS['phpgw']->contacts;
+ $this->contacts = &$GLOBALS['egw']->contacts;
$this->so = CreateObject('addressbook.soaddressbook');
if($session)
{
@@ -97,13 +97,13 @@
if($this->use_session)
{
if($this->debug) { echo '
Save:'; _debug_array($data); }
- $GLOBALS['phpgw']->session->appsession('session_data','addressbook',$data);
+ $GLOBALS['egw']->session->appsession('session_data','addressbook',$data);
}
}
function read_sessiondata()
{
- $data = $GLOBALS['phpgw']->session->appsession('session_data','addressbook');
+ $data = $GLOBALS['egw']->session->appsession('session_data','addressbook');
if($this->debug) { echo '
Read:'; _debug_array($data); }
$this->start = $data['start'];
@@ -349,7 +349,7 @@
// Read in user custom fields, if any
$customfields = array();
- while(list($col,$descr) = @each($GLOBALS['phpgw_info']['user']['preferences']['addressbook']))
+ while(list($col,$descr) = @each($GLOBALS['egw_info']['user']['preferences']['addressbook']))
{
if(substr($col,0,6) == 'extra_')
{
@@ -391,7 +391,7 @@
// Here, buffer becomes a string suitable for printing
$buffer = $contacts->export_end_file($buffer);
- $tsvfilename = $GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $tsvfilename;
+ $tsvfilename = $GLOBALS['egw_info']['server']['temp_dir'] . SEP . $tsvfilename;
return $buffer;
}
diff --git a/addressbook/inc/class.boaddressbook.inc.php b/addressbook/inc/class.boaddressbook.inc.php
index 194063c2cc..82805e5a9a 100644
--- a/addressbook/inc/class.boaddressbook.inc.php
+++ b/addressbook/inc/class.boaddressbook.inc.php
@@ -194,13 +194,13 @@
if($this->use_session)
{
if($this->debug) { echo '
Save:'; _debug_array($data); }
- $GLOBALS['phpgw']->session->appsession('session_data','addressbook',$data);
+ $GLOBALS['egw']->session->appsession('session_data','addressbook',$data);
}
}
function read_sessiondata()
{
- $data = $GLOBALS['phpgw']->session->appsession('session_data','addressbook');
+ $data = $GLOBALS['egw']->session->appsession('session_data','addressbook');
if($this->debug) { echo '
Read:'; _debug_array($data); }
$this->start = $data['start'];
@@ -227,12 +227,12 @@
{
foreach($dirty[$i] as $name => $value)
{
- $cleaned[$i][$name] = $GLOBALS['phpgw']->strip_html($dirty[$i][$name]);
+ $cleaned[$i][$name] = $GLOBALS['egw']->strip_html($dirty[$i][$name]);
}
}
else
{
- $cleaned[$i] == $GLOBALS['phpgw']->strip_html($dirty[$i]);
+ $cleaned[$i] == $GLOBALS['egw']->strip_html($dirty[$i]);
}
}
return $cleaned;
@@ -251,7 +251,7 @@
if(is_array($new_fields) && count($new_fields))
{
- if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
+ if(!$GLOBALS['egw_info']['user']['apps']['admin'])
{
$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['no_access'],$GLOBALS['xmlrpcstr']['no_access']);
}
@@ -338,12 +338,12 @@
}
if(!is_array($account))
{
- $GLOBALS['phpgw']->accounts->account_id = $account;
- $account = $GLOBALS['phpgw']->accounts->read_repository();
+ $GLOBALS['egw']->accounts->account_id = $account;
+ $account = $GLOBALS['egw']->accounts->read_repository();
}
$prefs->account_id = $account['account_id'];
$prefs->read_repository();
- $freebusy_url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.$account['account_lid'];
+ $freebusy_url = $GLOBALS['egw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.$account['account_lid'];
if($freebusy_url[0] == '/')
{
$freebusy_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$freebusy_url;
@@ -353,7 +353,7 @@
$ret = array(
'n_family' => $lastname,
'n_given' => $firstname,
- 'fn' => $GLOBALS['phpgw']->common->display_fullname($account['account_lid'],$firstname,$lastname),
+ 'fn' => $GLOBALS['egw']->common->display_fullname($account['account_lid'],$firstname,$lastname),
'email' => $prefs->email_address($account['account_id']),
'freebusy_url' => $freebusy_url,
'rights' => PHPGW_ACL_READ, // readonly access
@@ -370,14 +370,14 @@
switch($type)
{
case 'all': // all
- $accounts = $GLOBALS['phpgw']->accounts->get_list('accounts');
+ $accounts = $GLOBALS['egw']->accounts->get_list('accounts');
break;
case 'calendar': // Calendar users
- $accounts = $GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar');
+ $accounts = $GLOBALS['egw']->acl->get_ids_for_location('run',1,'calendar');
break;
case 'groupmates': // Groupmates
$accounts = array();
- foreach($GLOBALS['phpgw']->accounts->membership() as $group)
+ foreach($GLOBALS['egw']->accounts->membership() as $group)
{
$accounts[] = $group['account_id'];
}
@@ -385,11 +385,11 @@
}
foreach($accounts as $key => $account)
{
- if($type == 'calendar' && $GLOBALS['phpgw']->accounts->get_type($account) == 'g' || $type == 'groupmates')
+ if($type == 'calendar' && $GLOBALS['egw']->accounts->get_type($account) == 'g' || $type == 'groupmates')
{
// $account is a group
unset($accounts[$key]);
- $members = $GLOBALS['phpgw']->accounts->member($account);
+ $members = $GLOBALS['egw']->accounts->member($account);
if(is_array($members))
{
foreach($members as $member)
@@ -502,7 +502,7 @@
$vcard = CreateObject('phpgwapi.vcard');
$entry = $vcard->in_file($filename);
/* _debug_array($entry);exit; */
- $entry['owner'] = (int)$GLOBALS['phpgw_info']['user']['account_id'];
+ $entry['owner'] = (int)$GLOBALS['egw_info']['user']['account_id'];
$entry['access'] = 'private';
$entry['tid'] = 'n';
/* _debug_array($entry);exit; */
@@ -534,11 +534,11 @@
$fields['email'] = $add_email;
$referer = urlencode($referer);
- $this->so->add_entry($GLOBALS['phpgw_info']['user']['account_id'],$fields,'private','','n');
+ $this->so->add_entry($GLOBALS['egw_info']['user']['account_id'],$fields,'private','','n');
$ab_id = $this->get_lastid();
Header('Location: '
- . $GLOBALS['phpgw']->link('/index.php',"menuaction=addressbook.uiaddressbook.view&ab_id=$ab_id&referer=$referer"));
+ . $GLOBALS['egw']->link('/index.php',"menuaction=addressbook.uiaddressbook.view&ab_id=$ab_id&referer=$referer"));
}
function add_entry($fields)
@@ -551,7 +551,7 @@
}
if(!@$fields['owner'])
{
- $fields['owner'] = (int)$GLOBALS['phpgw_info']['user']['account_id'];
+ $fields['owner'] = (int)$GLOBALS['egw_info']['user']['account_id'];
}
if(empty($fields['access']))
{
@@ -565,7 +565,7 @@
if($id)
{
- $GLOBALS['phpgw']->contenthistory->updateTimeStamp('contacts', $id, 'add', time());
+ $GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $id, 'add', time());
}
if($this->xmlrpc && !$id)
@@ -596,7 +596,7 @@
$ok = $this->so->update_entry($fields);
if($ok)
{
- $GLOBALS['phpgw']->contenthistory->updateTimeStamp('contacts', $fields['ab_id'], 'modify', time());
+ $GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $fields['ab_id'], 'modify', time());
}
}
if($this->xmlrpc && !$ok)
@@ -626,7 +626,7 @@
if($this->check_perms($id,PHPGW_ACL_DELETE))
{
$this->so->delete_entry($id);
- $GLOBALS['phpgw']->contenthistory->updateTimeStamp('contacts', $id, 'delete', time());
+ $GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $id, 'delete', time());
}
elseif($this->xmlrpc)
{
@@ -666,7 +666,7 @@
function save_preferences($prefs,$other,$qfields,$fcat_id)
{
- $GLOBALS['phpgw']->preferences->read_repository();
+ $GLOBALS['egw']->preferences->read_repository();
if(is_array($prefs))
{
/* _debug_array($prefs);exit; */
@@ -675,39 +675,39 @@
/* echo '
checking: ' . $pref . '=' . $prefs[$pref]; */
if($prefs[$pref] == 'on')
{
- $GLOBALS['phpgw']->preferences->add('addressbook',$pref,'addressbook_on');
+ $GLOBALS['egw']->preferences->add('addressbook',$pref,'addressbook_on');
}
else
{
- $GLOBALS['phpgw']->preferences->delete('addressbook',$pref);
+ $GLOBALS['egw']->preferences->delete('addressbook',$pref);
}
}
}
if(is_array($other))
{
- $GLOBALS['phpgw']->preferences->delete('addressbook','mainscreen_showbirthdays');
+ $GLOBALS['egw']->preferences->delete('addressbook','mainscreen_showbirthdays');
if($other['mainscreen_showbirthdays'])
{
- $GLOBALS['phpgw']->preferences->add('addressbook','mainscreen_showbirthdays',True);
+ $GLOBALS['egw']->preferences->add('addressbook','mainscreen_showbirthdays',True);
}
- $GLOBALS['phpgw']->preferences->delete('addressbook','default_filter');
+ $GLOBALS['egw']->preferences->delete('addressbook','default_filter');
if($other['default_filter'])
{
- $GLOBALS['phpgw']->preferences->add('addressbook','default_filter',$other['default_filter']);
+ $GLOBALS['egw']->preferences->add('addressbook','default_filter',$other['default_filter']);
}
- $GLOBALS['phpgw']->preferences->delete('addressbook','autosave_category');
+ $GLOBALS['egw']->preferences->delete('addressbook','autosave_category');
if($other['autosave_category'])
{
- $GLOBALS['phpgw']->preferences->add('addressbook','autosave_category',True);
+ $GLOBALS['egw']->preferences->add('addressbook','autosave_category',True);
}
}
- $GLOBALS['phpgw']->preferences->delete('addressbook','default_category');
- $GLOBALS['phpgw']->preferences->add('addressbook','default_category',$fcat_id);
+ $GLOBALS['egw']->preferences->delete('addressbook','default_category');
+ $GLOBALS['egw']->preferences->add('addressbook','default_category',$fcat_id);
- $GLOBALS['phpgw']->preferences->save_repository(True);
+ $GLOBALS['egw']->preferences->save_repository(True);
}
function list_methods($_type='xmlrpc')
diff --git a/addressbook/inc/class.soaddressbook.inc.php b/addressbook/inc/class.soaddressbook.inc.php
index f0749488fc..df49e76542 100644
--- a/addressbook/inc/class.soaddressbook.inc.php
+++ b/addressbook/inc/class.soaddressbook.inc.php
@@ -22,14 +22,14 @@
function soaddressbook()
{
- if(!is_object($GLOBALS['phpgw']->contacts))
+ if(!is_object($GLOBALS['egw']->contacts))
{
- $GLOBALS['phpgw']->contacts = CreateObject('phpgwapi.contacts');
+ $GLOBALS['egw']->contacts = CreateObject('phpgwapi.contacts');
}
- $this->contacts = &$GLOBALS['phpgw']->contacts;
+ $this->contacts = &$GLOBALS['egw']->contacts;
$this->grants = &$this->contacts->grants;
- /* _debug_array($GLOBALS['phpgw_info']); */
+ /* _debug_array($GLOBALS['egw_info']); */
/* _debug_array($grants); */
}
diff --git a/addressbook/inc/class.uiXport.inc.php b/addressbook/inc/class.uiXport.inc.php
index 3de1fc9c0a..6dff77add4 100644
--- a/addressbook/inc/class.uiXport.inc.php
+++ b/addressbook/inc/class.uiXport.inc.php
@@ -32,7 +32,7 @@
function uiXport()
{
- $this->template = $GLOBALS['phpgw']->template;
+ $this->template = $GLOBALS['egw']->template;
$this->cat = CreateObject('phpgwapi.categories');
$this->bo = CreateObject('addressbook.boXport',True);
$this->browser = CreateObject('phpgwapi.browser');
@@ -106,14 +106,14 @@
{
if($conv_type == 'none')
{
- $GLOBALS['phpgw_info']['flags']['noheader'] = False;
- $GLOBALS['phpgw_info']['flags']['noheader'] = True;
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['egw_info']['flags']['noheader'] = False;
+ $GLOBALS['egw_info']['flags']['noheader'] = True;
+ $GLOBALS['egw']->common->phpgw_header();
echo parse_navbar();
echo lang('No conversion type <none> could be located. Please choose a conversion type from the list');
- echo ' ' . lang('OK') . '';
- $GLOBALS['phpgw']->common->phpgw_footer();
- $GLOBALS['phpgw']->common->phpgw_exit();
+ echo ' ' . lang('OK') . '';
+ $GLOBALS['egw']->common->phpgw_footer();
+ $GLOBALS['egw']->common->phpgw_exit();
}
$buffer = $this->bo->import($tsvfile,$conv_type,$private,$fcat_id);
@@ -122,30 +122,30 @@
if($conv_type == 'Debug LDAP' || $conv_type == 'Debug SQL')
{
// filename, default application/octet-stream, length of file, default nocache True
- $GLOBALS['phpgw']->browser->content_header($tsvfilename,'',strlen($buffer));
+ $GLOBALS['egw']->browser->content_header($tsvfilename,'',strlen($buffer));
echo $buffer;
}
else
{
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['egw']->common->phpgw_header();
echo parse_navbar();
echo "
$buffer"; - echo ''.lang('OK').''; - $GLOBALS['phpgw']->common->phpgw_footer(); + echo ''.lang('OK').''; + $GLOBALS['egw']->common->phpgw_footer(); } } else { - $GLOBALS['phpgw']->common->phpgw_header(); + $GLOBALS['egw']->common->phpgw_header(); echo parse_navbar(); echo "
$buffer"; - echo ''.lang('OK').''; - $GLOBALS['phpgw']->common->phpgw_footer(); + echo ''.lang('OK').''; + $GLOBALS['egw']->common->phpgw_footer(); } } else { - $GLOBALS['phpgw']->common->phpgw_header(); + $GLOBALS['egw']->common->phpgw_header(); echo parse_navbar(); set_time_limit(0); @@ -181,11 +181,11 @@ $this->template->set_var('lang_none', lang('none')); $this->template->set_var('lang_cancel',lang('Cancel')); $this->template->set_var('lang_cat',lang('Select Category')); - $this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index')); - $this->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']); - $this->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']); + $this->template->set_var('cancel_url',$GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiaddressbook.index')); + $this->template->set_var('navbar_bg',$GLOBALS['egw_info']['theme']['navbar_bg']); + $this->template->set_var('navbar_text',$GLOBALS['egw_info']['theme']['navbar_text']); $this->template->set_var('import_text',lang('Import from LDIF, CSV, or VCard')); - $this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import')); + $this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiXport.import')); $this->template->set_var('cat_link',$this->cat_option($this->cat_id,True,False)); $this->template->set_var('tsvfilename',''); $this->template->set_var('conv',$conv); @@ -211,7 +211,7 @@ $this->template->set_var('lang_debug',lang('Debug output in browser')); $this->template->pparse('out','import'); } -// $GLOBALS['phpgw']->common->phpgw_footer(); +// $GLOBALS['egw']->common->phpgw_footer(); } function export() @@ -226,14 +226,14 @@ { if($conv_type == 'none') { - $GLOBALS['phpgw_info']['flags']['noheader'] = False; - $GLOBALS['phpgw_info']['flags']['noheader'] = True; - $GLOBALS['phpgw']->common->phpgw_header(); + $GLOBALS['egw_info']['flags']['noheader'] = False; + $GLOBALS['egw_info']['flags']['noheader'] = True; + $GLOBALS['egw']->common->phpgw_header(); echo parse_navbar(); echo lang('No conversion type <none> could be located. Please choose a conversion type from the list'); - echo ' ' . lang('OK') . ''; - $GLOBALS['phpgw']->common->phpgw_footer(); - $GLOBALS['phpgw']->common->phpgw_exit(); + echo ' ' . lang('OK') . ''; + $GLOBALS['egw']->common->phpgw_footer(); + $GLOBALS['egw']->common->phpgw_exit(); } $buffer = $this->bo->export($conv_type,$fcat_id); @@ -251,18 +251,18 @@ } else { - $GLOBALS['phpgw']->common->phpgw_header(); + $GLOBALS['egw']->common->phpgw_header(); echo parse_navbar(); echo "
\n"; echo $buffer; echo "\n\n"; - echo '' . lang('OK') . ''; - $GLOBALS['phpgw']->common->phpgw_footer(); + echo '' . lang('OK') . ''; + $GLOBALS['egw']->common->phpgw_footer(); } } else { - $GLOBALS['phpgw']->common->phpgw_header(); + $GLOBALS['egw']->common->phpgw_header(); echo parse_navbar(); set_time_limit(0); @@ -300,11 +300,11 @@ $this->template->set_var('lang_export_instructions',lang('Download export file (Uncheck to debug output in browser)')); $this->template->set_var('lang_select',lang('Select the type of conversion:')); $this->template->set_var('cat_link',$this->cat_option($this->cat_id,False,False)); - $this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/addressbook/index.php')); - $this->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']); - $this->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']); + $this->template->set_var('cancel_url',$GLOBALS['egw']->link('/addressbook/index.php')); + $this->template->set_var('navbar_bg',$GLOBALS['egw_info']['theme']['navbar_bg']); + $this->template->set_var('navbar_text',$GLOBALS['egw_info']['theme']['navbar_text']); $this->template->set_var('export_text',lang('Export from Addressbook')); - $this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')); + $this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiXport.export')); $this->template->set_var('filename',lang('Export file name')); $this->template->set_var('conv',$conv); $this->template->set_var('debug',lang('')); @@ -317,7 +317,7 @@ $this->template->set_var('cat_id',$this->cat_id); $this->template->pparse('out','export'); - $GLOBALS['phpgw']->common->phpgw_footer(); + $GLOBALS['egw']->common->phpgw_footer(); } } } diff --git a/addressbook/inc/class.uiaddressbook.inc.php b/addressbook/inc/class.uiaddressbook.inc.php index 9c64e2c437..c177b37150 100644 --- a/addressbook/inc/class.uiaddressbook.inc.php +++ b/addressbook/inc/class.uiaddressbook.inc.php @@ -59,15 +59,15 @@ function uiaddressbook() { - $GLOBALS['phpgw']->country = CreateObject('phpgwapi.country'); - $GLOBALS['phpgw']->browser = CreateObject('phpgwapi.browser'); - $GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); + $GLOBALS['egw']->country = CreateObject('phpgwapi.country'); + $GLOBALS['egw']->browser = CreateObject('phpgwapi.browser'); + $GLOBALS['egw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); $this->fields = CreateObject('addressbook.uifields'); $this->bo = CreateObject('addressbook.boaddressbook',True); $this->cat = CreateObject('phpgwapi.categories'); // $this->company = CreateObject('phpgwapi.categories','addressbook_company'); - $this->prefs = $GLOBALS['phpgw_info']['user']['preferences']['addressbook']; + $this->prefs = $GLOBALS['egw_info']['user']['preferences']['addressbook']; $this->_set_sessiondata(); } @@ -239,16 +239,16 @@ function index() { - $GLOBALS['phpgw']->common->phpgw_header(); + $GLOBALS['egw']->common->phpgw_header(); echo parse_navbar(); - $GLOBALS['phpgw']->template->set_file(array('addressbook_list_t' => 'index.tpl')); - $GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_header','addressbook_header'); - $GLOBALS['phpgw']->template->set_block('addressbook_list_t','column','column'); - $GLOBALS['phpgw']->template->set_block('addressbook_list_t','row','row'); - $GLOBALS['phpgw']->template->set_block('addressbook_list_t','delete_block','delete_block'); - $GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_footer','addressbook_footer'); - $GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_alpha','addressbook_alpha'); + $GLOBALS['egw']->template->set_file(array('addressbook_list_t' => 'index.tpl')); + $GLOBALS['egw']->template->set_block('addressbook_list_t','addressbook_header','addressbook_header'); + $GLOBALS['egw']->template->set_block('addressbook_list_t','column','column'); + $GLOBALS['egw']->template->set_block('addressbook_list_t','row','row'); + $GLOBALS['egw']->template->set_block('addressbook_list_t','delete_block','delete_block'); + $GLOBALS['egw']->template->set_block('addressbook_list_t','addressbook_footer','addressbook_footer'); + $GLOBALS['egw']->template->set_block('addressbook_list_t','addressbook_alpha','addressbook_alpha'); /* Setup query for 1st char of fullname, company, lastname using user lang */ $chars = lang('alphabet'); @@ -261,23 +261,23 @@ $aar[] = 'all'; foreach($aar as $char) { - $GLOBALS['phpgw']->template->set_var('charclass',$this->cquery == $char || + $GLOBALS['egw']->template->set_var('charclass',$this->cquery == $char || $char == 'all' && !$this->cquery ? 'letter_box_active' : 'letter_box'); if($char == 'all') { - $GLOBALS['phpgw']->template->set_var('charlink', - $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery=') + $GLOBALS['egw']->template->set_var('charlink', + $GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery=') ); } else { - $GLOBALS['phpgw']->template->set_var('charlink', - $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery=' . $char) + $GLOBALS['egw']->template->set_var('charlink', + $GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery=' . $char) ); } - $GLOBALS['phpgw']->template->set_var('char',$char != 'all' ? strtoupper($char) : lang('all')); - $GLOBALS['phpgw']->template->fp('alphalinks','addressbook_alpha',True); + $GLOBALS['egw']->template->set_var('char',$char != 'all' ? strtoupper($char) : lang('all')); + $GLOBALS['egw']->template->fp('alphalinks','addressbook_alpha',True); } unset($aar); unset($char); @@ -298,10 +298,10 @@ if($this->prefs['autosave_category']) { - $GLOBALS['phpgw']->preferences->read_repository(); - $GLOBALS['phpgw']->preferences->delete('addressbook','default_category'); - $GLOBALS['phpgw']->preferences->add('addressbook','default_category',$this->cat_id); - $GLOBALS['phpgw']->preferences->save_repository(); + $GLOBALS['egw']->preferences->read_repository(); + $GLOBALS['egw']->preferences->delete('addressbook','default_category'); + $GLOBALS['egw']->preferences->add('addressbook','default_category',$this->cat_id); + $GLOBALS['egw']->preferences->save_repository(); } /* global here so nextmatchs accepts our setting of $query and $filter - may be changed again below */ @@ -318,7 +318,7 @@ $showcol = $this->display_name($column); $cols .= '