From d753351edc04a45c61411ee09607fb932d314617 Mon Sep 17 00:00:00 2001
From: Derky <derky@phpbb.com>
Date: Tue, 23 Oct 2018 23:51:55 +0200
Subject: [ticket/security/227] Replace ImageMagick support with thumbnail
 event

SECURITY-227
---
 .../install_database/task/add_config_settings.php  |  4 -
 .../obtain_data/task/obtain_imagick_path.php       | 89 ----------------------
 2 files changed, 93 deletions(-)
 delete mode 100644 phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php

(limited to 'phpBB/phpbb/install')

diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
index 54114e3f9c..ba439609ff 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
@@ -150,10 +150,6 @@ class add_config_settings extends \phpbb\install\task_base
 			'INSERT INTO ' . $this->config_table . " (config_name, config_value)
 				VALUES ('default_lang', '" . $this->db->sql_escape($this->install_config->get('default_lang')) . "')",
 
-			'UPDATE ' . $this->config_table . "
-				SET config_value = '" . $this->db->sql_escape($this->install_config->get('img_imagick')) . "'
-				WHERE config_name = 'img_imagick'",
-
 			'UPDATE ' . $this->config_table . "
 				SET config_value = '" . $this->db->sql_escape($this->install_config->get('server_name')) . "'
 				WHERE config_name = 'server_name'",
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php
deleted file mode 100644
index 377d96ed1a..0000000000
--- a/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-namespace phpbb\install\module\obtain_data\task;
-
-class obtain_imagick_path extends \phpbb\install\task_base implements \phpbb\install\task_interface
-{
-	/**
-	 * @var \phpbb\install\helper\config
-	 */
-	protected $config;
-
-	/**
-	 * Constructor
-	 *
-	 * @param \phpbb\install\helper\config	$config	Installer's config
-	 */
-	public function __construct(\phpbb\install\helper\config $config)
-	{
-		$this->config = $config;
-
-		parent::__construct(true);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function run()
-	{
-		// Can we find ImageMagick anywhere on the system?
-		$exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : '';
-
-		$magic_home = getenv('MAGICK_HOME');
-		$img_imagick = '';
-		if (empty($magic_home))
-		{
-			$locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/');
-			$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH'))));
-
-			$locations = array_merge($path_locations, $locations);
-			foreach ($locations as $location)
-			{
-				// The path might not end properly, fudge it
-				if (substr($location, -1, 1) !== '/')
-				{
-					$location .= '/';
-				}
-
-				if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)
-				{
-					$img_imagick = str_replace('\\', '/', $location);
-					continue;
-				}
-			}
-		}
-		else
-		{
-			$img_imagick = str_replace('\\', '/', $magic_home);
-		}
-
-		$this->config->set('img_imagick', $img_imagick);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	static public function get_step_count()
-	{
-		return 0;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_task_lang_name()
-	{
-		return '';
-	}
-}
-- 
cgit v1.2.1