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

MDL-8840 Loginas cleanup, some more improvements; merged from MOODLE_18_STABLE

Browse source 
+ merging of format_string fixes
This commit is contained in:
skodak 2007-03-20 07:42:41 +00:00
parent be78d45dd2
commit 3887fe4acd
4 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/moodlelib.php
View file

@ -1662,7 +1662,7 @@ function require_login($courseorid=0, $autologinguest=true, $cm=null) {
if ($COURSE->id != SITEID and !empty($USER->realuser)) {
if ($USER->loginascontext->contextlevel == CONTEXT_COURSE) {
if ($USER->loginascontext->instanceid != $COURSE->id) {
print_error('loginascourseredir', '', $CFG->wwwroot.'/course/view.php?id='.$USER->loginascontext->instanceid);
print_error('loginasonecourse', '', $CFG->wwwroot.'/course/view.php?id='.$USER->loginascontext->instanceid);
}
}
}
@ -3470,7 +3470,7 @@ function setnew_password_and_mail($user) {
$a = new object();
$a->firstname = $user->firstname;
$a->sitename = $site->fullname;
$a->sitename = format_string($site->fullname);
$a->username = $user->username;
$a->newpassword = $newpassword;
$a->link = $CFG->wwwroot .'/login/';
@ -3478,7 +3478,7 @@ function setnew_password_and_mail($user) {
$message = get_string('newusernewpasswordtext', '', $a);
$subject = $site->fullname .': '. get_string('newusernewpasswordsubj');
$subject = format_string($site->fullname) .': '. get_string('newusernewpasswordsubj');
return email_to_user($user, $from, $subject, $message);
@ -3513,7 +3513,7 @@ function reset_password_and_mail($user) {
$a = new object();
$a->firstname = $user->firstname;
$a->sitename = $site->fullname;
$a->sitename = format_string($site->fullname);
$a->username = $user->username;
$a->newpassword = $newpassword;
$a->link = $CFG->httpswwwroot .'/login/change_password.php';
@ -3521,7 +3521,7 @@ function reset_password_and_mail($user) {
$message = get_string('newpasswordtext', '', $a);
$subject = $site->fullname .': '. get_string('changedpassword');
$subject = format_string($site->fullname) .': '. get_string('changedpassword');
return email_to_user($user, $from, $subject, $message);
@ -3544,10 +3544,10 @@ function reset_password_and_mail($user) {
$data = new object();
$data->firstname = fullname($user);
$data->sitename = $site->fullname;
$data->sitename = format_string($site->fullname);
$data->admin = fullname($from) .' ('. $from->email .')';
$subject = get_string('emailconfirmationsubject', '', $site->fullname);
$subject = get_string('emailconfirmationsubject', '', format_string($site->fullname));
$data->link = $CFG->wwwroot .'/login/confirm.php?data='. $user->secret .'/'. $user->username;
$message = get_string('emailconfirmation', '', $data);
@ -3576,12 +3576,12 @@ function send_password_change_confirmation_email($user) {
$data = new object();
$data->firstname = $user->firstname;
$data->sitename = $site->fullname;
$data->sitename = format_string($site->fullname);
$data->link = $CFG->httpswwwroot .'/login/forgot_password.php?p='. $user->secret .'&s='. $user->username;
$data->admin = fullname($from).' ('. $from->email .')';
$message = get_string('emailpasswordconfirmation', '', $data);
$subject = get_string('emailpasswordconfirmationsubject', '', $site->fullname);
$subject = get_string('emailpasswordconfirmationsubject', '', format_string($site->fullname));
return email_to_user($user, $from, $subject, $message);
@ -3604,7 +3604,7 @@ function send_password_change_info($user) {
$data = new object();
$data->firstname = $user->firstname;
$data->sitename = $site->fullname;
$data->sitename = format_string($site->fullname);
$data->admin = fullname($from).' ('. $from->email .')';
$userauth = get_auth_plugin($user->auth);
@ -3619,10 +3619,10 @@ function send_password_change_info($user) {
if (!empty($data->link)) {
$message = get_string('emailpasswordchangeinfo', '', $data);
$subject = get_string('emailpasswordchangeinfosubject', '', $site->fullname);
$subject = get_string('emailpasswordchangeinfosubject', '', format_string($site->fullname));
} else {
$message = get_string('emailpasswordchangeinfofail', '', $data);
$subject = get_string('emailpasswordchangeinfosubject', '', $site->fullname);
$subject = get_string('emailpasswordchangeinfosubject', '', format_string($site->fullname));
}
return email_to_user($user, $from, $subject, $message);
@ -5450,7 +5450,7 @@ function notify_login_failures() {
$message = '';
$site = get_site();
$subject = get_string('notifyloginfailuressubject', '', $site->fullname);
$subject = get_string('notifyloginfailuressubject', '', format_string($site->fullname));
$message .= get_string('notifyloginfailuresmessagestart', '', $CFG->wwwroot)
.(($CFG->lastnotifyfailure != 0) ? '('.userdate($CFG->lastnotifyfailure).')' : '')."\n\n";
foreach ($logs as $log) {