Merge pull request #31 from Crizz0/issue/30

Update code for >= 3.3

Author: Crizz0

README.md

@@ -1,12 +1,17 @@
-# phpBB 3.1/3.2 Extension - phpBB.de External Images as Link
+# phpBB 3.2 & 3.3 Extension - phpBB.de External Images as Link
 
 Images which are not from the own board are displayed as link not as image.
 
 Author: Christian Schnegelberger, Oliver Schramm
 
 URL: https://www.phpbb.de
 
-Version: 1.2.0
+## New settings
+This extension add a new setting to: "ACP > Tab: General > Post settings > Permitted images". 
+
+You choose between allowed images "Only images from
+this domain" and "Only from secure websites and this domain". The last option will allow to include 
+"https://" image urls.
 
 ## Install instructions:
 1. Download the extension

composer.json

@@ -9,7 +9,7 @@
 	"authors": [
 		{
 			"name": "Christian Schnegelberger",
-			"email": "blackhawk87@phpbb.de",
+			"email": "crizzo@phpbb.de",
 			"homepage": "https://www.phpbb.de",
 			"role": "Developer"
 		},
@@ -24,13 +24,13 @@
 		"php": ">=5.4.7"
 	},
 	"require-dev": {
-		"phpbb/epv": "~0.0.8",
-		"phpbb/translation-validator": "~1.4.0"
+		"phpbb/epv": "^0.0.11",
+		"phpbb/translation-validator": "^1.5.2"
 	},
 	"extra": {
 		"display-name": "phpBB.de - External Image as Link",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.2.2"
+			"phpbb/phpbb": ">=3.2.4"
 		}
 	}
 }

config/services.yml

@@ -2,13 +2,14 @@ services:
     phpbbde.externalimgaslink.helper:
         class: phpbbde\externalimgaslink\helper
         arguments:
-            - '@user'
+            - '@language'
 
     phpbbde.externalimgaslink.listener:
         class: phpbbde\externalimgaslink\event\listener
         arguments:
             - '@config'
             - '@phpbbde.externalimgaslink.helper'
+            - '@language'
             - '@template'
             - '@user'
         tags:

event/listener.php

@@ -30,6 +30,9 @@ class listener implements EventSubscriberInterface
 	/** @var helper */
 	protected $helper;
 
+	/* @var \phpbb\language\language */
+	protected $language;
+
 	/** @var template */
 	protected $template;
 
@@ -39,19 +42,24 @@ class listener implements EventSubscriberInterface
 	/**
 	 * Constructor
 	 *
-	 * @param config		$config
-	 * @param helper		$helper
-	 * @param template		$template
-	 * @param user			$user
+	 * @param \phpbb\config\config				$config
+	 * @param helper							$helper
+	 * @param \phpbb\language\language			$language
+	 * @param \phpbb\template\template			$template
+	 * @param \phpbb\user						$user
 	 */
-	public function __construct(config $config, helper $helper, template $template, user $user)
+	public function __construct(
+		\phpbb\config\config $config,
+		helper $helper,
+		\phpbb\language\language $language,
+		\phpbb\template\template $template,
+		\phpbb\user $user)
 	{
 		$this->config = $config;
 		$this->helper = $helper;
+		$this->language = $language;
 		$this->template = $template;
 		$this->user = $user;
-
-		$this->user->add_lang_ext('phpbbde/externalimgaslink', 'extimgaslink');
 	}
 
 	/**
@@ -64,7 +72,6 @@ static public function getSubscribedEvents()
 		return array(
 			'core.acp_board_config_edit_add'	=> 'acp_add_config',
 			'core.bbcode_cache_init_end'		=> 'modify_case_img',
-			// 3.2 TextFormatter events (will only trigger in >=3.2)
 			'core.text_formatter_s9e_configure_after'	=> 'configure_textformatter',
 			'core.text_formatter_s9e_renderer_setup'	=> 'setup_textformatter_renderer',
 		);
@@ -78,6 +85,8 @@ static public function getSubscribedEvents()
 	 */
 	public function acp_add_config($event)
 	{
+		$this->language->add_lang('extimgaslink', 'phpbbde/externalimgaslink');
+
 		if ($event['mode'] !== 'post')
 		{
 			return;
@@ -165,7 +174,7 @@ public function modify_case_img($event)
 
 		$bbcode_cache[$bbcode_id]['preg'] += array(
 			// every other external image will be replaced
-			'#\[img:$uid\](.*?)\[/img:$uid\]#s'	=> str_replace('$2', $this->user->lang('EXTIMGLINK'), $bbcode->bbcode_tpl('url', $bbcode_id, true)),
+			'#\[img:$uid\](.*?)\[/img:$uid\]#s'	=> str_replace('$2', $this->language->lang('EXTIMGLINK'), $bbcode->bbcode_tpl('url', $bbcode_id, true)),
 		);
 
 		$event['bbcode_cache'] = $bbcode_cache;

helper.php

@@ -11,17 +11,17 @@
 
 class helper
 {
-	/** @var \phpbb\user */
-	protected $user;
+	/* @var \phpbb\language\language */
+	protected $language;
 
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\user $user
+	 * @param \phpbb\language\language		$language
 	 */
-	public function __construct(\phpbb\user $user)
+	public function __construct(\phpbb\language\language $language)
 	{
-		$this->user = $user;
+		$this->language = $language;
 	}
 
 	/**
@@ -57,7 +57,7 @@ public function extimgaslink_config_select($selected_type)
 		foreach ($types as $key => $value)
 		{
 			$selected = ($selected_type === $key) ? ' selected="selected"' : '';
-			$options .= '<option value="' . $key . '"' . $selected . '>' . $this->user->lang('EXTIMGASLINK_' . $value) . '</option>';
+			$options .= '<option value="' . $key . '"' . $selected . '>' . $this->language->lang('EXTIMGASLINK_' . $value) . '</option>';
 		}
 
 		return $options;

migrations/add_filter_config.php

@@ -13,6 +13,13 @@
 
 class add_filter_config extends \phpbb\db\migration\migration
 {
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v32x\v324',
+		);
+	}
+
 	public function update_data()
 	{
 		return array(