moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-66999-master' of git://github.com/bmbrands/moodle

Browse source
This commit is contained in:
Adrian Greeve 2019-12-23 14:26:39 +08:00
commit f00542c485
69 changed files with 1487 additions and 2168 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/adminlib.php
View file

@ -2757,7 +2757,7 @@ class admin_setting_configfile extends admin_setting_configtext {
];
if ($context->readonly) {
$this->visiblename .= '<div class="form-overridden">'.get_string('execpathnotallowed', 'admin').'</div>';
$this->visiblename .= '<div class="alert alert-info">'.get_string('execpathnotallowed', 'admin').'</div>';
}
$element = $OUTPUT->render_from_template('core_admin/setting_configfile', $context);
@ -2818,7 +2818,7 @@ class admin_setting_configexecutable extends admin_setting_configfile {
];
if (!empty($CFG->preventexecpath)) {
$this->visiblename .= '<div class="form-overridden">'.get_string('execpathnotallowed', 'admin').'</div>';
$this->visiblename .= '<div class="alert alert-info">'.get_string('execpathnotallowed', 'admin').'</div>';
}
$element = $OUTPUT->render_from_template('core_admin/setting_configexecutable', $context);
@ -2858,7 +2858,7 @@ class admin_setting_configdirectory extends admin_setting_configfile {
];
if (!empty($CFG->preventexecpath)) {
$this->visiblename .= '<div class="form-overridden">'.get_string('execpathnotallowed', 'admin').'</div>';
$this->visiblename .= '<div class="alert alert-info">'.get_string('execpathnotallowed', 'admin').'</div>';
}
$element = $OUTPUT->render_from_template('core_admin/setting_configdirectory', $context);
@ -9548,7 +9548,7 @@ class admin_setting_webservicesoverview extends admin_setting {
$url = new moodle_url("/admin/search.php?query=enablewebservices");
$row[0] = "1. " . html_writer::tag('a', get_string('enablews', 'webservice'),
array('href' => $url));
$status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
if ($CFG->enablewebservices) {
$status = get_string('yes');
}
@ -9561,7 +9561,7 @@ class admin_setting_webservicesoverview extends admin_setting {
$url = new moodle_url("/admin/settings.php?section=webserviceprotocols");
$row[0] = "2. " . html_writer::tag('a', get_string('enableprotocols', 'webservice'),
array('href' => $url));
$status = html_writer::tag('span', get_string('none'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('none'), array('class' => 'badge badge-danger'));
//retrieve activated protocol
$active_protocols = empty($CFG->webserviceprotocols) ?
array() : explode(',', $CFG->webserviceprotocols);
@ -9672,7 +9672,7 @@ class admin_setting_webservicesoverview extends admin_setting {
$url = new moodle_url("/admin/search.php?query=enablewebservices");
$row[0] = "1. " . html_writer::tag('a', get_string('enablews', 'webservice'),
array('href' => $url));
$status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
if ($CFG->enablewebservices) {
$status = get_string('yes');
}
@ -9685,7 +9685,7 @@ class admin_setting_webservicesoverview extends admin_setting {
$url = new moodle_url("/admin/settings.php?section=webserviceprotocols");
$row[0] = "2. " . html_writer::tag('a', get_string('enableprotocols', 'webservice'),
array('href' => $url));
$status = html_writer::tag('span', get_string('none'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('none'), array('class' => 'badge badge-danger'));
//retrieve activated protocol
$active_protocols = empty($CFG->webserviceprotocols) ?
array() : explode(',', $CFG->webserviceprotocols);
@ -10770,10 +10770,10 @@ class admin_setting_searchsetupinfo extends admin_setting {
$row[0] = '1. ' . html_writer::tag('a', get_string('selectsearchengine', 'admin'),
array('href' => $url));
$status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
if (!empty($CFG->searchengine)) {
$status = html_writer::tag('span', get_string('pluginname', 'search_' . $CFG->searchengine),
array('class' => 'statusok'));
array('class' => 'badge badge-success'));
}
$row[1] = $status;
@ -10785,9 +10785,9 @@ class admin_setting_searchsetupinfo extends admin_setting {
$row[0] = '2. ' . html_writer::tag('a', get_string('enablesearchareas', 'admin'),
array('href' => $url));
$status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
if ($anyenabled) {
$status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok'));
$status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success'));
}
$row[1] = $status;
@ -10797,7 +10797,7 @@ class admin_setting_searchsetupinfo extends admin_setting {
$row = array();
if (empty($CFG->searchengine)) {
$row[0] = '3. ' . get_string('setupsearchengine', 'admin');
$row[1] = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical'));
$row[1] = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
} else {
$url = new moodle_url('/admin/settings.php?section=search' . $CFG->searchengine);
$row[0] = '3. ' . html_writer::tag('a', get_string('setupsearchengine', 'admin'),
@ -10810,9 +10810,9 @@ class admin_setting_searchsetupinfo extends admin_setting {
$serverstatus = $e->getMessage();
}
if ($serverstatus === true) {
$status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok'));
$status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success'));
} else {
$status = html_writer::tag('span', $serverstatus, array('class' => 'statuscritical'));
$status = html_writer::tag('span', $serverstatus, array('class' => 'badge badge-danger'));
}
$row[1] = $status;
}
@ -10823,9 +10823,9 @@ class admin_setting_searchsetupinfo extends admin_setting {
$url = new moodle_url('/admin/searchareas.php');
$row[0] = '4. ' . html_writer::tag('a', get_string('indexdata', 'admin'), array('href' => $url));
if ($anyindexed) {
$status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok'));
$status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success'));
} else {
$status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
}
$row[1] = $status;
$table->data[] = $row;
@ -10835,9 +10835,9 @@ class admin_setting_searchsetupinfo extends admin_setting {
$url = new moodle_url("/admin/search.php?query=enableglobalsearch");
$row[0] = '5. ' . html_writer::tag('a', get_string('enableglobalsearch', 'admin'),
array('href' => $url));
$status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical'));
$status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger'));
if (\core_search\manager::is_global_search_enabled()) {
$status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok'));
$status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success'));
}
$row[1] = $status;
$table->data[] = $row;