AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exclude current user in email notifications, pull-request #273)

This commit is contained in:
Frédéric Guillot 2014-09-19 22:08:04 +02:00
parent 9ffa63747a
commit 95e54d1d30
5 changed files with 95 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Core/Session.php
View File

@ -19,6 +19,18 @@ class Session
*/
const SESSION_LIFETIME = 0; // Until the browser is closed
/**
* Return true if the session is open
*
* @static
* @access public
* @return boolean
*/
public static function isOpen()
{
return session_id() !== '';
}
/**
* Open a session
*
@ -50,14 +62,14 @@ class Session
ini_set('session.hash_bits_per_character', 6);
// If session was autostarted with session.auto_start = 1 in php.ini destroy it, otherwise we cannot login
if (isset($_SESSION))
{
if (isset($_SESSION)) {
session_destroy();
}
// Custom session name
session_name('__S');
// Start the session
session_start();
// Regenerate the session id to avoid session fixation issue

12
app/Model/Notification.php
View File

@ -2,6 +2,7 @@
namespace Model;
use Core\Session;
use Core\Translator;
use Core\Template;
use Event\TaskNotificationListener;
@ -30,15 +31,22 @@ class Notification extends Base
* Get the list of users to send the notification for a given project
*
* @access public
* @param integer $project_id Project id
* @param integer $project_id Project id
* @param array $exlude_users List of user_id to exclude
* @return array
*/
public function getUsersList($project_id)
public function getUsersList($project_id, array $exclude_users = array())
{
// Exclude the connected user
if (Session::isOpen()) {
$exclude_users[] = $this->acl->getUserId();
}
$users = $this->db->table(User::TABLE)
->columns('id', 'username', 'name', 'email')
->eq('notifications_enabled', '1')
->neq('email', '')
->notin('id', $exclude_users)
->findAll();
foreach ($users as $index => $user) {

3
app/Model/User.php
View File

@ -4,6 +4,7 @@ namespace Model;
use SimpleValidator\Validator;
use SimpleValidator\Validators;
use Core\Session;
/**
* User model
@ -205,7 +206,7 @@ class User extends Base
$result = $this->db->table(self::TABLE)->eq('id', $values['id'])->update($values);
// If the user is connected refresh his session
if (session_id() !== '' && $_SESSION['user']['id'] == $values['id']) {
if (Session::isOpen() && $_SESSION['user']['id'] == $values['id']) {
$this->updateSession();
}

67
tests/units/NotificationTest.php Normal file
View File

@ -0,0 +1,67 @@
<?php
require_once __DIR__.'/Base.php';
use Model\User;
use Model\Project;
use Model\Notification;
class NotificationTest extends Base
{
public function testGetUserList()
{
$u = new User($this->registry);
$p = new Project($this->registry);
$n = new Notification($this->registry);
$this->assertEquals(1, $p->create(array('name' => 'UnitTest1')));
$this->assertEquals(2, $p->create(array('name' => 'UnitTest2')));
// Email + Notifications enabled
$this->assertTrue($u->create(array('username' => 'user1', 'email' => 'user1@here', 'notifications_enabled' => 1)));
// No email + Notifications enabled
$this->assertTrue($u->create(array('username' => 'user2', 'email' => '', 'notifications_enabled' => 1)));
// Email + Notifications enabled
$this->assertTrue($u->create(array('username' => 'user3', 'email' => 'user3@here', 'notifications_enabled' => 1)));
// No email + notifications disabled
$this->assertTrue($u->create(array('username' => 'user4')));
$users = $n->getUsersList(1);
$this->assertNotEmpty($users);
$this->assertEquals(2, count($users));
$this->assertEquals('user1@here', $users[0]['email']);
$this->assertEquals('user3@here', $users[1]['email']);
$users = $n->getUsersList(2);
$this->assertNotEmpty($users);
$this->assertEquals(2, count($users));
$this->assertEquals('user1@here', $users[0]['email']);
$this->assertEquals('user3@here', $users[1]['email']);
// User 3 choose to receive notification only for project 2
$n->saveSettings(4, array('notifications_enabled' => 1, 'projects' => array(2 => true)));
$users = $n->getUsersList(1);
$this->assertNotEmpty($users);
$this->assertEquals(1, count($users));
$this->assertEquals('user1@here', $users[0]['email']);
$users = $n->getUsersList(2);
$this->assertNotEmpty($users);
$this->assertEquals(2, count($users));
$this->assertEquals('user1@here', $users[0]['email']);
$this->assertEquals('user3@here', $users[1]['email']);
// User 1 excluded
$users = $n->getUsersList(1, array(2));
$this->assertEmpty($users);
$users = $n->getUsersList(2, array(2));
$this->assertNotEmpty($users);
$this->assertEquals(1, count($users));
$this->assertEquals('user3@here', $users[0]['email']);
}
}

4
vendor/PicoDb/Table.php vendored
View File

@ -350,7 +350,7 @@ class Table
switch (strtolower($name)) {
case 'in':
if (isset($arguments[1]) && is_array($arguments[1])) {
if (isset($arguments[1]) && is_array($arguments[1]) && ! empty($arguments[1])) {
$sql = sprintf(
'%s IN (%s)',
@ -361,7 +361,7 @@ class Table
break;
case 'notin':
if (isset($arguments[1]) && is_array($arguments[1])) {
if (isset($arguments[1]) && is_array($arguments[1]) && ! empty($arguments[1])) {
$sql = sprintf(
'%s NOT IN (%s)',