Skip to content
Snippets Groups Projects
Commit 2858c967 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

fix casing of entityid

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2791 44740490-163a-0410-bde0-09ae8108e29a
parent dada6ce7
No related branches found
No related tags found
No related merge requests found
...@@ -188,7 +188,7 @@ class sspmod_discojuice_Feed { ...@@ -188,7 +188,7 @@ class sspmod_discojuice_Feed {
} }
$c = self::countryFromURL($m['entityID']); $c = self::countryFromURL($m['entityid']);
if (!empty($c)) { $data['country'] = $c; return; } if (!empty($c)) { $data['country'] = $c; return; }
if (!empty($m['SingleSignOnService']) ) { if (!empty($m['SingleSignOnService']) ) {
...@@ -239,16 +239,16 @@ class sspmod_discojuice_Feed { ...@@ -239,16 +239,16 @@ class sspmod_discojuice_Feed {
} else if (isset($m['OrganizationName']) && is_array($m['OrganizationName'])) { } else if (isset($m['OrganizationName']) && is_array($m['OrganizationName'])) {
$data['title'] = array_pop($m['OrganizationName']); $data['title'] = array_pop($m['OrganizationName']);
} else { } else {
$data['title'] = substr($m['entityID'], 0, 20); $data['title'] = substr($m['entityid'], 0, 20);
$data['weight'] = 9; $data['weight'] = 9;
} }
} }
protected function getOverrides(&$data, $m) { protected function getOverrides(&$data, $m) {
if (empty($this->overrides)) return; if (empty($this->overrides)) return;
if (empty($this->overrides[$m['entityID']])) return; if (empty($this->overrides[$m['entityid']])) return;
$override = $this->overrides[$m['entityID']]; $override = $this->overrides[$m['entityid']];
foreach($override AS $k => $v) { foreach($override AS $k => $v) {
$data[$k] = $v; $data[$k] = $v;
...@@ -274,9 +274,9 @@ class sspmod_discojuice_Feed { ...@@ -274,9 +274,9 @@ class sspmod_discojuice_Feed {
} }
protected function countryFromURL($entityID) { protected function countryFromURL($entityid) {
try { try {
$pu = parse_url($entityID, PHP_URL_HOST); $pu = parse_url($entityid, PHP_URL_HOST);
if (!empty($pu)) { if (!empty($pu)) {
$rh = strrev($pu); $rh = strrev($pu);
// error_log('Looking up TLD : ' . $rh); // error_log('Looking up TLD : ' . $rh);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment