From c37da45612655532cc426a0a0e2cb2645fb90582 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 12 Nov 2013 14:46:18 +0100
Subject: [PATCH] [feature/module_services] Pass phpBB dbal driver to module
 uninstall method

---
 modules/donation.php                     | 4 +---
 modules/module_base.php                  | 2 +-
 modules/module_interface.php             | 3 ++-
 portal/modules/portal_announcements.php  | 4 +---
 portal/modules/portal_attachments.php    | 4 +---
 portal/modules/portal_birthday_list.php  | 4 +---
 portal/modules/portal_calendar.php       | 4 +---
 portal/modules/portal_custom.php         | 4 +---
 portal/modules/portal_default.php        | 4 +---
 portal/modules/portal_forumlist.php      | 2 +-
 portal/modules/portal_friends.php        | 4 +---
 portal/modules/portal_latest_bots.php    | 4 +---
 portal/modules/portal_latest_members.php | 4 +---
 portal/modules/portal_leaders.php        | 4 +---
 portal/modules/portal_link_us.php        | 2 +-
 portal/modules/portal_links.php          | 4 +---
 portal/modules/portal_main_menu.php      | 4 +---
 portal/modules/portal_news.php           | 4 +---
 portal/modules/portal_poll.php           | 4 +---
 portal/modules/portal_random_member.php  | 2 +-
 portal/modules/portal_recent.php         | 4 +---
 portal/modules/portal_search.php         | 2 +-
 portal/modules/portal_statistics.php     | 2 +-
 portal/modules/portal_topposters.php     | 4 +---
 portal/modules/portal_user_menu.php      | 4 +---
 portal/modules/portal_welcome.php        | 4 +---
 portal/modules/portal_whois_online.php   | 2 +-
 27 files changed, 28 insertions(+), 65 deletions(-)

diff --git a/modules/donation.php b/modules/donation.php
index c3aa8a4b..ae34ddeb 100644
--- a/modules/donation.php
+++ b/modules/donation.php
@@ -118,10 +118,8 @@ class donation extends module_base
 	/**
 	* @inheritdoc
 	*/
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_pay_acc_' . $module_id,
 			'board3_pay_custom_' . $module_id,
diff --git a/modules/module_base.php b/modules/module_base.php
index 728f601d..c80f9756 100644
--- a/modules/module_base.php
+++ b/modules/module_base.php
@@ -81,7 +81,7 @@ class module_base implements module_interface
 	/**
 	* @inheritdoc
 	*/
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
 		return true;
 	}
diff --git a/modules/module_interface.php b/modules/module_interface.php
index 165c18e4..d2911e21 100644
--- a/modules/module_interface.php
+++ b/modules/module_interface.php
@@ -93,8 +93,9 @@ interface module_interface
 	* Executes any additional commands for uninstalling the module
 	*
 	* @param int $module_id Module's ID
+	* @param \phpbb\db\driver $db phpBB dbal driver
 	*
 	* @return bool True if uninstall was successful, false if not
 	*/
-	public function uninstall($module_id);
+	public function uninstall($module_id, $db);
 }
diff --git a/portal/modules/portal_announcements.php b/portal/modules/portal_announcements.php
index 7d7b678e..679a7fd4 100644
--- a/portal/modules/portal_announcements.php
+++ b/portal/modules/portal_announcements.php
@@ -413,10 +413,8 @@ class portal_announcements_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_announcements_style_' . $module_id,
 			'board3_number_of_announcements_' . $module_id,
diff --git a/portal/modules/portal_attachments.php b/portal/modules/portal_attachments.php
index 1e2c0624..de2fee59 100644
--- a/portal/modules/portal_attachments.php
+++ b/portal/modules/portal_attachments.php
@@ -87,10 +87,8 @@ class portal_attachments_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_attachments_number_' . $module_id,
 			'board3_attach_max_length_' . $module_id,
