diff --git a/addressbook/inc/hook_notifywindow.inc.php b/addressbook/inc/hook_notifywindow.inc.php
deleted file mode 100644
index 154d57dfa1..0000000000
--- a/addressbook/inc/hook_notifywindow.inc.php
+++ /dev/null
@@ -1,66 +0,0 @@
-\n";
- $GLOBALS['egw']->common->phpgw_exit();
- }
- unset($d1);
-
- $tmp_app_inc = PHPGW_APP_INC;
- define('PHPGW_APP_INC',$GLOBALS['egw']->common->get_inc_dir('addressbook'));
-
- if($GLOBALS['egw_info']['user']['apps']['addressbook']
- && $GLOBALS['egw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
- {
- echo "\n\n";
-
- $c = CreateObject('phpgwapi.contacts');
- $qfields = array(
- 'n_given' => 'n_given',
- 'n_family' => 'n_family',
- 'bday' => 'bday'
- );
- $now = time() - ((60 * 60) * (int)$GLOBALS['egw_info']['user']['preferences']['common']['tz_offset']);
- $today = $GLOBALS['egw']->common->show_date($now,'n/d/');
-// echo $today."\n";
-
- $bdays = $c->read(0,15,$qfields,$today,'tid=n','','',$GLOBALS['egw_info']['user']['account_id']);
-
- while(list($key,$val) = @each($bdays))
- {
- $tmp = ''
- . $val['n_given'] . ' ' . $val['n_family'] . '';
- echo '| ' . lang("Today is %1's birthday!", $tmp) . " |
\n";
- }
-
- $tomorrow = $GLOBALS['egw']->common->show_date($now + 86400,'n/d/');
-// echo $tomorrow."\n";
-
- $bdays = $c->read(0,15,$qfields,$tomorrow,'tid=n','','',$GLOBALS['egw_info']['user']['account_id']);
-
- while(list($key,$val) = @each($bdays))
- {
- $tmp = ''
- . $val['n_given'] . ' ' . $val['n_family'] . '';
- echo '| ' . lang("Tomorrow is %1's birthday.", $tmp) . " |
\n";
- }
- echo "\n\n";
- }
-
- define('PHPGW_APP_INC',$tmp_app_inc);
-?>
diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index 5a365a1e16..a62a3aee47 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -1,59 +1,53 @@
+ Always have your address book available for updates or look ups from anywhere.
+ Share address book contact information with others.
+ Link contacts to calendar events or InfoLog entires like phonecalls.
+ Addressbook is the eGroupWare default contact application.
+ It stores contact information via SQL or LDAP and provides contact services via the eGroupWare API.';
- $setup_info['addressbook']['author'] = 'Ralf Becker, Cornelius Weiss, Lars Kneschke';
-// $setup_info['addressbook']['note'] = 'The phpgwapi manages contact data. Addressbook manages servers for its remote capability.';
- $setup_info['addressbook']['license'] = 'GPL';
- $setup_info['addressbook']['description'] =
- 'Contact manager with Vcard support.
- Always have your address book available for updates or look ups from anywhere.
- Share address book contact information with others.
- Link contacts to calendar events or InfoLog entires like phonecalls.
- Addressbook is the eGroupWare default contact application.
- It stores contact information via SQL or LDAP and provides contact services via the eGroupWare API.';
+$setup_info['addressbook']['maintainer'] = 'eGroupWare coreteam';
+$setup_info['addressbook']['maintainer_email'] = 'egroupware-developers@lists.sourceforge.net';
- $setup_info['addressbook']['maintainer'] = 'eGroupWare coreteam';
- $setup_info['addressbook']['maintainer_email'] = 'egroupware-developers@lists.sourceforge.net';
+$setup_info['addressbook']['tables'] = array(); // addressbook tables are in the API!
- $setup_info['addressbook']['tables'] = array(); // addressbook tables are in phpgwapi!
+/* The hooks this app includes, needed for hooks registration */
+$setup_info['addressbook']['hooks']['admin'] = 'addressbook.contacts_admin_prefs.all_hooks';
+$setup_info['addressbook']['hooks']['preferences'] = 'addressbook.contacts_admin_prefs.all_hooks';
+$setup_info['addressbook']['hooks']['sidebox_menu'] = 'addressbook.contacts_admin_prefs.all_hooks';
+$setup_info['addressbook']['hooks']['settings'] = 'addressbook.contacts_admin_prefs.settings';
+$setup_info['addressbook']['hooks'][] = 'home';
+$setup_info['addressbook']['hooks']['deleteaccount'] = 'addressbook.bocontacts.deleteaccount';
+$setup_info['addressbook']['hooks']['search_link'] = 'addressbook.bocontacts.search_link';
+$setup_info['addressbook']['hooks']['edit_user'] = 'addressbook.contacts_admin_prefs.edit_user';
+$setup_info['addressbook']['hooks'][] = 'config';
- /* The hooks this app includes, needed for hooks registration */
- $setup_info['addressbook']['hooks']['admin'] = 'addressbook.contacts_admin_prefs.all_hooks';
- $setup_info['addressbook']['hooks']['preferences'] = 'addressbook.contacts_admin_prefs.all_hooks';
- $setup_info['addressbook']['hooks']['sidebox_menu'] = 'addressbook.contacts_admin_prefs.all_hooks';
- $setup_info['addressbook']['hooks']['settings'] = 'addressbook.contacts_admin_prefs.settings';
- $setup_info['addressbook']['hooks'][] = 'home';
- $setup_info['addressbook']['hooks']['deleteaccount'] = 'addressbook.bocontacts.deleteaccount';
- $setup_info['addressbook']['hooks'][] = 'notifywindow';
- $setup_info['addressbook']['hooks']['search_link'] = 'addressbook.bocontacts.search_link';
- $setup_info['addressbook']['hooks']['edit_user'] = 'addressbook.contacts_admin_prefs.edit_user';
- $setup_info['addressbook']['hooks'][] = 'config';
-
- /* Dependencies for this app to work */
- $setup_info['addressbook']['depends'][] = array(
- 'appname' => 'phpgwapi',
- 'versions' => Array('1.0.0','1.0.1','1.2','1.3')
- );
- $setup_info['addressbook']['depends'][] = array(
- 'appname' => 'etemplate',
- 'versions' => Array('1.0.0','1.0.1','1.2','1.3')
- );
+/* Dependencies for this app to work */
+$setup_info['addressbook']['depends'][] = array(
+ 'appname' => 'phpgwapi',
+ 'versions' => Array('1.3','1.4')
+);
+$setup_info['addressbook']['depends'][] = array(
+ 'appname' => 'etemplate',
+ 'versions' => Array('1.3','1.4')
+);