authentication MDL-18273 Custom Authentication Plugin title can be re…

…trieved from specific language file, merged from 19
eSrem · May 14, 2009 · 2a274f2 · 2a274f2
1 parent dc247e5
commit 2a274f2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/admin/settings/users.php b/admin/settings/users.php
@@ -41,10 +41,7 @@
         $authbyname = array();
 
         foreach ($auths as $auth) {
-            $strauthname = get_string("auth_{$auth}title", "auth");
-            if ($strauthname == "[[auth_{$auth}title]]") {
-                $strauthname = get_string("auth_{$auth}title", "auth_{$auth}");
-            }
+            $strauthname = auth_get_plugin_title($auth);
             $authbyname[$strauthname] = $auth;
         }
         ksort($authbyname);

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
@@ -979,7 +979,7 @@ function uu_allowed_auths() {
     $plugins = get_enabled_auth_plugins();
     $choices = array();
     foreach ($plugins as $plugin) {
-        $choices[$plugin] = get_string('auth_'.$plugin.'title', 'auth');
+        $choices[$plugin] = auth_get_plugin_title ($plugin);
     }
 
     return $choices;

diff --git a/lib/authlib.php b/lib/authlib.php
@@ -360,11 +360,7 @@ function ignore_timeout_hook($user, $sid, $timecreated, $timemodified) {
      * Return the properly translated human-friendly title of this auth plugin
      */
     function get_title() {
-        $authtitle = get_string("auth_{$this->authtype}title", "auth");
-        if ($authtitle == "[[auth_{$this->authtype}title]]") {
-            $authtitle = get_string("auth_{$this->authtype}title", "auth_{$this->authtype}");
-        }
-        return $authtitle;
+        return auth_get_plugin_title($this->authtype);
     }
 
     /**

diff --git a/lib/weblib.php b/lib/weblib.php
@@ -7324,5 +7324,18 @@ public function finished() {
     }
 }
 
+/**
+ * Return the authentication plugin title
+ * @param string $authtype plugin type
+ * @return string
+ */
+function auth_get_plugin_title ($authtype) {
+    $authtitle = get_string("auth_{$authtype}title", "auth");
+    if ($authtitle == "[[auth_{$authtype}title]]") {
+        $authtitle = get_string("auth_{$authtype}title", "auth_{$authtype}");
+    }
+    return $authtitle;
+}
+
 // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
 ?>
diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
@@ -27,7 +27,7 @@ function definition() {
         $modules = get_list_of_plugins('auth');
         $auth_options = array();
         foreach ($modules as $module) {
-            $auth_options[$module] = get_string("auth_$module"."title", "auth");
+            $auth_options[$module] = auth_get_plugin_title ($module);
         }
         $mform->addElement('select', 'auth', get_string('chooseauthmethod','auth'), $auth_options);
         $mform->setHelpButton('auth', array('authchange', get_string('chooseauthmethod','auth')));

diff --git a/user/filters/lib.php b/user/filters/lib.php
@@ -118,7 +118,7 @@ function get_field($fieldname, $advanced) {
                 $plugins = get_list_of_plugins('auth');
                 $choices = array();
                 foreach ($plugins as $auth) {
-                    $choices[$auth] = get_string("auth_{$auth}title", 'auth');
+                    $choices[$auth] = auth_get_plugin_title ($auth);
                 }
                 return new user_filter_simpleselect('auth', get_string('authentication'), $advanced, 'auth', $choices);