From 4924cfc9e2a86f238ba14869a970d936b12e74cc Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Sun, 3 Jul 2005 14:15:23 +0000
Subject: [PATCH] Switch remaining variables to egroupware convention

---
 addressbook/inc/export/phpgw_LDIF             |  6 +--
 addressbook/inc/hook_home.inc.php             | 38 +++++++++----------
 addressbook/inc/import/Import_Multiple_VCard  |  2 +-
 addressbook/inc/import/Import_from_Mozilla    |  2 +-
 addressbook/inc/import/Import_from_Netscape   |  2 +-
 .../inc/import/Import_from_Outlook_-_Deutsch  |  2 +-
 .../inc/import/Import_from_Outlook_-_English  |  2 +-
 .../inc/import/Import_from_Outlook_-_Espanol  |  2 +-
 .../inc/import/Import_from_Outlook_-_French   |  2 +-
 .../inc/import/Import_from_Outlook_-_Hungary  |  2 +-
 .../inc/import/Import_from_Outlook_-_Italiano |  2 +-
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/addressbook/inc/export/phpgw_LDIF b/addressbook/inc/export/phpgw_LDIF
index c1915ff769..5ee7fbec95 100644
--- a/addressbook/inc/export/phpgw_LDIF
+++ b/addressbook/inc/export/phpgw_LDIF
@@ -132,9 +132,9 @@
 		// Tack on some extra values
 		function export_end_record($buffer)
 		{
-			if ($GLOBALS['phpgw_info']['server']['ldap_contact_context'])
+			if ($GLOBALS['egw_info']['server']['ldap_contact_context'])
 			{
-				$context = $GLOBALS['phpgw_info']['server']['ldap_contact_context'];
+				$context = $GLOBALS['egw_info']['server']['ldap_contact_context'];
 			}
 			$time = gettimeofday();
 			$cn = str_replace(',','',$buffer[$this->id]['cn']);
@@ -168,7 +168,7 @@
 				$entries .= 'objectClass: organizationalPerson' . "\n";
 				# not needed for openldap > 2.1 anymore
 				#$entries .= 'objectClass: inetOrgPerson' . "\n";
-				$entries .= 'objectClass: phpgwContact' . "\n";
+				$entries .= 'objectClass: egwContact' . "\n";
 				$entries .= "\n";
 			}
 			$buffer = $entries;
diff --git a/addressbook/inc/hook_home.inc.php b/addressbook/inc/hook_home.inc.php
index 3f407c9081..987a6b07f1 100644
--- a/addressbook/inc/hook_home.inc.php
+++ b/addressbook/inc/hook_home.inc.php
@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * eGroupWare - E-Mail                                                      *
+  * eGroupWare - Addressbook                                                 *
   * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
@@ -11,16 +11,16 @@
 
 	/* $Id$ */
 	
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
+	$d1 = strtolower(substr(EGW_APP_INC,0,3));
 	if($d1 == 'htt' || $d1 == 'ftp' )
 	{
 		echo "Failed attempt to break in via an old Security Hole!<br>\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
+		$GLOBALS['egw']->common->phpgw_exit();
 	}
 	unset($d1);
 
