Merge pull request #128 from VSEphpbb/remove-unused-opts

Remove unused site URL option

Author: DavidIQ

adm/style/acp_phpbb_ideas.html

@@ -20,10 +20,6 @@ <h3>{{ lang('WARNING') }}</h3>
 			<dt><label for="ideas_forum_id">{{ lang('ACP_IDEAS_FORUM_ID') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_IDEAS_FORUM_ID_EXPLAIN') }}</span></dt>
 			<dd>{{ S_FORUM_SELECT_BOX }}</dd>
 		</dl>
-		<dl>
-			<dt><label for="ideas_base_url">{{ lang('ACP_IDEAS_BASE_URL') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_IDEAS_BASE_URL_EXPLAIN') }}</span></dt>
-			<dd><input id="ideas_base_url" type="text" size="45" maxlength="255" name="config[ideas_base_url]" value="{{ IDEAS_BASE_URL }}" /></dd>
-		</dl>
 
 		<fieldset class="submit-buttons">
 			<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;

controller/admin_controller.php

@@ -84,8 +84,6 @@ public function __construct(\phpbb\config\config $config, \phpbb\db\driver\drive
 	public function display_options()
 	{
 		$this->template->assign_vars(array(
-			'IDEAS_BASE_URL'	=> $this->config['ideas_base_url'] ?: '',
-
 			'S_FORUM_SELECT_BOX'	=> $this->select_ideas_forum(),
 			'S_IDEAS_FORUM_ID'		=> !empty($this->config['ideas_forum_id']),
 
@@ -130,7 +128,6 @@ public function set_config_options()
 			// Configuration options to list through
 			$display_vars = array(
 				'ideas_forum_id',
-				'ideas_base_url',
 				'ideas_forum_setup',
 			);
 

event/listener.php

@@ -101,9 +101,7 @@ public function ideas_forum_redirect($event)
 	{
 		if ($this->is_ideas_forum($event['forum_id']))
 		{
-			// Use the custom base url if set, otherwise default to normal routing
-			$url = $this->config['ideas_base_url'] ?: $this->helper->route('phpbb_ideas_index_controller');
-			redirect($url);
+			redirect($this->helper->route('phpbb_ideas_index_controller'));
 		}
 	}
 

language/en/phpbb_ideas_acp.php

@@ -29,7 +29,5 @@
 	'ACP_IDEAS_NO_FORUM'			=> 'No forum selected',
 	'ACP_IDEAS_SETTINGS_UPDATED'	=> 'phpBB Ideas settings updated.',
 	'ACP_IDEAS_UTILITIES'			=> 'Ideas utilities',
-	'ACP_IDEAS_BASE_URL'			=> 'Ideas base URL (optional)',
-	'ACP_IDEAS_BASE_URL_EXPLAIN'	=> 'Enter the full URL to Ideas, e.g.: <samp>http://www.phpbb.com/ideas</samp>. This should only be set if your board has custom routing configurations that prevent Ideas from working as expected.',
 	'ACP_PHPBB_IDEAS_EXPLAIN'		=> 'Here you can configure phpBB Ideas extension. phpBB Ideas is an ideas centre for phpBB. It allows users to suggest and vote on ideas that would help to improve and enhance phpBB.',
 ));

migrations/m12_drop_base_url_config.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ *
+ * Ideas extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace phpbb\ideas\migrations;
+
+class m12_drop_base_url_config extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return !$this->config->offsetExists('ideas_base_url');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\ideas\migrations\m1_initial_schema',
+			'\phpbb\ideas\migrations\m5_base_url_config',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.remove', ['ideas_base_url']],
+		];
+	}
+}