coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

add option to disable mail notifications for users (issue #330)

Browse source
This commit is contained in:
coderkun 2014-06-24 20:55:32 +02:00
commit 9d0275eb7a
6 changed files with 99 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

26
controllers/CharactersController.inc
View file

@ -644,18 +644,20 @@
foreach($characters as &$character)
{
$moderator = $this->Users->getUserById($character['user_id']);
\hhu\z\Utils::sendMail(
$moderator['email'],
'characterregistration',
true,
array(
$moderator,
\hhu\z\controllers\SeminaryController::$seminary,
\hhu\z\controllers\IntermediateController::$user,
$newCharacter
),
$this->linker
);
if($moderator['mailing']) {
\hhu\z\Utils::sendMail(
$moderator['email'],
'characterregistration',
true,
array(
$moderator,
\hhu\z\controllers\SeminaryController::$seminary,
\hhu\z\controllers\IntermediateController::$user,
$newCharacter
),
$this->linker
);
}
}
}
catch(\hhu\z\exceptions\MailingException $e) {

31
controllers/QuestsController.inc
View file

@ -879,19 +879,21 @@
foreach($moderators as &$moderator)
{
$user = $this->Users->getUserById($moderator['user_id']);
\hhu\z\Utils::sendMail(
$user['email'],
'charactersubmission',
true,
array(
$user,
$seminary,
$questgroup,
$quest,
$character
),
$this->linker
);
if($user['mailing']) {
\hhu\z\Utils::sendMail(
$user['email'],
'charactersubmission',
true,
array(
$user,
$seminary,
$questgroup,
$quest,
$character
),
$this->linker
);
}
}
}
catch(\hhu\z\exceptions\MailingException $e) {
@ -912,6 +914,9 @@
{
// Get user
$user = $this->Users->getUserById($character['user_id']);
if(!$user['mailing']) {
return;
}
// Send notification mail
try {

34
controllers/UsersController.inc
View file

@ -454,6 +454,7 @@
$prename = $user['prename'];
$surname = $user['surname'];
$email = $user['email'];
$mailing = $user['mailing'];
$fields = array('username', 'prename', 'surname', 'email');
$validation = array();
@ -482,6 +483,7 @@
if($this->Users->emailExists($email, $user['id'])) {
$validation = $this->Validation->addValidationResult($validation, 'email', 'exist', true);
}
$mailing = !is_null($this->request->getPostParam('mailing'));
// Save changes
if($validation === true)
@ -490,10 +492,11 @@
$this->Users->editUser(
$user['id'],
(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) ? $this->request->getPostParam('username') : $user['username'],
$this->request->getPostParam('prename'),
$this->request->getPostParam('surname'),
$this->request->getPostParam('email'),
$this->request->getPostParam('password')
$prename,
$surname,
$email,
$password,
$mailing
);
// Redirect to entry
@ -517,6 +520,7 @@
$this->set('prename', $prename);
$this->set('surname', $surname);
$this->set('email', $email);
$this->set('mailing', $mailing);
$this->set('validation', $validation);
$this->set('validationSettings', $validationSettings);
}
@ -577,16 +581,18 @@
try {
foreach($moderators as &$moderator)
{
\hhu\z\Utils::sendMail(
$moderator['email'],
'userregistration',
true,
array(
$moderator,
$user
),
$this->linker
);
if($moderator['mailing']) {
\hhu\z\Utils::sendMail(
$moderator['email'],
'userregistration',
true,
array(
$moderator,
$user
),
$this->linker
);
}
}
}
catch(\hhu\z\exceptions\MailingException $e) {