diff options
Diffstat (limited to 'modules/metarefresh/lib/MetaLoader.php')
| -rw-r--r-- | modules/metarefresh/lib/MetaLoader.php | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/modules/metarefresh/lib/MetaLoader.php b/modules/metarefresh/lib/MetaLoader.php index 24790fd..3f09817 100644 --- a/modules/metarefresh/lib/MetaLoader.php +++ b/modules/metarefresh/lib/MetaLoader.php @@ -50,7 +50,7 @@ class sspmod_metarefresh_MetaLoader { // GET! try { - list($data, $responseHeaders) = SimpleSAML_Utilities::fetch($source['src'], $context, TRUE); + list($data, $responseHeaders) = \SimpleSAML\Utils\HTTP::fetch($source['src'], $context, TRUE); } catch(Exception $e) { SimpleSAML_Logger::warning('metarefresh: ' . $e->getMessage()); } @@ -180,7 +180,6 @@ class sspmod_metarefresh_MetaLoader { foreach($this->oldMetadataSrc->getMetadataSet($type) as $entity) { if(array_key_exists('metarefresh:src', $entity)) { if($entity['metarefresh:src'] == $source['src']) { - //SimpleSAML_Logger::debug('Re-using cached metadata for ' . $entity['entityid']); $this->addMetadata($source['src'], $entity, $type); } } @@ -238,7 +237,7 @@ class sspmod_metarefresh_MetaLoader { public function writeState() { if($this->changed) { SimpleSAML_Logger::debug('Writing: ' . $this->stateFile); - SimpleSAML_Utilities::writeFile( + SimpleSAML\Utils\System::writeFile( $this->stateFile, "<?php\n/* This file was generated by the metarefresh module at ".$this->getTime() . ".\n". " Do not update it manually as it will get overwritten. */\n". @@ -291,10 +290,6 @@ class sspmod_metarefresh_MetaLoader { } if (isset($template)) { -// foreach($metadata AS $mkey => $mentry) { -// echo '<pre>'; print_r($metadata); exit; -// $metadata[$mkey] = array_merge($mentry, $template); -// } $metadata = array_merge($metadata, $template); } @@ -341,7 +336,7 @@ class sspmod_metarefresh_MetaLoader { $md = array_merge($md, $elements); } - #$metadata, $attributemap, $prefix, $suffix + // $metadata, $attributemap, $prefix, $suffix $arp = new sspmod_metarefresh_ARP($md, $config->getValue('attributemap', ''), $config->getValue('prefix', ''), @@ -393,7 +388,7 @@ class sspmod_metarefresh_MetaLoader { $content .= "\n" . '?>'; - SimpleSAML_Utilities::writeFile($filename, $content, 0644); + SimpleSAML\Utils\System::writeFile($filename, $content, 0644); } elseif(is_file($filename)) { if(unlink($filename)) { SimpleSAML_Logger::debug('Deleting stale metadata file: ' . $filename); |