diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-04 13:39:54 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-04 13:39:54 -0500 |
| commit | 37e24736058f4e41c67023ce48edeb75e44bbe75 (patch) | |
| tree | cef7b79b1fa28f6f654044cde630b23cd5e834ff /phpBB/includes | |
| parent | 1aa5c005cb560dfea0ab0b35839a8b354b24e4a4 (diff) | |
| download | forums-37e24736058f4e41c67023ce48edeb75e44bbe75.tar forums-37e24736058f4e41c67023ce48edeb75e44bbe75.tar.gz forums-37e24736058f4e41c67023ce48edeb75e44bbe75.tar.bz2 forums-37e24736058f4e41c67023ce48edeb75e44bbe75.tar.xz forums-37e24736058f4e41c67023ce48edeb75e44bbe75.zip | |
[ticket/11103] Rename classes
phpbb_notifications_service -> phpbb_notification_manager
phpbb_notifications_ -> phpbb_notification_
PHPBB3-11103
Diffstat (limited to 'phpBB/includes')
19 files changed, 35 insertions, 35 deletions
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php index b860fcffda..b502d3afd0 100644 --- a/phpBB/includes/notifications/method/base.php +++ b/phpBB/includes/notifications/method/base.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * Base notifications method class * @package notifications */ -abstract class phpbb_notifications_method_base implements phpbb_notifications_method_interface +abstract class phpbb_notification_method_base implements phpbb_notification_method_interface { protected $phpbb_container; protected $service; @@ -75,9 +75,9 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me /** * Add a notification to the queue * - * @param phpbb_notifications_type_interface $notification + * @param phpbb_notification_type_interface $notification */ - public function add_to_queue(phpbb_notifications_type_interface $notification) + public function add_to_queue(phpbb_notification_type_interface $notification) { $this->queue[] = $notification; } diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php index ebfc0c7c71..1b6b44d137 100644 --- a/phpBB/includes/notifications/method/email.php +++ b/phpBB/includes/notifications/method/email.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_method_email extends phpbb_notifications_method_base +class phpbb_notification_method_email extends phpbb_notification_method_base { /** * Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication) diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php index 820cf4fc12..4b990ec9fa 100644 --- a/phpBB/includes/notifications/method/interface.php +++ b/phpBB/includes/notifications/method/interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications method interface * @package notifications */ -interface phpbb_notifications_method_interface +interface phpbb_notification_method_interface { public function is_available(); diff --git a/phpBB/includes/notifications/method/jabber.php b/phpBB/includes/notifications/method/jabber.php index 738400a50e..9232d8fc45 100644 --- a/phpBB/includes/notifications/method/jabber.php +++ b/phpBB/includes/notifications/method/jabber.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_method_jabber extends phpbb_notifications_method_email +class phpbb_notification_method_jabber extends phpbb_notification_method_email { /** * Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication) diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php index ebf4cef12d..2bf21cefa5 100644 --- a/phpBB/includes/notifications/service.php +++ b/phpBB/includes/notifications/service.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * Notifications service class * @package notifications */ -class phpbb_notifications_service +class phpbb_notification_manager { protected $phpbb_container; protected $db; diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php index 912b9082a2..9a3def6217 100644 --- a/phpBB/includes/notifications/type/approve_post.php +++ b/phpBB/includes/notifications/type/approve_post.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_approve_post extends phpbb_notifications_type_post +class phpbb_notification_type_approve_post extends phpbb_notification_type_post { /** * Email template to use to send notifications @@ -52,7 +52,7 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php index e0e3a38e46..00af312018 100644 --- a/phpBB/includes/notifications/type/approve_topic.php +++ b/phpBB/includes/notifications/type/approve_topic.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_topic +class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic { /** * Email template to use to send notifications @@ -52,7 +52,7 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php index 01720b4554..40462bccfb 100644 --- a/phpBB/includes/notifications/type/base.php +++ b/phpBB/includes/notifications/type/base.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * Base notifications class * @package notifications */ -abstract class phpbb_notifications_type_base implements phpbb_notifications_type_interface +abstract class phpbb_notification_type_base implements phpbb_notification_type_interface { protected $phpbb_container; protected $service; diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php index a452583c77..51f23bc294 100644 --- a/phpBB/includes/notifications/type/bookmark.php +++ b/phpBB/includes/notifications/type/bookmark.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post +class phpbb_notification_type_bookmark extends phpbb_notification_type_post { /** * Email template to use to send notifications @@ -41,7 +41,7 @@ class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/disapprove_post.php b/phpBB/includes/notifications/type/disapprove_post.php index 6911af5b08..8fa0102e3d 100644 --- a/phpBB/includes/notifications/type/disapprove_post.php +++ b/phpBB/includes/notifications/type/disapprove_post.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_approve_post +class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post { /** * Email template to use to send notifications @@ -52,7 +52,7 @@ class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_ /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/disapprove_topic.php b/phpBB/includes/notifications/type/disapprove_topic.php index dab5ec1b02..186c42d2b6 100644 --- a/phpBB/includes/notifications/type/disapprove_topic.php +++ b/phpBB/includes/notifications/type/disapprove_topic.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type_approve_topic +class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic { /** * Email template to use to send notifications @@ -52,7 +52,7 @@ class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php index 95c307013e..aa54c62a97 100644 --- a/phpBB/includes/notifications/type/interface.php +++ b/phpBB/includes/notifications/type/interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications interface * @package notifications */ -interface phpbb_notifications_type_interface +interface phpbb_notification_type_interface { public static function get_item_type(); diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php index f0730f285c..8252a8577b 100644 --- a/phpBB/includes/notifications/type/pm.php +++ b/phpBB/includes/notifications/type/pm.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_pm extends phpbb_notifications_type_base +class phpbb_notification_type_pm extends phpbb_notification_type_base { /** * Email template to use to send notifications @@ -34,7 +34,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php index d654a2e3a3..1e654ef51b 100644 --- a/phpBB/includes/notifications/type/post.php +++ b/phpBB/includes/notifications/type/post.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_post extends phpbb_notifications_type_base +class phpbb_notification_type_post extends phpbb_notification_type_base { /** * Email template to use to send notifications @@ -41,7 +41,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php index 64f68c07e2..f0a5e0baec 100644 --- a/phpBB/includes/notifications/type/post_in_queue.php +++ b/phpBB/includes/notifications/type/post_in_queue.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_post +class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post { /** * Email template to use to send notifications @@ -52,7 +52,7 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php index f162b37126..dd3cbedee2 100644 --- a/phpBB/includes/notifications/type/quote.php +++ b/phpBB/includes/notifications/type/quote.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_quote extends phpbb_notifications_type_post +class phpbb_notification_type_quote extends phpbb_notification_type_post { /** * Email template to use to send notifications @@ -48,7 +48,7 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php index ddef0147ba..7753b196e8 100644 --- a/phpBB/includes/notifications/type/topic.php +++ b/phpBB/includes/notifications/type/topic.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_topic extends phpbb_notifications_type_base +class phpbb_notification_type_topic extends phpbb_notification_type_base { /** * Email template to use to send notifications @@ -41,7 +41,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notifications/type/topic_in_queue.php index dc7f7aa105..385578cec8 100644 --- a/phpBB/includes/notifications/type/topic_in_queue.php +++ b/phpBB/includes/notifications/type/topic_in_queue.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_topic +class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic { /** * Email template to use to send notifications @@ -62,7 +62,7 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t /** * Get the type of notification this is - * phpbb_notifications_type_ + * phpbb_notification_type_ */ public static function get_item_type() { diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 950b70a156..d248099b06 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -85,11 +85,11 @@ class ucp_notifications * Output all the notification types to the template * * @param string $block - * @param phpbb_notifications_service $phpbb_notifications + * @param phpbb_notification_manager $phpbb_notifications * @param phpbb_template $template * @param phpbb_user $user */ - public function output_notification_types($block = 'notification_types', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user) + public function output_notification_types($block = 'notification_types', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user) { $notification_methods = $phpbb_notifications->get_subscription_methods(); $subscriptions = $phpbb_notifications->get_subscriptions(false, true); @@ -121,11 +121,11 @@ class ucp_notifications * Output all the notification methods to the template * * @param string $block - * @param phpbb_notifications_service $phpbb_notifications + * @param phpbb_notification_manager $phpbb_notifications * @param phpbb_template $template * @param phpbb_user $user */ - public function output_notification_methods($block = 'notification_methods', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user) + public function output_notification_methods($block = 'notification_methods', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user) { $notification_methods = $phpbb_notifications->get_subscription_methods(); |