Utilities::debugMessage: Allow DOMelement as $message parameter.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2546 44740490-163a-0410-bde0-09ae8108e29a

lib/SAML2/EncryptedAssertion.php

@@ -46,8 +46,7 @@ class SAML2_EncryptedAssertion {
 
 		$xml = $assertion->toXML();
 
-		$xmlStr = $xml->ownerDocument->saveXML($xml);
-		SimpleSAML_Utilities::debugMessage($xmlStr, 'encrypt');
+		SimpleSAML_Utilities::debugMessage($xml, 'encrypt');
 
 		$enc = new XMLSecEnc();
 		$enc->setNode($xml);
@@ -88,8 +87,7 @@ class SAML2_EncryptedAssertion {
 
 		$assertionXML = SAML2_Utils::decryptElement($this->encryptedData, $inputKey);
 
-		$xmlStr = $assertionXML->ownerDocument->saveXML($assertionXML);
-		SimpleSAML_Utilities::debugMessage($xmlStr, 'decrypt');
+		SimpleSAML_Utilities::debugMessage($assertionXML, 'decrypt');
 
 		return new SAML2_Assertion($assertionXML);
 	}

lib/SimpleSAML/Utilities.php

@@ -1910,11 +1910,11 @@ class SimpleSAML_Utilities {
 	/**
 	 * Helper function to log messages that we send or receive.
 	 *
-	 * @param string $message  The message, as an XML string.
+	 * @param string|DOMElement $message  The message, as an XML string or an XML element.
 	 * @param string $type  Whether this message is sent or received, encrypted or decrypted.
 	 */
 	public static function debugMessage($message, $type) {
-		assert('is_string($message)');
+		assert('is_string($message) || $message instanceof DOMElement');
 
 		$globalConfig = SimpleSAML_Configuration::getInstance();
 		if (!$globalConfig->getBoolean('debug', FALSE)) {
@@ -1922,6 +1922,10 @@ class SimpleSAML_Utilities {
 			return;
 		}
 
+		if ($message instanceof DOMElement) {
+			$message = $message->ownerDocument->saveXML($message);
+		}
+
 		switch ($type) {
 		case 'in':
 			SimpleSAML_Logger::debug('Received message:');