L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-60634-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
David Monllao
2017-11-02 13:26:12 +01:00
parent ed76eb03f7 590706db1f
commit 5bd85d7f4f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+2 -7
View File
@@ -8440,16 +8440,11 @@ class admin_setting_enablemobileservice extends admin_setting_configcheckbox {
* @return string XHTML
*/
public function output_html($data, $query='') {
global $CFG, $OUTPUT;
global $OUTPUT;
$html = parent::output_html($data, $query);
if ((string)$data === $this->yes) {
require_once($CFG->dirroot . "/lib/filelib.php");
$curl = new curl();
$httpswwwroot = str_replace('http:', 'https:', $CFG->wwwroot); //force https url
$curl->head($httpswwwroot . "/login/index.php");
$info = $curl->get_info();
if (empty($info['http_code']) or ($info['http_code'] >= 400)) {
if (!is_https()) {
$html .= $OUTPUT->notification(get_string('nohttpsformobilewarning', 'admin'));
}
}