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

50
lib/classes/eventsmanager/notify/autoregister.php
View File

@@ -11,6 +11,7 @@
use Alchemy\Phrasea\Notification\Receiver;
use Alchemy\Phrasea\Notification\Mail\MailInfoSomebodyAutoregistered;
use Alchemy\Phrasea\Model\Entities\User;
class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
{
@@ -18,7 +19,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
*
* @var string
*/
public $events = ['__REGISTER_AUTOREGISTER__'];
public $events = array('__REGISTER_AUTOREGISTER__');
/**
*
@@ -38,10 +39,10 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'usr_id' => ''
, 'autoregister' => []
];
, 'autoregister' => array()
);
$params = array_merge($default, $params);
$base_ids = array_keys($params['autoregister']);
@@ -50,7 +51,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
return;
}
$mailColl = [];
$mailColl = array();
$sql = 'SELECT u.usr_id, b.base_id FROM usr u, basusr b
WHERE u.usr_id = b.usr_id
@@ -69,7 +70,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
foreach ($rs as $row) {
if ( ! isset($mailColl[$row['usr_id']]))
$mailColl[$row['usr_id']] = [];
$mailColl[$row['usr_id']] = array();
$mailColl[$row['usr_id']][] = $row['base_id'];
}
@@ -102,9 +103,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
$datas = $dom_xml->saveXml();
try {
$registered_user = User_Adapter::getInstance($params['usr_id'], $this->app);
} catch (Exception $e) {
if (null === $registered_user = $this->app['manipulator.user']->getRepository()->find($params['usr_id'])) {
return;
}
@@ -113,9 +112,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
$mailed = false;
if ($this->shouldSendNotificationFor($usr_id)) {
try {
$admin_user = User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
if (null === $admin_user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
continue;
}
@@ -140,18 +137,15 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
$sx = simplexml_load_string($datas);
$usr_id = (string) $sx->usr_id;
try {
User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
return [];
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return array();
}
$sender = User_Adapter::getInstance($usr_id, $this->app)->get_display_name();
$ret = [
'text' => $this->app->trans('%user% s\'est enregistre sur une ou plusieurs %before_link% scollections %after_link%', ['%user%' => $sender, '%before_link%' => '<a href="/admin/?section=users" target="_blank">', '%after_link%' => '</a>'])
'text' => $this->app->trans('%user% s\'est enregistre sur une ou plusieurs %before_link% scollections %after_link%', ['%user%' => $user->getDisplayName(), '%before_link%' => '<a href="/admin/?section=users" target="_blank">', '%after_link%' => '</a>'])
, 'class' => ''
];
);
return $ret;
}
@@ -176,17 +170,17 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
/**
*
* @param \User_Adapter $to
* @param \User_Adapter $registeredUser
* @param User $to
* @param User $registeredUser
*
* @return boolean
*/
public function mail(\User_Adapter $to, \User_Adapter $registeredUser)
public function mail(User $to, User $registeredUser)
{
$body .= sprintf("Login : %s\n", $registeredUser->get_login());
$body .= sprintf("%s : %s\n", $this->app->trans('admin::compte-utilisateur nom'), $registeredUser->get_firstname());
$body .= sprintf("%s : %s\n", $this->app->trans('admin::compte-utilisateur prenom'), $registeredUser->get_lastname());
$body .= sprintf("%s : %s\n", $this->app->trans('admin::compte-utilisateur email'), $registeredUser->get_email());
$body .= sprintf("%s : %s\n", _('admin::compte-utilisateur nom'), $registeredUser->get_firstname());
$body .= sprintf("%s : %s\n", _('admin::compte-utilisateur prenom'), $registeredUser->get_lastname());
$body .= sprintf("%s : %s\n", _('admin::compte-utilisateur email'), $registeredUser->get_email());
$body .= sprintf("%s/%s\n", $registeredUser->get_job(), $registeredUser->get_company());
$readyToSend = false;
@@ -216,9 +210,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
return false;
}
try {
$user = \User_Adapter::getInstance($usr_id, $this->app);
} catch (\Exception $e) {
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return false;
}

2
lib/classes/eventsmanager/notify/bridgeuploadfail.php
View File

@@ -79,7 +79,7 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract
$readyToSend = false;
try {
$user = User_Adapter::getInstance($params['usr_id'], $this->app);
$user = $this->app['manipulator.user']->getRepository()->find($params['usr_id']);
$account = Bridge_Account::load_account($this->app, $params['account_id']);
$receiver = Receiver::fromUser($user);
$readyToSend = true;

7
lib/classes/eventsmanager/notify/feed.php
View File

@@ -83,15 +83,14 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
$results = $Query->limit($start, $perLoop)->execute()->get_results();
foreach ($results as $user_to_notif) {
/* @var $user_to_notif \User_Adapter */
$mailed = false;
if ($params['notify_email'] && $this->shouldSendNotificationFor($user_to_notif->get_id())) {
if ($params['notify_email'] && $this->shouldSendNotificationFor($user_to_notif->getId())) {
$readyToSend = false;
try {
$token = $this->app['tokens']->getUrlToken(
\random::TYPE_FEED_ENTRY
, $user_to_notif->get_id()
, $user_to_notif->getId()
, null
, $entry->getId()
);
@@ -115,7 +114,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
}
}
$this->broker->notify($user_to_notif->get_id(), __CLASS__, $datas, $mailed);
$this->broker->notify($user_to_notif->getId(), __CLASS__, $datas, $mailed);
}
$start += $perLoop;
} while (count($results) > 0);

38
lib/classes/eventsmanager/notify/order.php
View File

@@ -18,7 +18,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
*
* @var string
*/
public $events = ['__NEW_ORDER__'];
public $events = array('__NEW_ORDER__');
/**
*
@@ -38,22 +38,22 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'usr_id' => ''
, 'order_id' => []
];
, 'order_id' => array()
);
$params = array_merge($default, $params);
$order_id = $params['order_id'];
$users = [];
$users = array();
try {
$repository = $this->app['EM']->getRepository('Phraseanet:OrderElement');
$results = $repository->findBy(['orderId' => $order_id]);
$results = $repository->findBy(array('orderId' => $order_id));
$base_ids = [];
$base_ids = array();
foreach ($results as $result) {
$base_ids[] = $result->getBaseId();
}
@@ -61,7 +61,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
$query = new User_Query($this->app);
$users = $query->on_base_ids($base_ids)
->who_have_right(['order_master'])
->who_have_right(array('order_master'))
->execute()->get_results();
} catch (Exception $e) {
@@ -92,16 +92,14 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
$datas = $dom_xml->saveXml();
try {
$orderInitiator = User_Adapter::getInstance($params['usr_id'], $this->app);
} catch (\Exception $e) {
if (null === $orderInitiator = $this->app['manipulator.user']->getRepository()->find($params['usr_id'])) {
return;
}
foreach ($users as $user) {
$mailed = false;
if ($this->shouldSendNotificationFor($user->get_id())) {
if ($this->shouldSendNotificationFor($user->getId())) {
$readyToSend = false;
try {
$receiver = Receiver::fromUser($user);
@@ -119,7 +117,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
}
}
$this->broker->notify($user->get_id(), __CLASS__, $datas, $mailed);
$this->broker->notify($user->getId(), __CLASS__, $datas, $mailed);
}
return;
@@ -138,13 +136,11 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
$usr_id = (string) $sx->usr_id;
$order_id = (string) $sx->order_id;
try {
User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
return [];
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return array();
}
$sender = User_Adapter::getInstance($usr_id, $this->app)->get_display_name();
$sender = $user->getDisplayName();
$ret = [
'text' => $this->app->trans('%user% a passe une %opening_link% commande %end_link%', [
@@ -152,7 +148,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
'%opening_link%' => '<a href="/prod/order/'.$order_id.'/" class="dialog full-dialog" title="'.$this->app->trans('Orders manager').'">',
'%end_link%' => '</a>',])
, 'class' => ''
];
);
return $ret;
}
@@ -182,9 +178,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
*/
public function is_available($usr_id)
{
try {
$user = \User_Adapter::getInstance($usr_id, $this->app);
} catch (\Exception $e) {
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return false;
}

34
lib/classes/eventsmanager/notify/orderdeliver.php
View File

@@ -20,7 +20,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
*
* @var string
*/
public $events = ['__ORDER_DELIVER__'];
public $events = array('__ORDER_DELIVER__');
/**
*
@@ -52,12 +52,12 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'from' => ''
, 'to' => ''
, 'ssel_id' => ''
, 'n' => ''
];
);
$params = array_merge($default, $params);
@@ -92,8 +92,8 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
if ($this->shouldSendNotificationFor($params['to'])) {
$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']);
$receiver = Receiver::fromUser($user_to);
$emitter = Emitter::fromUser($user_from);
@@ -107,15 +107,15 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
}
if ($readyToSend) {
$url = $this->app->url('lightbox_compare', [
'basket' => $basket->getId(),
$url = $this->app->url('lightbox_compare', array(
'ssel_id' => $basket->getId(),
'LOG' => $this->app['tokens']->getUrlToken(
\random::TYPE_VIEW,
$user_to->get_id(),
$user_to->getId(),
null,
$basket->getId()
)
]);
));
$mail = MailInfoOrderDelivered::create($this->app, $receiver, $emitter, null);
$mail->setButtonUrl($url);
@@ -144,25 +144,25 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$ssel_id = (string) $sx->ssel_id;
$n = (int) $sx->n;
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);
$repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
$basket = $repository->findUserBasket($this->app, $ssel_id, $this->app['authentication']->getUser(), false);
} catch (Exception $e) {
return [];
return array();
}
$ret = [
'text' => $this->app->trans('%user% vous a delivre %quantity% document(s) pour votre commande %title%', ['%user%' => $sender, '%quantity%' => $n, '%title%' => '<a href="/lightbox/compare/'
. (string) $sx->ssel_id . '/" target="_blank">'
. $basket->getName() . '</a>'])
, 'class' => ''
];
);
return $ret;
}

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

@@ -20,7 +20,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
*
* @var string
*/
public $events = ['__ORDER_NOT_DELIVERED__'];
public $events = array('__ORDER_NOT_DELIVERED__');
public function __construct(Application $app, eventsmanager_broker $broker)
{
@@ -37,11 +37,11 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'from' => ''
, 'to' => ''
, 'n' => ''
];
);
$params = array_merge($default, $params);
@@ -75,8 +75,8 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
$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']);
$receiver = Receiver::fromUser($user_to);
$emitter = Emitter::fromUser($user_from);
@@ -107,18 +107,16 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
$from = (string) $sx->from;
$n = (int) $sx->n;
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% a refuse la livraison de %quantity% document(s) pour votre commande', ['%user%' => $sender, '%quantity%' => $n])
, 'class' => ''
];
);
return $ret;
}

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

