Skip to content

Commit

Permalink
http → https
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Stein committed Jul 16, 2021
1 parent 8bb4c15 commit a080638
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
10 changes: 5 additions & 5 deletions server/requirements/RequirementsChecker.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a rel="noopener" target="_blank" href="http://php.net/manual/en/function.ini-set.php">ini_set</a> has been disabled in your <code>php.ini</code> file. Craft requires that to operate.';
$memo = 'It looks like <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.ini-set.php">ini_set</a> has been disabled in your <code>php.ini</code> 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 <a rel="noopener" target="_blank" href="http://php.net/manual/en/function.ini-set.php">ini_set</a> are not working for Craft. You may need to increase some settings in your php.ini file such as <a rel="noopener" target="_blank" href="http://php.net/manual/en/ini.core.php#ini.memory-limit">memory_limit</a> and <a rel="noopener" target="_blank" href="http://php.net/manual/en/info.configuration.php#ini.max-execution-time">max_execution_time</a> for long running operations like updating and asset transformations.';
$memo = 'It appears calls to <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.ini-set.php">ini_set</a> are not working for Craft. You may need to increase some settings in your php.ini file such as <a rel="noopener" target="_blank" href="https://php.net/manual/en/ini.core.php#ini.memory-limit">memory_limit</a> and <a rel="noopener" target="_blank" href="https://php.net/manual/en/info.configuration.php#ini.max-execution-time">max_execution_time</a> 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 <a rel="noopener" target="_blank" href="http://php.net/manual/en/function.ini-set.php">ini_set</a> are working correctly.';
$memo = 'Calls to <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.ini-set.php">ini_set</a> are working correctly.';
$condition = true;
}

