Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merged username login form bug fix from stable

  • Loading branch information...
commit a155f3784dae284aea9bd892edd21bfae2a5a92c 1 parent 2c040c2
exe-cutor authored
View
13 auth/shibboleth/README.txt
@@ -144,24 +144,27 @@ Example file:
<?PHP
// Set the zip code and the adress
- if ($_SERVER[$pluginconfig->field_map_address] != '')
+ if ($_SERVER[$this->config->field_map_address] != '')
{
// $address contains something like 'SWITCH$Limmatquai 138$CH-8021 Zurich'
- // We want to split this up to get:
+ // We want to split this up to get:
// institution, street, zipcode, city and country
- $address = $_SERVER[$pluginconfig->field_map_address];
+ $address = $_SERVER[$this->config->field_map_address];
list($institution, $street, $zip_city) = split('\$', $address);
ereg(' (.+)',$zip_city, $regs);
$city = $regs[1];
-
+
ereg('(.+)-',$zip_city, $regs);
$country = $regs[1];
-
+
$result["address"] = $street;
$result["city"] = $city;
$result["country"] = $country;
$result["department"] = $institution;
+ $result["description"] = "I am a Shibboleth user";
+
}
+
?>
--
View
13 auth/shibboleth/auth.php
@@ -148,18 +148,11 @@ function can_change_password() {
function loginpage_hook() {
global $SESSION, $CFG;
+
+ // Prevent username from being shown on login page after logout
+ $CFG->nolastloggedin = true;
- //TODO: fix the code
return;
-
- // See http://moodle.org/mod/forum/discuss.php?d=39918#187611
- // if ($CFG->auth == 'shibboleth') {
- // if (!empty($SESSION->shibboleth_checked) ) { // Just come from there
- // unset($SESSION->shibboleth_checked);
- // } else if (empty($_POST)) { // No incoming data, so redirect
- // redirect($CFG->wwwroot.'/auth/shibboleth/index.php');
- // }
- // }
}
/**
View
5 auth/shibboleth/index.php
@@ -41,7 +41,10 @@
$USER->site = $CFG->wwwroot; // for added security, store the site in the
update_user_login_times();
- set_moodle_cookie($USER->username);
+
+ // Don't show username on login page
+ set_moodle_cookie('nobody');
+
set_login_session_preferences();
unset($SESSION->lang);
Please sign in to comment.
Something went wrong with that request. Please try again.