Skip to content

Initialise $error_message in seamless login function #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+46 −45
Open

Initialise $error_message in seamless login function #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba8c0f2
Initialise $error_message in seamless login function
pauln May 24, 2016
fe85bf4
Make indentation consistent in seamless login function
pauln May 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 46 additions & 45 deletions locallib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,53 +373,54 @@ function convertXMLtoJSON($xml, $encode, $decode) {

//-------------------------------------------------------------
function echolink_ess_oauth_seamless_login($echolink) {
global $USER;
global $USER;

$config = get_config('echolink');
$essURL = $config->ESS_URL;
$essConsumerKey = $config->ESS_Consumer_Key;
$essConsumerSecret = $config->ESS_Consumer_Secret;
$realm = "";

$isInstructor = true;

$essSSOLogin = new EchoSystemSeamlessLogin($essURL, $essConsumerKey, $essConsumerSecret, $realm);
$ssoResponse = $essSSOLogin->generate_sso_url($echolink, $USER, $isInstructor, true);

if($ssoResponse['success'] == true) {
// we want to test for a 404
$curl = $essSSOLogin->get_curl_with_defaults();
$headers = $essSSOLogin->get_headers($curl, $ssoResponse['url'], 1);
$error_message = '';

if (!strstr($headers[0]['http'], "302")) {
$error_message = 'unexpected_response';
$e = explode(" ", $headers[0]['http'], 3);
$error_detail = $e[2];
} else if (strstr($headers[1]['http'], "404")) {
$error_message = 'not_found_response';
$e = explode(" ", $headers[1]['http'], 3);
$error_detail = $e[2];
} else if (strstr($headers[1]['http'], "403")) {
$error_message = 'forbidden_response';
$e = explode(" ", $headers[1]['http'], 3);
$error_detail = $e[2];
} else if (!strstr($headers[1]['http'], "200")) {
$error_message = 'unexpected_response';
$e = explode(" ", $headers[1]['http'], 3);
$error_detail = $e[2];
}
curl_close($curl);

$config = get_config('echolink');
$essURL = $config->ESS_URL;
$essConsumerKey = $config->ESS_Consumer_Key;
$essConsumerSecret = $config->ESS_Consumer_Secret;
$realm = "";

$isInstructor = true;

$essSSOLogin = new EchoSystemSeamlessLogin($essURL, $essConsumerKey, $essConsumerSecret, $realm);
$ssoResponse = $essSSOLogin->generate_sso_url($echolink, $USER, $isInstructor, true);

if($ssoResponse['success'] == true) {
// we want to test for a 404
$curl = $essSSOLogin->get_curl_with_defaults();
$headers = $essSSOLogin->get_headers($curl, $ssoResponse['url'], 1);

if (!strstr($headers[0]['http'], "302")) {
$error_message = 'unexpected_response';
$e = explode(" ", $headers[0]['http'], 3);
$error_detail = $e[2];
} else if (strstr($headers[1]['http'], "404")) {
$error_message = 'not_found_response';
$e = explode(" ", $headers[1]['http'], 3);
$error_detail = $e[2];
} else if (strstr($headers[1]['http'], "403")) {
$error_message = 'forbidden_response';
$e = explode(" ", $headers[1]['http'], 3);
$error_detail = $e[2];
} else if (!strstr($headers[1]['http'], "200")) {
$error_message = 'unexpected_response';
$e = explode(" ", $headers[1]['http'], 3);
$error_detail = $e[2];
}
curl_close($curl);

if ($error_message == "") {
// All good - but we already used the request - need to sign again (generate a new nonce)
$ssoResponse = $essSSOLogin->generate_sso_url($echolink, $USER, $isInstructor, true);
header("Location:" . $ssoResponse['url']);
} else {
print_error($error_message, 'mod_echolink', '', $error_detail);
}
}
if ($error_message == "") {
// All good - but we already used the request - need to sign again (generate a new nonce)
$ssoResponse = $essSSOLogin->generate_sso_url($echolink, $USER, $isInstructor, true);
header("Location:" . $ssoResponse['url']);
} else {
print_error($error_message, 'mod_echolink', '', $error_detail);
}
}

return;
return;
}// end of echolink_ess_oauth_seamless_login function

//-------------------------------------------------------------
Expand Down