R34085 - in /trunk/felamimail: inc/class.felamimail_bo.inc.php inc/class.felamimail_hooks.inc.php setup/setup.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 34085

URL: http://www.egroupware.org/viewvc/egroupware?rev=34085&view=rev
Log:
moved felamimail_bo hooks to felamimail_hooks, requires to run Admin >> Register hooks

Modified:
trunk/felamimail/inc/class.felamimail_bo.inc.php
trunk/felamimail/inc/class.felamimail_hooks.inc.php
trunk/felamimail/setup/setup.inc.php

Modified: trunk/felamimail/inc/class.felamimail_bo.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/felamimail/inc/class.felamimail_bo.inc.php?rev=34085&r1=34084&r2=34085&view=diff

— trunk/felamimail/inc/class.felamimail_bo.inc.php (original)
+++ trunk/felamimail/inc/class.felamimail_bo.inc.php Thu Mar 10 14:36:05 2011
@@ -227,7 +227,7 @@

	}

  •   function forcePrefReload()

  •   public static function forcePrefReload()
  {
  	// unset the fm_preferences session object, to force the reload/rebuild
  	$GLOBALS['egw']->session->appsession('fm_preferences','felamimail',serialize(array()));

@@ -275,24 +275,6 @@
if(is_a($ogServer,‘defaultsmtp’)) {
$ogServer->addAccount($_hookValues);
}

  •   	}

  •   }

  •   function adminMenu()

  •   {

  •   	if ($GLOBALS['egw_info']['server']['account_repository'] == "ldap")

  •   	{

  •   		$data = Array

  •   		(

  •   			'description'   => 'email settings',

  •   			'url'           => '/index.php',

  •   			'extradata'     => 'menuaction=emailadmin.uiuserdata.editUserData'

  •   		);

  •   		//Do not modify below this line

  •   		global $menuData;

  •   		$menuData[] = $data;
  	}
  }

Modified: trunk/felamimail/inc/class.felamimail_hooks.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/felamimail/inc/class.felamimail_hooks.inc.php?rev=34085&r1=34084&r2=34085&view=diff

— trunk/felamimail/inc/class.felamimail_hooks.inc.php (original)
+++ trunk/felamimail/inc/class.felamimail_hooks.inc.php Thu Mar 10 14:36:05 2011
@@ -13,7 +13,51 @@
*/
class felamimail_hooks
{

  • /**
    +/**
    • Several hooks calling an instanciated felamimail_bo, which need to use the felamimail_bo::getInstance() singelton
    • @param string|array $hookData
  • */
  • static public function accountHooks($hookData)
  • {
  •   $bofelamimail = felamimail_bo::getInstance();

  •   switch(is_array($hookData) ? $hookData['location'] : $hookData)

  •   {

  •   	case 'addaccount':

  •   		$bofelamimail->addAccount($hookData);

  •   		break;

  •   	case 'deleteaccount':

  •   		$bofelamimail->deleteAccount($hookData);

  •   		break;

  •   	case 'editaccount':

  •   		$bofelamimail->updateAccount($hookData);

  •   		break;

  •   }
  • }
  • /**
    • Menu for Admin >> Edit accounts
  • */
  • static public function adminMenu()
  • {
  •   if ($GLOBALS['egw_info']['server']['account_repository'] == "ldap")

  •   {

  •   	$data = Array

  •   	(

  •   		'description'   => 'email settings',

  •   		'url'           => '/index.php',

  •   		'extradata'     => 'menuaction=emailadmin.uiuserdata.editUserData'

  •   	);

  •   	//Do not modify below this line

  •   	global $menuData;

  •   	$menuData[] = $data;

  •   }
  • }
  • /**
    • Hook called by link-class to include calendar in the appregistry of the linkage
    • @param array/string $location location and other parameters (not used)

Modified: trunk/felamimail/setup/setup.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/felamimail/setup/setup.inc.php?rev=34085&r1=34084&r2=34085&view=diff

— trunk/felamimail/setup/setup.inc.php (original)
+++ trunk/felamimail/setup/setup.inc.php Thu Mar 10 14:36:05 2011
@@ -29,11 +29,11 @@
$setup_info[‘felamimail’][‘hooks’][‘settings’] = ‘felamimail_hooks::settings’;
$setup_info[‘felamimail’][‘hooks’][] = ‘home’;
$setup_info[‘felamimail’][‘hooks’][‘sidebox_menu’] = ‘felamimail_hooks::sidebox_menu’;
-$setup_info[‘felamimail’][‘hooks’][‘addaccount’] = ‘felamimail.felamimail_bo.addAccount’;
-$setup_info[‘felamimail’][‘hooks’][‘deleteaccount’] = ‘felamimail.felamimail_bo.deleteAccount’;
-$setup_info[‘felamimail’][‘hooks’][‘editaccount’] = ‘felamimail.felamimail_bo.updateAccount’;
-$setup_info[‘felamimail’][‘hooks’][‘edit_user’] = ‘felamimail.felamimail_bo.adminMenu’;
-$setup_info[‘felamimail’][‘hooks’][‘verify_settings’] = ‘felamimail.felamimail_bo.forcePrefReload’;
+$setup_info[‘felamimail’][‘hooks’][‘addaccount’] = ‘felamimail_hooks::accountHooks’;
+$setup_info[‘felamimail’][‘hooks’][‘deleteaccount’] = ‘felamimail_hooks::accountHooks’;
+$setup_info[‘felamimail’][‘hooks’][‘editaccount’] = ‘felamimail_hooks::accountHooks’;
+$setup_info[‘felamimail’][‘hooks’][‘verify_settings’] = ‘felamimail_bo::forcePrefReload’;
+$setup_info[‘felamimail’][‘hooks’][‘edit_user’] = ‘felamimail_hooks::adminMenu’;
$setup_info[‘felamimail’][‘hooks’][‘search_link’] = ‘felamimail_hooks::search_link’;

/* Dependencies for this app to work */

Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs