mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-38663 login: Remove login info from forgot password page

Browse Source 
Since this is checked in several locations, I have introduced a new
protected function to check whether the current page is a login page.

This could potentially be exposed as a public function, but Sam's original
comment suggests that this is undesirable.
This commit is contained in:
Andrew Nicols 2014-12-18 08:40:57 +08:00
parent 244ee80e80
commit 0e61dba339
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/outputrenderers.php
View File

@ -624,17 +624,6 @@ class core_renderer extends renderer_base {
$withlinks = empty($this->page->layout_options['nologinlinks']);
}
// This is a real bit of a hack, but its a rariety that we need to do something like this.
// In fact the login pages should be only these two pages and as exposing this as an option for all pages
// could lead to abuse (or at least unneedingly complex code) the hack is the way to go.
$loginpage = in_array(
$this->page->url->out_as_local_url(false, array()),
array(
'/login/index.php',
'/login/forgot_password.php',
)
);
$course = $this->page->course;
if (\core\session\manager::is_loggedinas()) {
$realuser = \core\session\manager::get_realuser();
@ -650,6 +639,7 @@ class core_renderer extends renderer_base {
$realuserinfo = '';
}
$loginpage = $this->is_login_page();
$loginurl = get_login_url();
if (empty($course->id)) {
@ -727,6 +717,25 @@ class core_renderer extends renderer_base {
return $loggedinas;
}
/**
* Check whether the current page is a login page.
*
* @since Moodle 2.9
* @return bool
*/
protected function is_login_page() {
// This is a real bit of a hack, but its a rarety that we need to do something like this.
// In fact the login pages should be only these two pages and as exposing this as an option for all pages
// could lead to abuse (or at least unneedingly complex code) the hack is the way to go.
return in_array(
$this->page->url->out_as_local_url(false, array()),
array(
'/login/index.php',
'/login/forgot_password.php',
)
);
}
/**
* Return the 'back' link that normally appears in the footer.
*
@ -2949,7 +2958,7 @@ EOD;
return $returnstr;
}
$loginpage = ((string)$this->page->url === get_login_url());
$loginpage = $this->is_login_page();
$loginurl = get_login_url();
// If not logged in, show the typical not-logged-in string.
if (!isloggedin()) {