-	if($GLOBALS['phpgw_info']['user']['apps']['addressbook']
-		&& $GLOBALS['phpgw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
+	if($GLOBALS['egw_info']['user']['apps']['addressbook']
+		&& $GLOBALS['egw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
 	{
 		echo "\n<!-- Birthday info -->\n";
 
@@ -30,25 +30,25 @@
 			'n_family' => 'n_family',
 			'bday'     => 'bday'
 		);
-		$now = time() - ((60 * 60) * (int)$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']);
-		$today = $GLOBALS['phpgw']->common->show_date($now,'n/d/');
+		$now = time() - ((60 * 60) * (int)$GLOBALS['egw_info']['user']['preferences']['common']['tz_offset']);
+		$today = $GLOBALS['egw']->common->show_date($now,'n/d/');
 		
-		$bdays = $c->read(0,15,$qfields,$today,'tid=n','','',$GLOBALS['phpgw_info']['user']['account_id']);
+		$bdays = $c->read(0,15,$qfields,$today,'tid=n','','',$GLOBALS['egw_info']['user']['account_id']);
 		
 		$title = '<center><font color="#FFFFFF">'.lang('Birthdays').'</font></center>';
 
 		$portalbox = CreateObject('phpgwapi.listbox',
 			Array(
 				'title'     => $title,
-				'primary'   => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
-				'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
-				'tertiary'  => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+				'primary'   => $GLOBALS['egw_info']['theme']['navbar_bg'],
+				'secondary' => $GLOBALS['egw_info']['theme']['navbar_bg'],
+				'tertiary'  => $GLOBALS['egw_info']['theme']['navbar_bg'],
 				'width'     => '100%',
 				'outerborderwidth' => '0',
-				'header_background_image' => $GLOBALS['phpgw']->common->image($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi'),'bg_filler')
+				'header_background_image' => $GLOBALS['egw']->common->image($GLOBALS['egw']->common->get_tpl_dir('phpgwapi'),'bg_filler')
 			)
 		);
-		$app_id = $GLOBALS['phpgw']->applications->name2id('addressbook');
+		$app_id = $GLOBALS['egw']->applications->name2id('addressbook');
 		$GLOBALS['portal_order'][] = $app_id;
 		$var = Array(
 			'up'       => Array('url' => '/set_box.php', 'app' => $app_id),
@@ -71,18 +71,18 @@
 			{
 				$portalbox->data[] = array(
 					'text' => lang("Today is %1's birthday!", $val['n_given'] . ' ' . $val['n_family']),
-					'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $val['id'])
+					'link' => $GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $val['id'])
 				);
 			}
 //			$tmp = '<a href="'
-//				. $GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' . $val['id']) . '">'
+//				. $GLOBALS['egw']->link('/addressbook/view.php','ab_id=' . $val['id']) . '">'
 //				. $val['n_given'] . ' ' . $val['n_family'] . '</a>';
 //			echo '<tr><td align="left">' . lang("Today is %1's birthday!", $tmp) . '</td></tr>' . "\n";
 		}
 
-		$tomorrow = $GLOBALS['phpgw']->common->show_date($now + 86400,'n/d/');
+		$tomorrow = $GLOBALS['egw']->common->show_date($now + 86400,'n/d/');
 
-		$bdays = $c->read(0,15,$qfields,$tomorrow,'tid=n','','',$GLOBALS['phpgw_info']['user']['account_id']);
+		$bdays = $c->read(0,15,$qfields,$tomorrow,'tid=n','','',$GLOBALS['egw_info']['user']['account_id']);
 
 		while(list($key,$val) = @each($bdays))
 		{
@@ -90,11 +90,11 @@
 			{
 				$portalbox->data[] = array(
 					'text' => lang("Tomorrow is %1's birthday.",$val['n_given'] . ' ' . $val['n_family']),
-					'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id'])
+					'link' => $GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id'])
 				);
 			}
 //			$tmp = '<a href="'
-//				. $GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' . $val['id']) . '">'
+//				. $GLOBALS['egw']->link('/addressbook/view.php','ab_id=' . $val['id']) . '">'
 //				. $val['n_given'] . ' ' . $val["n_family"] . '</a>';
 //			echo '<tr><td align="left">' . lang("Tomorrow is %1's birthday.", $tmp) . '</td></tr>' . "\n";
 		}
diff --git a/addressbook/inc/import/Import_Multiple_VCard b/addressbook/inc/import/Import_Multiple_VCard
index 06a472d3e4..7590e91ecd 100644
--- a/addressbook/inc/import/Import_Multiple_VCard
+++ b/addressbook/inc/import/Import_Multiple_VCard
@@ -81,7 +81,7 @@
 				*/
 				$entry = $this->vcard->in($buffer[$i]);
 				/* Now actually add the new entry */
-				$this->contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry,$access,$cat_id);
+				$this->contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry,$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Mozilla b/addressbook/inc/import/Import_from_Mozilla
index b0a05a6986..ed16973f77 100644
--- a/addressbook/inc/import/Import_from_Mozilla
+++ b/addressbook/inc/import/Import_from_Mozilla
@@ -109,7 +109,7 @@
 				$entry[$i]['adr_one_type']    = 'intl';
 				$entry[$i]['adr_two_type']    = 'intl';
 				/* echo '<br>'; */
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Netscape b/addressbook/inc/import/Import_from_Netscape
index cb5202b3e5..ac265e776e 100644
--- a/addressbook/inc/import/Import_from_Netscape
+++ b/addressbook/inc/import/Import_from_Netscape
@@ -104,7 +104,7 @@
 				$entry[$i]['adr_one_type']    = 'intl';
 				$entry[$i]['adr_two_type']    = 'intl';
 				/* echo '<br>'; */
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Outlook_-_Deutsch b/addressbook/inc/import/Import_from_Outlook_-_Deutsch
index 14124368e6..67ebdce6c1 100644
--- a/addressbook/inc/import/Import_from_Outlook_-_Deutsch
+++ b/addressbook/inc/import/Import_from_Outlook_-_Deutsch
@@ -173,7 +173,7 @@
 				$entry[$i]['adr_two_type']    = 'intl';
 				$entry[$i]['fn'] = $entry[$i]['n_given'] . ' ' . $entry[$i]['n_family'];
 				//echo '<br>';
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Outlook_-_English b/addressbook/inc/import/Import_from_Outlook_-_English
index 0d7b3faff7..e71b3e5e9d 100644
--- a/addressbook/inc/import/Import_from_Outlook_-_English
+++ b/addressbook/inc/import/Import_from_Outlook_-_English
@@ -169,7 +169,7 @@
 				$entry[$i]['adr_two_type']    = 'intl';
 				$entry[$i]['fn'] = $entry[$i]['n_given'] . ' ' . $entry[$i]['n_family'];
 				//echo '<br>';
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Outlook_-_Espanol b/addressbook/inc/import/Import_from_Outlook_-_Espanol
index 42b2476aea..547a1da018 100755
--- a/addressbook/inc/import/Import_from_Outlook_-_Espanol
+++ b/addressbook/inc/import/Import_from_Outlook_-_Espanol
@@ -171,7 +171,7 @@
 				$entry[$i]['adr_two_type']    = 'intl';
 				$entry[$i]['fn'] = $entry[$i]['n_given'] . ' ' . $entry[$i]['n_family'];
 				//echo '<br>';
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Outlook_-_French b/addressbook/inc/import/Import_from_Outlook_-_French
index fe8fcdc187..3b9b91fb57 100755
--- a/addressbook/inc/import/Import_from_Outlook_-_French
+++ b/addressbook/inc/import/Import_from_Outlook_-_French
@@ -167,7 +167,7 @@
 				$entry[$i]['adr_two_type']    = 'intl';
 				$entry[$i]['fn'] = $entry[$i]['n_given'] . ' ' . $entry[$i]['n_family'];
 				//echo '<br>';
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Outlook_-_Hungary b/addressbook/inc/import/Import_from_Outlook_-_Hungary
index de98dd981e..d3dca1146f 100644
--- a/addressbook/inc/import/Import_from_Outlook_-_Hungary
+++ b/addressbook/inc/import/Import_from_Outlook_-_Hungary
@@ -169,7 +169,7 @@
 				$entry[$i]['adr_two_type']    = 'intl';
 				$entry[$i]['fn'] = $entry[$i]['n_family'] . ' ' . $entry[$i]['n_given'];
 				//echo '<br>';
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);
diff --git a/addressbook/inc/import/Import_from_Outlook_-_Italiano b/addressbook/inc/import/Import_from_Outlook_-_Italiano
index 2b2695b980..2d9445f864 100644
--- a/addressbook/inc/import/Import_from_Outlook_-_Italiano
+++ b/addressbook/inc/import/Import_from_Outlook_-_Italiano
@@ -178,7 +178,7 @@
 				$entry[$i]['adr_two_type']    = 'intl';
 				$entry[$i]['fn'] = $entry[$i]['n_given'] . ' ' . $entry[$i]['n_family'];
 				//echo '<br>';
-				$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
+				$contacts->add($GLOBALS['egw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 			}
 			$num = $i - 1;
 			return lang('Successfully imported %1 records into your addressbook.',$num);