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

Remove User_Adapter

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-05 17:38:27 +01:00
parent 171390f7c8
commit c156f842c7
231 changed files with 3918 additions and 2986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classes/eventsmanager/notify/push.php
View File

@@ -19,7 +19,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
*
* @var string
*/
public $events = ['__PUSH_DATAS__'];
public $events = array('__PUSH_DATAS__');
/**
*
@@ -39,12 +39,12 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'from' => ''
, 'to' => ''
, 'message' => ''
, 'ssel_id' => ''
];
);
$params = array_merge($default, $params);
@@ -83,8 +83,8 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
$repository = $this->app['EM']->getRepository('Phraseanet:Basket');
$basket = $repository->find($params['ssel_id']);
$user_from = User_Adapter::getInstance($params['from'], $this->app);
$user_to = User_Adapter::getInstance($params['to'], $this->app);
$user_from = $this->app['manipulator.user']->getRepository()->find($params['from']);
$user_to = $this->app['manipulator.user']->getRepository()->find($params['to']);
$receiver = Receiver::fromUser($user_to);
$emitter = Emitter::fromUser($user_from);
@@ -119,19 +119,17 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
$from = (string) $sx->from;
try {
User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
return [];
if (null === $user = $this->app['manipulator.user']->getRepository()->find($from)) {
return array();
}
$sender = User_Adapter::getInstance($from, $this->app)->get_display_name();
$sender = $user->getDisplayName();
$ret = [
'text' => $this->app->trans('%user% vous a envoye un %before_link% panier %after_link%', ['%user%' => $sender, '%before_link%' => '<a href="#" onclick="openPreview(\'BASK\',1,\''
. (string) $sx->ssel_id . '\');return false;">', '%after_link%' => '</a>'])
, 'class' => ($unread == 1 ? 'reload_baskets' : '')
];
);
return $ret;
}