mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-04 15:57:45 +02:00
[ticket/12742] Replace authenticated with authorised
PHPBB3-12742
This commit is contained in:
@@ -81,7 +81,7 @@ class approve_post extends \phpbb\notification\type\post
|
|||||||
$users = array();
|
$users = array();
|
||||||
$users[$post['poster_id']] = array('');
|
$users[$post['poster_id']] = array('');
|
||||||
|
|
||||||
return $this->get_authenticated_recipients(array_keys($users), $post['forum_id'], array_merge($options, array(
|
return $this->get_authorised_recipients(array_keys($users), $post['forum_id'], array_merge($options, array(
|
||||||
'item_type' => self::$notification_option['id'],
|
'item_type' => self::$notification_option['id'],
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
@@ -81,7 +81,7 @@ class approve_topic extends \phpbb\notification\type\topic
|
|||||||
$users = array();
|
$users = array();
|
||||||
$users[$post['poster_id']] = array('');
|
$users[$post['poster_id']] = array('');
|
||||||
|
|
||||||
return $this->get_authenticated_recipients(array_keys($users), $post['forum_id'], array_merge($options, array(
|
return $this->get_authorised_recipients(array_keys($users), $post['forum_id'], array_merge($options, array(
|
||||||
'item_type' => self::$notification_option['id'],
|
'item_type' => self::$notification_option['id'],
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
@@ -535,14 +535,14 @@ abstract class base implements \phpbb\notification\type\type_interface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a list of users that are authenticated to receive notifications
|
* Get a list of users that are authorised to receive notifications
|
||||||
*
|
*
|
||||||
* @param array $users Array of users that have subscribed to a notification
|
* @param array $users Array of users that have subscribed to a notification
|
||||||
* @param int $forum_id Forum ID of the forum
|
* @param int $forum_id Forum ID of the forum
|
||||||
* @param array $options Array of notification options
|
* @param array $options Array of notification options
|
||||||
* @return array Array of users that are authenticated recipients
|
* @return array Array of users that are authorised recipients
|
||||||
*/
|
*/
|
||||||
protected function get_authenticated_recipients($users, $forum_id, $options)
|
protected function get_authorised_recipients($users, $forum_id, $options)
|
||||||
{
|
{
|
||||||
if (empty($users))
|
if (empty($users))
|
||||||
{
|
{
|
||||||
|
@@ -83,7 +83,7 @@ class bookmark extends \phpbb\notification\type\post
|
|||||||
}
|
}
|
||||||
$this->db->sql_freeresult($result);
|
$this->db->sql_freeresult($result);
|
||||||
|
|
||||||
$notify_users = $this->get_authenticated_recipients($users, $post['forum_id'], $options);
|
$notify_users = $this->get_authorised_recipients($users, $post['forum_id'], $options);
|
||||||
|
|
||||||
if (empty($notify_users))
|
if (empty($notify_users))
|
||||||
{
|
{
|
||||||
|
@@ -123,7 +123,7 @@ class post extends \phpbb\notification\type\base
|
|||||||
}
|
}
|
||||||
$this->db->sql_freeresult($result);
|
$this->db->sql_freeresult($result);
|
||||||
|
|
||||||
$notify_users = $this->get_authenticated_recipients($users, $post['forum_id'], $options);
|
$notify_users = $this->get_authorised_recipients($users, $post['forum_id'], $options);
|
||||||
|
|
||||||
if (empty($notify_users))
|
if (empty($notify_users))
|
||||||
{
|
{
|
||||||
|
@@ -102,7 +102,7 @@ class quote extends \phpbb\notification\type\post
|
|||||||
}
|
}
|
||||||
$this->db->sql_freeresult($result);
|
$this->db->sql_freeresult($result);
|
||||||
|
|
||||||
return $this->get_authenticated_recipients($users, $post['forum_id'], $options);
|
return $this->get_authorised_recipients($users, $post['forum_id'], $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -111,7 +111,7 @@ class topic extends \phpbb\notification\type\base
|
|||||||
}
|
}
|
||||||
$this->db->sql_freeresult($result);
|
$this->db->sql_freeresult($result);
|
||||||
|
|
||||||
return $this->get_authenticated_recipients($users, $topic['forum_id'], $options);
|
return $this->get_authorised_recipients($users, $topic['forum_id'], $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user