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

MDL-31301 use static textlib methods

Browse Source
This commit is contained in:
Petr Skoda
2012-03-03 11:46:13 +01:00
parent 5bbf3cb72b
commit f8311defeb
53 changed files with 191 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+28 -51
View File
@@ -1137,12 +1137,10 @@ class admin_externalpage implements part_of_admin_tree {
* @return mixed array-object structure of found settings and pages
*/
public function search($query) {
$textlib = textlib_get_instance();
$found = false;
if (strpos(strtolower($this->name), $query) !== false) {
$found = true;
} else if (strpos($textlib->strtolower($this->visiblename), $query) !== false) {
} else if (strpos(textlib::strtolower($this->visiblename), $query) !== false) {
$found = true;
}
if ($found) {
@@ -1286,12 +1284,10 @@ class admin_settingpage implements part_of_admin_tree {
return array($this->name => $result);
}
$textlib = textlib_get_instance();
$found = false;
if (strpos(strtolower($this->name), $query) !== false) {
$found = true;
} else if (strpos($textlib->strtolower($this->visiblename), $query) !== false) {
} else if (strpos(textlib::strtolower($this->visiblename), $query) !== false) {
$found = true;
}
if ($found) {
@@ -1613,17 +1609,16 @@ abstract class admin_setting {
if (strpos(strtolower($this->name), $query) !== false) {
return true;
}
$textlib = textlib_get_instance();
if (strpos($textlib->strtolower($this->visiblename), $query) !== false) {
if (strpos(textlib::strtolower($this->visiblename), $query) !== false) {
return true;
}
if (strpos($textlib->strtolower($this->description), $query) !== false) {
if (strpos(textlib::strtolower($this->description), $query) !== false) {
return true;
}
$current = $this->get_setting();
if (!is_null($current)) {
if (is_string($current)) {
if (strpos($textlib->strtolower($current), $query) !== false) {
if (strpos(textlib::strtolower($current), $query) !== false) {
return true;
}
}
@@ -1631,7 +1626,7 @@ abstract class admin_setting {
$default = $this->get_defaultsetting();
if (!is_null($default)) {
if (is_string($default)) {
if (strpos($textlib->strtolower($default), $query) !== false) {
if (strpos(textlib::strtolower($default), $query) !== false) {
return true;
}
}
@@ -2210,9 +2205,8 @@ class admin_setting_configmulticheckbox extends admin_setting {
return true;
}
$textlib = textlib_get_instance();
foreach ($this->choices as $desc) {
if (strpos($textlib->strtolower($desc), $query) !== false) {
if (strpos(textlib::strtolower($desc), $query) !== false) {
return true;
}
}
@@ -2440,12 +2434,11 @@ class admin_setting_configselect extends admin_setting {
if (!$this->load_choices()) {
return false;
}
$textlib = textlib_get_instance();
foreach ($this->choices as $key=>$value) {
if (strpos($textlib->strtolower($key), $query) !== false) {
if (strpos(textlib::strtolower($key), $query) !== false) {
return true;
}
if (strpos($textlib->strtolower($value), $query) !== false) {
if (strpos(textlib::strtolower($value), $query) !== false) {
return true;
}
}
@@ -2624,9 +2617,8 @@ class admin_setting_configmultiselect extends admin_setting_configselect {
return true;
}
$textlib = textlib_get_instance();
foreach ($this->choices as $desc) {
if (strpos($textlib->strtolower($desc), $query) !== false) {
if (strpos(textlib::strtolower($desc), $query) !== false) {
return true;
}
}
@@ -4716,7 +4708,6 @@ class admin_page_managemods extends admin_externalpage {
$found = false;
if ($modules = $DB->get_records('modules')) {
$textlib = textlib_get_instance();
foreach ($modules as $module) {
if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
continue;
@@ -4726,7 +4717,7 @@ class admin_page_managemods extends admin_externalpage {
break;
}
$strmodulename = get_string('modulename', $module->name);
if (strpos($textlib->strtolower($strmodulename), $query) !== false) {
if (strpos(textlib::strtolower($strmodulename), $query) !== false) {
$found = true;
break;
}
@@ -4798,15 +4789,14 @@ class admin_setting_manageenrols extends admin_setting {
return true;
}
$textlib = textlib_get_instance();
$query = $textlib->strtolower($query);
$query = textlib::strtolower($query);
$enrols = enrol_get_plugins(false);
foreach ($enrols as $name=>$enrol) {
$localised = get_string('pluginname', 'enrol_'.$name);
if (strpos($textlib->strtolower($name), $query) !== false) {
if (strpos(textlib::strtolower($name), $query) !== false) {
return true;
}
if (strpos($textlib->strtolower($localised), $query) !== false) {
if (strpos(textlib::strtolower($localised), $query) !== false) {
return true;
}
}
@@ -4969,7 +4959,6 @@ class admin_page_manageblocks extends admin_externalpage {
$found = false;
if ($blocks = $DB->get_records('block')) {
$textlib = textlib_get_instance();
foreach ($blocks as $block) {
if (!file_exists("$CFG->dirroot/blocks/$block->name/")) {
continue;
@@ -4979,7 +4968,7 @@ class admin_page_manageblocks extends admin_externalpage {
break;
}
$strblockname = get_string('pluginname', 'block_'.$block->name);
if (strpos($textlib->strtolower($strblockname), $query) !== false) {
if (strpos(textlib::strtolower($strblockname), $query) !== false) {
$found = true;
break;
}
@@ -5024,7 +5013,6 @@ class admin_page_managemessageoutputs extends admin_externalpage {
$found = false;
if ($processors = get_message_processors()) {
$textlib = textlib_get_instance();
foreach ($processors as $processor) {
if (!$processor->available) {
continue;
@@ -5034,7 +5022,7 @@ class admin_page_managemessageoutputs extends admin_externalpage {
break;
}
$strprocessorname = get_string('pluginname', 'message_'.$processor->name);
if (strpos($textlib->strtolower($strprocessorname), $query) !== false) {
if (strpos(textlib::strtolower($strprocessorname), $query) !== false) {
$found = true;
break;
}
@@ -5096,10 +5084,9 @@ class admin_page_manageqbehaviours extends admin_externalpage {
}
$found = false;
$textlib = textlib_get_instance();
require_once($CFG->dirroot . '/question/engine/lib.php');
foreach (get_plugin_list('qbehaviour') as $behaviour => $notused) {
if (strpos($textlib->strtolower(question_engine::get_behaviour_name($behaviour)),
if (strpos(textlib::strtolower(question_engine::get_behaviour_name($behaviour)),
$query) !== false) {
$found = true;
break;
@@ -5144,10 +5131,9 @@ class admin_page_manageqtypes extends admin_externalpage {
}
$found = false;
$textlib = textlib_get_instance();
require_once($CFG->dirroot . '/question/engine/bank.php');
foreach (question_bank::get_all_qtypes() as $qtype) {
if (strpos($textlib->strtolower($qtype->local_name()), $query) !== false) {
if (strpos(textlib::strtolower($qtype->local_name()), $query) !== false) {
$found = true;
break;
}
@@ -5186,7 +5172,6 @@ class admin_page_manageportfolios extends admin_externalpage {
}
$found = false;
$textlib = textlib_get_instance();
$portfolios = get_plugin_list('portfolio');
foreach ($portfolios as $p => $dir) {
if (strpos($p, $query) !== false) {
@@ -5197,7 +5182,7 @@ class admin_page_manageportfolios extends admin_externalpage {
if (!$found) {
foreach (portfolio_instances(false, false) as $instance) {
$title = $instance->get('name');
if (strpos($textlib->strtolower($title), $query) !== false) {
if (strpos(textlib::strtolower($title), $query) !== false) {
$found = true;
break;
}
@@ -5238,7 +5223,6 @@ class admin_page_managerepositories extends admin_externalpage {
}
$found = false;
$textlib = textlib_get_instance();
$repositories= get_plugin_list('repository');
foreach ($repositories as $p => $dir) {
if (strpos($p, $query) !== false) {
@@ -5249,7 +5233,7 @@ class admin_page_managerepositories extends admin_externalpage {
if (!$found) {
foreach (repository::get_types() as $instance) {
$title = $instance->get_typename();
if (strpos($textlib->strtolower($title), $query) !== false) {
if (strpos(textlib::strtolower($title), $query) !== false) {
$found = true;
break;
}
@@ -5321,7 +5305,6 @@ class admin_setting_manageauths extends admin_setting {
return true;
}
$textlib = textlib_get_instance();
$authsavailable = get_plugin_list('auth');
foreach ($authsavailable as $auth => $dir) {
if (strpos($auth, $query) !== false) {
@@ -5329,7 +5312,7 @@ class admin_setting_manageauths extends admin_setting {
}
$authplugin = get_auth_plugin($auth);
$authtitle = $authplugin->get_title();
if (strpos($textlib->strtolower($authtitle), $query) !== false) {
if (strpos(textlib::strtolower($authtitle), $query) !== false) {
return true;
}
}
@@ -5524,13 +5507,12 @@ class admin_setting_manageeditors extends admin_setting {
return true;
}
$textlib = textlib_get_instance();
$editors_available = editors_get_available();
foreach ($editors_available as $editor=>$editorstr) {
if (strpos($editor, $query) !== false) {
return true;
}
if (strpos($textlib->strtolower($editorstr), $query) !== false) {
if (strpos(textlib::strtolower($editorstr), $query) !== false) {
return true;
}
}
@@ -5761,9 +5743,8 @@ class admin_page_managefilters extends admin_externalpage {
$found = false;
$filternames = filter_get_all_installed();
$textlib = textlib_get_instance();
foreach ($filternames as $path => $strfiltername) {
if (strpos($textlib->strtolower($strfiltername), $query) !== false) {
if (strpos(textlib::strtolower($strfiltername), $query) !== false) {
$found = true;
break;
}
@@ -6071,11 +6052,10 @@ function admin_find_write_settings($node, $data) {
function admin_search_settings_html($query) {
global $CFG, $OUTPUT;
$textlib = textlib_get_instance();
if ($textlib->strlen($query) < 2) {
if (textlib::strlen($query) < 2) {
return '';
}
$query = $textlib->strtolower($query);
$query = textlib::strtolower($query);
$adminroot = admin_get_root();
$findings = $adminroot->search($query);
@@ -6406,7 +6386,6 @@ class admin_setting_managerepository extends admin_setting {
return true;
}
$textlib = textlib_get_instance();
$repositories= get_plugin_list('repository');
foreach ($repositories as $p => $dir) {
if (strpos($p, $query) !== false) {
@@ -6415,7 +6394,7 @@ class admin_setting_managerepository extends admin_setting {
}
foreach (repository::get_types() as $instance) {
$title = $instance->get_typename();
if (strpos($textlib->strtolower($title), $query) !== false) {
if (strpos(textlib::strtolower($title), $query) !== false) {
return true;
}
}
@@ -6811,10 +6790,9 @@ class admin_setting_manageexternalservices extends admin_setting {
return true;
}
$textlib = textlib_get_instance();
$services = $DB->get_records('external_services', array(), 'id, name');
foreach ($services as $service) {
if (strpos($textlib->strtolower($service->name), $query) !== false) {
if (strpos(textlib::strtolower($service->name), $query) !== false) {
return true;
}
}
@@ -7369,14 +7347,13 @@ class admin_setting_managewebserviceprotocols extends admin_setting {
return true;
}
$textlib = textlib_get_instance();
$protocols = get_plugin_list('webservice');
foreach ($protocols as $protocol=>$location) {
if (strpos($protocol, $query) !== false) {
return true;
}
$protocolstr = get_string('pluginname', 'webservice_'.$protocol);
if (strpos($textlib->strtolower($protocolstr), $query) !== false) {
if (strpos(textlib::strtolower($protocolstr), $query) !== false) {
return true;
}
}