Skip to content

Commit

Permalink
MDL-60435 auth_shibboleth: removed usage of deprecated loginhttps
Browse files Browse the repository at this point in the history
  • Loading branch information
mdjnelson committed Jul 16, 2018
1 parent c637d96 commit 4826b1e
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions auth/shibboleth/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,9 @@ public function test_settings() {
* @return array List of arrays with keys url, iconurl and name.
*/
public function loginpage_idp_list($wantsurl) {
global $CFG;
$config = get_config('auth_shibboleth');
if (empty($CFG->loginhttps)) {
$securewwwroot = $CFG->wwwroot;
} else {
$securewwwroot = str_replace('http:', 'https:', $CFG->wwwroot);
}
$result = [];
$url = new moodle_url($securewwwroot.'/auth/shibboleth/index.php');
$url = new moodle_url('/auth/shibboleth/index.php');
$iconurl = moodle_url::make_pluginfile_url(context_system::instance()->id,
'auth_shibboleth',
'logo',
Expand Down

0 comments on commit 4826b1e

Please sign in to comment.