- <property name="prevversion" value="3.2.4-RC1" />

- <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1, 3.2.2, 3.2.3" />

- <!-- IF not S_THUMBNAIL_SUPPORT -->

- <div class="errorbox">

- <p>{L_NO_THUMBNAIL_SUPPORT}</p>

- </div>

- <!-- ENDIF -->

-

- installer.obtain_data.obtain_imagick_path:

- class: phpbb\install\module\obtain_data\task\obtain_imagick_path

- arguments:

- - '@installer.helper.config'

- tags:

- - { name: install_obtain_data, order: 60 }

-

- <li>ImageMagick support</li>

- 'img_imagick' => array('lang' => 'IMAGICK_PATH', 'validate' => 'absolute_path', 'type' => 'text:20:200', 'explain' => true, 'append' => '&nbsp;&nbsp;<span>[ <a href="' . $this->u_action . '&amp;action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),

- if ($action == 'imgmagick')

- {

- $this->new_config['img_imagick'] = $this->search_imagemagick();

- }

-

- // We strip eventually manual added convert program, we only want the patch

- if ($this->new_config['img_imagick'])

- {

- // Change path separator

- $this->new_config['img_imagick'] = str_replace('\\', '/', $this->new_config['img_imagick']);

- $this->new_config['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $this->new_config['img_imagick']);

-

- // Check for trailing slash

- if (substr($this->new_config['img_imagick'], -1) !== '/')

- {

- $this->new_config['img_imagick'] .= '/';

- }

- }

-

- $supported_types = get_supported_image_types();

-

- // Check Thumbnail Support

- if (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !count($supported_types['format'])))

- {

- $this->new_config['img_create_thumbnail'] = 0;

- }

-

- $template->assign_vars(array(

- 'U_SEARCH_IMAGICK' => $this->u_action . '&amp;action=imgmagick',

- 'S_THUMBNAIL_SUPPORT' => (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !count($supported_types['format']))) ? false : true)

- );

-

- * Search Imagick

- */

- function search_imagemagick()

- {

- $imagick = '';

-

- $exe = ((defined('PHP_OS')) && (preg_match('#^win#i', PHP_OS))) ? '.exe' : '';

-

- $magic_home = getenv('MAGICK_HOME');

-

- 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) !== '/')

- {

- $location .= '/';

- }

-

- if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)

- {

- $imagick = str_replace('\\', '/', $location);

- continue;

- }

- }

- }

- else

- {

- $imagick = str_replace('\\', '/', $magic_home);

- }

-

- return $imagick;

- }

-

- /**

- if (!preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches))

- if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches))

- return gen_rand_string(32);

- // Absolute file path

- case 'absolute_path':

- case 'absolute_path_writable':

- $path = in_array($config_definition['validate'], array('wpath', 'path', 'rpath', 'rwpath')) ? $phpbb_root_path . $cfg_array[$config_name] : $cfg_array[$config_name];

- if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath' || $config_definition['validate'] === 'absolute_path_writable')

- global $config, $phpbb_filesystem;

- $used_imagick = false;

- // Only use ImageMagick if defined and the passthru function not disabled

- if ($config['img_imagick'] && function_exists('passthru'))

- {

- if (substr($config['img_imagick'], -1) !== '/')

- {

- $config['img_imagick'] .= '/';

- }

-

- @passthru(escapeshellcmd($config['img_imagick']) . 'convert' . ((defined('PHP_OS') && preg_match('#^win#i', PHP_OS)) ? '.exe' : '') . ' -quality 85 -geometry ' . $new_width . 'x' . $new_height . ' "' . str_replace('\\', '/', $source) . '" "' . str_replace('\\', '/', $destination) . '"');

-

- if (file_exists($destination))

- {

- $used_imagick = true;

- }

- }

- if (!$used_imagick)

- 'img_imagick' => true,

- $config->set('img_imagick', $attach_config['img_imagick']);

-define('PHPBB_VERSION', '3.2.4-RC1');

-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_imagick', '');

- 'IMAGICK_PATH' => 'ImageMagick path',

- 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',

- 'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled. For proper functionality either the GD extension need to be available or imagemagick being installed. Both were not found.',

- 'SEARCH_IMAGICK' => 'Search for ImageMagick',

- SET config_value = '" . $this->db->sql_escape($this->install_config->get('img_imagick')) . "'

- WHERE config_name = 'img_imagick'",

-

- 'UPDATE ' . $this->config_table . "

-<?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 '';

- }

-}

- 'img_imagick' => '',

-<?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.

- *

- */

