hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +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

22
lib/classes/eventsmanager/notify/validate.php
View File

@@ -20,7 +20,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
*
* @var string
*/
public $events = ['__PUSH_VALIDATION__'];
public $events = array('__PUSH_VALIDATION__');
/**
*
@@ -52,12 +52,12 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'from' => ''
, 'to' => ''
, 'message' => ''
, 'ssel_id' => ''
];
);
$params = array_merge($default, $params);
@@ -93,8 +93,8 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
$readyToSend = false;
try {
$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']);
$basket = $this->app['EM']
->getRepository('Phraseanet:Basket')
@@ -137,13 +137,11 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
$from = (string) $sx->from;
$ssel_id = (string) $sx->ssel_id;
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();
try {
$basket = $this->app['converter.basket']->convert($ssel_id);
@@ -153,7 +151,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
}
$bask_link = '<a href="'
. $this->app->url('lightbox_validation', ['basket' => (string) $sx->ssel_id])
. $this->app->url('lightbox_validation', array('ssel_id' => (string) $sx->ssel_id))
. '" target="_blank">'
. $basket_name . '</a>';
@@ -163,7 +161,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
'%title%' => $bask_link,
])
, 'class' => ($unread == 1 ? 'reload_baskets' : '')
];
);
return $ret;
}