From a0806386a391bc093759133beb7f42c22833cfce Mon Sep 17 00:00:00 2001 From: Matt Stein Date: Fri, 16 Jul 2021 08:33:26 -0500 Subject: [PATCH] =?UTF-8?q?`http`=20=E2=86=92=20`https`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/requirements/RequirementsChecker.php | 10 ++--- server/requirements/requirements.php | 48 ++++++++++----------- server/views/web/css.php | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/server/requirements/RequirementsChecker.php b/server/requirements/RequirementsChecker.php index 87fcbca..285e7e2 100644 --- a/server/requirements/RequirementsChecker.php +++ b/server/requirements/RequirementsChecker.php @@ -451,20 +451,20 @@ function iniSetRequirement() // ini_set can return false or an empty string depending on your php version / FastCGI. // If ini_set has been disabled in php.ini, the value will be null because of our muted error handler if ($result === null) { - $memo = 'It looks like ini_set has been disabled in your php.ini file. Craft requires that to operate.'; + $memo = 'It looks like ini_set has been disabled in your php.ini file. Craft requires that to operate.'; $condition = false; } // ini_set can return false or an empty string or the current value of memory_limit depending on your php // version and FastCGI. Regard, calling it didn't work, but there was no error. else if ($result === false || $result === '' || $result === $newValue) { - $memo = 'It appears calls to ini_set are not working for Craft. You may need to increase some settings in your php.ini file such as memory_limit and max_execution_time for long running operations like updating and asset transformations.'; + $memo = 'It appears calls to ini_set are not working for Craft. You may need to increase some settings in your php.ini file such as memory_limit and max_execution_time for long running operations like updating and asset transformations.'; // Set mandatory to false here so it's not a "fatal" error, but will be treated as a warning. $mandatory = false; $condition = false; } else { - $memo = 'Calls to ini_set are working correctly.'; + $memo = 'Calls to ini_set are working correctly.'; $condition = true; } @@ -479,7 +479,7 @@ function iniSetRequirement() /** * @return array * - * @see http://php.net/manual/en/ini.core.php#ini.memory-limit + * @see https://php.net/manual/en/ini.core.php#ini.memory-limit */ function memoryLimitRequirement() { @@ -500,7 +500,7 @@ function memoryLimitRequirement() /** * @return array * - * @see http://php.net/manual/en/info.configuration.php#ini.max-execution-time + * @see https://php.net/manual/en/info.configuration.php#ini.max-execution-time */ function maxExecutionTimeRequirement() { diff --git a/server/requirements/requirements.php b/server/requirements/requirements.php index cd22388..fb60b3b 100644 --- a/server/requirements/requirements.php +++ b/server/requirements/requirements.php @@ -21,7 +21,7 @@ 'name' => 'PDO MySQL extension', 'mandatory' => true, 'condition' => extension_loaded('pdo_mysql'), - 'memo' => 'The PDO MySQL extension is required.' + 'memo' => 'The PDO MySQL extension is required.' ); if ($conn !== false) { $requirements[] = array( @@ -43,7 +43,7 @@ 'name' => 'PDO PostgreSQL extension', 'mandatory' => true, 'condition' => extension_loaded('pdo_pgsql'), - 'memo' => 'The PDO PostgreSQL extension is required.' + 'memo' => 'The PDO PostgreSQL extension is required.' ); if ($conn !== false) { $requirements[] = array( @@ -66,80 +66,80 @@ 'name' => 'Reflection extension', 'mandatory' => true, 'condition' => extension_loaded('reflection'), - 'memo' => 'The Reflection extension is required.', + 'memo' => 'The Reflection extension is required.', ), array( 'name' => 'PCRE extension (with UTF-8 support)', 'mandatory' => true, 'condition' => extension_loaded('pcre') && preg_match('/./u', 'Ü') === 1, - 'memo' => 'The PCRE extension is required and it must be compiled to support UTF-8.', + 'memo' => 'The PCRE extension is required and it must be compiled to support UTF-8.', ), array( 'name' => 'SPL extension', 'mandatory' => true, 'condition' => extension_loaded('SPL'), - 'memo' => 'The SPL extension is required.' + 'memo' => 'The SPL extension is required.' ), array( 'name' => 'PDO extension', 'mandatory' => true, 'condition' => extension_loaded('pdo'), - 'memo' => 'The PDO extension is required.' + 'memo' => 'The PDO extension is required.' ), array( 'name' => 'Multibyte String extension (with Function Overloading disabled)', 'mandatory' => true, 'condition' => extension_loaded('mbstring') && ini_get('mbstring.func_overload') == 0, - 'memo' => 'Craft CMS requires the Multibyte String extension with Function Overloading disabled in order to run.' + 'memo' => 'Craft CMS requires the Multibyte String extension with Function Overloading disabled in order to run.' ), array( 'name' => 'GD extension or ImageMagick extension', 'mandatory' => true, 'condition' => extension_loaded('gd') || (extension_loaded('imagick') && !empty(\Imagick::queryFormats())), - 'memo' => 'The GD or ImageMagick extension is required, however ImageMagick is recommended as it adds animated GIF support, and preserves 8-bit and 24-bit PNGs during image transforms.' + 'memo' => 'The GD or ImageMagick extension is required, however ImageMagick is recommended as it adds animated GIF support, and preserves 8-bit and 24-bit PNGs during image transforms.' ), array( 'name' => 'OpenSSL extension', 'mandatory' => true, 'condition' => extension_loaded('openssl'), - 'memo' => 'The OpenSSL extension is required.' + 'memo' => 'The OpenSSL extension is required.' ), array( 'name' => 'cURL extension', 'mandatory' => true, 'condition' => extension_loaded('curl'), - 'memo' => 'The cURL extension is required.', + 'memo' => 'The cURL extension is required.', ), array( 'name' => 'ctype extension', 'mandatory' => true, 'condition' => extension_loaded('ctype'), - 'memo' => 'The ctype extension is required.', + 'memo' => 'The ctype extension is required.', ), $this->iniSetRequirement(), array( 'name' => 'Intl extension', 'mandatory' => false, 'condition' => $this->checkPhpExtensionVersion('intl', '1.0.2', '>='), - 'memo' => 'The Intl extension (version 1.0.2+) is recommended.' + 'memo' => 'The Intl extension (version 1.0.2+) is recommended.' ), array( 'name' => 'Fileinfo extension', 'mandatory' => true, 'condition' => extension_loaded('fileinfo'), - 'memo' => 'The Fileinfo extension required.' + 'memo' => 'The Fileinfo extension required.' ), array( 'name' => 'DOM extension', 'mandatory' => true, 'condition' => extension_loaded('dom'), - 'memo' => 'The DOM extension is required.', + 'memo' => 'The DOM extension is required.', ), array( 'name' => 'iconv extension', 'mandatory' => true, 'condition' => function_exists('iconv'), - 'memo' => 'iconv is required for more robust character set conversion support.', + 'memo' => 'iconv is required for more robust character set conversion support.', ), $this->memoryLimitRequirement(), $this->maxExecutionTimeRequirement(), @@ -147,55 +147,55 @@ 'name' => 'password_hash()', 'mandatory' => true, 'condition' => function_exists('password_hash'), - 'memo' => 'The password_hash() function is required so Craft can create secure passwords.', + 'memo' => 'The password_hash() function is required so Craft can create secure passwords.', ), array( 'name' => 'Zip extension', 'mandatory' => true, 'condition' => extension_loaded('zip'), - 'memo' => 'The zip extension is required for zip and unzip operations.', + 'memo' => 'The zip extension is required for zip and unzip operations.', ), array( 'name' => 'JSON extension', 'mandatory' => true, 'condition' => extension_loaded('json'), - 'memo' => 'The JSON extension is required for JSON encoding and decoding.', + 'memo' => 'The JSON extension is required for JSON encoding and decoding.', ), array( 'name' => 'proc_open()', 'mandatory' => false, 'condition' => function_exists('proc_open'), - 'memo' => 'The proc_open() function is required for Plugin Store operations as well as sending emails.', + 'memo' => 'The proc_open() function is required for Plugin Store operations as well as sending emails.', ), array( 'name' => 'proc_get_status()', 'mandatory' => false, 'condition' => function_exists('proc_get_status'), - 'memo' => 'The proc_get_status() function is required for Plugin Store operations as well as sending emails.', + 'memo' => 'The proc_get_status() function is required for Plugin Store operations as well as sending emails.', ), array( 'name' => 'proc_close()', 'mandatory' => false, 'condition' => function_exists('proc_close'), - 'memo' => 'The proc_close() function is required for Plugin Store operations as well as sending emails.', + 'memo' => 'The proc_close() function is required for Plugin Store operations as well as sending emails.', ), array( 'name' => 'proc_terminate()', 'mandatory' => false, 'condition' => function_exists('proc_terminate'), - 'memo' => 'The proc_terminate() function is required for Plugin Store operations as well as sending emails.', + 'memo' => 'The proc_terminate() function is required for Plugin Store operations as well as sending emails.', ), array( 'name' => 'allow_url_fopen', 'mandatory' => false, 'condition' => ini_get('allow_url_fopen'), - 'memo' => 'allow_url_fopen must be enabled in your PHP configuration for Plugin Store and updating operations.', + 'memo' => 'allow_url_fopen must be enabled in your PHP configuration for Plugin Store and updating operations.', ), array( 'name' => 'ignore_user_abort()', 'mandatory' => false, 'condition' => function_exists('ignore_user_abort'), - 'memo' => 'ignore_user_abort() must be enabled in your PHP configuration for the native web-based queue runner to work.', + 'memo' => 'ignore_user_abort() must be enabled in your PHP configuration for the native web-based queue runner to work.', ), )); diff --git a/server/views/web/css.php b/server/views/web/css.php index 2946a4d..ecfe5fa 100644 --- a/server/views/web/css.php +++ b/server/views/web/css.php @@ -4,7 +4,7 @@ * * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world by @mdo and @fat. */