Skip to content
Snippets Groups Projects
Commit 9c3d26ab authored by Jaime Perez Crespo's avatar Jaime Perez Crespo
Browse files

Some more fixes for the new SimpleSAML\Module and SimpleSAML\Logger.

parent d42386e9
No related branches found
No related tags found
No related merge requests found
<?php <?php
namespace SimpleSAML\Utils; namespace SimpleSAML\Utils;
use SimpleSAML\Module;
/** /**
* Auth-related utility methods. * Auth-related utility methods.
* *
...@@ -24,10 +26,10 @@ class Auth ...@@ -24,10 +26,10 @@ class Auth
} }
if ($returnTo === null) { if ($returnTo === null) {
$returnTo = \SimpleSAML\Utils\HTTP::getSelfURL(); $returnTo = HTTP::getSelfURL();
} }
return \SimpleSAML_Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo)); return Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
} }
/** /**
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
namespace SimpleSAML\Utils; namespace SimpleSAML\Utils;
use SimpleSAML\Logger;
use Symfony\Component\Config\Definition\Exception\Exception; use Symfony\Component\Config\Definition\Exception\Exception;
class XML class XML
...@@ -59,7 +59,7 @@ class XML ...@@ -59,7 +59,7 @@ class XML
$result = self::isValid($message, 'saml-schema-metadata-2.0.xsd'); $result = self::isValid($message, 'saml-schema-metadata-2.0.xsd');
} }
if ($result !== true) { if ($result !== true) {
\SimpleSAML_Logger::warning($result); Logger::warning($result);
} }
} }
...@@ -97,16 +97,16 @@ class XML ...@@ -97,16 +97,16 @@ class XML
switch ($type) { switch ($type) {
case 'in': case 'in':
\SimpleSAML_Logger::debug('Received message:'); Logger::debug('Received message:');
break; break;
case 'out': case 'out':
\SimpleSAML_Logger::debug('Sending message:'); Logger::debug('Sending message:');
break; break;
case 'decrypt': case 'decrypt':
\SimpleSAML_Logger::debug('Decrypted message:'); Logger::debug('Decrypted message:');
break; break;
case 'encrypt': case 'encrypt':
\SimpleSAML_Logger::debug('Encrypted message:'); Logger::debug('Encrypted message:');
break; break;
default: default:
assert(false); assert(false);
...@@ -114,7 +114,7 @@ class XML ...@@ -114,7 +114,7 @@ class XML
$str = self::formatXMLString($message); $str = self::formatXMLString($message);
foreach (explode("\n", $str) as $line) { foreach (explode("\n", $str) as $line) {
\SimpleSAML_Logger::debug($line); Logger::debug($line);
} }
} }
......
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