diff --git a/lib/Alchemy/Phrasea/Application/Lightbox.php b/lib/Alchemy/Phrasea/Application/Lightbox.php index cb8d66ce9a..8b4f589d51 100644 --- a/lib/Alchemy/Phrasea/Application/Lightbox.php +++ b/lib/Alchemy/Phrasea/Application/Lightbox.php @@ -513,7 +513,7 @@ return call_user_func( $participant = $basket->getValidation()->getParticipant($user); $appbox = \appbox::get_instance($app['Core']); - $evt_mngr = \eventsmanager_broker::getInstance($appbox, $app['Core']); + $evt_mngr = $app['Core']['events-manager']; $expires = new \DateTime('+10 days'); $url = $appbox->get_registry()->get('GV_ServerName') diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Root.php b/lib/Alchemy/Phrasea/Controller/Admin/Root.php index e5ac0d7445..6232e6130f 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Root.php @@ -84,7 +84,7 @@ class Root implements ControllerProviderInterface return new Response($twig->render('admin/index.html.twig', array( 'module' => 'admin' - , 'events' => \eventsmanager_broker::getInstance($appbox, $Core) + , 'events' => $app['Core']['events-manager']//\eventsmanager_broker::getInstance($appbox, $Core) , 'module_name' => 'Admin' , 'notice' => $request->get("notice") , 'feature' => $feature diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php index 2d44799db5..55969d1214 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php @@ -189,7 +189,7 @@ class Push implements ControllerProviderInterface throw new ControllerException(_('No elements to push')); } - $events_manager = \eventsmanager_broker::getInstance(\appbox::get_instance($app['Core']), $app['Core']); + $events_manager = $app['Core']['events-manager']; foreach ($receivers as $receiver) { try { @@ -297,7 +297,7 @@ class Push implements ControllerProviderInterface $pusher = new RecordHelper\Push($app['Core'], $app['request']); $user = $app['Core']->getAuthenticatedUser(); - $events_manager = \eventsmanager_broker::getInstance(\appbox::get_instance($app['Core']), $app['Core']); + $events_manager = $app['Core']['events-manager']; $repository = $em->getRepository('\Entities\Basket'); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index 3170a4570b..e3a7f7e2ae 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -109,7 +109,7 @@ class Root implements ControllerProviderInterface 'module_prod' => new Helper\Prod($app['Core'], $app['request']), 'cssfile' => $cssfile, 'module' => 'prod', - 'events' => \eventsmanager_broker::getInstance($appbox, $app['Core']), + 'events' => $app['Core']['events-manager'], 'GV_defaultQuery_type' => $registry->get('GV_defaultQuery_type'), 'GV_multiAndReport' => $registry->get('GV_multiAndReport'), 'GV_thesaurus' => $registry->get('GV_thesaurus'), diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php index bf8bc6a97f..70b8dd8218 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php @@ -251,7 +251,7 @@ class Upload implements ControllerProviderInterface $appbox = \appbox::get_instance($app['Core']); - $eventsManager = \eventsmanager_broker::getInstance($appbox, $app['Core']); + $eventsManager = $app['Core']['events-manager']; $eventsManager->trigger('__UPLOAD_QUARANTINE__', $params); $id = $elementCreated->getId(); diff --git a/lib/Alchemy/Phrasea/Core.php b/lib/Alchemy/Phrasea/Core.php index c77efaee6e..216e21d133 100644 --- a/lib/Alchemy/Phrasea/Core.php +++ b/lib/Alchemy/Phrasea/Core.php @@ -213,6 +213,11 @@ class Core extends \Pimple return new \Symfony\Component\Filesystem\Filesystem(); }); + $this['EM'] = $this->share(function($core){ + $events = \eventsmanager_broker::getInstance(\appbox::get_instance($core), $core); + $events->start(); + }); + $this['pdf-to-text'] = $this->share(function () use ($core) { try { @@ -401,14 +406,6 @@ class Core extends \Pimple return $this->getRequest()->getLocale(); } - public function enableEvents() - { - $events = \eventsmanager_broker::getInstance(\appbox::get_instance($this), $this); - $events->start(); - - return; - } - /** * Initialiaze phraseanet log process * diff --git a/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php b/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php index 8240331183..7b94eaad00 100644 --- a/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php +++ b/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php @@ -70,7 +70,7 @@ class Twig extends ServiceAbstract } $core = \bootstrap::execute(); - $eventsmanager = \eventsmanager_broker::getInstance($appbox, $core); + $eventsmanager = $core['events-manager']; $this->twig->addGlobal('session', $session); $this->twig->addGlobal('version_number', $core->getVersion()->getNumber()); diff --git a/lib/classes/Feed/Entry/Adapter.class.php b/lib/classes/Feed/Entry/Adapter.class.php index f0f69b1bff..829d9ef105 100644 --- a/lib/classes/Feed/Entry/Adapter.class.php +++ b/lib/classes/Feed/Entry/Adapter.class.php @@ -542,7 +542,8 @@ class Feed_Entry_Adapter implements Feed_Entry_Interface, cache_cacheableInterfa $entry = new self($appbox, $feed, $entry_id); - $eventsmanager = \eventsmanager_broker::getInstance($appbox, \bootstrap::getCore()); + $Core = \bootstrap::getCore(); + $eventsmanager = $Core['events-manager']; $eventsmanager->trigger('__FEED_ENTRY_CREATE__', array('entry_id' => $entry_id), $entry); return $entry; diff --git a/lib/classes/Session/Handler.class.php b/lib/classes/Session/Handler.class.php index 6eebf2480d..479a24cf6f 100644 --- a/lib/classes/Session/Handler.class.php +++ b/lib/classes/Session/Handler.class.php @@ -536,7 +536,7 @@ class Session_Handler $date = new DateTime('+' . (int) $registry->get('GV_validation_reminder') . ' days'); - $eventsMngr = eventsmanager_broker::getInstance($this->appbox, $core); + $eventsMngr = $core['events-manager']; $em = $core->getEntityManager(); /* @var $em \Doctrine\ORM\EntityManager */ diff --git a/lib/classes/User/Adapter.class.php b/lib/classes/User/Adapter.class.php index 4fb7795828..0c6c1ba915 100644 --- a/lib/classes/User/Adapter.class.php +++ b/lib/classes/User/Adapter.class.php @@ -1284,7 +1284,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface protected function load_notifications_preferences() { $Core = bootstrap::getCore(); - $evt_mngr = eventsmanager_broker::getInstance($this->appbox, $Core); + $evt_mngr = $Core['events-manager']; $notifications = $evt_mngr->list_notifications_available($this->id); foreach ($notifications as $notification_group => $nots) { diff --git a/lib/classes/bootstrap.class.php b/lib/classes/bootstrap.class.php index a7a6223ca3..0cfdb6c43f 100644 --- a/lib/classes/bootstrap.class.php +++ b/lib/classes/bootstrap.class.php @@ -48,11 +48,6 @@ class bootstrap } } - - if (static::$core->getConfiguration()->isInstalled()) { - static::$core->enableEvents(); - } - if (\setup::is_installed()) { $gatekeeper = \gatekeeper::getInstance(static::$core); $gatekeeper->check_directory($request); diff --git a/lib/classes/set/exportorder.class.php b/lib/classes/set/exportorder.class.php index cae559307c..af714d75e5 100644 --- a/lib/classes/set/exportorder.class.php +++ b/lib/classes/set/exportorder.class.php @@ -87,7 +87,7 @@ class set_exportorder extends set_export return false; } - $evt_mngr = eventsmanager_broker::getInstance(appbox::get_instance($Core), $Core); + $evt_mngr = $Core['events-manager']; $params = array( 'order_id' => $order_id, diff --git a/lib/classes/set/order.class.php b/lib/classes/set/order.class.php index fbf4191415..b650595cc3 100644 --- a/lib/classes/set/order.class.php +++ b/lib/classes/set/order.class.php @@ -301,7 +301,7 @@ class set_order extends set_abstract $stmt->closeCursor(); if ($n > 0) { - $evt_mngr = eventsmanager_broker::getInstance($appbox, $core); + $evt_mngr = $Core['events-manager']; $params = array( 'ssel_id' => $this->ssel_id, @@ -348,7 +348,7 @@ class set_order extends set_abstract } if ($n > 0) { - $evt_mngr = eventsmanager_broker::getInstance($appbox, $Core); + $evt_mngr = $Core['events-manager']; $params = array( 'from' => $session->get_usr_id(), diff --git a/lib/classes/task/period/apibridge.class.php b/lib/classes/task/period/apibridge.class.php index 2c5eda860f..2ac704fc91 100755 --- a/lib/classes/task/period/apibridge.class.php +++ b/lib/classes/task/period/apibridge.class.php @@ -167,7 +167,7 @@ class task_period_apibridge extends task_appboxAbstract , 'sbas_id' => $element->get_record()->get_sbas_id() , 'record_id' => $element->get_record()->get_record_id() ); - $events_mngr = eventsmanager_broker::getInstance(appbox::get_instance(\bootstrap::getCore()), $Core); + $events_mngr = $Core['events-manager']; $events_mngr->trigger('__BRIDGE_UPLOAD_FAIL__', $params); break; diff --git a/lib/conf.d/_GV_template.inc b/lib/conf.d/_GV_template.inc index d3cedf5142..fe4de236b6 100644 --- a/lib/conf.d/_GV_template.inc +++ b/lib/conf.d/_GV_template.inc @@ -38,7 +38,7 @@ $extractDateFields = function(\Alchemy\Phrasea\Core $Core) { $date_sort_fields = $extractDateFields($Core); -$eventsmanager = eventsmanager_broker::getInstance(appbox::get_instance($Core), $Core); +$eventsmanager = $Core['events-manager']; $PHP_CONF = array( 'output_buffering' => '4096' //INI_ALL diff --git a/templates/web/common/menubar.twig b/templates/web/common/menubar.twig index a6276e4d5b..59e655a802 100644 --- a/templates/web/common/menubar.twig +++ b/templates/web/common/menubar.twig @@ -127,9 +127,9 @@ {% trans 'Notifications' %} - @@ -196,6 +196,6 @@ diff --git a/www/client/index.php b/www/client/index.php index 09e0994a18..c0bdf6cf40 100644 --- a/www/client/index.php +++ b/www/client/index.php @@ -109,7 +109,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
getTwig(); diff --git a/www/include/download.php b/www/include/download.php index d83fefb8e5..fa7e7a4a5a 100644 --- a/www/include/download.php +++ b/www/include/download.php @@ -67,7 +67,7 @@ if ($url) { ); - $events_mngr = eventsmanager_broker::getInstance($appbox, $Core); + $events_mngr = $Core['events-manager']; $events_mngr->trigger('__DOWNLOAD__', $params); return phrasea::redirect('/download/' . $url); diff --git a/www/include/sendmailpage.php b/www/include/sendmailpage.php index 79ad44d018..fea23dc7d1 100644 --- a/www/include/sendmailpage.php +++ b/www/include/sendmailpage.php @@ -29,8 +29,7 @@ $registry = $Core->getRegistry(); $gatekeeper = gatekeeper::getInstance($Core); $gatekeeper->require_session(); -$events_mngr = \eventsmanager_broker::getInstance(\appbox::get_instance($Core), $Core); - +$events_mngr = $Core['events-manager']; $user = $Core->getAuthenticatedUser(); diff --git a/www/include/updses.php b/www/include/updses.php index bbae295d00..930f7fb559 100644 --- a/www/include/updses.php +++ b/www/include/updses.php @@ -53,7 +53,7 @@ $session->set_event_module($parm['app'], true); $ret['status'] = 'ok'; $ret['notifications'] = false; -$evt_mngr = eventsmanager_broker::getInstance($appbox, $Core); +$evt_mngr = $Core['events-manager']; $notif = $evt_mngr->get_notifications(); $browser = Browser::getInstance(); diff --git a/www/login/account.php b/www/login/account.php index 040eee89ef..b3c466c96f 100644 --- a/www/login/account.php +++ b/www/login/account.php @@ -124,7 +124,7 @@ if ($request->has_post_datas()) { } } if ($request->has_post_datas()) { - $evt_mngr = eventsmanager_broker::getInstance($appbox, $Core); + $evt_mngr = $Core['events-manager']; $notifications = $evt_mngr->list_notifications_available($appbox->get_session()->get_usr_id()); $datas = array(); @@ -498,7 +498,7 @@ $user = User_Adapter::getInstance($appbox->get_session()->get_usr_id(), $appbox) list_notifications_available($appbox->get_session()->get_usr_id()); foreach ($notifications as $notification_group => $nots) { diff --git a/www/login/register.php b/www/login/register.php index 4172499393..555ddc3467 100644 --- a/www/login/register.php +++ b/www/login/register.php @@ -195,7 +195,7 @@ if ($request->has_post_datas()) { $demandOK[$base_id] = true; } - $event_mngr = eventsmanager_broker::getInstance($appbox, $Core); + $event_mngr = $Core['events-manager']; $params = array( 'demand' => $demandOK diff --git a/www/prod/prodFeedBack.php b/www/prod/prodFeedBack.php index e78cfda20d..42c45569bf 100644 --- a/www/prod/prodFeedBack.php +++ b/www/prod/prodFeedBack.php @@ -105,7 +105,7 @@ switch ($action) { case 'READ_NOTIFICATIONS': try { - $evt_mngr = eventsmanager_broker::getInstance($appbox, $Core); + $evt_mngr = $Core['events-manager']; $parm = $request->get_parms('notifications'); $output = $evt_mngr->read(explode('_', $parm['notifications']), $session->get_usr_id()); $output = p4string::jsonencode(array('error' => false, 'message' => '')); @@ -114,7 +114,7 @@ switch ($action) { } break; case 'NOTIFICATIONS_FULL': - $evt_mngr = eventsmanager_broker::getInstance($appbox, $Core); + $evt_mngr = $Core['events-manager']; $parm = $request->get_parms('page'); $output = $evt_mngr->get_json_notifications($parm['page']); break;