34
lib/classes/eventsmanager/notify/register.php
View File

@@ -18,7 +18,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
*
* @var string
*/
public $events = ['__REGISTER_APPROVAL__'];
public $events = array('__REGISTER_APPROVAL__');
/**
*
@@ -38,10 +38,10 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'usr_id' => ''
, 'demand' => []
];
, 'demand' => array()
);
$params = array_merge($default, $params);
$base_ids = $params['demand'];
@@ -50,7 +50,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
return;
}
$mailColl = [];
$mailColl = array();
try {
$sql = 'SELECT u.usr_id, b.base_id
@@ -70,7 +70,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
foreach ($rs as $row) {
if ( ! isset($mailColl[$row['usr_id']]))
$mailColl[$row['usr_id']] = [];
$mailColl[$row['usr_id']] = array();
$mailColl[$row['usr_id']][] = $row['base_id'];
}
@@ -103,10 +103,8 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
$datas = $dom_xml->saveXml();
try {
$registeredUser = \User_Adapter::getInstance($params['usr_id'], $this->app);
} catch (\Exception $e) {
return;
if (null === $registeredUser = $this->app['manipulator.user']->getRepository()->find($params['usr_id'])) {
return;
}
foreach ($mailColl as $usr_id => $base_ids) {
@@ -115,7 +113,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
if ($this->shouldSendNotificationFor($usr_id)) {
$readyToSend = false;
try {
$admin_user = User_Adapter::getInstance($usr_id, $this->app);
$admin_user = $this->app['manipulator.user']->getRepository()->find($usr_id);
$receiver = Receiver::fromUser($admin_user);
$readyToSend = true;
} catch (\Exception $e) {
@@ -150,18 +148,16 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
$usr_id = (string) $sx->usr_id;
try {
User_Adapter::getInstance($usr_id, $this->app);
} catch (Exception $e) {
return [];
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return array();
}
$sender = User_Adapter::getInstance($usr_id, $this->app)->get_display_name();
$sender = $user->getDisplayName();
$ret = [
'text' => $this->app->trans('%user% demande votre approbation sur une ou plusieurs %before_link% collections %after_link%', ['%user%' => $sender, '%before_link%' => '<a href="' . $this->app->url('admin', ['section' => 'registrations']) . '" target="_blank">', '%after_link%' => '</a>'])
, 'class' => ''
];
);
return $ret;
}
@@ -195,9 +191,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
return false;
}
try {
$user = \User_Adapter::getInstance($usr_id, $this->app);
} catch (\Exception $e) {
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return false;
}

15
lib/classes/eventsmanager/notify/uploadquarantine.php
View File

@@ -11,6 +11,7 @@
use Alchemy\Phrasea\Model\Entities\LazaretCheck;
use Alchemy\Phrasea\Model\Entities\LazaretFile;
use Alchemy\Phrasea\Model\Entities\User;
use Alchemy\Phrasea\Notification\Receiver;
use Alchemy\Phrasea\Notification\Mail\MailInfoRecordQuarantined;
@@ -73,7 +74,7 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
//Sender
if (null !== $user = $lazaretFile->getSession()->getUser($this->app)) {
$sender = $domXML->createElement('sender');
$sender->appendChild($domXML->createTextNode($user->get_display_name()));
$sender->appendChild($domXML->createTextNode($user->getDisplayName()));
$root->appendChild($sender);
$this->notifyUser($user, $datas);
@@ -98,14 +99,14 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
/**
* Notifiy an user using the specified datas
*
* @param \User_Adapter $user
* @param User $user
* @param string $datas
*/
private function notifyUser(\User_Adapter $user, $datas)
private function notifyUser(User $user, $datas)
{
$mailed = false;
if ($this->shouldSendNotificationFor($user->get_id())) {
if ($this->shouldSendNotificationFor($user->getId())) {
$readyToSend = false;
try {
$receiver = Receiver::fromUser($user);
@@ -121,7 +122,7 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
}
}
$this->broker->notify($user->get_id(), __CLASS__, $datas, $mailed);
$this->broker->notify($user->getId(), __CLASS__, $datas, $mailed);
}
/**
@@ -182,9 +183,7 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
*/
public function is_available($usr_id)
{
try {
$user = \User_Adapter::getInstance($usr_id, $this->app);
} catch (\Exception $e) {
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return false;
}

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

30
lib/classes/eventsmanager/notify/validationdone.php
View File

@@ -20,7 +20,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
*
* @var string
*/
public $events = ['__VALIDATION_DONE__'];
public $events = array('__VALIDATION_DONE__');
/**
*
@@ -52,11 +52,11 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'from' => ''
, 'to' => ''
, 'ssel_id' => ''
];
);
$params = array_merge($default, $params);
@@ -88,8 +88,8 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
if ($this->shouldSendNotificationFor($params['to'])) {
$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')
@@ -131,18 +131,18 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
$from = (string) $sx->from;
$ssel_id = (string) $sx->ssel_id;
try {
$registered_user = User_Adapter::getInstance($from, $this->app);
} catch (Exception $e) {
return [];
if (null === $registered_user = $this->app['manipulator.user']->getRepository()->find($from)) {
return array();
}
$sender = $registered_user->get_display_name();
$sender = $registered_user->getDisplayName();
try {
$basket = $this->app['converter.basket']->convert($ssel_id);
$repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
$basket = $repository->findUserBasket($this->app, $ssel_id, $this->app['authentication']->getUser(), false);
} catch (Exception $e) {
return [];
return array();
}
$ret = [
@@ -151,7 +151,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
. $basket->getName() . '</a>'
])
, 'class' => ''
];
);
return $ret;
}
@@ -181,9 +181,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
*/
public function is_available($usr_id)
{
try {
$user = \User_Adapter::getInstance($usr_id, $this->app);
} catch (\Exception $e) {
if (null === $user = $this->app['manipulator.user']->getRepository()->find($usr_id)) {
return false;
}

24
lib/classes/eventsmanager/notify/validationreminder.php
View File

@@ -20,7 +20,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
*
* @var string
*/
public $events = ['__VALIDATION_REMINDER__'];
public $events = array('__VALIDATION_REMINDER__');
/**
*
@@ -52,12 +52,12 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
*/
public function fire($event, $params, &$object)
{
$default = [
$default = array(
'from' => ''
, 'to' => ''
, 'ssel_id' => ''
, 'url' => ''
];
);
$params = array_merge($default, $params);
@@ -86,10 +86,10 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
$mailed = false;
try {
$user_from = User_Adapter::getInstance($params['from'], $this->app);
$user_to = User_Adapter::getInstance($params['to'], $this->app);
} catch (Exception $e) {
$user_from = $this->app['manipulator.user']->getRepository()->find($params['from']);
$user_to = $this->app['manipulator.user']->getRepository()->find($params['to']);
if (null === $user_from || null === $user_to) {
return false;
}
@@ -136,13 +136,11 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
$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);
@@ -158,7 +156,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
$ret = [
'text' => $this->app->trans('Rappel : Il vous reste %number% jours pour valider %title% de %user%', ['%number%' => $this->app['conf']->get(['registry', 'actions', 'validation-reminder-days']), '%title%' => $bask_link, '%user%' => $sender])
, 'class' => ($unread == 1 ? 'reload_baskets' : '')
];
);
return $ret;
}