From 3d50fe76fb09d2efbd7f19d9fa1ad2907df3ece1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Tue, 14 Nov 2017 15:19:42 +0100
Subject: [PATCH] remove hooks from EMailAdmin as it might screw up
 adding/removing accounts if EMailAdmin has not been deinstalled, as it should
 have been by 16.1 update

---
 emailadmin/setup/setup.inc.php | 72 +---------------------------------
 1 file changed, 1 insertion(+), 71 deletions(-)

diff --git a/emailadmin/setup/setup.inc.php b/emailadmin/setup/setup.inc.php
index da64363520..86d587a0bc 100644
--- a/emailadmin/setup/setup.inc.php
+++ b/emailadmin/setup/setup.inc.php
@@ -8,7 +8,6 @@
  * @package emailadmin
  * @subpackage setup
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id$
  */
 
 // do NOT offer emailadmin for installation
@@ -27,7 +26,7 @@ $setup_info['emailadmin']['maintainer'] = array(
 );
 $setup_info['emailadmin']['license']  = 'GPL';
 $setup_info['emailadmin']['description'] =
-	'A central Mailserver management application for EGroupWare. Completely rewritten by Ralf Becker in 2013/14';
+	'EMailAdmin directory only exists in 16.1+ to allow updating from previous versions, without loosing email configuration.';
 
 $setup_info['emailadmin']['tables'][]	= 'egw_emailadmin';
 $setup_info['emailadmin']['tables'][]	= 'egw_mailaccounts';
@@ -36,72 +35,3 @@ $setup_info['emailadmin']['tables'][]	= 'egw_ea_credentials';
 $setup_info['emailadmin']['tables'][]	= 'egw_ea_identities';
 $setup_info['emailadmin']['tables'][]	= 'egw_ea_valid';
 $setup_info['emailadmin']['tables'][]	= 'egw_ea_notifications';
-
-/* The hooks this app includes, needed for hooks registration */
-$setup_info['emailadmin']['hooks']['deleteaccount'] = 'emailadmin_hooks::deleteaccount';
-$setup_info['emailadmin']['hooks']['addaccount'] = 'emailadmin_hooks::addaccount';
-$setup_info['emailadmin']['hooks']['editaccount'] = 'emailadmin_hooks::addaccount';
-$setup_info['emailadmin']['hooks']['deletegroup'] = 'emailadmin_hooks::deletegroup';
-$setup_info['emailadmin']['hooks']['changepassword'] = 'emailadmin_hooks::changepassword';
-
-/* Dependencies for this app to work */
-$setup_info['emailadmin']['depends'][] = array(
-	'appname'  => 'phpgwapi',
-	'versions' => Array('14.1')
-);
-$setup_info['emailadmin']['depends'][] = array(
-	'appname'  => 'etemplate',
-	'versions' => Array('14.1')
-);
-// installation checks
-$setup_info['emailadmin']['check_install'] = array(
-	'' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-	),
-	'pear.horde.org/Horde_Imap_Client' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '2.24.2',
-	),
-	'pear.horde.org/Horde_Nls' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '2.0.3',
-	),
-	'pear.horde.org/Horde_Mail' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '2.1.2',
-	),
-	'pear.horde.org/Horde_Smtp' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '1.3.0',
-	),
-	'pear.horde.org/Horde_ManageSieve' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '1.0.1',
-	),
-	// next 4 are required for TNEF support
-	'pear.horde.org/Horde_Compress' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '2.0.8',
-	),
-	'pear.horde.org/Horde_Icalendar' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '2.0.0',
-	),
-	'pear.horde.org/Horde_Mapi' => array(
-		'func' => 'pear_check',
-		'from' => 'EMailAdmin',
-		'version' => '1.0.0',
-	),
-	'bcmath' => array(
-		'func' => 'extension_check',
-		'from' => 'EMailAdmin',
-	),
-);