Use is_internal_email function (see bug 978)

diff --git a/admin/users.php b/admin/users.php
index f129db59c729373432a40fbfb36a4375ce150bac..e6f9f7000ad4f9fa9fc6d4e2fbbc95d79e9faa2f 100644 (file)
--- a/admin/users.php
+++ b/admin/users.php
@@ -25,7 +25,7 @@
     $table->data[] = array("<b><a href=\"auth.php\">".get_string("authentication")."</a></b>",
                            get_string("adminhelpauthentication"));
 
-    if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+    if (is_internal_auth()) {
         $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</a></b>",
                                get_string("adminhelpaddnewuser"));
         $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/uploaduser.php\">".get_string("uploadusers")."</a></b>",

diff --git a/course/lib.php b/course/lib.php
index f3f382c8d43d4adbf5f68c78dfcade77740a7fee..db9b8f476afca46978c9a344656d782398c74e1f 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -929,7 +929,7 @@ function print_course_admin_links($course, $width=180) {
             $admindata[]="<a href=\"user.php?id=$course->id&user=$USER->id\">".get_string("activityreport")."...</a>";
             $adminicon[]="<img src=\"$CFG->pixpath/i/report.gif\" height=16 width=16 alt=\"\">";
         }
-        if ($CFG->auth == "email" or $CFG->auth == "none" or $CFG->auth == "manual") {
+        if (is_internal_auth()) {
             $admindata[]="<a href=\"$CFG->wwwroot/login/change_password.php?id=$course->id\">".
                           get_string("changepassword")."...</a>";
             $adminicon[]="<img src=\"$CFG->pixpath/i/user.gif\" height=16 width=16 alt=\"\">";