-

-/**

- * @group functional

- */

-class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case

-{

- public function data_imagick_path_linux()

- {

- return array(

- array('/usr/bin', 'Configuration updated successfully'),

- array('/usr/foobar', 'The entered path “/usr/foobar” does not exist.'),

- array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'),

- );

- }

-

- /**

- * @dataProvider data_imagick_path_linux

- */

- public function test_imagick_path_linux($imagick_path, $expected)

- {

- if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')

- {

- $this->markTestSkipped('Unable to test linux specific paths on other OS.');

- }

-

- $this->login();

- $this->admin_login();

-

- $crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);

-

- $form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path));

-

- $crawler = self::submit($form);

- $this->assertContains($expected, $crawler->filter('#main')->text());

- }

-

- public function data_imagick_path_windows()

- {

- return array(

- array('C:\Windows', 'Configuration updated successfully'),

- array('C:\Windows\foobar1', 'The entered path “C:\Windows\foobar1” does not exist.'),

- array('C:\Windows\explorer.exe', 'The entered path “C:\Windows\explorer.exe” is not a directory.'),

- );

- }

-

- /**

- * @dataProvider data_imagick_path_windows

- */

- public function test_imagick_path_windows($imagick_path, $expected)

- {

- if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')

- {

- $this->markTestSkipped('Unable to test windows specific paths on other OS.');

- }

-

- $this->login();

- $this->admin_login();

-

- $crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);

-

- $form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path));

-

- $crawler = self::submit($form);

- $this->assertContains($expected, $crawler->filter('#main')->text());

- }

-}

- 'config[img_imagick]' => '',

-

- public function data_validate_path_linux()

- {

- return array(

- array('/usr/bin', 'absolute_path', true),

- array('/usr/bin/', 'absolute_path:50:200', true),

- array('/usr/bin/which', 'absolute_path', 'DIRECTORY_NOT_DIR'),

- array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- array('C:\Windows', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- array('.', 'absolute_path', true),

- array('', 'absolute_path', true),

- array('mkdir /foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- // Make sure above command didn't do anything

- array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- );

- }

-

- /**

- * @dataProvider data_validate_path_linux

- */

- public function test_validate_path_linux($path, $validation_type, $expected)

- {

- if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')

- {

- $this->markTestSkipped('Unable to test linux specific paths on other OS.');

- }

-

- $error = array();

- $config_ary = array(

- 'path' => $path,

- );

-

- validate_config_vars(array(

- 'path' => array('lang' => 'FOOBAR', 'validate' => $validation_type),

- ),

- $config_ary,

- $error

- );

-

- if ($expected === true)

- {

- $this->assertEmpty($error);

- }

- else

- {

- $this->assertEquals(array($expected), $error);

- }

- }

-

- public function data_validate_path_windows()

- {

- return array(

- array('C:\Windows', 'absolute_path', true),

- array('C:\Windows\\', 'absolute_path:50:200', true),

- array('C:\Windows\explorer.exe', 'absolute_path', 'DIRECTORY_NOT_DIR'),

- array('C:\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- array('/usr/bin', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- array('.', 'absolute_path', true),

- array('', 'absolute_path', true),

- array('mkdir C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- // Make sure above command didn't do anything

- array('C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),

- );

- }

-

- /**

- * @dataProvider data_validate_path_windows

- */

- public function test_validate_path_windows($path, $validation_type, $expected)

- {

- if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')

- {

- $this->markTestSkipped('Unable to test windows specific paths on other OS.');

- }

-

- $error = array();

- $config_ary = array(

- 'path' => $path,

- );

-

- validate_config_vars(array(

- 'path' => array('lang' => 'FOOBAR', 'validate' => $validation_type),

- ),

- $config_ary,

- $error

- );

-

- if ($expected === true)

- {

- $this->assertEmpty($error);

- }

- else

- {

- $this->assertEquals(array($expected), $error);

- }

- }