From f29b12e35397ef4a4996ea7d212f0ab5a7a1dba6 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Thu, 9 Jul 2015 14:28:34 +0200
Subject: [ticket/11444] Cleanup method constructors

PHPBB3-11444
---
 phpBB/phpbb/notification/method/email.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'phpBB/phpbb/notification/method/email.php')

diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php
index a4b93bc85c..21a6559012 100644
--- a/phpBB/phpbb/notification/method/email.php
+++ b/phpBB/phpbb/notification/method/email.php
@@ -20,6 +20,29 @@ namespace phpbb\notification\method;
 
 class email extends \phpbb\notification\method\messenger_base
 {
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/**
+	 * Notification Method email Constructor
+	 *
+	 * @param \phpbb\user_loader $user_loader
+	 * @param \phpbb\user $user
+	 * @param \phpbb\config\config $config
+	 * @param string $phpbb_root_path
+	 * @param string $php_ext
+	 */
+	public function __construct(\phpbb\user_loader $user_loader, \phpbb\user $user, \phpbb\config\config $config, $phpbb_root_path, $php_ext)
+	{
+		parent::__construct($user_loader, $phpbb_root_path, $php_ext);
+
+		$this->user = $user;
+		$this->config = $config;
+	}
+
 	/**
 	* Get notification method name
 	*
-- 
cgit v1.2.1


From ec2d983ab1864affc6fd5718fc2faede488301dd Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Thu, 24 Aug 2017 10:36:54 +0200
Subject: [ticket/15328] Disable checkbox if notification method isn't
 supported

PHPBB3-15328
---
 phpBB/phpbb/notification/method/email.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/notification/method/email.php')

diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php
index 21a6559012..b330aa9da8 100644
--- a/phpBB/phpbb/notification/method/email.php
+++ b/phpBB/phpbb/notification/method/email.php
@@ -56,10 +56,14 @@ class email extends \phpbb\notification\method\messenger_base
 	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
+	*
+	* @param \phpbb\notification\type\type_interface $notification_type An optional instance of a notification type. If provided, this
+	*																	method additionally checks if the type provides an email template.
+	* @return bool
 	*/
-	public function is_available()
+	public function is_available(\phpbb\notification\type\type_interface $notification_type = null)
 	{
-		return $this->config['email_enable'] && $this->user->data['user_email'];
+		return parent::is_available($notification_type) && $this->config['email_enable'] && $this->user->data['user_email'];
 	}
 
 	/**
-- 
cgit v1.2.1


From edd1ce74436c399f407e667b0b81b329a57a6f15 Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Thu, 7 Sep 2017 13:30:39 +0200
Subject: [ticket/15328] Use type_interface

PHPBB3-15328
---
 phpBB/phpbb/notification/method/email.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/notification/method/email.php')

diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php
index b330aa9da8..56dd1e9367 100644
--- a/phpBB/phpbb/notification/method/email.php
+++ b/phpBB/phpbb/notification/method/email.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\notification\method;
 
+use phpbb\notification\type\type_interface;
+
 /**
 * Email notification method class
 * This class handles sending emails for notifications
@@ -57,11 +59,11 @@ class email extends \phpbb\notification\method\messenger_base
 	* Is this method available for the user?
 	* This is checked on the notifications options
 	*
-	* @param \phpbb\notification\type\type_interface $notification_type An optional instance of a notification type. If provided, this
-	*																	method additionally checks if the type provides an email template.
+	* @param type_interface $notification_type  An optional instance of a notification type. If provided, this
+	*											method additionally checks if the type provides an email template.
 	* @return bool
 	*/
-	public function is_available(\phpbb\notification\type\type_interface $notification_type = null)
+	public function is_available(type_interface $notification_type = null)
 	{
 		return parent::is_available($notification_type) && $this->config['email_enable'] && $this->user->data['user_email'];
 	}
-- 
cgit v1.2.1