hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Events Manager to service

Browse Source
This commit is contained in:
Romain Neutron
2012-09-24 16:18:55 +02:00
parent 48743dc786
commit b86c3ed0c0
23 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Application/Lightbox.php
View File

@@ -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')

2
lib/Alchemy/Phrasea/Controller/Admin/Root.php
View File

@@ -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

4
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -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');

2
lib/Alchemy/Phrasea/Controller/Prod/Root.php
View File

@@ -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'),

2
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
View File

@@ -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();

13
lib/Alchemy/Phrasea/Core.php
View File

@@ -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
*

2
lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php
View File

@@ -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());

3
lib/classes/Feed/Entry/Adapter.class.php
View File

@@ -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;

2
lib/classes/Session/Handler.class.php
View File

@@ -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 */

2
lib/classes/User/Adapter.class.php
View File

@@ -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) {

5
lib/classes/bootstrap.class.php
View File

@@ -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);

2
lib/classes/set/exportorder.class.php
View File

@@ -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,

4
lib/classes/set/order.class.php
View File

@@ -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(),

2
lib/classes/task/period/apibridge.class.php
View File

@@ -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;

2
lib/conf.d/_GV_template.inc
View File

@@ -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

8
templates/web/common/menubar.twig
View File

@@ -127,9 +127,9 @@
<a href="#" style="font-weight:bold;text-decoration:none;">
<span>
{% trans 'Notifications' %}
<button class="counter btn btn-danger" style="visibility:{% if events.get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};">
{% if events.get_unread_notifications_number > 0 %}
{{events.get_unread_notifications_number}}
<button class="counter btn btn-danger" style="visibility:{% if core['events-manager'].get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};">
{% if core['events-manager'].get_unread_notifications_number > 0 %}
{{core['events-manager'].get_unread_notifications_number}}
{% endif %}
</button>
</span>
@@ -196,6 +196,6 @@
</div>
<div style="display:none;z-index:30000;" id="notification_box">
{% set notifications = events.get_notifications %}
{% set notifications = core['events-manager'].get_notifications %}
{% include 'prod/notifications.twig' %}
</div>

2
www/client/index.php
View File

@@ -109,7 +109,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
<div id="container" style="position:absolute;top:0;left:0;overflow:hidden;width:100%;height:100%;">
<?php
$events_mngr = eventsmanager_broker::getInstance($appbox, $Core);
$events_mngr = $Core['events-manager'];
$core = \bootstrap::getCore();
$twig = $core->getTwig();

2
www/include/download.php
View File

@@ -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);

3
www/include/sendmailpage.php
View File

@@ -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();

2
www/include/updses.php
View File

@@ -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();

4
www/login/account.php
View File

@@ -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)
<td colspan="3"><?php echo _('Email notification') ?></td>
</tr>
<?php
$evt_mngr = eventsmanager_broker::getInstance($appbox, $Core);
$evt_mngr = $Core['events-manager'];
$notifications = $evt_mngr->list_notifications_available($appbox->get_session()->get_usr_id());
foreach ($notifications as $notification_group => $nots) {

2
www/login/register.php
View File

@@ -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

4
www/prod/prodFeedBack.php
View File

@@ -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;