diff --git a/portal/modules/portal_birthday_list.php b/portal/modules/portal_birthday_list.php
index 79ca6482..987766a9 100644
--- a/portal/modules/portal_birthday_list.php
+++ b/portal/modules/portal_birthday_list.php
@@ -146,10 +146,8 @@ class portal_birthday_list_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_birthdays_ahead_' . $module_id,
 		);
diff --git a/portal/modules/portal_calendar.php b/portal/modules/portal_calendar.php
index 61c60100..5b416630 100644
--- a/portal/modules/portal_calendar.php
+++ b/portal/modules/portal_calendar.php
@@ -297,10 +297,8 @@ class portal_calendar_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_calendar_events_' . $module_id,
 		);
diff --git a/portal/modules/portal_custom.php b/portal/modules/portal_custom.php
index f9374308..b397be9d 100644
--- a/portal/modules/portal_custom.php
+++ b/portal/modules/portal_custom.php
@@ -90,10 +90,8 @@ class portal_custom_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_custom_' . $module_id . '_code',
 		);
diff --git a/portal/modules/portal_default.php b/portal/modules/portal_default.php
index 5bf6dc39..a9f36a1f 100644
--- a/portal/modules/portal_default.php
+++ b/portal/modules/portal_default.php
@@ -102,10 +102,8 @@ class portal_modulename_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_configname_' . $module_id,
 			'board3_configname2_' . $module_id,
diff --git a/portal/modules/portal_forumlist.php b/portal/modules/portal_forumlist.php
index 12a04219..028fc725 100644
--- a/portal/modules/portal_forumlist.php
+++ b/portal/modules/portal_forumlist.php
@@ -87,7 +87,7 @@ class portal_forumlist_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
 		return true;
 	}
diff --git a/portal/modules/portal_friends.php b/portal/modules/portal_friends.php
index a04b5eb3..95972e19 100644
--- a/portal/modules/portal_friends.php
+++ b/portal/modules/portal_friends.php
@@ -122,10 +122,8 @@ class portal_friends_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_max_online_friends_' . $module_id,
 		);
diff --git a/portal/modules/portal_latest_bots.php b/portal/modules/portal_latest_bots.php
index f4e6cb15..00879c16 100755
--- a/portal/modules/portal_latest_bots.php
+++ b/portal/modules/portal_latest_bots.php
@@ -103,10 +103,8 @@ class portal_latest_bots_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_last_visited_bots_number_' . $module_id,
 		);
diff --git a/portal/modules/portal_latest_members.php b/portal/modules/portal_latest_members.php
index a788a933..1475be99 100644
--- a/portal/modules/portal_latest_members.php
+++ b/portal/modules/portal_latest_members.php
@@ -90,10 +90,8 @@ class portal_latest_members_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_max_last_member_' . $module_id,
 		);
diff --git a/portal/modules/portal_leaders.php b/portal/modules/portal_leaders.php
index bb267d26..55b4f454 100644
--- a/portal/modules/portal_leaders.php
+++ b/portal/modules/portal_leaders.php
@@ -226,10 +226,8 @@ class portal_leaders_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_leaders_ext_' . $module_id,
 		);
diff --git a/portal/modules/portal_link_us.php b/portal/modules/portal_link_us.php
index 818f6b3c..13594b4e 100644
--- a/portal/modules/portal_link_us.php
+++ b/portal/modules/portal_link_us.php
@@ -79,7 +79,7 @@ class portal_link_us_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
 		return true;
 	}
diff --git a/portal/modules/portal_links.php b/portal/modules/portal_links.php
index 9cae9a1f..61cd1457 100644
--- a/portal/modules/portal_links.php
+++ b/portal/modules/portal_links.php
@@ -160,10 +160,8 @@ class portal_links_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_links_array_' . $module_id,
 		);
