[ticket/12990] Use the full services name for the notification's types

PHPBB3-12990

phpBB/phpbb/notification/manager.php

@@ -570,7 +570,7 @@ class manager
 			{
 				$subscription_methods[$method_name] = array(
 					'id'		=> $method->get_type(),
-					'lang'		=> 'NOTIFICATION_METHOD_' . strtoupper($method->get_type()),
+					'lang'		=> str_replace('.', '_', strtoupper($method->get_type())),
 				);
 			}
 		}
@@ -851,8 +851,6 @@ class manager
 	*/
 	public function get_item_type_class($notification_type_name, $data = array())
 	{
-		$notification_type_name = (strpos($notification_type_name, 'notification.type.') === 0) ? $notification_type_name : 'notification.type.' . $notification_type_name;
-
 		$item = $this->load_object($notification_type_name);
 
 		$item->set_initial_data($data);
@@ -865,8 +863,6 @@ class manager
 	*/
 	public function get_method_class($method_name)
 	{
-		$method_name = (strpos($method_name, 'notification.method.') === 0) ? $method_name : 'notification.method.' . $method_name;
-
 		return $this->load_object($method_name);
 	}
 

phpBB/phpbb/notification/method/email.php

@@ -27,7 +27,7 @@ class email extends \phpbb\notification\method\messenger_base
 	*/
 	public function get_type()
 	{
-		return 'email';
+		return 'notification.method.email';
 	}
 
 	/**

phpBB/phpbb/notification/method/jabber.php

@@ -27,7 +27,7 @@ class jabber extends \phpbb\notification\method\messenger_base
 	*/
 	public function get_type()
 	{
-		return 'jabber';
+		return 'notification.method.jabber';
 	}
 
 	/**

phpBB/phpbb/notification/type/admin_activate_user.php

@@ -25,7 +25,7 @@ class admin_activate_user extends \phpbb\notification\type\base
 	*/
 	public function get_type()
 	{
-		return 'admin_activate_user';
+		return 'notification.type.admin_activate_user';
 	}
 
 	/**

phpBB/phpbb/notification/type/approve_post.php

@@ -27,7 +27,7 @@ class approve_post extends \phpbb\notification\type\post
 	*/
 	public function get_type()
 	{
-		return 'approve_post';
+		return 'notification.type.approve_post';
 	}
 
 	/**

phpBB/phpbb/notification/type/approve_topic.php

@@ -27,7 +27,7 @@ class approve_topic extends \phpbb\notification\type\topic
 	*/
 	public function get_type()
 	{
-		return 'approve_topic';
+		return 'notification.type.approve_topic';
 	}
 
 	/**

phpBB/phpbb/notification/type/bookmark.php

@@ -27,7 +27,7 @@ class bookmark extends \phpbb\notification\type\post
 	*/
 	public function get_type()
 	{
-		return 'bookmark';
+		return 'notification.type.bookmark';
 	}
 
 	/**

phpBB/phpbb/notification/type/disapprove_post.php

@@ -27,7 +27,7 @@ class disapprove_post extends \phpbb\notification\type\approve_post
 	*/
 	public function get_type()
 	{
-		return 'disapprove_post';
+		return 'notification.type.disapprove_post';
 	}
 
 	/**

phpBB/phpbb/notification/type/disapprove_topic.php

@@ -27,7 +27,7 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic
 	*/
 	public function get_type()
 	{
-		return 'disapprove_topic';
+		return 'notification.type.disapprove_topic';
 	}
 
 	/**

phpBB/phpbb/notification/type/group_request.php

@@ -20,7 +20,7 @@ class group_request extends \phpbb\notification\type\base
 	*/
 	public function get_type()
 	{
-		return 'group_request';
+		return 'notification.type.group_request';
 	}
 
 	/**

phpBB/phpbb/notification/type/group_request_approved.php

@@ -20,7 +20,7 @@ class group_request_approved extends \phpbb\notification\type\base
 	*/
 	public function get_type()
 	{
-		return 'group_request_approved';
+		return 'notification.type.group_request_approved';
 	}
 
 	/**

phpBB/phpbb/notification/type/pm.php

@@ -27,7 +27,7 @@ class pm extends \phpbb\notification\type\base
 	*/
 	public function get_type()
 	{
-		return 'pm';
+		return 'notification.type.pm';
 	}
 
 	/**

phpBB/phpbb/notification/type/post.php

@@ -27,7 +27,7 @@ class post extends \phpbb\notification\type\base
 	*/
 	public function get_type()
 	{
-		return 'post';
+		return 'notification.type.post';
 	}
 
 	/**

phpBB/phpbb/notification/type/post_in_queue.php

@@ -27,7 +27,7 @@ class post_in_queue extends \phpbb\notification\type\post
 	*/
 	public function get_type()
 	{
-		return 'post_in_queue';
+		return 'notification.type.post_in_queue';
 	}
 
 	/**
@@ -44,7 +44,7 @@ class post_in_queue extends \phpbb\notification\type\post
 	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
-		'id'	=> 'needs_approval',
+		'id'	=> 'notification.type.needs_approval',
 		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
 		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);

phpBB/phpbb/notification/type/quote.php

@@ -27,7 +27,7 @@ class quote extends \phpbb\notification\type\post
 	*/
 	public function get_type()
 	{
-		return 'quote';
+		return 'notification.type.quote';
 	}
 
 	/**

phpBB/phpbb/notification/type/report_pm.php

@@ -27,7 +27,7 @@ class report_pm extends \phpbb\notification\type\pm
 	*/
 	public function get_type()
 	{
-		return 'report_pm';
+		return 'notification.type.report_pm';
 	}
 
 	/**
@@ -61,7 +61,7 @@ class report_pm extends \phpbb\notification\type\pm
 	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
-		'id'	=> 'report',
+		'id'	=> 'notification.type.report',
 		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
 		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);

phpBB/phpbb/notification/type/report_pm_closed.php

@@ -27,7 +27,7 @@ class report_pm_closed extends \phpbb\notification\type\pm
 	*/
 	public function get_type()
 	{
-		return 'report_pm_closed';
+		return 'notification.type.report_pm_closed';
 	}
 
 	/**

phpBB/phpbb/notification/type/report_post.php

@@ -26,7 +26,7 @@ class report_post extends \phpbb\notification\type\post_in_queue
 	*/
 	public function get_type()
 	{
-		return 'report_post';
+		return 'notification.type.report_post';
 	}
 
 	/**
@@ -67,7 +67,7 @@ class report_post extends \phpbb\notification\type\post_in_queue
 	* 					Array of data (including keys 'id' and 'lang')
 	*/
 	public static $notification_option = array(
-		'id'	=> 'report',
+		'id'	=> 'notification.type.report',
 		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
 		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);

phpBB/phpbb/notification/type/report_post_closed.php

@@ -27,7 +27,7 @@ class report_post_closed extends \phpbb\notification\type\post
 	*/
 	public function get_type()
 	{
-		return 'report_post_closed';
+		return 'notification.type.report_post_closed';
 	}
 
 	/**

phpBB/phpbb/notification/type/topic.php

@@ -27,7 +27,7 @@ class topic extends \phpbb\notification\type\base
 	*/
 	public function get_type()
 	{
-		return 'topic';
+		return 'notification.type.topic';
 	}
 
 	/**

phpBB/phpbb/notification/type/topic_in_queue.php

@@ -27,7 +27,7 @@ class topic_in_queue extends \phpbb\notification\type\topic
 	*/
 	public function get_type()
 	{
-		return 'topic_in_queue';
+		return 'notification.type.topic_in_queue';
 	}
 
 	/**
@@ -44,7 +44,7 @@ class topic_in_queue extends \phpbb\notification\type\topic
 	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
-		'id'	=> 'needs_approval',
+		'id'	=> 'notification.type.needs_approval',
 		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
 		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);