From 0cc092073405166a0da72009823256a00389d0b8 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 22 Oct 2016 21:40:21 +0700
Subject: [ticket/14831] Fix module migrator tool

PHPBB3-14831
---
 phpBB/phpbb/db/migration/tool/module.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/db/migration/tool/module.php')

diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index 6d5378e35f..d28d6153b9 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -197,7 +197,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 
 		if ($this->exists($class, $parent, $data['module_langname']))
 		{
-			throw new \phpbb\db\migration\exception('MODULE_EXISTS', $module_id);
+			throw new \phpbb\db\migration\exception('MODULE_EXISTS', $data['module_langname']);
 		}
 
 		if (!class_exists('acp_modules'))
@@ -448,12 +448,11 @@ class module implements \phpbb\db\migration\tool\tool_interface
 	protected function get_categories_list()
 	{
 		// Select the top level categories
-		// and 2nd level [sub]categories which exist for ACP only
+		// and 2nd level [sub]categories
 		$sql = 'SELECT m2.module_id, m2.module_langname
 			FROM ' . $this->modules_table . ' m1, ' . $this->modules_table . " m2
 			WHERE m1.parent_id = 0
-				AND (m1.module_id = m2.module_id
-				OR m2.module_class = 'acp' AND m2.parent_id = m1.module_id)
+				AND (m1.module_id = m2.module_id OR m2.parent_id = m1.module_id)
 			ORDER BY m1.module_id, m2.module_id ASC";
 
 		$result = $this->db->sql_query($sql);
-- 
cgit v1.2.1


From a02b124dd02f8c5a2d0c60820f6563311e983a4c Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 23 Oct 2016 21:17:41 +0700
Subject: [ticket/14831] Do not throw exception on the module existence
 checking

PHPBB3-14831
---
 phpBB/phpbb/db/migration/tool/module.php | 34 +++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'phpBB/phpbb/db/migration/tool/module.php')

diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index d28d6153b9..e8f2eaf80b 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -90,8 +90,15 @@ class module implements \phpbb\db\migration\tool\tool_interface
 		$parent_sql = '';
 		if ($parent !== false)
 		{
-			$parent = $this->get_parent_module_id($parent, $module);
-			$parent_sql = 'AND parent_id = ' . (int) $parent;
+			$parent = $this->get_parent_module_id($parent, $module, false);
+			if ($parent !== false)
+			{
+				$parent_sql = 'AND parent_id = ' . (int) $parent;
+			}
+			else
+			{
+				return false;
+			}
 		}
 
 		$sql = 'SELECT module_id
@@ -468,11 +475,15 @@ class module implements \phpbb\db\migration\tool\tool_interface
 	*
 	* @param string|int $parent_id The parent module_id|module_langname
 	* @param int|string|array $data The module_id, module_langname for existance checking or module data array for adding
-	* @return int The parent module_id
+	* @param bool $throw_exception The flag indicating if exception should be thrown on error
+	* @return mixed The int parent module_id or false
 	* @throws \phpbb\db\migration\exception
 	*/
-	public function get_parent_module_id($parent_id, $data = '')
+	public function get_parent_module_id($parent_id, $data = '', $throw_exception = true)
 	{
+		// Initialize exception object placeholder
+		$e = false;
+
 		// Allow '' to be sent as 0
 		$parent_id = $parent_id ?: 0;
 
@@ -494,7 +505,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 			{
 				// No parent with the given module_langname exist
 				case 0:
-					throw new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id);
+					$e = new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id);
 				break;
 
 				// Return the module id
@@ -516,7 +527,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 						$parent_id = (int) $this->db->sql_fetchfield('parent_id');
 						if (!$parent_id)
 						{
-							throw new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']);
+							$e = new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']);
 						}
 					}
 					else if (!empty($data) && !is_array($data))
@@ -534,12 +545,21 @@ class module implements \phpbb\db\migration\tool\tool_interface
 					else
 					{
 						//Unable to get the parent module id, throwing an exception
-						throw new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id);
+						$e = new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id);
 					}
 				break;
 			}
 		}
 
+		if ($e !== false)
+		{
+			if ($throw_exception)
+			{
+				throw $e;
+			}
+			return false;
+		}
+
 		return $parent_id;
 	}
 }
-- 
cgit v1.2.1


From 51ef1ae346c08863d188e723ba41720e744a2fbd Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 23 Oct 2016 22:44:47 +0700
Subject: [ticket/14831] Add more tests, better name for $e placeholder

PHPBB3-14831
---
 phpBB/phpbb/db/migration/tool/module.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/db/migration/tool/module.php')

diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index e8f2eaf80b..a543fd5cab 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -482,7 +482,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 	public function get_parent_module_id($parent_id, $data = '', $throw_exception = true)
 	{
 		// Initialize exception object placeholder
-		$e = false;
+		$exception = false;
 
 		// Allow '' to be sent as 0
 		$parent_id = $parent_id ?: 0;
@@ -505,7 +505,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 			{
 				// No parent with the given module_langname exist
 				case 0:
-					$e = new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id);
+					$exception = new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id);
 				break;
 
 				// Return the module id
@@ -527,7 +527,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 						$parent_id = (int) $this->db->sql_fetchfield('parent_id');
 						if (!$parent_id)
 						{
-							$e = new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']);
+							$exception = new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']);
 						}
 					}
 					else if (!empty($data) && !is_array($data))
@@ -545,17 +545,17 @@ class module implements \phpbb\db\migration\tool\tool_interface
 					else
 					{
 						//Unable to get the parent module id, throwing an exception
-						$e = new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id);
+						$exception = new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id);
 					}
 				break;
 			}
 		}
 
-		if ($e !== false)
+		if ($exception !== false)
 		{
 			if ($throw_exception)
 			{
-				throw $e;
+				throw $exception;
 			}
 			return false;
 		}
-- 
cgit v1.2.1


From 77f1bac64bd00a581f71dccbb20b532ff1ec2434 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 24 Oct 2016 01:41:24 +0700
Subject: [ticket/14831] Optimize code construction

PHPBB3-14831
---
 phpBB/phpbb/db/migration/tool/module.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/db/migration/tool/module.php')

diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index a543fd5cab..7ea7d1dac1 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -91,14 +91,12 @@ class module implements \phpbb\db\migration\tool\tool_interface
 		if ($parent !== false)
 		{
 			$parent = $this->get_parent_module_id($parent, $module, false);
-			if ($parent !== false)
-			{
-				$parent_sql = 'AND parent_id = ' . (int) $parent;
-			}
-			else
+			if ($parent === false)
 			{
 				return false;
 			}
+
+			$parent_sql = 'AND parent_id = ' . (int) $parent;
 		}
 
 		$sql = 'SELECT module_id
-- 
cgit v1.2.1