Expand All @@ -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()
{
Expand All @@ -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()
{
Expand Down
48 changes: 24 additions & 24 deletions server/requirements/requirements.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'name' => 'PDO MySQL extension',
'mandatory' => true,
'condition' => extension_loaded('pdo_mysql'),
'memo' => 'The <http://php.net/manual/en/ref.pdo-mysql.php>PDO MySQL</a> extension is required.'
'memo' => 'The <https://php.net/manual/en/ref.pdo-mysql.php>PDO MySQL</a> extension is required.'
);
if ($conn !== false) {
$requirements[] = array(
Expand All @@ -43,7 +43,7 @@
'name' => 'PDO PostgreSQL extension',
'mandatory' => true,
'condition' => extension_loaded('pdo_pgsql'),
'memo' => 'The <https://secure.php.net/manual/en/ref.pdo-pgsql.php>PDO PostgreSQL</a> extension is required.'
'memo' => 'The <https://php.net/manual/en/ref.pdo-pgsql.php>PDO PostgreSQL</a> extension is required.'
);
if ($conn !== false) {
$requirements[] = array(
Expand All @@ -66,136 +66,136 @@
'name' => 'Reflection extension',
'mandatory' => true,
'condition' => extension_loaded('reflection'),
'memo' => 'The <a rel="noopener" target="_blank" href="http://php.net/manual/en/class.reflectionextension.php">Reflection</a> extension is required.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/class.reflectionextension.php">Reflection</a> extension is required.',
),
array(
'name' => 'PCRE extension (with UTF-8 support)',
'mandatory' => true,
'condition' => extension_loaded('pcre') && preg_match('/./u', 'Ü') === 1,
'memo' => 'The <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.pcre.php">PCRE</a> extension is required and it must be compiled to support UTF-8.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.pcre.php">PCRE</a> extension is required and it must be compiled to support UTF-8.',
),
array(
'name' => 'SPL extension',
'mandatory' => true,
'condition' => extension_loaded('SPL'),
'memo' => 'The <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.spl.php">SPL</a> extension is required.'
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.spl.php">SPL</a> extension is required.'
),
array(
'name' => 'PDO extension',
'mandatory' => true,
'condition' => extension_loaded('pdo'),
'memo' => 'The <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.pdo.php">PDO</a> extension is required.'
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.pdo.php">PDO</a> 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 <a rel="noopener" target="_blank" href="http://www.php.net/manual/en/book.mbstring.php">Multibyte String</a> extension with <a rel="noopener" target="_blank" href="http://php.net/manual/en/mbstring.overload.php">Function Overloading</a> disabled in order to run.'
'memo' => 'Craft CMS requires the <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.mbstring.php">Multibyte String</a> extension with <a rel="noopener" target="_blank" href="https://php.net/manual/en/mbstring.overload.php">Function Overloading</a> 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 <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.image.php">GD</a> or <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.imagick.php">ImageMagick</a> 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 <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.image.php">GD</a> or <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.imagick.php">ImageMagick</a> 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 <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.openssl.php">OpenSSL</a> extension is required.'
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.openssl.php">OpenSSL</a> extension is required.'
),
array(
'name' => 'cURL extension',
'mandatory' => true,
'condition' => extension_loaded('curl'),
'memo' => 'The <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.curl.php">cURL</a> extension is required.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.curl.php">cURL</a> extension is required.',
),
array(
'name' => 'ctype extension',
'mandatory' => true,
'condition' => extension_loaded('ctype'),
'memo' => 'The <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/book.ctype.php">ctype</a> extension is required.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.ctype.php">ctype</a> extension is required.',
),
$this->iniSetRequirement(),
array(
'name' => 'Intl extension',
'mandatory' => false,
'condition' => $this->checkPhpExtensionVersion('intl', '1.0.2', '>='),
'memo' => 'The <a rel="noopener" target="_blank" href="http://www.php.net/manual/en/book.intl.php">Intl</a> extension (version 1.0.2+) is recommended.'
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.intl.php">Intl</a> extension (version 1.0.2+) is recommended.'
),
array(
'name' => 'Fileinfo extension',
'mandatory' => true,
'condition' => extension_loaded('fileinfo'),
'memo' => 'The <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.fileinfo.php">Fileinfo</a> extension required.'
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.fileinfo.php">Fileinfo</a> extension required.'
),
array(
'name' => 'DOM extension',
'mandatory' => true,
'condition' => extension_loaded('dom'),
'memo' => 'The <a rel="noopener" target="_blank" href="http://php.net/manual/en/book.dom.php">DOM</a> extension is required.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.dom.php">DOM</a> extension is required.',
),
array(
'name' => 'iconv extension',
'mandatory' => true,
'condition' => function_exists('iconv'),
'memo' => '<a rel="noopener" target="_blank" href="http://php.net/manual/en/book.iconv.php">iconv</a> is required for more robust character set conversion support.',
'memo' => '<a rel="noopener" target="_blank" href="https://php.net/manual/en/book.iconv.php">iconv</a> is required for more robust character set conversion support.',
),
$this->memoryLimitRequirement(),
$this->maxExecutionTimeRequirement(),
array(
'name' => 'password_hash()',
'mandatory' => true,
'condition' => function_exists('password_hash'),
'memo' => 'The <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/function.password-hash.php">password_hash()</a> function is required so Craft can create secure passwords.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.password-hash.php">password_hash()</a> function is required so Craft can create secure passwords.',
),
array(
'name' => 'Zip extension',
'mandatory' => true,
'condition' => extension_loaded('zip'),
'memo' => 'The <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/book.zip.php">zip</a> extension is required for zip and unzip operations.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.zip.php">zip</a> extension is required for zip and unzip operations.',
),
array(
'name' => 'JSON extension',
'mandatory' => true,
'condition' => extension_loaded('json'),
'memo' => 'The <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/book.json.php">JSON</a> extension is required for JSON encoding and decoding.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.json.php">JSON</a> extension is required for JSON encoding and decoding.',
),
array(
'name' => 'proc_open()',
'mandatory' => false,
'condition' => function_exists('proc_open'),
'memo' => 'The <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/function.proc-open.php">proc_open()</a> function is required for Plugin Store operations as well as sending emails.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.proc-open.php">proc_open()</a> 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 <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/function.proc-get-status.php">proc_get_status()</a> function is required for Plugin Store operations as well as sending emails.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.proc-get-status.php">proc_get_status()</a> 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 <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/function.proc-close.php">proc_close()</a> function is required for Plugin Store operations as well as sending emails.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.proc-close.php">proc_close()</a> 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 <a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/function.proc-terminate.php">proc_terminate()</a> function is required for Plugin Store operations as well as sending emails.',
'memo' => 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/function.proc-terminate.php">proc_terminate()</a> 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' => '<a rel="noopener" target="_blank" href="https://secure.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a> must be enabled in your PHP configuration for Plugin Store and updating operations.',
'memo' => '<a rel="noopener" target="_blank" href="https://php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a> 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' => '<a rel="noopener" target="_blank" href="https://www.php.net/manual/en/function.ignore-user-abort.php">ignore_user_abort()</a> must be enabled in your PHP configuration for the native web-based queue runner to work.',
'memo' => '<a rel="noopener" target="_blank" href="https://php.net/manual/en/function.ignore-user-abort.php">ignore_user_abort()</a> must be enabled in your PHP configuration for the native web-based queue runner to work.',
),
));

Expand Down
2 changes: 1 addition & 1 deletion server/views/web/css.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit a080638

Please sign in to comment.