diff --git a/portal/modules/portal_main_menu.php b/portal/modules/portal_main_menu.php
index 1ce257fd..6b514fc7 100644
--- a/portal/modules/portal_main_menu.php
+++ b/portal/modules/portal_main_menu.php
@@ -216,10 +216,8 @@ class portal_main_menu_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_menu_array_' . $module_id,
 		);
diff --git a/portal/modules/portal_news.php b/portal/modules/portal_news.php
index 6d5045d5..d8cd194b 100644
--- a/portal/modules/portal_news.php
+++ b/portal/modules/portal_news.php
@@ -394,10 +394,8 @@ class portal_news_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_news_length_' . $module_id,
 			'board3_news_forum_' . $module_id,
diff --git a/portal/modules/portal_poll.php b/portal/modules/portal_poll.php
index 828d8dc4..4466cf1a 100644
--- a/portal/modules/portal_poll.php
+++ b/portal/modules/portal_poll.php
@@ -91,10 +91,8 @@ class portal_poll_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_poll_allow_vote_' . $module_id,
 			'board3_poll_topic_id_' . $module_id,
diff --git a/portal/modules/portal_random_member.php b/portal/modules/portal_random_member.php
index 70d14aa6..9e7e92c2 100644
--- a/portal/modules/portal_random_member.php
+++ b/portal/modules/portal_random_member.php
@@ -135,7 +135,7 @@ class portal_random_member_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
 		return true;
 	}
diff --git a/portal/modules/portal_recent.php b/portal/modules/portal_recent.php
index ccf6a28f..f7a31b2a 100644
--- a/portal/modules/portal_recent.php
+++ b/portal/modules/portal_recent.php
@@ -196,10 +196,8 @@ class portal_recent_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_max_topics_' . $module_id,
 			'board3_recent_title_limit_' . $module_id,
diff --git a/portal/modules/portal_search.php b/portal/modules/portal_search.php
index 0e0a3880..f87bc876 100644
--- a/portal/modules/portal_search.php
+++ b/portal/modules/portal_search.php
@@ -78,7 +78,7 @@ class portal_search_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
 		return true;
 	}
diff --git a/portal/modules/portal_statistics.php b/portal/modules/portal_statistics.php
index 4da2187c..04b1ee82 100644
--- a/portal/modules/portal_statistics.php
+++ b/portal/modules/portal_statistics.php
@@ -153,7 +153,7 @@ class portal_statistics_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
 		return true;
 	}
diff --git a/portal/modules/portal_topposters.php b/portal/modules/portal_topposters.php
index bb9f2776..34d7833d 100644
--- a/portal/modules/portal_topposters.php
+++ b/portal/modules/portal_topposters.php
@@ -98,10 +98,8 @@ class portal_topposters_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_topposters_' . $module_id,
 		);
diff --git a/portal/modules/portal_user_menu.php b/portal/modules/portal_user_menu.php
index b778a416..2a6c0f1d 100644
--- a/portal/modules/portal_user_menu.php
+++ b/portal/modules/portal_user_menu.php
@@ -167,10 +167,8 @@ class portal_user_menu_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_user_menu_register_' . $module_id,
 		);
diff --git a/portal/modules/portal_welcome.php b/portal/modules/portal_welcome.php
index 3300bd7c..60f748a5 100644
--- a/portal/modules/portal_welcome.php
+++ b/portal/modules/portal_welcome.php
@@ -93,10 +93,8 @@ class portal_welcome_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
-		global $db;
-
 		$del_config = array(
 			'board3_welcome_message_' . $module_id,
 		);
diff --git a/portal/modules/portal_whois_online.php b/portal/modules/portal_whois_online.php
index 7b48481c..a215f627 100644
--- a/portal/modules/portal_whois_online.php
+++ b/portal/modules/portal_whois_online.php
@@ -130,7 +130,7 @@ class portal_whois_online_module extends \board3\portal\modules\module_base
 		return true;
 	}
 
-	public function uninstall($module_id)
+	public function uninstall($module_id, $db)
 	{
 		return true;
 	}