Skip to content

Commit

Permalink
MDL-54901 environment: pg93, openssl, https & utf8mb4
Browse files Browse the repository at this point in the history
  • Loading branch information
stronk7 committed Apr 18, 2017
1 parent 3422a91 commit 22983bd
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 3 deletions.
16 changes: 13 additions & 3 deletions admin/environment.xml
Expand Up @@ -1914,7 +1914,7 @@
<DATABASE level="required">
<VENDOR name="mariadb" version="5.5.31" />
<VENDOR name="mysql" version="5.5.31" />
<VENDOR name="postgres" version="9.1" />
<VENDOR name="postgres" version="9.3" />
<VENDOR name="mssql" version="10.0" />
<VENDOR name="oracle" version="10.2" />
</DATABASE>
Expand All @@ -1941,9 +1941,9 @@
<ON_ERROR message="curlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="openssl" level="optional">
<PHP_EXTENSION name="openssl" level="required">
<FEEDBACK>
<ON_CHECK message="opensslrecommended" />
<ON_ERROR message="opensslrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="tokenizer" level="optional">
Expand Down Expand Up @@ -2068,6 +2068,16 @@
<ON_ERROR message="unsupporteddblargeprefix" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
<FEEDBACK>
<ON_CHECK message="ishttpswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
<FEEDBACK>
<ON_CHECK message="incompleteunicodesupport" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
2 changes: 2 additions & 0 deletions lang/en/admin.php
Expand Up @@ -599,6 +599,7 @@
It is recommended to install local copy of free GeoLite City database from MaxMind.<br />
IP address location is displayed on simple map or using Google Maps. Please note that you need to have a Google account and apply for free Google Maps API key to enable interactive maps.';
$string['iplookupmaxmindnote'] = 'This product includes GeoLite data created by MaxMind, available from <a href="http://www.maxmind.com/">http://www.maxmind.com/</a>.';
$string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. For increased security and improved integrations with other systems is highly recommended to migrate your site to HTTPS.';
$string['keeptagnamecase'] = 'Keep tag name casing';
$string['lang'] = 'Default language';
$string['langcache'] = 'Cache language menu';
Expand Down Expand Up @@ -769,6 +770,7 @@
$string['numberofstrings'] = 'Total number of strings: {$a->strings}<br />Missing: {$a->missing} ({$a->missingpercent}&nbsp;%)';
$string['opcacherecommended'] = 'PHP opcode caching improves performance and lowers memory requirements, OPcache extension is recommended and fully supported.';
$string['opensslrecommended'] = 'Installing the optional OpenSSL library is highly recommended -- it enables Moodle Networking functionality.';
$string['opensslrequired'] = 'The OpenSSL PHP extension is now required by Moodle to provide stronger cryptographic services.';
$string['opentogoogle'] = 'Open to Google';
$string['optionalmaintenancemessage'] = 'Optional maintenance message';
$string['order1'] = 'First';
Expand Down
21 changes: 21 additions & 0 deletions lib/upgradelib.php
Expand Up @@ -2240,6 +2240,27 @@ function check_mysql_incomplete_unicode_support(environment_results $result) {
return null;
}

/**
* Check if the site is being served using an ssl url.
*
* Note this does not really perform any request neither looks for proxies or
* other situations. Just looks to wwwroot and warn if it's not using https.
*
* @param environment_results $result $result
* @return environment_results|null updated results object, or null if the site is https.
*/
function check_is_https(environment_results $result) {
global $CFG;

// Only if is defined, non-empty and whatever core tell us.
if (!empty($CFG->wwwroot) && !is_https()) {
$result->setInfo('site not https');
$result->setStatus(false);
return $result;
}
return null;
}

/**
* Upgrade the minmaxgrade setting.
*
Expand Down

0 comments on commit 22983bd

Please sign in to comment.