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

Fix tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-12-05 14:21:50 +01:00
parent 49744c5e2f
commit b341495c88
122 changed files with 963 additions and 3454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,6 @@
use Alchemy\Phrasea\Notification\Receiver;
use Alchemy\Phrasea\Notification\Mail\MailInfoSomebodyAutoregistered;
use Alchemy\Phrasea\Model\Entities\User;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
{
@@ -50,23 +49,8 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
$mailColl = [];
$rsm = new ResultSetMappingBuilder($this->app['EM']);
$rsm->addRootEntityFromClassMetadata('Alchemy\Phrasea\Model\Entities\User', 'u');
$rsm->addScalarResult('base_id', 'base_id');
$selectClause = $rsm->generateSelectClause();
$query = $this->app['EM']->createNativeQuery('
SELECT b.base_id, '.$selectClause.' FROM Users u, basusr b
WHERE u.id = b.usr_id
AND b.base_id IN (' . implode(', ', array_keys($base_ids)) . ')
AND u.model_of IS NULL
AND b.actif="1"
AND b.canadmin="1"
AND u.deleted="0"', $rsm
);
try {
$rs = $query->getResult();
$rs = $this->app['phraseanet.native-query']->getAdminsOfBases(array_keys($base_ids));
foreach ($rs as $row) {
$user = $row[0];
@@ -145,7 +129,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
}
$ret = [
'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>'])
'text' => $this->app->trans('%user% s\'est enregistre sur une ou plusieurs %before_link% scollections %after_link%', ['%user%' => $user->getDisplayName($this->app['translator']), '%before_link%' => '<a href="/admin/?section=users" target="_blank">', '%after_link%' => '</a>'])
, 'class' => ''
];
@@ -179,15 +163,16 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
*/
public function mail(User $to, User $registeredUser)
{
$body .= sprintf("Login : %s\n", $registeredUser->get_login());
$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());
$body = '';
$body .= sprintf("Login : %s\n", $registeredUser->getLogin());
$body .= sprintf("%s : %s\n", _('admin::compte-utilisateur nom'), $registeredUser->getFirstName());
$body .= sprintf("%s : %s\n", _('admin::compte-utilisateur prenom'), $registeredUser->getLastName());
$body .= sprintf("%s : %s\n", _('admin::compte-utilisateur email'), $registeredUser->getEmail());
$body .= sprintf("%s/%s\n", $registeredUser->get_job(), $registeredUser->getCompany());
$readyToSend = false;
try {
$receiver = Receiver::fromUser($to);
$receiver = Receiver::fromUser($to, $this->app['translator']);
$readyToSend = true;
} catch (Exception $e) {

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

@@ -81,7 +81,7 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract
try {
$user = $this->app['manipulator.user']->getRepository()->find($params['usr_id']);
$account = Bridge_Account::load_account($this->app, $params['account_id']);
$receiver = Receiver::fromUser($user);
$receiver = Receiver::fromUser($user, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {

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

@@ -97,7 +97,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
$url = $this->app->url('lightbox', ['LOG' => $token]);
$receiver = Receiver::fromUser($user_to_notif);
$receiver = Receiver::fromUser($user_to_notif, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {

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

@@ -102,7 +102,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
if ($this->shouldSendNotificationFor($user->getId())) {
$readyToSend = false;
try {
$receiver = Receiver::fromUser($user);
$receiver = Receiver::fromUser($user, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {
continue;
@@ -140,7 +140,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
return [];
}
$sender = $user->getDisplayName();
$sender = $user->getDisplayName($this->app['translator']);
$ret = [
'text' => $this->app->trans('%user% a passe une %opening_link% commande %end_link%', [

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

@@ -95,8 +95,8 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$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);
$receiver = Receiver::fromUser($user_to, $this->app['translator']);
$emitter = Emitter::fromUser($user_from, $this->app['translator']);
$repository = $this->app['EM']->getRepository('Phraseanet:Basket');
$basket = $repository->find($params['ssel_id']);
@@ -148,7 +148,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
return [];
}
$sender = $user->getDisplayName();
$sender = $user->getDisplayName($this->app['translator']);
try {
$repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');

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

@@ -78,8 +78,8 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
$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);
$receiver = Receiver::fromUser($user_to, $this->app['translator']);
$emitter = Emitter::fromUser($user_from, $this->app['translator']);
$readyToSend = true;
} catch (Exception $e) {
@@ -111,7 +111,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
return [];
}
$sender = $user->getDisplayName();
$sender = $user->getDisplayName($this->app['translator']);
$ret = [
'text' => $this->app->trans('%user% a refuse la livraison de %quantity% document(s) pour votre commande', ['%user%' => $sender, '%quantity%' => $n])

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

@@ -86,8 +86,8 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
$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);
$receiver = Receiver::fromUser($user_to, $this->app['translator']);
$emitter = Emitter::fromUser($user_from, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {
@@ -123,7 +123,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
return [];
}
$sender = $user->getDisplayName();
$sender = $user->getDisplayName($this->app['translator']);
$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,\''

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

@@ -10,7 +10,6 @@
*/
use Alchemy\Phrasea\Notification\Receiver;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Alchemy\Phrasea\Notification\Mail\MailInfoUserRegistered;
class eventsmanager_notify_register extends eventsmanager_notifyAbstract
@@ -53,23 +52,10 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
$mailColl = [];
$rsm = new ResultSetMappingBuilder($this->app['EM']);
$rsm->addRootEntityFromClassMetadata('Alchemy\Phrasea\Model\Entities\User', 'u');
$rsm->addScalarResult('base_id', 'base_id');
$selectClause = $rsm->generateSelectClause();
$query = $this->app['EM']->createNativeQuery('
SELECT b.base_id, '.$selectClause.' FROM Users u, basusr b
WHERE u.id = b.usr_id
AND b.base_id IN (' . implode(', ', array_keys($base_ids)) . ')
AND u.model_of IS NULL
AND b.actif="1"
AND b.canadmin="1"
AND u.deleted="0"',
$rsm);
try {
foreach ($query->getResult() as $row) {
$rs = $this->app['phraseanet.native-query']->getAdminsOfBases(array_keys($base_ids));
foreach ($rs as $row) {
$user = $row[0];
if (!isset($mailColl[$user->getId()])) {
@@ -117,7 +103,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
$readyToSend = false;
try {
$admin_user = $this->app['manipulator.user']->getRepository()->find($usr_id);
$receiver = Receiver::fromUser($admin_user);
$receiver = Receiver::fromUser($admin_user, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {
continue;
@@ -155,7 +141,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
return [];
}
$sender = $user->getDisplayName();
$sender = $user->getDisplayName($this->app['translator']);
$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>'])

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

@@ -74,7 +74,7 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
//Sender
if (null !== $user = $lazaretFile->getSession()->getUser()) {
$sender = $domXML->createElement('sender');
$sender->appendChild($domXML->createTextNode($user->getDisplayName()));
$sender->appendChild($domXML->createTextNode($user->getDisplayName($this->app['translator'])));
$root->appendChild($sender);
$this->notifyUser($user, $datas);
@@ -109,7 +109,7 @@ class eventsmanager_notify_uploadquarantine extends eventsmanager_notifyAbstract
if ($this->shouldSendNotificationFor($user->getId())) {
$readyToSend = false;
try {
$receiver = Receiver::fromUser($user);
$receiver = Receiver::fromUser($user, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {

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

@@ -101,8 +101,8 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
->find($params['ssel_id']);
$title = $basket->getName();
$receiver = Receiver::fromUser($user_to);
$emitter = Emitter::fromUser($user_from);
$receiver = Receiver::fromUser($user_to, $this->app['translator']);
$emitter = Emitter::fromUser($user_from, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {
@@ -141,7 +141,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
return [];
}
$sender = $user->getDisplayName();
$sender = $user->getDisplayName($this->app['translator']);
try {
$basket = $this->app['converter.basket']->convert($ssel_id);

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

@@ -96,8 +96,8 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
->find($params['ssel_id']);
$title = $basket->getName();
$receiver = Receiver::fromUser($user_to);
$emitter = Emitter::fromUser($user_from);
$receiver = Receiver::fromUser($user_to, $this->app['translator']);
$emitter = Emitter::fromUser($user_from, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {
@@ -135,7 +135,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
return [];
}
$sender = $registered_user->getDisplayName();
$sender = $registered_user->getDisplayName($this->app['translator']);
try {
$repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');

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

@@ -102,8 +102,8 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
->find($params['ssel_id']);
$title = $basket->getName();
$receiver = Receiver::fromUser($user_to);
$emitter = Emitter::fromUser($user_from);
$receiver = Receiver::fromUser($user_to, $this->app['translator']);
$emitter = Emitter::fromUser($user_from, $this->app['translator']);
$readyToSend = true;
} catch (\Exception $e) {
@@ -140,7 +140,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
return [];
}
$sender = $user->getDisplayName();
$sender = $user->getDisplayName($this->app['translator']);
try {
$basket = $this->app['converter.basket']->convert($ssel_id);