pronamic / wp-pronamic-ideal

src/readme-md/gateways.php

Spacing +16 added lines, -16 removed lines

@@ -1,39 +1,39 @@
 <?php
 
-$data = file_get_contents( __DIR__ . '/../providers.json' );
-$data = json_decode( $data );
+$data = file_get_contents(__DIR__ . '/../providers.json');
+$data = json_decode($data);
 
 $providers = array();
-foreach ( $data as $provider ) {
-	$providers[ $provider->slug ] = $provider;
+foreach ($data as $provider) {
+	$providers[$provider->slug] = $provider;
 }
 
-$data     = file_get_contents( __DIR__ . '/../gateways.json' );
-$gateways = json_decode( $data );
+$data     = file_get_contents(__DIR__ . '/../gateways.json');
+$gateways = json_decode($data);
 
-foreach ( $gateways as $gateway ) {
-	if ( isset( $providers[ $gateway->provider ] ) ) {
-		$provider = $providers[ $gateway->provider ];
+foreach ($gateways as $gateway) {
+	if (isset($providers[$gateway->provider])) {
+		$provider = $providers[$gateway->provider];
 
-		if ( ! isset( $provider->gateways ) ) {
+		if ( ! isset($provider->gateways)) {
 			$provider->gateways = array();
 		}
 
-		$provider->gateways[ $gateway->slug ] = $gateway;
+		$provider->gateways[$gateway->slug] = $gateway;
 	}
 }
 
 ?>
 | Provider | Name |
 | -------- | ---- |
-<?php foreach ( $gateways as $gateway ) : ?>
+<?php foreach ($gateways as $gateway) : ?>
 | <?php
 
-if ( isset( $gateway->provider, $providers[ $gateway->provider ] ) ) {
-	$provider = $providers[ $gateway->provider ];
+if (isset($gateway->provider, $providers[$gateway->provider])) {
+	$provider = $providers[$gateway->provider];
 
-	if ( isset( $provider->url ) ) {
-		printf( '[%s](%s)', $provider->name, $provider->url );
+	if (isset($provider->url)) {
+		printf('[%s](%s)', $provider->name, $provider->url);
 	} else {
 		echo $provider->name;
 	}

includes/xmlseclibs/xmlseclibs.php

Indentation +1659 added lines, -1659 removed lines

@@ -47,101 +47,101 @@ 
 
 /* helper function */
 function sortAndAddAttrs($element, $arAtts) {
-    $newAtts = array();
-    foreach ($arAtts AS $attnode) {
-        $newAtts[$attnode->nodeName] = $attnode;
-    }
-    ksort($newAtts);
-    foreach ($newAtts as $attnode) {
-        $element->setAttribute($attnode->nodeName, $attnode->nodeValue);
-    }
+	$newAtts = array();
+	foreach ($arAtts AS $attnode) {
+		$newAtts[$attnode->nodeName] = $attnode;
+	}
+	ksort($newAtts);
+	foreach ($newAtts as $attnode) {
+		$element->setAttribute($attnode->nodeName, $attnode->nodeValue);
+	}
 }
 
 /* helper function */
 
 function canonical($tree, $element, $withcomments) {
-    if ($tree->nodeType != XML_DOCUMENT_NODE) {
-        $dom = $tree->ownerDocument;
-    } else {
-        $dom = $tree;
-    }
-    if ($element->nodeType != XML_ELEMENT_NODE) {
-        if ($element->nodeType == XML_DOCUMENT_NODE) {
-            foreach ($element->childNodes AS $node) {
-                canonical($dom, $node, $withcomments);
-            }
-            return;
-        }
-        if ($element->nodeType == XML_COMMENT_NODE && !$withcomments) {
-            return;
-        }
-        $tree->appendChild($dom->importNode($element, TRUE));
-        return;
-    }
-    $arNS = array();
-    if ($element->namespaceURI != "") {
-        if ($element->prefix == "") {
-            $elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
-        } else {
-            $prefix = $tree->lookupPrefix($element->namespaceURI);
-            if ($prefix == $element->prefix) {
-                $elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
-            } else {
-                $elCopy = $dom->createElement($element->nodeName);
-                $arNS[$element->namespaceURI] = $element->prefix;
-            }
-        }
-    } else {
-        $elCopy = $dom->createElement($element->nodeName);
-    }
-    $tree->appendChild($elCopy);
-
-    /* Create DOMXPath based on original document */
-    $xPath = new DOMXPath($element->ownerDocument);
-
-    /* Get namespaced attributes */
-    $arAtts = $xPath->query('attribute::*[namespace-uri(.) != ""]', $element);
-
-    /* Create an array with namespace URIs as keys, and sort them */
-    foreach ($arAtts AS $attnode) {
-        if (array_key_exists($attnode->namespaceURI, $arNS) &&
-                ($arNS[$attnode->namespaceURI] == $attnode->prefix)) {
-            continue;
-        }
-        $prefix = $tree->lookupPrefix($attnode->namespaceURI);
-        if ($prefix != $attnode->prefix) {
-            $arNS[$attnode->namespaceURI] = $attnode->prefix;
-        } else {
-            $arNS[$attnode->namespaceURI] = NULL;
-        }
-    }
-    if (count($arNS) > 0) {
-        asort($arNS);
-    }
-
-    /* Add namespace nodes */
-    foreach ($arNS AS $namespaceURI => $prefix) {
-        if ($prefix != NULL) {
-            $elCopy->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" . $prefix, $namespaceURI);
-        }
-    }
-    if (count($arNS) > 0) {
-        ksort($arNS);
-    }
-
-    /* Get attributes not in a namespace, and then sort and add them */
-    $arAtts = $xPath->query('attribute::*[namespace-uri(.) = ""]', $element);
-    sortAndAddAttrs($elCopy, $arAtts);
-
-    /* Loop through the URIs, and then sort and add attributes within that namespace */
-    foreach ($arNS as $nsURI => $prefix) {
-        $arAtts = $xPath->query('attribute::*[namespace-uri(.) = "' . $nsURI . '"]', $element);
-        sortAndAddAttrs($elCopy, $arAtts);
-    }
-
-    foreach ($element->childNodes AS $node) {
-        canonical($elCopy, $node, $withcomments);
-    }
+	if ($tree->nodeType != XML_DOCUMENT_NODE) {
+		$dom = $tree->ownerDocument;
+	} else {
+		$dom = $tree;
+	}
+	if ($element->nodeType != XML_ELEMENT_NODE) {
+		if ($element->nodeType == XML_DOCUMENT_NODE) {
+			foreach ($element->childNodes AS $node) {
+				canonical($dom, $node, $withcomments);
+			}
+			return;
+		}
+		if ($element->nodeType == XML_COMMENT_NODE && !$withcomments) {
+			return;
+		}
+		$tree->appendChild($dom->importNode($element, TRUE));
+		return;
+	}
+	$arNS = array();
+	if ($element->namespaceURI != "") {
+		if ($element->prefix == "") {
+			$elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
+		} else {
+			$prefix = $tree->lookupPrefix($element->namespaceURI);
+			if ($prefix == $element->prefix) {
+				$elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
+			} else {
+				$elCopy = $dom->createElement($element->nodeName);
+				$arNS[$element->namespaceURI] = $element->prefix;
+			}
+		}
+	} else {
+		$elCopy = $dom->createElement($element->nodeName);
+	}
+	$tree->appendChild($elCopy);
+
+	/* Create DOMXPath based on original document */
+	$xPath = new DOMXPath($element->ownerDocument);
+
+	/* Get namespaced attributes */
+	$arAtts = $xPath->query('attribute::*[namespace-uri(.) != ""]', $element);
+
+	/* Create an array with namespace URIs as keys, and sort them */
+	foreach ($arAtts AS $attnode) {
+		if (array_key_exists($attnode->namespaceURI, $arNS) &&
+				($arNS[$attnode->namespaceURI] == $attnode->prefix)) {
+			continue;
+		}
+		$prefix = $tree->lookupPrefix($attnode->namespaceURI);
+		if ($prefix != $attnode->prefix) {
+			$arNS[$attnode->namespaceURI] = $attnode->prefix;
+		} else {
+			$arNS[$attnode->namespaceURI] = NULL;
+		}
+	}
+	if (count($arNS) > 0) {
+		asort($arNS);
+	}
+
+	/* Add namespace nodes */
+	foreach ($arNS AS $namespaceURI => $prefix) {
+		if ($prefix != NULL) {
+			$elCopy->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" . $prefix, $namespaceURI);
+		}
+	}
+	if (count($arNS) > 0) {
+		ksort($arNS);
+	}
+
+	/* Get attributes not in a namespace, and then sort and add them */
+	$arAtts = $xPath->query('attribute::*[namespace-uri(.) = ""]', $element);
+	sortAndAddAttrs($elCopy, $arAtts);
+
+	/* Loop through the URIs, and then sort and add attributes within that namespace */
+	foreach ($arNS as $nsURI => $prefix) {
+		$arAtts = $xPath->query('attribute::*[namespace-uri(.) = "' . $nsURI . '"]', $element);
+		sortAndAddAttrs($elCopy, $arAtts);
+	}
+
+	foreach ($element->childNodes AS $node) {
+		canonical($elCopy, $node, $withcomments);
+	}
 }
 
 /*
@@ -151,1228 +151,1228 @@ 
  */
 
 function C14NGeneral($element, $exclusive=FALSE, $withcomments=FALSE) {
-    /* IF PHP 5.2+ then use built in canonical functionality */
-    $php_version = explode('.', PHP_VERSION);
-    if (($php_version[0] > 5) || ($php_version[0] == 5 && $php_version[1] >= 2)) {
-        return $element->C14N($exclusive, $withcomments);
-    }
-
-    /* Must be element or document */
-    if (!$element instanceof DOMElement && !$element instanceof DOMDocument) {
-        return NULL;
-    }
-    /* Currently only exclusive XML is supported */
-    if ($exclusive == FALSE) {
-        throw new Exception("Only exclusive canonicalization is supported in this version of PHP");
-    }
-
-    $copyDoc = new DOMDocument();
-    canonical($copyDoc, $element, $withcomments);
-    return $copyDoc->saveXML($copyDoc->documentElement, LIBXML_NOEMPTYTAG);
+	/* IF PHP 5.2+ then use built in canonical functionality */
+	$php_version = explode('.', PHP_VERSION);
+	if (($php_version[0] > 5) || ($php_version[0] == 5 && $php_version[1] >= 2)) {
+		return $element->C14N($exclusive, $withcomments);
+	}
+
+	/* Must be element or document */
+	if (!$element instanceof DOMElement && !$element instanceof DOMDocument) {
+		return NULL;
+	}
+	/* Currently only exclusive XML is supported */
+	if ($exclusive == FALSE) {
+		throw new Exception("Only exclusive canonicalization is supported in this version of PHP");
+	}
+
+	$copyDoc = new DOMDocument();
+	canonical($copyDoc, $element, $withcomments);
+	return $copyDoc->saveXML($copyDoc->documentElement, LIBXML_NOEMPTYTAG);
 }
 
 class XMLSecurityKey {
-    const TRIPLEDES_CBC = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
-    const AES128_CBC = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
-    const AES192_CBC = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
-    const AES256_CBC = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
-    const RSA_1_5 = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-    const RSA_OAEP_MGF1P = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
-    const DSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#dsa-sha1';
-    const RSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
-    const RSA_SHA256 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
-
-    private $cryptParams = array();
-    public $type = 0;
-    public $key = NULL;
-    public $passphrase = "";
-    public $iv = NULL;
-    public $name = NULL;
-    public $keyChain = NULL;
-    public $isEncrypted = FALSE;
-    public $encryptedCtx = NULL;
-    public $guid = NULL;
-
-    /**
-     * This variable contains the certificate as a string if this key represents an X509-certificate.
-     * If this key doesn't represent a certificate, this will be NULL.
-     */
-    private $x509Certificate = NULL;
-
-    /* This variable contains the certificate thunbprint if we have loaded an X509-certificate. */
-    private $X509Thumbprint = NULL;
-
-    public function __construct($type, $params=NULL) {
-        srand();
-        switch ($type) {
-            case (XMLSecurityKey::TRIPLEDES_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_TRIPLEDES;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
-                $this->cryptParams['keysize'] = 24;
-                break;
-            case (XMLSecurityKey::AES128_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
-                $this->cryptParams['keysize'] = 16;
-                break;
-            case (XMLSecurityKey::AES192_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
-                $this->cryptParams['keysize'] = 24;
-                break;
-            case (XMLSecurityKey::AES256_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
-                $this->cryptParams['keysize'] = 32;
-                break;
-            case (XMLSecurityKey::RSA_1_5):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                return;
-            case (XMLSecurityKey::RSA_OAEP_MGF1P):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
-                $this->cryptParams['hash'] = NULL;
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                return;
-            case (XMLSecurityKey::RSA_SHA1):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                break;
-            case (XMLSecurityKey::RSA_SHA256):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['digest'] = 'SHA256';
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                break;
-            default:
-                throw new Exception('Invalid Key Type');
-                return;
-        }
-        $this->type = $type;
-    }
-
-    /**
-     * Retrieve the key size for the symmetric encryption algorithm..
-     *
-     * If the key size is unknown, or this isn't a symmetric encryption algorithm,
-     * NULL is returned.
-     *
-     * @return int|NULL  The number of bytes in the key.
-     */
-    public function getSymmetricKeySize() {
-        if (!isset($this->cryptParams['keysize'])) {
-            return NULL;
-        }
-        return $this->cryptParams['keysize'];
-    }
-
-    public function generateSessionKey() {
-        if (!isset($this->cryptParams['keysize'])) {
-            throw new Exception('Unknown key size for type "' . $this->type . '".');
-        }
-        $keysize = $this->cryptParams['keysize'];
-
-        if (function_exists('openssl_random_pseudo_bytes')) {
-            /* We have PHP >= 5.3 - use openssl to generate session key. */
-            $key = openssl_random_pseudo_bytes($keysize);
-        } else {
-            /* Generating random key using iv generation routines */
-            $key = mcrypt_create_iv($keysize, MCRYPT_RAND);
-        }
-
-        if ($this->type === XMLSecurityKey::TRIPLEDES_CBC) {
-            /* Make sure that the generated key has the proper parity bits set.
+	const TRIPLEDES_CBC = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
+	const AES128_CBC = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
+	const AES192_CBC = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
+	const AES256_CBC = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
+	const RSA_1_5 = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
+	const RSA_OAEP_MGF1P = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
+	const DSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#dsa-sha1';
+	const RSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
+	const RSA_SHA256 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
+
+	private $cryptParams = array();
+	public $type = 0;
+	public $key = NULL;
+	public $passphrase = "";
+	public $iv = NULL;
+	public $name = NULL;
+	public $keyChain = NULL;
+	public $isEncrypted = FALSE;
+	public $encryptedCtx = NULL;
+	public $guid = NULL;
+
+	/**
+	 * This variable contains the certificate as a string if this key represents an X509-certificate.
+	 * If this key doesn't represent a certificate, this will be NULL.
+	 */
+	private $x509Certificate = NULL;
+
+	/* This variable contains the certificate thunbprint if we have loaded an X509-certificate. */
+	private $X509Thumbprint = NULL;
+
+	public function __construct($type, $params=NULL) {
+		srand();
+		switch ($type) {
+			case (XMLSecurityKey::TRIPLEDES_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_TRIPLEDES;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
+				$this->cryptParams['keysize'] = 24;
+				break;
+			case (XMLSecurityKey::AES128_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
+				$this->cryptParams['keysize'] = 16;
+				break;
+			case (XMLSecurityKey::AES192_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
+				$this->cryptParams['keysize'] = 24;
+				break;
+			case (XMLSecurityKey::AES256_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
+				$this->cryptParams['keysize'] = 32;
+				break;
+			case (XMLSecurityKey::RSA_1_5):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				return;
+			case (XMLSecurityKey::RSA_OAEP_MGF1P):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
+				$this->cryptParams['hash'] = NULL;
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				return;
+			case (XMLSecurityKey::RSA_SHA1):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				break;
+			case (XMLSecurityKey::RSA_SHA256):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
+				$this->cryptParams['digest'] = 'SHA256';
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				break;
+			default:
+				throw new Exception('Invalid Key Type');
+				return;
+		}
+		$this->type = $type;
+	}
+
+	/**
+	 * Retrieve the key size for the symmetric encryption algorithm..
+	 *
+	 * If the key size is unknown, or this isn't a symmetric encryption algorithm,
+	 * NULL is returned.
+	 *
+	 * @return int|NULL  The number of bytes in the key.
+	 */
+	public function getSymmetricKeySize() {
+		if (!isset($this->cryptParams['keysize'])) {
+			return NULL;
+		}
+		return $this->cryptParams['keysize'];
+	}
+
+	public function generateSessionKey() {
+		if (!isset($this->cryptParams['keysize'])) {
+			throw new Exception('Unknown key size for type "' . $this->type . '".');
+		}
+		$keysize = $this->cryptParams['keysize'];
+
+		if (function_exists('openssl_random_pseudo_bytes')) {
+			/* We have PHP >= 5.3 - use openssl to generate session key. */
+			$key = openssl_random_pseudo_bytes($keysize);
+		} else {
+			/* Generating random key using iv generation routines */
+			$key = mcrypt_create_iv($keysize, MCRYPT_RAND);
+		}
+
+		if ($this->type === XMLSecurityKey::TRIPLEDES_CBC) {
+			/* Make sure that the generated key has the proper parity bits set.
              * Mcrypt doesn't care about the parity bits, but others may care.
              */
-            for ($i = 0; $i < strlen($key); $i++) {
-                $byte = ord($key[$i]) & 0xfe;
-                $parity = 1;
-                for ($j = 1; $j < 8; $j++) {
-                    $parity ^= ($byte >> $j) & 1;
-                }
-                $byte |= $parity;
-                $key[$i] = chr($byte);
-            }
-        }
-
-        $this->key = $key;
-        return $key;
-    }
-
-    public static function getRawThumbprint($cert) {
-
-        $arCert = explode("\n", $cert);
-        $data = '';
-        $inData = FALSE;
-
-        foreach ($arCert AS $curData) {
-            if (!$inData) {
-                if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
-                    $inData = TRUE;
-                }
-            } else {
-                if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
-                    $inData = FALSE;
-                    break;
-                }
-                $data .= trim($curData);
-            }
-        }
-
-        if (!empty($data)) {
-            return strtolower(sha1(base64_decode($data)));
-        }
-
-        return NULL;
-    }
-
-    public function loadKey($key, $isFile=FALSE, $isCert = FALSE) {
-        if ($isFile) {
-            $this->key = file_get_contents($key);
-        } else {
-            $this->key = $key;
-        }
-        if ($isCert) {
-            $this->key = openssl_x509_read($this->key);
-            openssl_x509_export($this->key, $str_cert);
-            $this->x509Certificate = $str_cert;
-            $this->key = $str_cert;
-        } else {
-            $this->x509Certificate = NULL;
-        }
-        if ($this->cryptParams['library'] == 'openssl') {
-            if ($this->cryptParams['type'] == 'public') {
-                if ($isCert) {
-                    /* Load the thumbprint if this is an X509 certificate. */
-                    $this->X509Thumbprint = self::getRawThumbprint($this->key);
-                }
-                $this->key = openssl_get_publickey($this->key);
-            } else {
-                $this->key = openssl_get_privatekey($this->key, $this->passphrase);
-            }
-        } else if ($this->cryptParams['cipher'] == MCRYPT_RIJNDAEL_128) {
-            /* Check key length */
-            switch ($this->type) {
-                case (XMLSecurityKey::AES256_CBC):
-                    if (strlen($this->key) < 25) {
-                        throw new Exception('Key must contain at least 25 characters for this cipher');
-                    }
-                    break;
-                case (XMLSecurityKey::AES192_CBC):
-                    if (strlen($this->key) < 17) {
-                        throw new Exception('Key must contain at least 17 characters for this cipher');
-                    }
-                    break;
-            }
-        }
-    }
-
-    private function encryptMcrypt($data) {
-        $td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
-        $this->iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-        mcrypt_generic_init($td, $this->key, $this->iv);
-        if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
-            $bs = mcrypt_enc_get_block_size($td);
-            for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
-                $data.=chr(rand(1, 127));
-            $data.=chr($datalen - $datalen0 + 1);
-        }
-        $encrypted_data = $this->iv . mcrypt_generic($td, $data);
-        mcrypt_generic_deinit($td);
-        mcrypt_module_close($td);
-        return $encrypted_data;
-    }
-
-    private function decryptMcrypt($data) {
-        $td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
-        $iv_length = mcrypt_enc_get_iv_size($td);
-
-        $this->iv = substr($data, 0, $iv_length);
-        $data = substr($data, $iv_length);
-
-        mcrypt_generic_init($td, $this->key, $this->iv);
-        $decrypted_data = mdecrypt_generic($td, $data);
-        mcrypt_generic_deinit($td);
-        mcrypt_module_close($td);
-        if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
-            $dataLen = strlen($decrypted_data);
-            $paddingLength = substr($decrypted_data, $dataLen - 1, 1);
-            $decrypted_data = substr($decrypted_data, 0, $dataLen - ord($paddingLength));
-        }
-        return $decrypted_data;
-    }
-
-    private function encryptOpenSSL($data) {
-        if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure encrypting Data');
-                return;
-            }
-        } else {
-            if (!openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure encrypting Data');
-                return;
-            }
-        }
-        return $encrypted_data;
-    }
-
-    private function decryptOpenSSL($data) {
-        if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure decrypting Data');
-                return;
-            }
-        } else {
-            if (!openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure decrypting Data');
-                return;
-            }
-        }
-        return $decrypted;
-    }
-
-    private function signOpenSSL($data) {
-        $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
-            $algo = $this->cryptParams['digest'];
-        }
-        if (!openssl_sign($data, $signature, $this->key, $algo)) {
-            throw new Exception('Failure Signing Data: ' . openssl_error_string() . ' - ' . $algo);
-            return;
-        }
-        return $signature;
-    }
-
-    private function verifyOpenSSL($data, $signature) {
-        $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
-            $algo = $this->cryptParams['digest'];
-        }
-        return openssl_verify($data, $signature, $this->key, $algo);
-    }
-
-    public function encryptData($data) {
-        switch ($this->cryptParams['library']) {
-            case 'mcrypt':
-                return $this->encryptMcrypt($data);
-                break;
-            case 'openssl':
-                return $this->encryptOpenSSL($data);
-                break;
-        }
-    }
-
-    public function decryptData($data) {
-        switch ($this->cryptParams['library']) {
-            case 'mcrypt':
-                return $this->decryptMcrypt($data);
-                break;
-            case 'openssl':
-                return $this->decryptOpenSSL($data);
-                break;
-        }
-    }
-
-    public function signData($data) {
-        switch ($this->cryptParams['library']) {
-            case 'openssl':
-                return $this->signOpenSSL($data);
-                break;
-        }
-    }
-
-    public function verifySignature($data, $signature) {
-        switch ($this->cryptParams['library']) {
-            case 'openssl':
-                return $this->verifyOpenSSL($data, $signature);
-                break;
-        }
-    }
-
-    public function getAlgorith() {
-        return $this->cryptParams['method'];
-    }
-
-    static function makeAsnSegment($type, $string) {
-        switch ($type) {
-            case 0x02:
-                if (ord($string) > 0x7f)
-                    $string = chr(0) . $string;
-                break;
-            case 0x03:
-                $string = chr(0) . $string;
-                break;
-        }
-
-        $length = strlen($string);
-
-        if ($length < 128) {
-            $output = sprintf("%c%c%s", $type, $length, $string);
-        } else if ($length < 0x0100) {
-            $output = sprintf("%c%c%c%s", $type, 0x81, $length, $string);
-        } else if ($length < 0x010000) {
-            $output = sprintf("%c%c%c%c%s", $type, 0x82, $length / 0x0100, $length % 0x0100, $string);
-        } else {
-            $output = NULL;
-        }
-        return($output);
-    }
-
-    /* Modulus and Exponent must already be base64 decoded */
-
-    static function convertRSA($modulus, $exponent) {
-        /* make an ASN publicKeyInfo */
-        $exponentEncoding = XMLSecurityKey::makeAsnSegment(0x02, $exponent);
-        $modulusEncoding = XMLSecurityKey::makeAsnSegment(0x02, $modulus);
-        $sequenceEncoding = XMLSecurityKey:: makeAsnSegment(0x30, $modulusEncoding . $exponentEncoding);
-        $bitstringEncoding = XMLSecurityKey::makeAsnSegment(0x03, $sequenceEncoding);
-        $rsaAlgorithmIdentifier = pack("H*", "300D06092A864886F70D0101010500");
-        $publicKeyInfo = XMLSecurityKey::makeAsnSegment(0x30, $rsaAlgorithmIdentifier . $bitstringEncoding);
-
-        /* encode the publicKeyInfo in base64 and add PEM brackets */
-        $publicKeyInfoBase64 = base64_encode($publicKeyInfo);
-        $encoding = "-----BEGIN PUBLIC KEY-----\n";
-        $offset = 0;
-        while ($segment = substr($publicKeyInfoBase64, $offset, 64)) {
-            $encoding = $encoding . $segment . "\n";
-            $offset += 64;
-        }
-        return $encoding . "-----END PUBLIC KEY-----\n";
-    }
-
-    public function serializeKey($parent) {
-
-    }
-
-    /**
-     * Retrieve the X509 certificate this key represents.
-     *
-     * Will return the X509 certificate in PEM-format if this key represents
-     * an X509 certificate.
-     *
-     * @return  The X509 certificate or NULL if this key doesn't represent an X509-certificate.
-     */
-    public function getX509Certificate() {
-        return $this->x509Certificate;
-    }
-
-    /* Get the thumbprint of this X509 certificate.
+			for ($i = 0; $i < strlen($key); $i++) {
+				$byte = ord($key[$i]) & 0xfe;
+				$parity = 1;
+				for ($j = 1; $j < 8; $j++) {
+					$parity ^= ($byte >> $j) & 1;
+				}
+				$byte |= $parity;
+				$key[$i] = chr($byte);
+			}
+		}
+
+		$this->key = $key;
+		return $key;
+	}
+
+	public static function getRawThumbprint($cert) {
+
+		$arCert = explode("\n", $cert);
+		$data = '';
+		$inData = FALSE;
+
+		foreach ($arCert AS $curData) {
+			if (!$inData) {
+				if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
+					$inData = TRUE;
+				}
+			} else {
+				if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
+					$inData = FALSE;
+					break;
+				}
+				$data .= trim($curData);
+			}
+		}
+
+		if (!empty($data)) {
+			return strtolower(sha1(base64_decode($data)));
+		}
+
+		return NULL;
+	}
+
+	public function loadKey($key, $isFile=FALSE, $isCert = FALSE) {
+		if ($isFile) {
+			$this->key = file_get_contents($key);
+		} else {
+			$this->key = $key;
+		}
+		if ($isCert) {
+			$this->key = openssl_x509_read($this->key);
+			openssl_x509_export($this->key, $str_cert);
+			$this->x509Certificate = $str_cert;
+			$this->key = $str_cert;
+		} else {
+			$this->x509Certificate = NULL;
+		}
+		if ($this->cryptParams['library'] == 'openssl') {
+			if ($this->cryptParams['type'] == 'public') {
+				if ($isCert) {
+					/* Load the thumbprint if this is an X509 certificate. */
+					$this->X509Thumbprint = self::getRawThumbprint($this->key);
+				}
+				$this->key = openssl_get_publickey($this->key);
+			} else {
+				$this->key = openssl_get_privatekey($this->key, $this->passphrase);
+			}
+		} else if ($this->cryptParams['cipher'] == MCRYPT_RIJNDAEL_128) {
+			/* Check key length */
+			switch ($this->type) {
+				case (XMLSecurityKey::AES256_CBC):
+					if (strlen($this->key) < 25) {
+						throw new Exception('Key must contain at least 25 characters for this cipher');
+					}
+					break;
+				case (XMLSecurityKey::AES192_CBC):
+					if (strlen($this->key) < 17) {
+						throw new Exception('Key must contain at least 17 characters for this cipher');
+					}
+					break;
+			}
+		}
+	}
+
+	private function encryptMcrypt($data) {
+		$td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
+		$this->iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
+		mcrypt_generic_init($td, $this->key, $this->iv);
+		if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
+			$bs = mcrypt_enc_get_block_size($td);
+			for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
+				$data.=chr(rand(1, 127));
+			$data.=chr($datalen - $datalen0 + 1);
+		}
+		$encrypted_data = $this->iv . mcrypt_generic($td, $data);
+		mcrypt_generic_deinit($td);
+		mcrypt_module_close($td);
+		return $encrypted_data;
+	}
+
+	private function decryptMcrypt($data) {
+		$td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
+		$iv_length = mcrypt_enc_get_iv_size($td);
+
+		$this->iv = substr($data, 0, $iv_length);
+		$data = substr($data, $iv_length);
+
+		mcrypt_generic_init($td, $this->key, $this->iv);
+		$decrypted_data = mdecrypt_generic($td, $data);
+		mcrypt_generic_deinit($td);
+		mcrypt_module_close($td);
+		if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
+			$dataLen = strlen($decrypted_data);
+			$paddingLength = substr($decrypted_data, $dataLen - 1, 1);
+			$decrypted_data = substr($decrypted_data, 0, $dataLen - ord($paddingLength));
+		}
+		return $decrypted_data;
+	}
+
+	private function encryptOpenSSL($data) {
+		if ($this->cryptParams['type'] == 'public') {
+			if (!openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure encrypting Data');
+				return;
+			}
+		} else {
+			if (!openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure encrypting Data');
+				return;
+			}
+		}
+		return $encrypted_data;
+	}
+
+	private function decryptOpenSSL($data) {
+		if ($this->cryptParams['type'] == 'public') {
+			if (!openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure decrypting Data');
+				return;
+			}
+		} else {
+			if (!openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure decrypting Data');
+				return;
+			}
+		}
+		return $decrypted;
+	}
+
+	private function signOpenSSL($data) {
+		$algo = OPENSSL_ALGO_SHA1;
+		if (!empty($this->cryptParams['digest'])) {
+			$algo = $this->cryptParams['digest'];
+		}
+		if (!openssl_sign($data, $signature, $this->key, $algo)) {
+			throw new Exception('Failure Signing Data: ' . openssl_error_string() . ' - ' . $algo);
+			return;
+		}
+		return $signature;
+	}
+
+	private function verifyOpenSSL($data, $signature) {
+		$algo = OPENSSL_ALGO_SHA1;
+		if (!empty($this->cryptParams['digest'])) {
+			$algo = $this->cryptParams['digest'];
+		}
+		return openssl_verify($data, $signature, $this->key, $algo);
+	}
+
+	public function encryptData($data) {
+		switch ($this->cryptParams['library']) {
+			case 'mcrypt':
+				return $this->encryptMcrypt($data);
+				break;
+			case 'openssl':
+				return $this->encryptOpenSSL($data);
+				break;
+		}
+	}
+
+	public function decryptData($data) {
+		switch ($this->cryptParams['library']) {
+			case 'mcrypt':
+				return $this->decryptMcrypt($data);
+				break;
+			case 'openssl':
+				return $this->decryptOpenSSL($data);
+				break;
+		}
+	}
+
+	public function signData($data) {
+		switch ($this->cryptParams['library']) {
+			case 'openssl':
+				return $this->signOpenSSL($data);
+				break;
+		}
+	}
+
+	public function verifySignature($data, $signature) {
+		switch ($this->cryptParams['library']) {
+			case 'openssl':
+				return $this->verifyOpenSSL($data, $signature);
+				break;
+		}
+	}
+
+	public function getAlgorith() {
+		return $this->cryptParams['method'];
+	}
+
+	static function makeAsnSegment($type, $string) {
+		switch ($type) {
+			case 0x02:
+				if (ord($string) > 0x7f)
+					$string = chr(0) . $string;
+				break;
+			case 0x03:
+				$string = chr(0) . $string;
+				break;
+		}
+
+		$length = strlen($string);
+
+		if ($length < 128) {
+			$output = sprintf("%c%c%s", $type, $length, $string);
+		} else if ($length < 0x0100) {
+			$output = sprintf("%c%c%c%s", $type, 0x81, $length, $string);
+		} else if ($length < 0x010000) {
+			$output = sprintf("%c%c%c%c%s", $type, 0x82, $length / 0x0100, $length % 0x0100, $string);
+		} else {
+			$output = NULL;
+		}
+		return($output);
+	}
+
+	/* Modulus and Exponent must already be base64 decoded */
+
+	static function convertRSA($modulus, $exponent) {
+		/* make an ASN publicKeyInfo */
+		$exponentEncoding = XMLSecurityKey::makeAsnSegment(0x02, $exponent);
+		$modulusEncoding = XMLSecurityKey::makeAsnSegment(0x02, $modulus);
+		$sequenceEncoding = XMLSecurityKey:: makeAsnSegment(0x30, $modulusEncoding . $exponentEncoding);
+		$bitstringEncoding = XMLSecurityKey::makeAsnSegment(0x03, $sequenceEncoding);
+		$rsaAlgorithmIdentifier = pack("H*", "300D06092A864886F70D0101010500");
+		$publicKeyInfo = XMLSecurityKey::makeAsnSegment(0x30, $rsaAlgorithmIdentifier . $bitstringEncoding);
+
+		/* encode the publicKeyInfo in base64 and add PEM brackets */
+		$publicKeyInfoBase64 = base64_encode($publicKeyInfo);
+		$encoding = "-----BEGIN PUBLIC KEY-----\n";
+		$offset = 0;
+		while ($segment = substr($publicKeyInfoBase64, $offset, 64)) {
+			$encoding = $encoding . $segment . "\n";
+			$offset += 64;
+		}
+		return $encoding . "-----END PUBLIC KEY-----\n";
+	}
+
+	public function serializeKey($parent) {
+
+	}
+
+	/**
+	 * Retrieve the X509 certificate this key represents.
+	 *
+	 * Will return the X509 certificate in PEM-format if this key represents
+	 * an X509 certificate.
+	 *
+	 * @return  The X509 certificate or NULL if this key doesn't represent an X509-certificate.
+	 */
+	public function getX509Certificate() {
+		return $this->x509Certificate;
+	}
+
+	/* Get the thumbprint of this X509 certificate.
      *
      * Returns:
      *  The thumbprint as a lowercase 40-character hexadecimal number, or NULL
      *  if this isn't a X509 certificate.
      */
 
-    public function getX509Thumbprint() {
-        return $this->X509Thumbprint;
-    }
-
-    /**
-     * Create key from an EncryptedKey-element.
-     *
-     * @param DOMElement $element  The EncryptedKey-element.
-     * @return XMLSecurityKey  The new key.
-     */
-    public static function fromEncryptedKeyElement(DOMElement $element) {
-
-        $objenc = new XMLSecEnc();
-        $objenc->setNode($element);
-        if (!$objKey = $objenc->locateKey()) {
-            throw new Exception("Unable to locate algorithm for this Encrypted Key");
-        }
-        $objKey->isEncrypted = TRUE;
-        $objKey->encryptedCtx = $objenc;
-        XMLSecEnc::staticLocateKeyInfo($objKey, $element);
-        return $objKey;
-    }
+	public function getX509Thumbprint() {
+		return $this->X509Thumbprint;
+	}
+
+	/**
+	 * Create key from an EncryptedKey-element.
+	 *
+	 * @param DOMElement $element  The EncryptedKey-element.
+	 * @return XMLSecurityKey  The new key.
+	 */
+	public static function fromEncryptedKeyElement(DOMElement $element) {
+
+		$objenc = new XMLSecEnc();
+		$objenc->setNode($element);
+		if (!$objKey = $objenc->locateKey()) {
+			throw new Exception("Unable to locate algorithm for this Encrypted Key");
+		}
+		$objKey->isEncrypted = TRUE;
+		$objKey->encryptedCtx = $objenc;
+		XMLSecEnc::staticLocateKeyInfo($objKey, $element);
+		return $objKey;
+	}
 
 }
 
 class XMLSecurityDSig {
-    const XMLDSIGNS = 'http://www.w3.org/2000/09/xmldsig#';
-    const SHA1 = 'http://www.w3.org/2000/09/xmldsig#sha1';
-    const SHA256 = 'http://www.w3.org/2001/04/xmlenc#sha256';
-    const SHA512 = 'http://www.w3.org/2001/04/xmlenc#sha512';
-    const RIPEMD160 = 'http://www.w3.org/2001/04/xmlenc#ripemd160';
-
-    const C14N = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-    const C14N_COMMENTS = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments';
-    const EXC_C14N = 'http://www.w3.org/2001/10/xml-exc-c14n#';
-    const EXC_C14N_COMMENTS = 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments';
-
-    const template = '<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+	const XMLDSIGNS = 'http://www.w3.org/2000/09/xmldsig#';
+	const SHA1 = 'http://www.w3.org/2000/09/xmldsig#sha1';
+	const SHA256 = 'http://www.w3.org/2001/04/xmlenc#sha256';
+	const SHA512 = 'http://www.w3.org/2001/04/xmlenc#sha512';
+	const RIPEMD160 = 'http://www.w3.org/2001/04/xmlenc#ripemd160';
+
+	const C14N = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
+	const C14N_COMMENTS = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments';
+	const EXC_C14N = 'http://www.w3.org/2001/10/xml-exc-c14n#';
+	const EXC_C14N_COMMENTS = 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments';
+
+	const template = '<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
   <SignedInfo>
     <SignatureMethod />
   </SignedInfo>
 </Signature>';
 
-    public $sigNode = NULL;
-    public $idKeys = array();
-    public $idNS = array();
-    private $signedInfo = NULL;
-    private $xPathCtx = NULL;
-    private $canonicalMethod = NULL;
-    private $prefix = NULL;
-    private $searchpfx = 'secdsig';
-
-    /* This variable contains an associative array of validated nodes. */
-    private $validatedNodes = NULL;
-
-    public function __construct() {
-        $sigdoc = new DOMDocument();
-        $sigdoc->loadXML(XMLSecurityDSig::template);
-        $this->sigNode = $sigdoc->documentElement;
-    }
-
-    private function resetXPathObj() {
-        $this->xPathCtx = NULL;
-    }
-
-    private function getXPathObj() {
-        if (empty($this->xPathCtx) && !empty($this->sigNode)) {
-            $xpath = new DOMXPath($this->sigNode->ownerDocument);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-            $this->xPathCtx = $xpath;
-        }
-        return $this->xPathCtx;
-    }
-
-    static function generate_GUID($prefix='pfx') {
-        $uuid = md5(uniqid(rand(), true));
-        $guid = $prefix . substr($uuid, 0, 8) . "-" .
-                substr($uuid, 8, 4) . "-" .
-                substr($uuid, 12, 4) . "-" .
-                substr($uuid, 16, 4) . "-" .
-                substr($uuid, 20, 12);
-        return $guid;
-    }
-
-    public function locateSignature($objDoc) {
-        if ($objDoc instanceof DOMDocument) {
-            $doc = $objDoc;
-        } else {
-            $doc = $objDoc->ownerDocument;
-        }
-        if ($doc) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-            $query = ".//secdsig:Signature";
-            $nodeset = $xpath->query($query, $objDoc);
-            $this->sigNode = $nodeset->item(0);
-            return $this->sigNode;
-        }
-        return NULL;
-    }
-
-    public function createNewSignNode($name, $value=NULL) {
-        $doc = $this->sigNode->ownerDocument;
-        if ($this->prefix != null) {
-            $name = $this->prefix . ':' . $name;
-        }
-        if (!is_null($value)) {
-            $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name, $value);
-        } else {
-            $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name);
-        }
-        return $node;
-    }
-
-    public function setCanonicalMethod($method) {
-        switch ($method) {
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-                $this->canonicalMethod = $method;
-                break;
-            default:
-                throw new Exception('Invalid Canonical Method');
-        }
-        if ($xpath = $this->getXPathObj()) {
-            $query = './' . $this->searchpfx . ':SignedInfo';
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sinfo = $nodeset->item(0)) {
-                $query = './' . $this->searchpfx . 'CanonicalizationMethod';
-                $nodeset = $xpath->query($query, $sinfo);
-                if (!($canonNode = $nodeset->item(0))) {
-                    $canonNode = $this->createNewSignNode('CanonicalizationMethod');
-                    $sinfo->insertBefore($canonNode, $sinfo->firstChild);
-                }
-                $canonNode->setAttribute('Algorithm', $this->canonicalMethod);
-            }
-        }
-    }
-
-    private function canonicalizeData($node, $canonicalmethod, $arXPath=NULL, $prefixList=NULL) {
-        $exclusive = FALSE;
-        $withComments = FALSE;
-        switch ($canonicalmethod) {
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-                $exclusive = FALSE;
-                $withComments = FALSE;
-                break;
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                $withComments = TRUE;
-                break;
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-                $exclusive = TRUE;
-                break;
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-                $exclusive = TRUE;
-                $withComments = TRUE;
-                break;
-        }
-        /* Support PHP versions < 5.2 not containing C14N methods in DOM extension */
-        $php_version = explode('.', PHP_VERSION);
-        if (($php_version[0] < 5) || ($php_version[0] == 5 && $php_version[1] < 2)) {
-            if (!is_null($arXPath)) {
-                throw new Exception("PHP 5.2.0 or higher is required to perform XPath Transformations");
-            }
-            return C14NGeneral($node, $exclusive, $withComments);
-        }
-        return $node->C14N($exclusive, $withComments, $arXPath, $prefixList);
-    }
-
-    public function canonicalizeSignedInfo() {
-
-        $doc = $this->sigNode->ownerDocument;
-        $canonicalmethod = NULL;
-        if ($doc) {
-            $xpath = $this->getXPathObj();
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($signInfoNode = $nodeset->item(0)) {
-                $query = "./secdsig:CanonicalizationMethod";
-                $nodeset = $xpath->query($query, $signInfoNode);
-                if ($canonNode = $nodeset->item(0)) {
-                    $canonicalmethod = $canonNode->getAttribute('Algorithm');
-                }
-                $this->signedInfo = $this->canonicalizeData($signInfoNode, $canonicalmethod);
-                return $this->signedInfo;
-            }
-        }
-        return NULL;
-    }
-
-    public function calculateDigest($digestAlgorithm, $data) {
-        switch ($digestAlgorithm) {
-            case XMLSecurityDSig::SHA1:
-                $alg = 'sha1';
-                break;
-            case XMLSecurityDSig::SHA256:
-                $alg = 'sha256';
-                break;
-            case XMLSecurityDSig::SHA512:
-                $alg = 'sha512';
-                break;
-            case XMLSecurityDSig::RIPEMD160:
-                $alg = 'ripemd160';
-                break;
-            default:
-                throw new Exception("Cannot validate digest: Unsupported Algorith <$digestAlgorithm>");
-        }
-        if (function_exists('hash')) {
-            return base64_encode(hash($alg, $data, TRUE));
-        } elseif (function_exists('mhash')) {
-            $alg = "MHASH_" . strtoupper($alg);
-            return base64_encode(mhash(constant($alg), $data));
-        } elseif ($alg === 'sha1') {
-            return base64_encode(sha1($data, TRUE));
-        } else {
-            throw new Exception('xmlseclibs is unable to calculate a digest. Maybe you need the mhash library?');
-        }
-    }
-
-    public function validateDigest($refNode, $data) {
-        $xpath = new DOMXPath($refNode->ownerDocument);
-        $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = 'string(./secdsig:DigestMethod/@Algorithm)';
-        $digestAlgorithm = $xpath->evaluate($query, $refNode);
-        $digValue = $this->calculateDigest($digestAlgorithm, $data);
-        $query = 'string(./secdsig:DigestValue)';
-        $digestValue = $xpath->evaluate($query, $refNode);
-        return ($digValue == $digestValue);
-    }
-
-    public function processTransforms($refNode, $objData, $includeCommentNodes = TRUE) {
-        $data = $objData;
-        $xpath = new DOMXPath($refNode->ownerDocument);
-        $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = './secdsig:Transforms/secdsig:Transform';
-        $nodelist = $xpath->query($query, $refNode);
-        $canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-        $arXPath = NULL;
-        $prefixList = NULL;
-        foreach ($nodelist AS $transform) {
-            $algorithm = $transform->getAttribute("Algorithm");
-            switch ($algorithm) {
-                case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-                case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-
-                    if (!$includeCommentNodes) {
-                        /* We remove comment nodes by forcing it to use a canonicalization
+	public $sigNode = NULL;
+	public $idKeys = array();
+	public $idNS = array();
+	private $signedInfo = NULL;
+	private $xPathCtx = NULL;
+	private $canonicalMethod = NULL;
+	private $prefix = NULL;
+	private $searchpfx = 'secdsig';
+
+	/* This variable contains an associative array of validated nodes. */
+	private $validatedNodes = NULL;
+
+	public function __construct() {
+		$sigdoc = new DOMDocument();
+		$sigdoc->loadXML(XMLSecurityDSig::template);
+		$this->sigNode = $sigdoc->documentElement;
+	}
+
+	private function resetXPathObj() {
+		$this->xPathCtx = NULL;
+	}
+
+	private function getXPathObj() {
+		if (empty($this->xPathCtx) && !empty($this->sigNode)) {
+			$xpath = new DOMXPath($this->sigNode->ownerDocument);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+			$this->xPathCtx = $xpath;
+		}
+		return $this->xPathCtx;
+	}
+
+	static function generate_GUID($prefix='pfx') {
+		$uuid = md5(uniqid(rand(), true));
+		$guid = $prefix . substr($uuid, 0, 8) . "-" .
+				substr($uuid, 8, 4) . "-" .
+				substr($uuid, 12, 4) . "-" .
+				substr($uuid, 16, 4) . "-" .
+				substr($uuid, 20, 12);
+		return $guid;
+	}
+
+	public function locateSignature($objDoc) {
+		if ($objDoc instanceof DOMDocument) {
+			$doc = $objDoc;
+		} else {
+			$doc = $objDoc->ownerDocument;
+		}
+		if ($doc) {
+			$xpath = new DOMXPath($doc);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+			$query = ".//secdsig:Signature";
+			$nodeset = $xpath->query($query, $objDoc);
+			$this->sigNode = $nodeset->item(0);
+			return $this->sigNode;
+		}
+		return NULL;
+	}
+
+	public function createNewSignNode($name, $value=NULL) {
+		$doc = $this->sigNode->ownerDocument;
+		if ($this->prefix != null) {
+			$name = $this->prefix . ':' . $name;
+		}
+		if (!is_null($value)) {
+			$node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name, $value);
+		} else {
+			$node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name);
+		}
+		return $node;
+	}
+
+	public function setCanonicalMethod($method) {
+		switch ($method) {
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#':
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
+				$this->canonicalMethod = $method;
+				break;
+			default:
+				throw new Exception('Invalid Canonical Method');
+		}
+		if ($xpath = $this->getXPathObj()) {
+			$query = './' . $this->searchpfx . ':SignedInfo';
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sinfo = $nodeset->item(0)) {
+				$query = './' . $this->searchpfx . 'CanonicalizationMethod';
+				$nodeset = $xpath->query($query, $sinfo);
+				if (!($canonNode = $nodeset->item(0))) {
+					$canonNode = $this->createNewSignNode('CanonicalizationMethod');
+					$sinfo->insertBefore($canonNode, $sinfo->firstChild);
+				}
+				$canonNode->setAttribute('Algorithm', $this->canonicalMethod);
+			}
+		}
+	}
+
+	private function canonicalizeData($node, $canonicalmethod, $arXPath=NULL, $prefixList=NULL) {
+		$exclusive = FALSE;
+		$withComments = FALSE;
+		switch ($canonicalmethod) {
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
+				$exclusive = FALSE;
+				$withComments = FALSE;
+				break;
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
+				$withComments = TRUE;
+				break;
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#':
+				$exclusive = TRUE;
+				break;
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
+				$exclusive = TRUE;
+				$withComments = TRUE;
+				break;
+		}
+		/* Support PHP versions < 5.2 not containing C14N methods in DOM extension */
+		$php_version = explode('.', PHP_VERSION);
+		if (($php_version[0] < 5) || ($php_version[0] == 5 && $php_version[1] < 2)) {
+			if (!is_null($arXPath)) {
+				throw new Exception("PHP 5.2.0 or higher is required to perform XPath Transformations");
+			}
+			return C14NGeneral($node, $exclusive, $withComments);
+		}
+		return $node->C14N($exclusive, $withComments, $arXPath, $prefixList);
+	}
+
+	public function canonicalizeSignedInfo() {
+
+		$doc = $this->sigNode->ownerDocument;
+		$canonicalmethod = NULL;
+		if ($doc) {
+			$xpath = $this->getXPathObj();
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($signInfoNode = $nodeset->item(0)) {
+				$query = "./secdsig:CanonicalizationMethod";
+				$nodeset = $xpath->query($query, $signInfoNode);
+				if ($canonNode = $nodeset->item(0)) {
+					$canonicalmethod = $canonNode->getAttribute('Algorithm');
+				}
+				$this->signedInfo = $this->canonicalizeData($signInfoNode, $canonicalmethod);
+				return $this->signedInfo;
+			}
+		}
+		return NULL;
+	}
+
+	public function calculateDigest($digestAlgorithm, $data) {
+		switch ($digestAlgorithm) {
+			case XMLSecurityDSig::SHA1:
+				$alg = 'sha1';
+				break;
+			case XMLSecurityDSig::SHA256:
+				$alg = 'sha256';
+				break;
+			case XMLSecurityDSig::SHA512:
+				$alg = 'sha512';
+				break;
+			case XMLSecurityDSig::RIPEMD160:
+				$alg = 'ripemd160';
+				break;
+			default:
+				throw new Exception("Cannot validate digest: Unsupported Algorith <$digestAlgorithm>");
+		}
+		if (function_exists('hash')) {
+			return base64_encode(hash($alg, $data, TRUE));
+		} elseif (function_exists('mhash')) {
+			$alg = "MHASH_" . strtoupper($alg);
+			return base64_encode(mhash(constant($alg), $data));
+		} elseif ($alg === 'sha1') {
+			return base64_encode(sha1($data, TRUE));
+		} else {
+			throw new Exception('xmlseclibs is unable to calculate a digest. Maybe you need the mhash library?');
+		}
+	}
+
+	public function validateDigest($refNode, $data) {
+		$xpath = new DOMXPath($refNode->ownerDocument);
+		$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = 'string(./secdsig:DigestMethod/@Algorithm)';
+		$digestAlgorithm = $xpath->evaluate($query, $refNode);
+		$digValue = $this->calculateDigest($digestAlgorithm, $data);
+		$query = 'string(./secdsig:DigestValue)';
+		$digestValue = $xpath->evaluate($query, $refNode);
+		return ($digValue == $digestValue);
+	}
+
+	public function processTransforms($refNode, $objData, $includeCommentNodes = TRUE) {
+		$data = $objData;
+		$xpath = new DOMXPath($refNode->ownerDocument);
+		$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = './secdsig:Transforms/secdsig:Transform';
+		$nodelist = $xpath->query($query, $refNode);
+		$canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
+		$arXPath = NULL;
+		$prefixList = NULL;
+		foreach ($nodelist AS $transform) {
+			$algorithm = $transform->getAttribute("Algorithm");
+			switch ($algorithm) {
+				case 'http://www.w3.org/2001/10/xml-exc-c14n#':
+				case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
+
+					if (!$includeCommentNodes) {
+						/* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
-                        $canonicalMethod = 'http://www.w3.org/2001/10/xml-exc-c14n#';
-                    } else {
-                        $canonicalMethod = $algorithm;
-                    }
-
-                    $node = $transform->firstChild;
-                    while ($node) {
-                        if ($node->localName == 'InclusiveNamespaces') {
-                            if ($pfx = $node->getAttribute('PrefixList')) {
-                                $arpfx = array();
-                                $pfxlist = explode(" ", $pfx);
-                                foreach ($pfxlist AS $pfx) {
-                                    $val = trim($pfx);
-                                    if (!empty($val)) {
-                                        $arpfx[] = $val;
-                                    }
-                                }
-                                if (count($arpfx) > 0) {
-                                    $prefixList = $arpfx;
-                                }
-                            }
-                            break;
-                        }
-                        $node = $node->nextSibling;
-                    }
-                    break;
-                case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-                case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                    if (!$includeCommentNodes) {
-                        /* We remove comment nodes by forcing it to use a canonicalization
+						$canonicalMethod = 'http://www.w3.org/2001/10/xml-exc-c14n#';
+					} else {
+						$canonicalMethod = $algorithm;
+					}
+
+					$node = $transform->firstChild;
+					while ($node) {
+						if ($node->localName == 'InclusiveNamespaces') {
+							if ($pfx = $node->getAttribute('PrefixList')) {
+								$arpfx = array();
+								$pfxlist = explode(" ", $pfx);
+								foreach ($pfxlist AS $pfx) {
+									$val = trim($pfx);
+									if (!empty($val)) {
+										$arpfx[] = $val;
+									}
+								}
+								if (count($arpfx) > 0) {
+									$prefixList = $arpfx;
+								}
+							}
+							break;
+						}
+						$node = $node->nextSibling;
+					}
+					break;
+				case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
+				case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
+					if (!$includeCommentNodes) {
+						/* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
-                        $canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-                    } else {
-                        $canonicalMethod = $algorithm;
-                    }
-
-                    break;
-                case 'http://www.w3.org/TR/1999/REC-xpath-19991116':
-                    $node = $transform->firstChild;
-                    while ($node) {
-                        if ($node->localName == 'XPath') {
-                            $arXPath = array();
-                            $arXPath['query'] = '(.//. | .//@* | .//namespace::*)[' . $node->nodeValue . ']';
-                            $arXpath['namespaces'] = array();
-                            $nslist = $xpath->query('./namespace::*', $node);
-                            foreach ($nslist AS $nsnode) {
-                                if ($nsnode->localName != "xml") {
-                                    $arXPath['namespaces'][$nsnode->localName] = $nsnode->nodeValue;
-                                }
-                            }
-                            break;
-                        }
-                        $node = $node->nextSibling;
-                    }
-                    break;
-            }
-        }
-        if ($data instanceof DOMNode) {
-            $data = $this->canonicalizeData($objData, $canonicalMethod, $arXPath, $prefixList);
-        }
-        return $data;
-    }
-
-    public function processRefNode($refNode) {
-        $dataObject = NULL;
-
-        /*
+						$canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
+					} else {
+						$canonicalMethod = $algorithm;
+					}
+
+					break;
+				case 'http://www.w3.org/TR/1999/REC-xpath-19991116':
+					$node = $transform->firstChild;
+					while ($node) {
+						if ($node->localName == 'XPath') {
+							$arXPath = array();
+							$arXPath['query'] = '(.//. | .//@* | .//namespace::*)[' . $node->nodeValue . ']';
+							$arXpath['namespaces'] = array();
+							$nslist = $xpath->query('./namespace::*', $node);
+							foreach ($nslist AS $nsnode) {
+								if ($nsnode->localName != "xml") {
+									$arXPath['namespaces'][$nsnode->localName] = $nsnode->nodeValue;
+								}
+							}
+							break;
+						}
+						$node = $node->nextSibling;
+					}
+					break;
+			}
+		}
+		if ($data instanceof DOMNode) {
+			$data = $this->canonicalizeData($objData, $canonicalMethod, $arXPath, $prefixList);
+		}
+		return $data;
+	}
+
+	public function processRefNode($refNode) {
+		$dataObject = NULL;
+
+		/*
          * Depending on the URI, we may not want to include comments in the result
          * See: http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel
          */
-        $includeCommentNodes = TRUE;
+		$includeCommentNodes = TRUE;
 
-        if ($uri = $refNode->getAttribute("URI")) {
-            $arUrl = parse_url($uri);
-            if (empty($arUrl['path'])) {
-                if ($identifier = $arUrl['fragment']) {
+		if ($uri = $refNode->getAttribute("URI")) {
+			$arUrl = parse_url($uri);
+			if (empty($arUrl['path'])) {
+				if ($identifier = $arUrl['fragment']) {
 
-                    /* This reference identifies a node with the given id by using
+					/* This reference identifies a node with the given id by using
                      * a URI on the form "#identifier". This should not include comments.
                      */
-                    $includeCommentNodes = FALSE;
-
-                    $xPath = new DOMXPath($refNode->ownerDocument);
-                    if ($this->idNS && is_array($this->idNS)) {
-                        foreach ($this->idNS AS $nspf => $ns) {
-                            $xPath->registerNamespace($nspf, $ns);
-                        }
-                    }
-                    $iDlist = '@Id="' . $identifier . '"';
-                    if (is_array($this->idKeys)) {
-                        foreach ($this->idKeys AS $idKey) {
-                            $iDlist .= " or @$idKey='$identifier'";
-                        }
-                    }
-                    $query = '//*[' . $iDlist . ']';
-                    $dataObject = $xPath->query($query)->item(0);
-                } else {
-                    $dataObject = $refNode->ownerDocument;
-                }
-            } else {
-                $dataObject = file_get_contents($arUrl);
-            }
-        } else {
-            /* This reference identifies the root node with an empty URI. This should
+					$includeCommentNodes = FALSE;
+
+					$xPath = new DOMXPath($refNode->ownerDocument);
+					if ($this->idNS && is_array($this->idNS)) {
+						foreach ($this->idNS AS $nspf => $ns) {
+							$xPath->registerNamespace($nspf, $ns);
+						}
+					}
+					$iDlist = '@Id="' . $identifier . '"';
+					if (is_array($this->idKeys)) {
+						foreach ($this->idKeys AS $idKey) {
+							$iDlist .= " or @$idKey='$identifier'";
+						}
+					}
+					$query = '//*[' . $iDlist . ']';
+					$dataObject = $xPath->query($query)->item(0);
+				} else {
+					$dataObject = $refNode->ownerDocument;
+				}
+			} else {
+				$dataObject = file_get_contents($arUrl);
+			}
+		} else {
+			/* This reference identifies the root node with an empty URI. This should
              * not include comments.
              */
-            $includeCommentNodes = FALSE;
-
-            $dataObject = $refNode->ownerDocument;
-        }
-        $data = $this->processTransforms($refNode, $dataObject, $includeCommentNodes);
-        if (!$this->validateDigest($refNode, $data)) {
-            return FALSE;
-        }
-
-        if ($dataObject instanceof DOMNode) {
-            /* Add this node to the list of validated nodes. */
-            if (!empty($identifier)) {
-                $this->validatedNodes[$identifier] = $dataObject;
-            } else {
-                $this->validatedNodes[] = $dataObject;
-            }
-        }
-
-        return TRUE;
-    }
-
-    public function getRefNodeID($refNode) {
-        if ($uri = $refNode->getAttribute("URI")) {
-            $arUrl = parse_url($uri);
-            if (empty($arUrl['path'])) {
-                if ($identifier = $arUrl['fragment']) {
-                    return $identifier;
-                }
-            }
-        }
-        return null;
-    }
-
-    public function getRefIDs() {
-        $refids = array();
-        $doc = $this->sigNode->ownerDocument;
-
-        $xpath = $this->getXPathObj();
-        $query = "./secdsig:SignedInfo/secdsig:Reference";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        if ($nodeset->length == 0) {
-            throw new Exception("Reference nodes not found");
-        }
-        foreach ($nodeset AS $refNode) {
-            $refids[] = $this->getRefNodeID($refNode);
-        }
-        return $refids;
-    }
-
-    public function validateReference() {
-        $doc = $this->sigNode->ownerDocument;
-        if (!$doc->isSameNode($this->sigNode)) {
-            $this->sigNode->parentNode->removeChild($this->sigNode);
-        }
-        $xpath = $this->getXPathObj();
-        $query = "./secdsig:SignedInfo/secdsig:Reference";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        if ($nodeset->length == 0) {
-            throw new Exception("Reference nodes not found");
-        }
-
-        /* Initialize/reset the list of validated nodes. */
-        $this->validatedNodes = array();
-
-        foreach ($nodeset AS $refNode) {
-            if (!$this->processRefNode($refNode)) {
-                /* Clear the list of validated nodes. */
-                $this->validatedNodes = NULL;
-                throw new Exception("Reference validation failed");
-            }
-        }
-        return TRUE;
-    }
-
-    private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms=NULL, $options=NULL) {
-        $prefix = NULL;
-        $prefix_ns = NULL;
-        $id_name = 'Id';
-        $overwrite_id = TRUE;
-        $force_uri = FALSE;
-
-        if (is_array($options)) {
-            $prefix = empty($options['prefix']) ? NULL : $options['prefix'];
-            $prefix_ns = empty($options['prefix_ns']) ? NULL : $options['prefix_ns'];
-            $id_name = empty($options['id_name']) ? 'Id' : $options['id_name'];
-            $overwrite_id = !isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
-            $force_uri = !isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
-        }
-
-        $attname = $id_name;
-        if (!empty($prefix)) {
-            $attname = $prefix . ':' . $attname;
-        }
-
-        $refNode = $this->createNewSignNode('Reference');
-        $sinfoNode->appendChild($refNode);
-
-        if (!$node instanceof DOMDocument) {
-            $uri = NULL;
-            if (!$overwrite_id) {
-                $uri = $node->getAttributeNS($prefix_ns, $attname);
-            }
-            if (empty($uri)) {
-                $uri = XMLSecurityDSig::generate_GUID();
-                $node->setAttributeNS($prefix_ns, $attname, $uri);
-            }
-            $refNode->setAttribute("URI", '#' . $uri);
-        } elseif ($force_uri) {
-            $refNode->setAttribute("URI", '');
-        }
-
-        $transNodes = $this->createNewSignNode('Transforms');
-        $refNode->appendChild($transNodes);
-
-        if (is_array($arTransforms)) {
-            foreach ($arTransforms AS $transform) {
-                $transNode = $this->createNewSignNode('Transform');
-                $transNodes->appendChild($transNode);
-                if (is_array($transform) &&
-                        (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
-                        (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
-                    $transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
-                    $XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
-                    $transNode->appendChild($XPathNode);
-                    if (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
-                        foreach ($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'] AS $prefix => $namespace) {
-                            $XPathNode->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:$prefix", $namespace);
-                        }
-                    }
-                } else {
-                    $transNode->setAttribute('Algorithm', $transform);
-                }
-            }
-        } elseif (!empty($this->canonicalMethod)) {
-            $transNode = $this->createNewSignNode('Transform');
-            $transNodes->appendChild($transNode);
-            $transNode->setAttribute('Algorithm', $this->canonicalMethod);
-        }
-
-        $canonicalData = $this->processTransforms($refNode, $node);
-        $digValue = $this->calculateDigest($algorithm, $canonicalData);
-
-        $digestMethod = $this->createNewSignNode('DigestMethod');
-        $refNode->appendChild($digestMethod);
-        $digestMethod->setAttribute('Algorithm', $algorithm);
-
-        $digestValue = $this->createNewSignNode('DigestValue', $digValue);
-        $refNode->appendChild($digestValue);
-    }
-
-    public function addReference($node, $algorithm, $arTransforms=NULL, $options=NULL) {
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                $this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
-            }
-        }
-    }
-
-    public function addReferenceList($arNodes, $algorithm, $arTransforms=NULL, $options=NULL) {
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                foreach ($arNodes AS $node) {
-                    $this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
-                }
-            }
-        }
-    }
-
-    public function addObject($data, $mimetype=NULL, $encoding=NULL) {
-        $objNode = $this->createNewSignNode('Object');
-        $this->sigNode->appendChild($objNode);
-        if (!empty($mimetype)) {
-            $objNode->setAtribute('MimeType', $mimetype);
-        }
-        if (!empty($encoding)) {
-            $objNode->setAttribute('Encoding', $encoding);
-        }
-
-        if ($data instanceof DOMElement) {
-            $newData = $this->sigNode->ownerDocument->importNode($data, TRUE);
-        } else {
-            $newData = $this->sigNode->ownerDocument->createTextNode($data);
-        }
-        $objNode->appendChild($newData);
-
-        return $objNode;
-    }
-
-    public function locateKey($node=NULL) {
-        if (empty($node)) {
-            $node = $this->sigNode;
-        }
-        if (!$node instanceof DOMNode) {
-            return NULL;
-        }
-        if ($doc = $node->ownerDocument) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-            $query = "string(./secdsig:SignedInfo/secdsig:SignatureMethod/@Algorithm)";
-            $algorithm = $xpath->evaluate($query, $node);
-            if ($algorithm) {
-                try {
-                    $objKey = new XMLSecurityKey($algorithm, array('type' => 'public'));
-                } catch (Exception $e) {
-                    return NULL;
-                }
-                return $objKey;
-            }
-        }
-        return NULL;
-    }
-
-    public function verify($objKey) {
-        $doc = $this->sigNode->ownerDocument;
-        $xpath = new DOMXPath($doc);
-        $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = "string(./secdsig:SignatureValue)";
-        $sigValue = $xpath->evaluate($query, $this->sigNode);
-        if (empty($sigValue)) {
-            throw new Exception("Unable to locate SignatureValue");
-        }
-        return $objKey->verifySignature($this->signedInfo, base64_decode($sigValue));
-    }
-
-    public function signData($objKey, $data) {
-        return $objKey->signData($data);
-    }
-
-    public function sign($objKey, $appendToNode = NULL) {
-        // If we have a parent node append it now so C14N properly works
-        if ($appendToNode != NULL) {
-            $this->resetXPathObj();
-            $this->appendSignature($appendToNode);
-            $this->sigNode = $appendToNode->lastChild;
-        }
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                $query = "./secdsig:SignatureMethod";
-                $nodeset = $xpath->query($query, $sInfo);
-                $sMethod = $nodeset->item(0);
-                $sMethod->setAttribute('Algorithm', $objKey->type);
-                $data = $this->canonicalizeData($sInfo, $this->canonicalMethod);
-                $sigValue = base64_encode($this->signData($objKey, $data));
-                $sigValueNode = $this->createNewSignNode('SignatureValue', $sigValue);
-                if ($infoSibling = $sInfo->nextSibling) {
-                    $infoSibling->parentNode->insertBefore($sigValueNode, $infoSibling);
-                } else {
-                    $this->sigNode->appendChild($sigValueNode);
-                }
-            }
-        }
-    }
-
-    public function appendCert() {
-
-    }
-
-    public function appendKey($objKey, $parent=NULL) {
-        $objKey->serializeKey($parent);
-    }
-
-    /**
-     * This function inserts the signature element.
-     *
-     * The signature element will be appended to the element, unless $beforeNode is specified. If $beforeNode
-     * is specified, the signature element will be inserted as the last element before $beforeNode.
-     *
-     * @param $node  The node the signature element should be inserted into.
-     * @param $beforeNode  The node the signature element should be located before.
-     *
-     * @return DOMNode The signature element node
-     */
-    public function insertSignature($node, $beforeNode = NULL) {
-
-        $document = $node->ownerDocument;
-        $signatureElement = $document->importNode($this->sigNode, TRUE);
-
-        if ($beforeNode == NULL) {
-            return $node->insertBefore($signatureElement);
-        } else {
-            return $node->insertBefore($signatureElement, $beforeNode);
-        }
-    }
-
-    public function appendSignature($parentNode, $insertBefore = FALSE) {
-        $beforeNode = $insertBefore ? $parentNode->firstChild : NULL;
-        return $this->insertSignature($parentNode, $beforeNode);
-    }
-
-    static function get509XCert($cert, $isPEMFormat=TRUE) {
-        $certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
-        if (!empty($certs)) {
-            return $certs[0];
-        }
-        return '';
-    }
-
-    static function staticGet509XCerts($certs, $isPEMFormat=TRUE) {
-        if ($isPEMFormat) {
-            $data = '';
-            $certlist = array();
-            $arCert = explode("\n", $certs);
-            $inData = FALSE;
-            foreach ($arCert AS $curData) {
-                if (!$inData) {
-                    if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
-                        $inData = TRUE;
-                    }
-                } else {
-                    if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
-                        $inData = FALSE;
-                        $certlist[] = $data;
-                        $data = '';
-                        continue;
-                    }
-                    $data .= trim($curData);
-                }
-            }
-            return $certlist;
-        } else {
-            return array($certs);
-        }
-    }
-
-    static function staticAdd509Cert($parentRef, $cert, $isPEMFormat=TRUE, $isURL=False, $xpath=NULL) {
-        if ($isURL) {
-            $cert = file_get_contents($cert);
-        }
-        if (!$parentRef instanceof DOMElement) {
-            throw new Exception('Invalid parent Node parameter');
-        }
-        $baseDoc = $parentRef->ownerDocument;
-
-        if (empty($xpath)) {
-            $xpath = new DOMXPath($parentRef->ownerDocument);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        }
-
-        $query = "./secdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $parentRef);
-        $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
-            $inserted = FALSE;
-            $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:KeyInfo');
-
-            $query = "./secdsig:Object";
-            $nodeset = $xpath->query($query, $parentRef);
-            if ($sObject = $nodeset->item(0)) {
-                $sObject->parentNode->insertBefore($keyInfo, $sObject);
-                $inserted = TRUE;
-            }
-
-            if (!$inserted) {
-                $parentRef->appendChild($keyInfo);
-            }
-        }
-
-        // Add all certs if there are more than one
-        $certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
-
-        // Atach X509 data node
-        $x509DataNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Data');
-        $keyInfo->appendChild($x509DataNode);
-
-        // Atach all certificate nodes
-        foreach ($certs as $X509Cert) {
-            $x509CertNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Certificate', $X509Cert);
-            $x509DataNode->appendChild($x509CertNode);
-        }
-    }
-
-    public function add509Cert($cert, $isPEMFormat=TRUE, $isURL=False) {
-        if ($xpath = $this->getXPathObj()) {
-            self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath);
-        }
-    }
-
-    function addKeyInfoAndName($keyName, $xpath=NULL) {
-
-        $baseDoc = $this->sigNode->ownerDocument;
-
-        if (empty($xpath)) {
-            $xpath = new DOMXPath($baseDoc);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        }
-
-        $query = "./secdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
-            $inserted = FALSE;
-            $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'KeyInfo');
-
-            $query = "./secdsig:Object";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sObject = $nodeset->item(0)) {
-                $sObject->parentNode->insertBefore($keyInfo, $sObject);
-                $inserted = TRUE;
-            }
-            if (!$inserted) {
-                $this->sigNode->appendChild($keyInfo);
-            }
-        }
-        $keyInfo->appendChild($baseDoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'KeyName', $keyName));
-    }
-
-    /* This function retrieves an associative array of the validated nodes.
+			$includeCommentNodes = FALSE;
+
+			$dataObject = $refNode->ownerDocument;
+		}
+		$data = $this->processTransforms($refNode, $dataObject, $includeCommentNodes);
+		if (!$this->validateDigest($refNode, $data)) {
+			return FALSE;
+		}
+
+		if ($dataObject instanceof DOMNode) {
+			/* Add this node to the list of validated nodes. */
+			if (!empty($identifier)) {
+				$this->validatedNodes[$identifier] = $dataObject;
+			} else {
+				$this->validatedNodes[] = $dataObject;
+			}
+		}
+
+		return TRUE;
+	}
+
+	public function getRefNodeID($refNode) {
+		if ($uri = $refNode->getAttribute("URI")) {
+			$arUrl = parse_url($uri);
+			if (empty($arUrl['path'])) {
+				if ($identifier = $arUrl['fragment']) {
+					return $identifier;
+				}
+			}
+		}
+		return null;
+	}
+
+	public function getRefIDs() {
+		$refids = array();
+		$doc = $this->sigNode->ownerDocument;
+
+		$xpath = $this->getXPathObj();
+		$query = "./secdsig:SignedInfo/secdsig:Reference";
+		$nodeset = $xpath->query($query, $this->sigNode);
+		if ($nodeset->length == 0) {
+			throw new Exception("Reference nodes not found");
+		}
+		foreach ($nodeset AS $refNode) {
+			$refids[] = $this->getRefNodeID($refNode);
+		}
+		return $refids;
+	}
+
+	public function validateReference() {
+		$doc = $this->sigNode->ownerDocument;
+		if (!$doc->isSameNode($this->sigNode)) {
+			$this->sigNode->parentNode->removeChild($this->sigNode);
+		}
+		$xpath = $this->getXPathObj();
+		$query = "./secdsig:SignedInfo/secdsig:Reference";
+		$nodeset = $xpath->query($query, $this->sigNode);
+		if ($nodeset->length == 0) {
+			throw new Exception("Reference nodes not found");
+		}
+
+		/* Initialize/reset the list of validated nodes. */
+		$this->validatedNodes = array();
+
+		foreach ($nodeset AS $refNode) {
+			if (!$this->processRefNode($refNode)) {
+				/* Clear the list of validated nodes. */
+				$this->validatedNodes = NULL;
+				throw new Exception("Reference validation failed");
+			}
+		}
+		return TRUE;
+	}
+
+	private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms=NULL, $options=NULL) {
+		$prefix = NULL;
+		$prefix_ns = NULL;
+		$id_name = 'Id';
+		$overwrite_id = TRUE;
+		$force_uri = FALSE;
+
+		if (is_array($options)) {
+			$prefix = empty($options['prefix']) ? NULL : $options['prefix'];
+			$prefix_ns = empty($options['prefix_ns']) ? NULL : $options['prefix_ns'];
+			$id_name = empty($options['id_name']) ? 'Id' : $options['id_name'];
+			$overwrite_id = !isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
+			$force_uri = !isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
+		}
+
+		$attname = $id_name;
+		if (!empty($prefix)) {
+			$attname = $prefix . ':' . $attname;
+		}
+
+		$refNode = $this->createNewSignNode('Reference');
+		$sinfoNode->appendChild($refNode);
+
+		if (!$node instanceof DOMDocument) {
+			$uri = NULL;
+			if (!$overwrite_id) {
+				$uri = $node->getAttributeNS($prefix_ns, $attname);
+			}
+			if (empty($uri)) {
+				$uri = XMLSecurityDSig::generate_GUID();
+				$node->setAttributeNS($prefix_ns, $attname, $uri);
+			}
+			$refNode->setAttribute("URI", '#' . $uri);
+		} elseif ($force_uri) {
+			$refNode->setAttribute("URI", '');
+		}
+
+		$transNodes = $this->createNewSignNode('Transforms');
+		$refNode->appendChild($transNodes);
+
+		if (is_array($arTransforms)) {
+			foreach ($arTransforms AS $transform) {
+				$transNode = $this->createNewSignNode('Transform');
+				$transNodes->appendChild($transNode);
+				if (is_array($transform) &&
+						(!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
+						(!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
+					$transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
+					$XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
+					$transNode->appendChild($XPathNode);
+					if (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
+						foreach ($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'] AS $prefix => $namespace) {
+							$XPathNode->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:$prefix", $namespace);
+						}
+					}
+				} else {
+					$transNode->setAttribute('Algorithm', $transform);
+				}
+			}
+		} elseif (!empty($this->canonicalMethod)) {
+			$transNode = $this->createNewSignNode('Transform');
+			$transNodes->appendChild($transNode);
+			$transNode->setAttribute('Algorithm', $this->canonicalMethod);
+		}
+
+		$canonicalData = $this->processTransforms($refNode, $node);
+		$digValue = $this->calculateDigest($algorithm, $canonicalData);
+
+		$digestMethod = $this->createNewSignNode('DigestMethod');
+		$refNode->appendChild($digestMethod);
+		$digestMethod->setAttribute('Algorithm', $algorithm);
+
+		$digestValue = $this->createNewSignNode('DigestValue', $digValue);
+		$refNode->appendChild($digestValue);
+	}
+
+	public function addReference($node, $algorithm, $arTransforms=NULL, $options=NULL) {
+		if ($xpath = $this->getXPathObj()) {
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sInfo = $nodeset->item(0)) {
+				$this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
+			}
+		}
+	}
+
+	public function addReferenceList($arNodes, $algorithm, $arTransforms=NULL, $options=NULL) {
+		if ($xpath = $this->getXPathObj()) {
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sInfo = $nodeset->item(0)) {
+				foreach ($arNodes AS $node) {
+					$this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
+				}
+			}
+		}
+	}
+
+	public function addObject($data, $mimetype=NULL, $encoding=NULL) {
+		$objNode = $this->createNewSignNode('Object');
+		$this->sigNode->appendChild($objNode);
+		if (!empty($mimetype)) {
+			$objNode->setAtribute('MimeType', $mimetype);
+		}
+		if (!empty($encoding)) {
+			$objNode->setAttribute('Encoding', $encoding);
+		}
+
+		if ($data instanceof DOMElement) {
+			$newData = $this->sigNode->ownerDocument->importNode($data, TRUE);
+		} else {
+			$newData = $this->sigNode->ownerDocument->createTextNode($data);
+		}
+		$objNode->appendChild($newData);
+
+		return $objNode;
+	}
+
+	public function locateKey($node=NULL) {
+		if (empty($node)) {
+			$node = $this->sigNode;
+		}
+		if (!$node instanceof DOMNode) {
+			return NULL;
+		}
+		if ($doc = $node->ownerDocument) {
+			$xpath = new DOMXPath($doc);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+			$query = "string(./secdsig:SignedInfo/secdsig:SignatureMethod/@Algorithm)";
+			$algorithm = $xpath->evaluate($query, $node);
+			if ($algorithm) {
+				try {
+					$objKey = new XMLSecurityKey($algorithm, array('type' => 'public'));
+				} catch (Exception $e) {
+					return NULL;
+				}
+				return $objKey;
+			}
+		}
+		return NULL;
+	}
+
+	public function verify($objKey) {
+		$doc = $this->sigNode->ownerDocument;
+		$xpath = new DOMXPath($doc);
+		$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = "string(./secdsig:SignatureValue)";
+		$sigValue = $xpath->evaluate($query, $this->sigNode);
+		if (empty($sigValue)) {
+			throw new Exception("Unable to locate SignatureValue");
+		}
+		return $objKey->verifySignature($this->signedInfo, base64_decode($sigValue));
+	}
+
+	public function signData($objKey, $data) {
+		return $objKey->signData($data);
+	}
+
+	public function sign($objKey, $appendToNode = NULL) {
+		// If we have a parent node append it now so C14N properly works
+		if ($appendToNode != NULL) {
+			$this->resetXPathObj();
+			$this->appendSignature($appendToNode);
+			$this->sigNode = $appendToNode->lastChild;
+		}
+		if ($xpath = $this->getXPathObj()) {
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sInfo = $nodeset->item(0)) {
+				$query = "./secdsig:SignatureMethod";
+				$nodeset = $xpath->query($query, $sInfo);
+				$sMethod = $nodeset->item(0);
+				$sMethod->setAttribute('Algorithm', $objKey->type);
+				$data = $this->canonicalizeData($sInfo, $this->canonicalMethod);
+				$sigValue = base64_encode($this->signData($objKey, $data));
+				$sigValueNode = $this->createNewSignNode('SignatureValue', $sigValue);
+				if ($infoSibling = $sInfo->nextSibling) {
+					$infoSibling->parentNode->insertBefore($sigValueNode, $infoSibling);
+				} else {
+					$this->sigNode->appendChild($sigValueNode);
+				}
+			}
+		}
+	}
+
+	public function appendCert() {
+
+	}
+
+	public function appendKey($objKey, $parent=NULL) {
+		$objKey->serializeKey($parent);
+	}
+
+	/**
+	 * This function inserts the signature element.
+	 *
+	 * The signature element will be appended to the element, unless $beforeNode is specified. If $beforeNode
+	 * is specified, the signature element will be inserted as the last element before $beforeNode.
+	 *
+	 * @param $node  The node the signature element should be inserted into.
+	 * @param $beforeNode  The node the signature element should be located before.
+	 *
+	 * @return DOMNode The signature element node
+	 */
+	public function insertSignature($node, $beforeNode = NULL) {
+
+		$document = $node->ownerDocument;
+		$signatureElement = $document->importNode($this->sigNode, TRUE);
+
+		if ($beforeNode == NULL) {
+			return $node->insertBefore($signatureElement);
+		} else {
+			return $node->insertBefore($signatureElement, $beforeNode);
+		}
+	}
+
+	public function appendSignature($parentNode, $insertBefore = FALSE) {
+		$beforeNode = $insertBefore ? $parentNode->firstChild : NULL;
+		return $this->insertSignature($parentNode, $beforeNode);
+	}
+
+	static function get509XCert($cert, $isPEMFormat=TRUE) {
+		$certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
+		if (!empty($certs)) {
+			return $certs[0];
+		}
+		return '';
+	}
+
+	static function staticGet509XCerts($certs, $isPEMFormat=TRUE) {
+		if ($isPEMFormat) {
+			$data = '';
+			$certlist = array();
+			$arCert = explode("\n", $certs);
+			$inData = FALSE;
+			foreach ($arCert AS $curData) {
+				if (!$inData) {
+					if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
+						$inData = TRUE;
+					}
+				} else {
+					if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
+						$inData = FALSE;
+						$certlist[] = $data;
+						$data = '';
+						continue;
+					}
+					$data .= trim($curData);
+				}
+			}
+			return $certlist;
+		} else {
+			return array($certs);
+		}
+	}
+
+	static function staticAdd509Cert($parentRef, $cert, $isPEMFormat=TRUE, $isURL=False, $xpath=NULL) {
+		if ($isURL) {
+			$cert = file_get_contents($cert);
+		}
+		if (!$parentRef instanceof DOMElement) {
+			throw new Exception('Invalid parent Node parameter');
+		}
+		$baseDoc = $parentRef->ownerDocument;
+
+		if (empty($xpath)) {
+			$xpath = new DOMXPath($parentRef->ownerDocument);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		}
+
+		$query = "./secdsig:KeyInfo";
+		$nodeset = $xpath->query($query, $parentRef);
+		$keyInfo = $nodeset->item(0);
+		if (!$keyInfo) {
+			$inserted = FALSE;
+			$keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:KeyInfo');
+
+			$query = "./secdsig:Object";
+			$nodeset = $xpath->query($query, $parentRef);
+			if ($sObject = $nodeset->item(0)) {
+				$sObject->parentNode->insertBefore($keyInfo, $sObject);
+				$inserted = TRUE;
+			}
+
+			if (!$inserted) {
+				$parentRef->appendChild($keyInfo);
+			}
+		}
+
+		// Add all certs if there are more than one
+		$certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
+
+		// Atach X509 data node
+		$x509DataNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Data');
+		$keyInfo->appendChild($x509DataNode);
+
+		// Atach all certificate nodes
+		foreach ($certs as $X509Cert) {
+			$x509CertNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Certificate', $X509Cert);
+			$x509DataNode->appendChild($x509CertNode);
+		}
+	}
+
+	public function add509Cert($cert, $isPEMFormat=TRUE, $isURL=False) {
+		if ($xpath = $this->getXPathObj()) {
+			self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath);
+		}
+	}
+
+	function addKeyInfoAndName($keyName, $xpath=NULL) {
+
+		$baseDoc = $this->sigNode->ownerDocument;
+
+		if (empty($xpath)) {
+			$xpath = new DOMXPath($baseDoc);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		}
+
+		$query = "./secdsig:KeyInfo";
+		$nodeset = $xpath->query($query, $this->sigNode);
+		$keyInfo = $nodeset->item(0);
+		if (!$keyInfo) {
+			$inserted = FALSE;
+			$keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'KeyInfo');
+
+			$query = "./secdsig:Object";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sObject = $nodeset->item(0)) {
+				$sObject->parentNode->insertBefore($keyInfo, $sObject);
+				$inserted = TRUE;
+			}
+			if (!$inserted) {
+				$this->sigNode->appendChild($keyInfo);
+			}
+		}
+		$keyInfo->appendChild($baseDoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'KeyName', $keyName));
+	}
+
+	/* This function retrieves an associative array of the validated nodes.
      *
      * The array will contain the id of the referenced node as the key and the node itself
      * as the value.
@@ -1381,394 +1381,394 @@ 
      *  An associative array of validated nodes or NULL if no nodes have been validated.
      */
 
-    public function getValidatedNodes() {
-        return $this->validatedNodes;
-    }
+	public function getValidatedNodes() {
+		return $this->validatedNodes;
+	}
 
 }
 
 class XMLSecEnc {
-    const template = "<xenc:EncryptedData xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'>
+	const template = "<xenc:EncryptedData xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'>
    <xenc:CipherData>
       <xenc:CipherValue></xenc:CipherValue>
    </xenc:CipherData>
 </xenc:EncryptedData>";
 
-    const Element = 'http://www.w3.org/2001/04/xmlenc#Element';
-    const Content = 'http://www.w3.org/2001/04/xmlenc#Content';
-    const URI = 3;
-    const XMLENCNS = 'http://www.w3.org/2001/04/xmlenc#';
-
-    private $encdoc = NULL;
-    private $rawNode = NULL;
-    public $type = NULL;
-    public $encKey = NULL;
-    private $references = array();
-
-    public function __construct() {
-        $this->_resetTemplate();
-    }
-
-    private function _resetTemplate() {
-        $this->encdoc = new DOMDocument();
-        $this->encdoc->loadXML(XMLSecEnc::template);
-    }
-
-    public function addReference($name, $node, $type) {
-        if (!$node instanceOf DOMNode) {
-            throw new Exception('$node is not of type DOMNode');
-        }
-        $curencdoc = $this->encdoc;
-        $this->_resetTemplate();
-        $encdoc = $this->encdoc;
-        $this->encdoc = $curencdoc;
-        $refuri = XMLSecurityDSig::generate_GUID();
-        $element = $encdoc->documentElement;
-        $element->setAttribute("Id", $refuri);
-        $this->references[$name] = array("node" => $node, "type" => $type, "encnode" => $encdoc, "refuri" => $refuri);
-    }
-
-    public function setNode($node) {
-        $this->rawNode = $node;
-    }
-
-    public function encryptNode($objKey, $replace=TRUE) {
-        $data = '';
-        if (empty($this->rawNode)) {
-            throw new Exception('Node to encrypt has not been set');
-        }
-        if (!$objKey instanceof XMLSecurityKey) {
-            throw new Exception('Invalid Key');
-        }
-        $doc = $this->rawNode->ownerDocument;
-        $xPath = new DOMXPath($this->encdoc);
-        $objList = $xPath->query('/xenc:EncryptedData/xenc:CipherData/xenc:CipherValue');
-        $cipherValue = $objList->item(0);
-        if ($cipherValue == NULL) {
-            throw new Exception('Error locating CipherValue element within template');
-        }
-        switch ($this->type) {
-            case (XMLSecEnc::Element):
-                $data = $doc->saveXML($this->rawNode);
-                $this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Element);
-                break;
-            case (XMLSecEnc::Content):
-                $children = $this->rawNode->childNodes;
-                foreach ($children AS $child) {
-                    $data .= $doc->saveXML($child);
-                }
-                $this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Content);
-                break;
-            default:
-                throw new Exception('Type is currently not supported');
-                return;
-        }
-
-        $encMethod = $this->encdoc->documentElement->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
-        $encMethod->setAttribute('Algorithm', $objKey->getAlgorith());
-        $cipherValue->parentNode->parentNode->insertBefore($encMethod, $cipherValue->parentNode->parentNode->firstChild);
-
-        $strEncrypt = base64_encode($objKey->encryptData($data));
-        $value = $this->encdoc->createTextNode($strEncrypt);
-        $cipherValue->appendChild($value);
-
-        if ($replace) {
-            switch ($this->type) {
-                case (XMLSecEnc::Element):
-                    if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                        return $this->encdoc;
-                    }
-                    $importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
-                    $this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
-                    return $importEnc;
-                    break;
-                case (XMLSecEnc::Content):
-                    $importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
-                    while ($this->rawNode->firstChild) {
-                        $this->rawNode->removeChild($this->rawNode->firstChild);
-                    }
-                    $this->rawNode->appendChild($importEnc);
-                    return $importEnc;
-                    break;
-            }
-        }
-    }
-
-    public function encryptReferences($objKey) {
-        $curRawNode = $this->rawNode;
-        $curType = $this->type;
-        foreach ($this->references AS $name => $reference) {
-            $this->encdoc = $reference["encnode"];
-            $this->rawNode = $reference["node"];
-            $this->type = $reference["type"];
-            try {
-                $encNode = $this->encryptNode($objKey);
-                $this->references[$name]["encnode"] = $encNode;
-            } catch (Exception $e) {
-                $this->rawNode = $curRawNode;
-                $this->type = $curType;
-                throw $e;
-            }
-        }
-        $this->rawNode = $curRawNode;
-        $this->type = $curType;
-    }
-
-    /**
-     * Retrieve the CipherValue text from this encrypted node.
-     *
-     * @return string|NULL  The Ciphervalue text, or NULL if no CipherValue is found.
-     */
-    public function getCipherValue() {
-        if (empty($this->rawNode)) {
-            throw new Exception('Node to decrypt has not been set');
-        }
-
-        $doc = $this->rawNode->ownerDocument;
-        $xPath = new DOMXPath($doc);
-        $xPath->registerNamespace('xmlencr', XMLSecEnc::XMLENCNS);
-        /* Only handles embedded content right now and not a reference */
-        $query = "./xmlencr:CipherData/xmlencr:CipherValue";
-        $nodeset = $xPath->query($query, $this->rawNode);
-        $node = $nodeset->item(0);
-
-        if (!$node) {
-            return NULL;
-        }
-
-        return base64_decode($node->nodeValue);
-    }
-
-    /**
-     * Decrypt this encrypted node.
-     *
-     * The behaviour of this function depends on the value of $replace.
-     * If $replace is FALSE, we will return the decrypted data as a string.
-     * If $replace is TRUE, we will insert the decrypted element(s) into the
-     * document, and return the decrypted element(s).
-     *
-     * @params XMLSecurityKey $objKey  The decryption key that should be used when decrypting the node.
-     * @params boolean $replace  Whether we should replace the encrypted node in the XML document with the decrypted data. The default is TRUE.
-     * @return string|DOMElement  The decrypted data.
-     */
-    public function decryptNode($objKey, $replace=TRUE) {
-        if (!$objKey instanceof XMLSecurityKey) {
-            throw new Exception('Invalid Key');
-        }
-
-        $encryptedData = $this->getCipherValue();
-        if ($encryptedData) {
-            $decrypted = $objKey->decryptData($encryptedData);
-            if ($replace) {
-                switch ($this->type) {
-                    case (XMLSecEnc::Element):
-                        $newdoc = new DOMDocument();
-                        $newdoc->loadXML($decrypted);
-                        if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                            return $newdoc;
-                        }
-                        $importEnc = $this->rawNode->ownerDocument->importNode($newdoc->documentElement, TRUE);
-                        $this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
-                        return $importEnc;
-                        break;
-                    case (XMLSecEnc::Content):
-                        if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                            $doc = $this->rawNode;
-                        } else {
-                            $doc = $this->rawNode->ownerDocument;
-                        }
-                        $newFrag = $doc->createDocumentFragment();
-                        $newFrag->appendXML($decrypted);
-                        $parent = $this->rawNode->parentNode;
-                        $parent->replaceChild($newFrag, $this->rawNode);
-                        return $parent;
-                        break;
-                    default:
-                        return $decrypted;
-                }
-            } else {
-                return $decrypted;
-            }
-        } else {
-            throw new Exception("Cannot locate encrypted data");
-        }
-    }
-
-    public function encryptKey($srcKey, $rawKey, $append=TRUE) {
-        if ((!$srcKey instanceof XMLSecurityKey) || (!$rawKey instanceof XMLSecurityKey)) {
-            throw new Exception('Invalid Key');
-        }
-        $strEncKey = base64_encode($srcKey->encryptData($rawKey->key));
-        $root = $this->encdoc->documentElement;
-        $encKey = $this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptedKey');
-        if ($append) {
-            $keyInfo = $root->insertBefore($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'), $root->firstChild);
-            $keyInfo->appendChild($encKey);
-        } else {
-            $this->encKey = $encKey;
-        }
-        $encMethod = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
-        $encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
-        if (!empty($srcKey->name)) {
-            $keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
-            $keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));
-        }
-        $cipherData = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherData'));
-        $cipherData->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherValue', $strEncKey));
-        if (is_array($this->references) && count($this->references) > 0) {
-            $refList = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:ReferenceList'));
-            foreach ($this->references AS $name => $reference) {
-                $refuri = $reference["refuri"];
-                $dataRef = $refList->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:DataReference'));
-                $dataRef->setAttribute("URI", '#' . $refuri);
-            }
-        }
-        return;
-    }
-
-    public function decryptKey($encKey) {
-        if (!$encKey->isEncrypted) {
-            throw new Exception("Key is not Encrypted");
-        }
-        if (empty($encKey->key)) {
-            throw new Exception("Key is missing data to perform the decryption");
-        }
-        return $this->decryptNode($encKey, FALSE);
-    }
-
-    public function locateEncryptedData($element) {
-        if ($element instanceof DOMDocument) {
-            $doc = $element;
-        } else {
-            $doc = $element->ownerDocument;
-        }
-        if ($doc) {
-            $xpath = new DOMXPath($doc);
-            $query = "//*[local-name()='EncryptedData' and namespace-uri()='" . XMLSecEnc::XMLENCNS . "']";
-            $nodeset = $xpath->query($query);
-            return $nodeset->item(0);
-        }
-        return NULL;
-    }
-
-    public function locateKey($node=NULL) {
-        if (empty($node)) {
-            $node = $this->rawNode;
-        }
-        if (!$node instanceof DOMNode) {
-            return NULL;
-        }
-        if ($doc = $node->ownerDocument) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
-            $query = ".//xmlsecenc:EncryptionMethod";
-            $nodeset = $xpath->query($query, $node);
-            if ($encmeth = $nodeset->item(0)) {
-                $attrAlgorithm = $encmeth->getAttribute("Algorithm");
-                try {
-                    $objKey = new XMLSecurityKey($attrAlgorithm, array('type' => 'private'));
-                } catch (Exception $e) {
-                    return NULL;
-                }
-                return $objKey;
-            }
-        }
-        return NULL;
-    }
-
-    static function staticLocateKeyInfo($objBaseKey=NULL, $node=NULL) {
-        if (empty($node) || (!$node instanceof DOMNode)) {
-            return NULL;
-        }
-        $doc = $node->ownerDocument;
-        if (!$doc) {
-            return NULL;
-        }
-
-        $xpath = new DOMXPath($doc);
-        $xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
-        $xpath->registerNamespace('xmlsecdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = "./xmlsecdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $node);
-        $encmeth = $nodeset->item(0);
-        if (!$encmeth) {
-            /* No KeyInfo in EncryptedData / EncryptedKey. */
-            return $objBaseKey;
-        }
-
-        foreach ($encmeth->childNodes AS $child) {
-            switch ($child->localName) {
-                case 'KeyName':
-                    if (!empty($objBaseKey)) {
-                        $objBaseKey->name = $child->nodeValue;
-                    }
-                    break;
-                case 'KeyValue':
-                    foreach ($child->childNodes AS $keyval) {
-                        switch ($keyval->localName) {
-                            case 'DSAKeyValue':
-                                throw new Exception("DSAKeyValue currently not supported");
-                                break;
-                            case 'RSAKeyValue':
-                                $modulus = NULL;
-                                $exponent = NULL;
-                                if ($modulusNode = $keyval->getElementsByTagName('Modulus')->item(0)) {
-                                    $modulus = base64_decode($modulusNode->nodeValue);
-                                }
-                                if ($exponentNode = $keyval->getElementsByTagName('Exponent')->item(0)) {
-                                    $exponent = base64_decode($exponentNode->nodeValue);
-                                }
-                                if (empty($modulus) || empty($exponent)) {
-                                    throw new Exception("Missing Modulus or Exponent");
-                                }
-                                $publicKey = XMLSecurityKey::convertRSA($modulus, $exponent);
-                                $objBaseKey->loadKey($publicKey);
-                                break;
-                        }
-                    }
-                    break;
-                case 'RetrievalMethod':
-                    $type = $child->getAttribute('Type');
-                    if ($type !== 'http://www.w3.org/2001/04/xmlenc#EncryptedKey') {
-                        /* Unsupported key type. */
-                        break;
-                    }
-                    $uri = $child->getAttribute('URI');
-                    if ($uri[0] !== '#') {
-                        /* URI not a reference - unsupported. */
-                        break;
-                    }
-                    $id = substr($uri, 1);
-
-                    $query = "//xmlsecenc:EncryptedKey[@Id='$id']";
-                    $keyElement = $xpath->query($query)->item(0);
-                    if (!$keyElement) {
-                        throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
-                    }
-
-                    return XMLSecurityKey::fromEncryptedKeyElement($keyElement);
-                case 'EncryptedKey':
-                    return XMLSecurityKey::fromEncryptedKeyElement($child);
-                case 'X509Data':
-                    if ($x509certNodes = $child->getElementsByTagName('X509Certificate')) {
-                        if ($x509certNodes->length > 0) {
-                            $x509cert = $x509certNodes->item(0)->textContent;
-                            $x509cert = str_replace(array("\r", "\n"), "", $x509cert);
-                            $x509cert = "-----BEGIN CERTIFICATE-----\n" . chunk_split($x509cert, 64, "\n") . "-----END CERTIFICATE-----\n";
-                            $objBaseKey->loadKey($x509cert, FALSE, TRUE);
-                        }
-                    }
-                    break;
-            }
-        }
-        return $objBaseKey;
-    }
-
-    public function locateKeyInfo($objBaseKey=NULL, $node=NULL) {
-        if (empty($node)) {
-            $node = $this->rawNode;
-        }
-        return XMLSecEnc::staticLocateKeyInfo($objBaseKey, $node);
-    }
+	const Element = 'http://www.w3.org/2001/04/xmlenc#Element';
+	const Content = 'http://www.w3.org/2001/04/xmlenc#Content';
+	const URI = 3;
+	const XMLENCNS = 'http://www.w3.org/2001/04/xmlenc#';
+
+	private $encdoc = NULL;
+	private $rawNode = NULL;
+	public $type = NULL;
+	public $encKey = NULL;
+	private $references = array();
+
+	public function __construct() {
+		$this->_resetTemplate();
+	}
+
+	private function _resetTemplate() {
+		$this->encdoc = new DOMDocument();
+		$this->encdoc->loadXML(XMLSecEnc::template);
+	}
+
+	public function addReference($name, $node, $type) {
+		if (!$node instanceOf DOMNode) {
+			throw new Exception('$node is not of type DOMNode');
+		}
+		$curencdoc = $this->encdoc;
+		$this->_resetTemplate();
+		$encdoc = $this->encdoc;
+		$this->encdoc = $curencdoc;
+		$refuri = XMLSecurityDSig::generate_GUID();
+		$element = $encdoc->documentElement;
+		$element->setAttribute("Id", $refuri);
+		$this->references[$name] = array("node" => $node, "type" => $type, "encnode" => $encdoc, "refuri" => $refuri);
+	}
+
+	public function setNode($node) {
+		$this->rawNode = $node;
+	}
+
+	public function encryptNode($objKey, $replace=TRUE) {
+		$data = '';
+		if (empty($this->rawNode)) {
+			throw new Exception('Node to encrypt has not been set');
+		}
+		if (!$objKey instanceof XMLSecurityKey) {
+			throw new Exception('Invalid Key');
+		}
+		$doc = $this->rawNode->ownerDocument;
+		$xPath = new DOMXPath($this->encdoc);
+		$objList = $xPath->query('/xenc:EncryptedData/xenc:CipherData/xenc:CipherValue');
+		$cipherValue = $objList->item(0);
+		if ($cipherValue == NULL) {
+			throw new Exception('Error locating CipherValue element within template');
+		}
+		switch ($this->type) {
+			case (XMLSecEnc::Element):
+				$data = $doc->saveXML($this->rawNode);
+				$this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Element);
+				break;
+			case (XMLSecEnc::Content):
+				$children = $this->rawNode->childNodes;
+				foreach ($children AS $child) {
+					$data .= $doc->saveXML($child);
+				}
+				$this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Content);
+				break;
+			default:
+				throw new Exception('Type is currently not supported');
+				return;
+		}
+
+		$encMethod = $this->encdoc->documentElement->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
+		$encMethod->setAttribute('Algorithm', $objKey->getAlgorith());
+		$cipherValue->parentNode->parentNode->insertBefore($encMethod, $cipherValue->parentNode->parentNode->firstChild);
+
+		$strEncrypt = base64_encode($objKey->encryptData($data));
+		$value = $this->encdoc->createTextNode($strEncrypt);
+		$cipherValue->appendChild($value);
+
+		if ($replace) {
+			switch ($this->type) {
+				case (XMLSecEnc::Element):
+					if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
+						return $this->encdoc;
+					}
+					$importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
+					$this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
+					return $importEnc;
+					break;
+				case (XMLSecEnc::Content):
+					$importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
+					while ($this->rawNode->firstChild) {
+						$this->rawNode->removeChild($this->rawNode->firstChild);
+					}
+					$this->rawNode->appendChild($importEnc);
+					return $importEnc;
+					break;
+			}
+		}
+	}
+
+	public function encryptReferences($objKey) {
+		$curRawNode = $this->rawNode;
+		$curType = $this->type;
+		foreach ($this->references AS $name => $reference) {
+			$this->encdoc = $reference["encnode"];
+			$this->rawNode = $reference["node"];
+			$this->type = $reference["type"];
+			try {
+				$encNode = $this->encryptNode($objKey);
+				$this->references[$name]["encnode"] = $encNode;
+			} catch (Exception $e) {
+				$this->rawNode = $curRawNode;
+				$this->type = $curType;
+				throw $e;
+			}
+		}
+		$this->rawNode = $curRawNode;
+		$this->type = $curType;
+	}
+
+	/**
+	 * Retrieve the CipherValue text from this encrypted node.
+	 *
+	 * @return string|NULL  The Ciphervalue text, or NULL if no CipherValue is found.
+	 */
+	public function getCipherValue() {
+		if (empty($this->rawNode)) {
+			throw new Exception('Node to decrypt has not been set');
+		}
+
+		$doc = $this->rawNode->ownerDocument;
+		$xPath = new DOMXPath($doc);
+		$xPath->registerNamespace('xmlencr', XMLSecEnc::XMLENCNS);
+		/* Only handles embedded content right now and not a reference */
+		$query = "./xmlencr:CipherData/xmlencr:CipherValue";
+		$nodeset = $xPath->query($query, $this->rawNode);
+		$node = $nodeset->item(0);
+
+		if (!$node) {
+			return NULL;
+		}
+
+		return base64_decode($node->nodeValue);
+	}
+
+	/**
+	 * Decrypt this encrypted node.
+	 *
+	 * The behaviour of this function depends on the value of $replace.
+	 * If $replace is FALSE, we will return the decrypted data as a string.
+	 * If $replace is TRUE, we will insert the decrypted element(s) into the
+	 * document, and return the decrypted element(s).
+	 *
+	 * @params XMLSecurityKey $objKey  The decryption key that should be used when decrypting the node.
+	 * @params boolean $replace  Whether we should replace the encrypted node in the XML document with the decrypted data. The default is TRUE.
+	 * @return string|DOMElement  The decrypted data.
+	 */
+	public function decryptNode($objKey, $replace=TRUE) {
+		if (!$objKey instanceof XMLSecurityKey) {
+			throw new Exception('Invalid Key');
+		}
+
+		$encryptedData = $this->getCipherValue();
+		if ($encryptedData) {
+			$decrypted = $objKey->decryptData($encryptedData);
+			if ($replace) {
+				switch ($this->type) {
+					case (XMLSecEnc::Element):
+						$newdoc = new DOMDocument();
+						$newdoc->loadXML($decrypted);
+						if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
+							return $newdoc;
+						}
+						$importEnc = $this->rawNode->ownerDocument->importNode($newdoc->documentElement, TRUE);
+						$this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
+						return $importEnc;
+						break;
+					case (XMLSecEnc::Content):
+						if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
+							$doc = $this->rawNode;
+						} else {
+							$doc = $this->rawNode->ownerDocument;
+						}
+						$newFrag = $doc->createDocumentFragment();
+						$newFrag->appendXML($decrypted);
+						$parent = $this->rawNode->parentNode;
+						$parent->replaceChild($newFrag, $this->rawNode);
+						return $parent;
+						break;
+					default:
+						return $decrypted;
+				}
+			} else {
+				return $decrypted;
+			}
+		} else {
+			throw new Exception("Cannot locate encrypted data");
+		}
+	}
+
+	public function encryptKey($srcKey, $rawKey, $append=TRUE) {
+		if ((!$srcKey instanceof XMLSecurityKey) || (!$rawKey instanceof XMLSecurityKey)) {
+			throw new Exception('Invalid Key');
+		}
+		$strEncKey = base64_encode($srcKey->encryptData($rawKey->key));
+		$root = $this->encdoc->documentElement;
+		$encKey = $this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptedKey');
+		if ($append) {
+			$keyInfo = $root->insertBefore($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'), $root->firstChild);
+			$keyInfo->appendChild($encKey);
+		} else {
+			$this->encKey = $encKey;
+		}
+		$encMethod = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
+		$encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
+		if (!empty($srcKey->name)) {
+			$keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
+			$keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));
+		}
+		$cipherData = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherData'));
+		$cipherData->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherValue', $strEncKey));
+		if (is_array($this->references) && count($this->references) > 0) {
+			$refList = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:ReferenceList'));
+			foreach ($this->references AS $name => $reference) {
+				$refuri = $reference["refuri"];
+				$dataRef = $refList->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:DataReference'));
+				$dataRef->setAttribute("URI", '#' . $refuri);
+			}
+		}
+		return;
+	}
+
+	public function decryptKey($encKey) {
+		if (!$encKey->isEncrypted) {
+			throw new Exception("Key is not Encrypted");
+		}
+		if (empty($encKey->key)) {
+			throw new Exception("Key is missing data to perform the decryption");
+		}
+		return $this->decryptNode($encKey, FALSE);
+	}
+
+	public function locateEncryptedData($element) {
+		if ($element instanceof DOMDocument) {
+			$doc = $element;
+		} else {
+			$doc = $element->ownerDocument;
+		}
+		if ($doc) {
+			$xpath = new DOMXPath($doc);
+			$query = "//*[local-name()='EncryptedData' and namespace-uri()='" . XMLSecEnc::XMLENCNS . "']";
+			$nodeset = $xpath->query($query);
+			return $nodeset->item(0);
+		}
+		return NULL;
+	}
+
+	public function locateKey($node=NULL) {
+		if (empty($node)) {
+			$node = $this->rawNode;
+		}
+		if (!$node instanceof DOMNode) {
+			return NULL;
+		}
+		if ($doc = $node->ownerDocument) {
+			$xpath = new DOMXPath($doc);
+			$xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
+			$query = ".//xmlsecenc:EncryptionMethod";
+			$nodeset = $xpath->query($query, $node);
+			if ($encmeth = $nodeset->item(0)) {
+				$attrAlgorithm = $encmeth->getAttribute("Algorithm");
+				try {
+					$objKey = new XMLSecurityKey($attrAlgorithm, array('type' => 'private'));
+				} catch (Exception $e) {
+					return NULL;
+				}
+				return $objKey;
+			}
+		}
+		return NULL;
+	}
+
+	static function staticLocateKeyInfo($objBaseKey=NULL, $node=NULL) {
+		if (empty($node) || (!$node instanceof DOMNode)) {
+			return NULL;
+		}
+		$doc = $node->ownerDocument;
+		if (!$doc) {
+			return NULL;
+		}
+
+		$xpath = new DOMXPath($doc);
+		$xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
+		$xpath->registerNamespace('xmlsecdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = "./xmlsecdsig:KeyInfo";
+		$nodeset = $xpath->query($query, $node);
+		$encmeth = $nodeset->item(0);
+		if (!$encmeth) {
+			/* No KeyInfo in EncryptedData / EncryptedKey. */
+			return $objBaseKey;
+		}
+
+		foreach ($encmeth->childNodes AS $child) {
+			switch ($child->localName) {
+				case 'KeyName':
+					if (!empty($objBaseKey)) {
+						$objBaseKey->name = $child->nodeValue;
+					}
+					break;
+				case 'KeyValue':
+					foreach ($child->childNodes AS $keyval) {
+						switch ($keyval->localName) {
+							case 'DSAKeyValue':
+								throw new Exception("DSAKeyValue currently not supported");
+								break;
+							case 'RSAKeyValue':
+								$modulus = NULL;
+								$exponent = NULL;
+								if ($modulusNode = $keyval->getElementsByTagName('Modulus')->item(0)) {
+									$modulus = base64_decode($modulusNode->nodeValue);
+								}
+								if ($exponentNode = $keyval->getElementsByTagName('Exponent')->item(0)) {
+									$exponent = base64_decode($exponentNode->nodeValue);
+								}
+								if (empty($modulus) || empty($exponent)) {
+									throw new Exception("Missing Modulus or Exponent");
+								}
+								$publicKey = XMLSecurityKey::convertRSA($modulus, $exponent);
+								$objBaseKey->loadKey($publicKey);
+								break;
+						}
+					}
+					break;
+				case 'RetrievalMethod':
+					$type = $child->getAttribute('Type');
+					if ($type !== 'http://www.w3.org/2001/04/xmlenc#EncryptedKey') {
+						/* Unsupported key type. */
+						break;
+					}
+					$uri = $child->getAttribute('URI');
+					if ($uri[0] !== '#') {
+						/* URI not a reference - unsupported. */
+						break;
+					}
+					$id = substr($uri, 1);
+
+					$query = "//xmlsecenc:EncryptedKey[@Id='$id']";
+					$keyElement = $xpath->query($query)->item(0);
+					if (!$keyElement) {
+						throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
+					}
+
+					return XMLSecurityKey::fromEncryptedKeyElement($keyElement);
+				case 'EncryptedKey':
+					return XMLSecurityKey::fromEncryptedKeyElement($child);
+				case 'X509Data':
+					if ($x509certNodes = $child->getElementsByTagName('X509Certificate')) {
+						if ($x509certNodes->length > 0) {
+							$x509cert = $x509certNodes->item(0)->textContent;
+							$x509cert = str_replace(array("\r", "\n"), "", $x509cert);
+							$x509cert = "-----BEGIN CERTIFICATE-----\n" . chunk_split($x509cert, 64, "\n") . "-----END CERTIFICATE-----\n";
+							$objBaseKey->loadKey($x509cert, FALSE, TRUE);
+						}
+					}
+					break;
+			}
+		}
+		return $objBaseKey;
+	}
+
+	public function locateKeyInfo($objBaseKey=NULL, $node=NULL) {
+		if (empty($node)) {
+			$node = $this->rawNode;
+		}
+		return XMLSecEnc::staticLocateKeyInfo($objBaseKey, $node);
+	}
 
 }

Spacing +86 added lines, -86 removed lines

@@ -72,7 +72,7 @@ 
             }
             return;
         }
-        if ($element->nodeType == XML_COMMENT_NODE && !$withcomments) {
+        if ($element->nodeType == XML_COMMENT_NODE && ! $withcomments) {
             return;
         }
         $tree->appendChild($dom->importNode($element, TRUE));
@@ -150,7 +150,7 @@ 
   $withcomments - boolean indicating wether or not to include comments in canonicalized form
  */
 
-function C14NGeneral($element, $exclusive=FALSE, $withcomments=FALSE) {
+function C14NGeneral($element, $exclusive = FALSE, $withcomments = FALSE) {
     /* IF PHP 5.2+ then use built in canonical functionality */
     $php_version = explode('.', PHP_VERSION);
     if (($php_version[0] > 5) || ($php_version[0] == 5 && $php_version[1] >= 2)) {
@@ -158,7 +158,7 @@ 
     }
 
     /* Must be element or document */
-    if (!$element instanceof DOMElement && !$element instanceof DOMDocument) {
+    if ( ! $element instanceof DOMElement && ! $element instanceof DOMDocument) {
         return NULL;
     }
     /* Currently only exclusive XML is supported */
@@ -202,7 +202,7 @@ 
     /* This variable contains the certificate thunbprint if we have loaded an X509-certificate. */
     private $X509Thumbprint = NULL;
 
-    public function __construct($type, $params=NULL) {
+    public function __construct($type, $params = NULL) {
         srand();
         switch ($type) {
             case (XMLSecurityKey::TRIPLEDES_CBC):
@@ -237,7 +237,7 @@ 
                 $this->cryptParams['library'] = 'openssl';
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
                 $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -250,7 +250,7 @@ 
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
                 $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
                 $this->cryptParams['hash'] = NULL;
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -262,7 +262,7 @@ 
                 $this->cryptParams['library'] = 'openssl';
                 $this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -275,7 +275,7 @@ 
                 $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
                 $this->cryptParams['digest'] = 'SHA256';
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -299,14 +299,14 @@ 
      * @return int|NULL  The number of bytes in the key.
      */
     public function getSymmetricKeySize() {
-        if (!isset($this->cryptParams['keysize'])) {
+        if ( ! isset($this->cryptParams['keysize'])) {
             return NULL;
         }
         return $this->cryptParams['keysize'];
     }
 
     public function generateSessionKey() {
-        if (!isset($this->cryptParams['keysize'])) {
+        if ( ! isset($this->cryptParams['keysize'])) {
             throw new Exception('Unknown key size for type "' . $this->type . '".');
         }
         $keysize = $this->cryptParams['keysize'];
@@ -345,7 +345,7 @@ 
         $inData = FALSE;
 
         foreach ($arCert AS $curData) {
-            if (!$inData) {
+            if ( ! $inData) {
                 if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
                     $inData = TRUE;
                 }
@@ -358,14 +358,14 @@ 
             }
         }
 
-        if (!empty($data)) {
+        if ( ! empty($data)) {
             return strtolower(sha1(base64_decode($data)));
         }
 
         return NULL;
     }
 
-    public function loadKey($key, $isFile=FALSE, $isCert = FALSE) {
+    public function loadKey($key, $isFile = FALSE, $isCert = FALSE) {
         if ($isFile) {
             $this->key = file_get_contents($key);
         } else {
@@ -413,8 +413,8 @@ 
         if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
             $bs = mcrypt_enc_get_block_size($td);
             for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
-                $data.=chr(rand(1, 127));
-            $data.=chr($datalen - $datalen0 + 1);
+                $data .= chr(rand(1, 127));
+            $data .= chr($datalen - $datalen0 + 1);
         }
         $encrypted_data = $this->iv . mcrypt_generic($td, $data);
         mcrypt_generic_deinit($td);
@@ -443,12 +443,12 @@ 
 
     private function encryptOpenSSL($data) {
         if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure encrypting Data');
                 return;
             }
         } else {
-            if (!openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure encrypting Data');
                 return;
             }
@@ -458,12 +458,12 @@ 
 
     private function decryptOpenSSL($data) {
         if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure decrypting Data');
                 return;
             }
         } else {
-            if (!openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure decrypting Data');
                 return;
             }
@@ -473,10 +473,10 @@ 
 
     private function signOpenSSL($data) {
         $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
+        if ( ! empty($this->cryptParams['digest'])) {
             $algo = $this->cryptParams['digest'];
         }
-        if (!openssl_sign($data, $signature, $this->key, $algo)) {
+        if ( ! openssl_sign($data, $signature, $this->key, $algo)) {
             throw new Exception('Failure Signing Data: ' . openssl_error_string() . ' - ' . $algo);
             return;
         }
@@ -485,7 +485,7 @@ 
 
     private function verifyOpenSSL($data, $signature) {
         $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
+        if ( ! empty($this->cryptParams['digest'])) {
             $algo = $this->cryptParams['digest'];
         }
         return openssl_verify($data, $signature, $this->key, $algo);
@@ -617,7 +617,7 @@ 
 
         $objenc = new XMLSecEnc();
         $objenc->setNode($element);
-        if (!$objKey = $objenc->locateKey()) {
+        if ( ! $objKey = $objenc->locateKey()) {
             throw new Exception("Unable to locate algorithm for this Encrypted Key");
         }
         $objKey->isEncrypted = TRUE;
@@ -669,7 +669,7 @@ 
     }
 
     private function getXPathObj() {
-        if (empty($this->xPathCtx) && !empty($this->sigNode)) {
+        if (empty($this->xPathCtx) && ! empty($this->sigNode)) {
             $xpath = new DOMXPath($this->sigNode->ownerDocument);
             $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
             $this->xPathCtx = $xpath;
@@ -677,7 +677,7 @@ 
         return $this->xPathCtx;
     }
 
-    static function generate_GUID($prefix='pfx') {
+    static function generate_GUID($prefix = 'pfx') {
         $uuid = md5(uniqid(rand(), true));
         $guid = $prefix . substr($uuid, 0, 8) . "-" .
                 substr($uuid, 8, 4) . "-" .
@@ -704,12 +704,12 @@ 
         return NULL;
     }
 
-    public function createNewSignNode($name, $value=NULL) {
+    public function createNewSignNode($name, $value = NULL) {
         $doc = $this->sigNode->ownerDocument;
         if ($this->prefix != null) {
             $name = $this->prefix . ':' . $name;
         }
-        if (!is_null($value)) {
+        if ( ! is_null($value)) {
             $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name, $value);
         } else {
             $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name);
@@ -734,7 +734,7 @@ 
             if ($sinfo = $nodeset->item(0)) {
                 $query = './' . $this->searchpfx . 'CanonicalizationMethod';
                 $nodeset = $xpath->query($query, $sinfo);
-                if (!($canonNode = $nodeset->item(0))) {
+                if ( ! ($canonNode = $nodeset->item(0))) {
                     $canonNode = $this->createNewSignNode('CanonicalizationMethod');
                     $sinfo->insertBefore($canonNode, $sinfo->firstChild);
                 }
@@ -743,7 +743,7 @@ 
         }
     }
 
-    private function canonicalizeData($node, $canonicalmethod, $arXPath=NULL, $prefixList=NULL) {
+    private function canonicalizeData($node, $canonicalmethod, $arXPath = NULL, $prefixList = NULL) {
         $exclusive = FALSE;
         $withComments = FALSE;
         switch ($canonicalmethod) {
@@ -765,7 +765,7 @@ 
         /* Support PHP versions < 5.2 not containing C14N methods in DOM extension */
         $php_version = explode('.', PHP_VERSION);
         if (($php_version[0] < 5) || ($php_version[0] == 5 && $php_version[1] < 2)) {
-            if (!is_null($arXPath)) {
+            if ( ! is_null($arXPath)) {
                 throw new Exception("PHP 5.2.0 or higher is required to perform XPath Transformations");
             }
             return C14NGeneral($node, $exclusive, $withComments);
@@ -849,7 +849,7 @@ 
                 case 'http://www.w3.org/2001/10/xml-exc-c14n#':
                 case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
 
-                    if (!$includeCommentNodes) {
+                    if ( ! $includeCommentNodes) {
                         /* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
@@ -866,7 +866,7 @@ 
                                 $pfxlist = explode(" ", $pfx);
                                 foreach ($pfxlist AS $pfx) {
                                     $val = trim($pfx);
-                                    if (!empty($val)) {
+                                    if ( ! empty($val)) {
                                         $arpfx[] = $val;
                                     }
                                 }
@@ -881,7 +881,7 @@ 
                     break;
                 case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
                 case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                    if (!$includeCommentNodes) {
+                    if ( ! $includeCommentNodes) {
                         /* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
@@ -965,13 +965,13 @@ 
             $dataObject = $refNode->ownerDocument;
         }
         $data = $this->processTransforms($refNode, $dataObject, $includeCommentNodes);
-        if (!$this->validateDigest($refNode, $data)) {
+        if ( ! $this->validateDigest($refNode, $data)) {
             return FALSE;
         }
 
         if ($dataObject instanceof DOMNode) {
             /* Add this node to the list of validated nodes. */
-            if (!empty($identifier)) {
+            if ( ! empty($identifier)) {
                 $this->validatedNodes[$identifier] = $dataObject;
             } else {
                 $this->validatedNodes[] = $dataObject;
@@ -1011,7 +1011,7 @@ 
 
     public function validateReference() {
         $doc = $this->sigNode->ownerDocument;
-        if (!$doc->isSameNode($this->sigNode)) {
+        if ( ! $doc->isSameNode($this->sigNode)) {
             $this->sigNode->parentNode->removeChild($this->sigNode);
         }
         $xpath = $this->getXPathObj();
@@ -1025,7 +1025,7 @@ 
         $this->validatedNodes = array();
 
         foreach ($nodeset AS $refNode) {
-            if (!$this->processRefNode($refNode)) {
+            if ( ! $this->processRefNode($refNode)) {
                 /* Clear the list of validated nodes. */
                 $this->validatedNodes = NULL;
                 throw new Exception("Reference validation failed");
@@ -1034,7 +1034,7 @@ 
         return TRUE;
     }
 
-    private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms=NULL, $options=NULL) {
+    private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms = NULL, $options = NULL) {
         $prefix = NULL;
         $prefix_ns = NULL;
         $id_name = 'Id';
@@ -1045,21 +1045,21 @@ 
             $prefix = empty($options['prefix']) ? NULL : $options['prefix'];
             $prefix_ns = empty($options['prefix_ns']) ? NULL : $options['prefix_ns'];
             $id_name = empty($options['id_name']) ? 'Id' : $options['id_name'];
-            $overwrite_id = !isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
-            $force_uri = !isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
+            $overwrite_id = ! isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
+            $force_uri = ! isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
         }
 
         $attname = $id_name;
-        if (!empty($prefix)) {
+        if ( ! empty($prefix)) {
             $attname = $prefix . ':' . $attname;
         }
 
         $refNode = $this->createNewSignNode('Reference');
         $sinfoNode->appendChild($refNode);
 
-        if (!$node instanceof DOMDocument) {
+        if ( ! $node instanceof DOMDocument) {
             $uri = NULL;
-            if (!$overwrite_id) {
+            if ( ! $overwrite_id) {
                 $uri = $node->getAttributeNS($prefix_ns, $attname);
             }
             if (empty($uri)) {
@@ -1079,12 +1079,12 @@ 
                 $transNode = $this->createNewSignNode('Transform');
                 $transNodes->appendChild($transNode);
                 if (is_array($transform) &&
-                        (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
-                        (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
+                        ( ! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
+                        ( ! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
                     $transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
                     $XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
                     $transNode->appendChild($XPathNode);
-                    if (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
+                    if ( ! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
                         foreach ($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'] AS $prefix => $namespace) {
                             $XPathNode->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:$prefix", $namespace);
                         }
@@ -1093,7 +1093,7 @@ 
                     $transNode->setAttribute('Algorithm', $transform);
                 }
             }
-        } elseif (!empty($this->canonicalMethod)) {
+        } elseif ( ! empty($this->canonicalMethod)) {
             $transNode = $this->createNewSignNode('Transform');
             $transNodes->appendChild($transNode);
             $transNode->setAttribute('Algorithm', $this->canonicalMethod);
@@ -1110,7 +1110,7 @@ 
         $refNode->appendChild($digestValue);
     }
 
-    public function addReference($node, $algorithm, $arTransforms=NULL, $options=NULL) {
+    public function addReference($node, $algorithm, $arTransforms = NULL, $options = NULL) {
         if ($xpath = $this->getXPathObj()) {
             $query = "./secdsig:SignedInfo";
             $nodeset = $xpath->query($query, $this->sigNode);
@@ -1120,7 +1120,7 @@ 
         }
     }
 
-    public function addReferenceList($arNodes, $algorithm, $arTransforms=NULL, $options=NULL) {
+    public function addReferenceList($arNodes, $algorithm, $arTransforms = NULL, $options = NULL) {
         if ($xpath = $this->getXPathObj()) {
             $query = "./secdsig:SignedInfo";
             $nodeset = $xpath->query($query, $this->sigNode);
@@ -1132,13 +1132,13 @@ 
         }
     }
 
-    public function addObject($data, $mimetype=NULL, $encoding=NULL) {
+    public function addObject($data, $mimetype = NULL, $encoding = NULL) {
         $objNode = $this->createNewSignNode('Object');
         $this->sigNode->appendChild($objNode);
-        if (!empty($mimetype)) {
+        if ( ! empty($mimetype)) {
             $objNode->setAtribute('MimeType', $mimetype);
         }
-        if (!empty($encoding)) {
+        if ( ! empty($encoding)) {
             $objNode->setAttribute('Encoding', $encoding);
         }
 
@@ -1152,11 +1152,11 @@ 
         return $objNode;
     }
 
-    public function locateKey($node=NULL) {
+    public function locateKey($node = NULL) {
         if (empty($node)) {
             $node = $this->sigNode;
         }
-        if (!$node instanceof DOMNode) {
+        if ( ! $node instanceof DOMNode) {
             return NULL;
         }
         if ($doc = $node->ownerDocument) {
@@ -1223,7 +1223,7 @@ 
 
     }
 
-    public function appendKey($objKey, $parent=NULL) {
+    public function appendKey($objKey, $parent = NULL) {
         $objKey->serializeKey($parent);
     }
 
@@ -1255,22 +1255,22 @@ 
         return $this->insertSignature($parentNode, $beforeNode);
     }
 
-    static function get509XCert($cert, $isPEMFormat=TRUE) {
+    static function get509XCert($cert, $isPEMFormat = TRUE) {
         $certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
-        if (!empty($certs)) {
+        if ( ! empty($certs)) {
             return $certs[0];
         }
         return '';
     }
 
-    static function staticGet509XCerts($certs, $isPEMFormat=TRUE) {
+    static function staticGet509XCerts($certs, $isPEMFormat = TRUE) {
         if ($isPEMFormat) {
             $data = '';
             $certlist = array();
             $arCert = explode("\n", $certs);
             $inData = FALSE;
             foreach ($arCert AS $curData) {
-                if (!$inData) {
+                if ( ! $inData) {
                     if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
                         $inData = TRUE;
                     }
@@ -1290,11 +1290,11 @@ 
         }
     }
 
-    static function staticAdd509Cert($parentRef, $cert, $isPEMFormat=TRUE, $isURL=False, $xpath=NULL) {
+    static function staticAdd509Cert($parentRef, $cert, $isPEMFormat = TRUE, $isURL = False, $xpath = NULL) {
         if ($isURL) {
             $cert = file_get_contents($cert);
         }
-        if (!$parentRef instanceof DOMElement) {
+        if ( ! $parentRef instanceof DOMElement) {
             throw new Exception('Invalid parent Node parameter');
         }
         $baseDoc = $parentRef->ownerDocument;
@@ -1307,7 +1307,7 @@ 
         $query = "./secdsig:KeyInfo";
         $nodeset = $xpath->query($query, $parentRef);
         $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
+        if ( ! $keyInfo) {
             $inserted = FALSE;
             $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:KeyInfo');
 
@@ -1318,7 +1318,7 @@ 
                 $inserted = TRUE;
             }
 
-            if (!$inserted) {
+            if ( ! $inserted) {
                 $parentRef->appendChild($keyInfo);
             }
         }
@@ -1337,13 +1337,13 @@ 
         }
     }
 
-    public function add509Cert($cert, $isPEMFormat=TRUE, $isURL=False) {
+    public function add509Cert($cert, $isPEMFormat = TRUE, $isURL = False) {
         if ($xpath = $this->getXPathObj()) {
             self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath);
         }
     }
 
-    function addKeyInfoAndName($keyName, $xpath=NULL) {
+    function addKeyInfoAndName($keyName, $xpath = NULL) {
 
         $baseDoc = $this->sigNode->ownerDocument;
 
@@ -1355,7 +1355,7 @@ 
         $query = "./secdsig:KeyInfo";
         $nodeset = $xpath->query($query, $this->sigNode);
         $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
+        if ( ! $keyInfo) {
             $inserted = FALSE;
             $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'KeyInfo');
 
@@ -1365,7 +1365,7 @@ 
                 $sObject->parentNode->insertBefore($keyInfo, $sObject);
                 $inserted = TRUE;
             }
-            if (!$inserted) {
+            if ( ! $inserted) {
                 $this->sigNode->appendChild($keyInfo);
             }
         }
@@ -1415,7 +1415,7 @@ 
     }
 
     public function addReference($name, $node, $type) {
-        if (!$node instanceOf DOMNode) {
+        if ( ! $node instanceOf DOMNode) {
             throw new Exception('$node is not of type DOMNode');
         }
         $curencdoc = $this->encdoc;
@@ -1432,12 +1432,12 @@ 
         $this->rawNode = $node;
     }
 
-    public function encryptNode($objKey, $replace=TRUE) {
+    public function encryptNode($objKey, $replace = TRUE) {
         $data = '';
         if (empty($this->rawNode)) {
             throw new Exception('Node to encrypt has not been set');
         }
-        if (!$objKey instanceof XMLSecurityKey) {
+        if ( ! $objKey instanceof XMLSecurityKey) {
             throw new Exception('Invalid Key');
         }
         $doc = $this->rawNode->ownerDocument;
@@ -1532,7 +1532,7 @@ 
         $nodeset = $xPath->query($query, $this->rawNode);
         $node = $nodeset->item(0);
 
-        if (!$node) {
+        if ( ! $node) {
             return NULL;
         }
 
@@ -1551,8 +1551,8 @@ 
      * @params boolean $replace  Whether we should replace the encrypted node in the XML document with the decrypted data. The default is TRUE.
      * @return string|DOMElement  The decrypted data.
      */
-    public function decryptNode($objKey, $replace=TRUE) {
-        if (!$objKey instanceof XMLSecurityKey) {
+    public function decryptNode($objKey, $replace = TRUE) {
+        if ( ! $objKey instanceof XMLSecurityKey) {
             throw new Exception('Invalid Key');
         }
 
@@ -1594,8 +1594,8 @@ 
         }
     }
 
-    public function encryptKey($srcKey, $rawKey, $append=TRUE) {
-        if ((!$srcKey instanceof XMLSecurityKey) || (!$rawKey instanceof XMLSecurityKey)) {
+    public function encryptKey($srcKey, $rawKey, $append = TRUE) {
+        if (( ! $srcKey instanceof XMLSecurityKey) || ( ! $rawKey instanceof XMLSecurityKey)) {
             throw new Exception('Invalid Key');
         }
         $strEncKey = base64_encode($srcKey->encryptData($rawKey->key));
@@ -1609,7 +1609,7 @@ 
         }
         $encMethod = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
         $encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
-        if (!empty($srcKey->name)) {
+        if ( ! empty($srcKey->name)) {
             $keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
             $keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));
         }
@@ -1627,7 +1627,7 @@ 
     }
 
     public function decryptKey($encKey) {
-        if (!$encKey->isEncrypted) {
+        if ( ! $encKey->isEncrypted) {
             throw new Exception("Key is not Encrypted");
         }
         if (empty($encKey->key)) {
@@ -1651,11 +1651,11 @@ 
         return NULL;
     }
 
-    public function locateKey($node=NULL) {
+    public function locateKey($node = NULL) {
         if (empty($node)) {
             $node = $this->rawNode;
         }
-        if (!$node instanceof DOMNode) {
+        if ( ! $node instanceof DOMNode) {
             return NULL;
         }
         if ($doc = $node->ownerDocument) {
@@ -1676,12 +1676,12 @@ 
         return NULL;
     }
 
-    static function staticLocateKeyInfo($objBaseKey=NULL, $node=NULL) {
-        if (empty($node) || (!$node instanceof DOMNode)) {
+    static function staticLocateKeyInfo($objBaseKey = NULL, $node = NULL) {
+        if (empty($node) || ( ! $node instanceof DOMNode)) {
             return NULL;
         }
         $doc = $node->ownerDocument;
-        if (!$doc) {
+        if ( ! $doc) {
             return NULL;
         }
 
@@ -1691,7 +1691,7 @@ 
         $query = "./xmlsecdsig:KeyInfo";
         $nodeset = $xpath->query($query, $node);
         $encmeth = $nodeset->item(0);
-        if (!$encmeth) {
+        if ( ! $encmeth) {
             /* No KeyInfo in EncryptedData / EncryptedKey. */
             return $objBaseKey;
         }
@@ -1699,7 +1699,7 @@ 
         foreach ($encmeth->childNodes AS $child) {
             switch ($child->localName) {
                 case 'KeyName':
-                    if (!empty($objBaseKey)) {
+                    if ( ! empty($objBaseKey)) {
                         $objBaseKey->name = $child->nodeValue;
                     }
                     break;
@@ -1742,7 +1742,7 @@ 
 
                     $query = "//xmlsecenc:EncryptedKey[@Id='$id']";
                     $keyElement = $xpath->query($query)->item(0);
-                    if (!$keyElement) {
+                    if ( ! $keyElement) {
                         throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
                     }
 
@@ -1764,7 +1764,7 @@ 
         return $objBaseKey;
     }
 
-    public function locateKeyInfo($objBaseKey=NULL, $node=NULL) {
+    public function locateKeyInfo($objBaseKey = NULL, $node = NULL) {
         if (empty($node)) {
             $node = $this->rawNode;
         }

Braces +6 added lines, -4 removed lines

@@ -412,8 +412,9 @@ 
         mcrypt_generic_init($td, $this->key, $this->iv);
         if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
             $bs = mcrypt_enc_get_block_size($td);
-            for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
-                $data.=chr(rand(1, 127));
+            for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++) {
+                            $data.=chr(rand(1, 127));
+            }
             $data.=chr($datalen - $datalen0 + 1);
         }
         $encrypted_data = $this->iv . mcrypt_generic($td, $data);
@@ -536,8 +537,9 @@ 
     static function makeAsnSegment($type, $string) {
         switch ($type) {
             case 0x02:
-                if (ord($string) > 0x7f)
-                    $string = chr(0) . $string;
+                if (ord($string) > 0x7f) {
+                                    $string = chr(0) . $string;
+                }
                 break;
             case 0x03:
                 $string = chr(0) . $string;

includes/xmlseclibs/xmlseclibs-ing.php

Indentation +1687 added lines, -1687 removed lines

@@ -47,101 +47,101 @@ 
 
 /* helper function */
 function sortAndAddAttrs($element, $arAtts) {
-    $newAtts = array();
-    foreach ($arAtts AS $attnode) {
-        $newAtts[$attnode->nodeName] = $attnode;
-    }
-    ksort($newAtts);
-    foreach ($newAtts as $attnode) {
-        $element->setAttribute($attnode->nodeName, $attnode->nodeValue);
-    }
+	$newAtts = array();
+	foreach ($arAtts AS $attnode) {
+		$newAtts[$attnode->nodeName] = $attnode;
+	}
+	ksort($newAtts);
+	foreach ($newAtts as $attnode) {
+		$element->setAttribute($attnode->nodeName, $attnode->nodeValue);
+	}
 }
 
 /* helper function */
 
 function canonical($tree, $element, $withcomments) {
-    if ($tree->nodeType != XML_DOCUMENT_NODE) {
-        $dom = $tree->ownerDocument;
-    } else {
-        $dom = $tree;
-    }
-    if ($element->nodeType != XML_ELEMENT_NODE) {
-        if ($element->nodeType == XML_DOCUMENT_NODE) {
-            foreach ($element->childNodes AS $node) {
-                canonical($dom, $node, $withcomments);
-            }
-            return;
-        }
-        if ($element->nodeType == XML_COMMENT_NODE && !$withcomments) {
-            return;
-        }
-        $tree->appendChild($dom->importNode($element, TRUE));
-        return;
-    }
-    $arNS = array();
-    if ($element->namespaceURI != "") {
-        if ($element->prefix == "") {
-            $elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
-        } else {
-            $prefix = $tree->lookupPrefix($element->namespaceURI);
-            if ($prefix == $element->prefix) {
-                $elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
-            } else {
-                $elCopy = $dom->createElement($element->nodeName);
-                $arNS[$element->namespaceURI] = $element->prefix;
-            }
-        }
-    } else {
-        $elCopy = $dom->createElement($element->nodeName);
-    }
-    $tree->appendChild($elCopy);
-
-    /* Create DOMXPath based on original document */
-    $xPath = new DOMXPath($element->ownerDocument);
-
-    /* Get namespaced attributes */
-    $arAtts = $xPath->query('attribute::*[namespace-uri(.) != ""]', $element);
-
-    /* Create an array with namespace URIs as keys, and sort them */
-    foreach ($arAtts AS $attnode) {
-        if (array_key_exists($attnode->namespaceURI, $arNS) &&
-            ($arNS[$attnode->namespaceURI] == $attnode->prefix)) {
-            continue;
-        }
-        $prefix = $tree->lookupPrefix($attnode->namespaceURI);
-        if ($prefix != $attnode->prefix) {
-            $arNS[$attnode->namespaceURI] = $attnode->prefix;
-        } else {
-            $arNS[$attnode->namespaceURI] = NULL;
-        }
-    }
-    if (count($arNS) > 0) {
-        asort($arNS);
-    }
-
-    /* Add namespace nodes */
-    foreach ($arNS AS $namespaceURI => $prefix) {
-        if ($prefix != NULL) {
-            $elCopy->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" . $prefix, $namespaceURI);
-        }
-    }
-    if (count($arNS) > 0) {
-        ksort($arNS);
-    }
-
-    /* Get attributes not in a namespace, and then sort and add them */
-    $arAtts = $xPath->query('attribute::*[namespace-uri(.) = ""]', $element);
-    sortAndAddAttrs($elCopy, $arAtts);
-
-    /* Loop through the URIs, and then sort and add attributes within that namespace */
-    foreach ($arNS as $nsURI => $prefix) {
-        $arAtts = $xPath->query('attribute::*[namespace-uri(.) = "' . $nsURI . '"]', $element);
-        sortAndAddAttrs($elCopy, $arAtts);
-    }
-
-    foreach ($element->childNodes AS $node) {
-        canonical($elCopy, $node, $withcomments);
-    }
+	if ($tree->nodeType != XML_DOCUMENT_NODE) {
+		$dom = $tree->ownerDocument;
+	} else {
+		$dom = $tree;
+	}
+	if ($element->nodeType != XML_ELEMENT_NODE) {
+		if ($element->nodeType == XML_DOCUMENT_NODE) {
+			foreach ($element->childNodes AS $node) {
+				canonical($dom, $node, $withcomments);
+			}
+			return;
+		}
+		if ($element->nodeType == XML_COMMENT_NODE && !$withcomments) {
+			return;
+		}
+		$tree->appendChild($dom->importNode($element, TRUE));
+		return;
+	}
+	$arNS = array();
+	if ($element->namespaceURI != "") {
+		if ($element->prefix == "") {
+			$elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
+		} else {
+			$prefix = $tree->lookupPrefix($element->namespaceURI);
+			if ($prefix == $element->prefix) {
+				$elCopy = $dom->createElementNS($element->namespaceURI, $element->nodeName);
+			} else {
+				$elCopy = $dom->createElement($element->nodeName);
+				$arNS[$element->namespaceURI] = $element->prefix;
+			}
+		}
+	} else {
+		$elCopy = $dom->createElement($element->nodeName);
+	}
+	$tree->appendChild($elCopy);
+
+	/* Create DOMXPath based on original document */
+	$xPath = new DOMXPath($element->ownerDocument);
+
+	/* Get namespaced attributes */
+	$arAtts = $xPath->query('attribute::*[namespace-uri(.) != ""]', $element);
+
+	/* Create an array with namespace URIs as keys, and sort them */
+	foreach ($arAtts AS $attnode) {
+		if (array_key_exists($attnode->namespaceURI, $arNS) &&
+			($arNS[$attnode->namespaceURI] == $attnode->prefix)) {
+			continue;
+		}
+		$prefix = $tree->lookupPrefix($attnode->namespaceURI);
+		if ($prefix != $attnode->prefix) {
+			$arNS[$attnode->namespaceURI] = $attnode->prefix;
+		} else {
+			$arNS[$attnode->namespaceURI] = NULL;
+		}
+	}
+	if (count($arNS) > 0) {
+		asort($arNS);
+	}
+
+	/* Add namespace nodes */
+	foreach ($arNS AS $namespaceURI => $prefix) {
+		if ($prefix != NULL) {
+			$elCopy->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" . $prefix, $namespaceURI);
+		}
+	}
+	if (count($arNS) > 0) {
+		ksort($arNS);
+	}
+
+	/* Get attributes not in a namespace, and then sort and add them */
+	$arAtts = $xPath->query('attribute::*[namespace-uri(.) = ""]', $element);
+	sortAndAddAttrs($elCopy, $arAtts);
+
+	/* Loop through the URIs, and then sort and add attributes within that namespace */
+	foreach ($arNS as $nsURI => $prefix) {
+		$arAtts = $xPath->query('attribute::*[namespace-uri(.) = "' . $nsURI . '"]', $element);
+		sortAndAddAttrs($elCopy, $arAtts);
+	}
+
+	foreach ($element->childNodes AS $node) {
+		canonical($elCopy, $node, $withcomments);
+	}
 }
 
 /*
@@ -151,1256 +151,1256 @@ 
  */
 
 function C14NGeneral($element, $exclusive=FALSE, $withcomments=FALSE) {
-    /* IF PHP 5.2+ then use built in canonical functionality */
-    $php_version = explode('.', PHP_VERSION);
-    if (($php_version[0] > 5) || ($php_version[0] == 5 && $php_version[1] >= 2)) {
-        return $element->C14N($exclusive, $withcomments);
-    }
-
-    /* Must be element or document */
-    if (!$element instanceof DOMElement && !$element instanceof DOMDocument) {
-        return NULL;
-    }
-    /* Currently only exclusive XML is supported */
-    if ($exclusive == FALSE) {
-        throw new Exception("Only exclusive canonicalization is supported in this version of PHP");
-    }
-
-    $copyDoc = new DOMDocument();
-    canonical($copyDoc, $element, $withcomments);
-    return $copyDoc->saveXML($copyDoc->documentElement, LIBXML_NOEMPTYTAG);
+	/* IF PHP 5.2+ then use built in canonical functionality */
+	$php_version = explode('.', PHP_VERSION);
+	if (($php_version[0] > 5) || ($php_version[0] == 5 && $php_version[1] >= 2)) {
+		return $element->C14N($exclusive, $withcomments);
+	}
+
+	/* Must be element or document */
+	if (!$element instanceof DOMElement && !$element instanceof DOMDocument) {
+		return NULL;
+	}
+	/* Currently only exclusive XML is supported */
+	if ($exclusive == FALSE) {
+		throw new Exception("Only exclusive canonicalization is supported in this version of PHP");
+	}
+
+	$copyDoc = new DOMDocument();
+	canonical($copyDoc, $element, $withcomments);
+	return $copyDoc->saveXML($copyDoc->documentElement, LIBXML_NOEMPTYTAG);
 }
 
 class XMLSecurityKey {
-    const TRIPLEDES_CBC = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
-    const AES128_CBC = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
-    const AES192_CBC = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
-    const AES256_CBC = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
-    const RSA_1_5 = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-    const RSA_OAEP_MGF1P = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
-    const DSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#dsa-sha1';
-    const RSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
-    const RSA_SHA256 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
-
-    private $cryptParams = array();
-    public $type = 0;
-    public $key = NULL;
-    public $passphrase = "";
-    public $iv = NULL;
-    public $name = NULL;
-    public $keyChain = NULL;
-    public $isEncrypted = FALSE;
-    public $encryptedCtx = NULL;
-    public $guid = NULL;
-
-    /**
-     * This variable contains the certificate as a string if this key represents an X509-certificate.
-     * If this key doesn't represent a certificate, this will be NULL.
-     */
-    private $x509Certificate = NULL;
-
-    /* This variable contains the certificate thunbprint if we have loaded an X509-certificate. */
-    private $X509Thumbprint = NULL;
-
-    public function __construct($type, $params=NULL) {
-        srand();
-        switch ($type) {
-            case (XMLSecurityKey::TRIPLEDES_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_TRIPLEDES;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
-                $this->cryptParams['keysize'] = 24;
-                break;
-            case (XMLSecurityKey::AES128_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
-                $this->cryptParams['keysize'] = 16;
-                break;
-            case (XMLSecurityKey::AES192_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
-                $this->cryptParams['keysize'] = 24;
-                break;
-            case (XMLSecurityKey::AES256_CBC):
-                $this->cryptParams['library'] = 'mcrypt';
-                $this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
-                $this->cryptParams['mode'] = MCRYPT_MODE_CBC;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
-                $this->cryptParams['keysize'] = 32;
-                break;
-            case (XMLSecurityKey::RSA_1_5):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                return;
-            case (XMLSecurityKey::RSA_OAEP_MGF1P):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
-                $this->cryptParams['hash'] = NULL;
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                return;
-            case (XMLSecurityKey::RSA_SHA1):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                break;
-            case (XMLSecurityKey::RSA_SHA256):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['digest'] = 'SHA256';
-                if (is_array($params) && !empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-                break;
-            default:
-                throw new Exception('Invalid Key Type');
-                return;
-        }
-        $this->type = $type;
-    }
-
-    /**
-     * Retrieve the key size for the symmetric encryption algorithm..
-     *
-     * If the key size is unknown, or this isn't a symmetric encryption algorithm,
-     * NULL is returned.
-     *
-     * @return int|NULL  The number of bytes in the key.
-     */
-    public function getSymmetricKeySize() {
-        if (!isset($this->cryptParams['keysize'])) {
-            return NULL;
-        }
-        return $this->cryptParams['keysize'];
-    }
-
-    public function generateSessionKey() {
-        if (!isset($this->cryptParams['keysize'])) {
-            throw new Exception('Unknown key size for type "' . $this->type . '".');
-        }
-        $keysize = $this->cryptParams['keysize'];
-
-        if (function_exists('openssl_random_pseudo_bytes')) {
-            /* We have PHP >= 5.3 - use openssl to generate session key. */
-            $key = openssl_random_pseudo_bytes($keysize);
-        } else {
-            /* Generating random key using iv generation routines */
-            $key = mcrypt_create_iv($keysize, MCRYPT_RAND);
-        }
-
-        if ($this->type === XMLSecurityKey::TRIPLEDES_CBC) {
-            /* Make sure that the generated key has the proper parity bits set.
+	const TRIPLEDES_CBC = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
+	const AES128_CBC = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
+	const AES192_CBC = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
+	const AES256_CBC = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
+	const RSA_1_5 = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
+	const RSA_OAEP_MGF1P = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
+	const DSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#dsa-sha1';
+	const RSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
+	const RSA_SHA256 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
+
+	private $cryptParams = array();
+	public $type = 0;
+	public $key = NULL;
+	public $passphrase = "";
+	public $iv = NULL;
+	public $name = NULL;
+	public $keyChain = NULL;
+	public $isEncrypted = FALSE;
+	public $encryptedCtx = NULL;
+	public $guid = NULL;
+
+	/**
+	 * This variable contains the certificate as a string if this key represents an X509-certificate.
+	 * If this key doesn't represent a certificate, this will be NULL.
+	 */
+	private $x509Certificate = NULL;
+
+	/* This variable contains the certificate thunbprint if we have loaded an X509-certificate. */
+	private $X509Thumbprint = NULL;
+
+	public function __construct($type, $params=NULL) {
+		srand();
+		switch ($type) {
+			case (XMLSecurityKey::TRIPLEDES_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_TRIPLEDES;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
+				$this->cryptParams['keysize'] = 24;
+				break;
+			case (XMLSecurityKey::AES128_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
+				$this->cryptParams['keysize'] = 16;
+				break;
+			case (XMLSecurityKey::AES192_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
+				$this->cryptParams['keysize'] = 24;
+				break;
+			case (XMLSecurityKey::AES256_CBC):
+				$this->cryptParams['library'] = 'mcrypt';
+				$this->cryptParams['cipher'] = MCRYPT_RIJNDAEL_128;
+				$this->cryptParams['mode'] = MCRYPT_MODE_CBC;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
+				$this->cryptParams['keysize'] = 32;
+				break;
+			case (XMLSecurityKey::RSA_1_5):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				return;
+			case (XMLSecurityKey::RSA_OAEP_MGF1P):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
+				$this->cryptParams['hash'] = NULL;
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				return;
+			case (XMLSecurityKey::RSA_SHA1):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				break;
+			case (XMLSecurityKey::RSA_SHA256):
+				$this->cryptParams['library'] = 'openssl';
+				$this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
+				$this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
+				$this->cryptParams['digest'] = 'SHA256';
+				if (is_array($params) && !empty($params['type'])) {
+					if ($params['type'] == 'public' || $params['type'] == 'private') {
+						$this->cryptParams['type'] = $params['type'];
+						break;
+					}
+				}
+				throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+				break;
+			default:
+				throw new Exception('Invalid Key Type');
+				return;
+		}
+		$this->type = $type;
+	}
+
+	/**
+	 * Retrieve the key size for the symmetric encryption algorithm..
+	 *
+	 * If the key size is unknown, or this isn't a symmetric encryption algorithm,
+	 * NULL is returned.
+	 *
+	 * @return int|NULL  The number of bytes in the key.
+	 */
+	public function getSymmetricKeySize() {
+		if (!isset($this->cryptParams['keysize'])) {
+			return NULL;
+		}
+		return $this->cryptParams['keysize'];
+	}
+
+	public function generateSessionKey() {
+		if (!isset($this->cryptParams['keysize'])) {
+			throw new Exception('Unknown key size for type "' . $this->type . '".');
+		}
+		$keysize = $this->cryptParams['keysize'];
+
+		if (function_exists('openssl_random_pseudo_bytes')) {
+			/* We have PHP >= 5.3 - use openssl to generate session key. */
+			$key = openssl_random_pseudo_bytes($keysize);
+		} else {
+			/* Generating random key using iv generation routines */
+			$key = mcrypt_create_iv($keysize, MCRYPT_RAND);
+		}
+
+		if ($this->type === XMLSecurityKey::TRIPLEDES_CBC) {
+			/* Make sure that the generated key has the proper parity bits set.
              * Mcrypt doesn't care about the parity bits, but others may care.
              */
-            for ($i = 0; $i < strlen($key); $i++) {
-                $byte = ord($key[$i]) & 0xfe;
-                $parity = 1;
-                for ($j = 1; $j < 8; $j++) {
-                    $parity ^= ($byte >> $j) & 1;
-                }
-                $byte |= $parity;
-                $key[$i] = chr($byte);
-            }
-        }
-
-        $this->key = $key;
-        return $key;
-    }
-
-    public static function getRawThumbprint($cert) {
-
-        $arCert = explode("\n", $cert);
-        $data = '';
-        $inData = FALSE;
-
-        foreach ($arCert AS $curData) {
-            if (!$inData) {
-                if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
-                    $inData = TRUE;
-                }
-            } else {
-                if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
-                    $inData = FALSE;
-                    break;
-                }
-                $data .= trim($curData);
-            }
-        }
-
-        if (!empty($data)) {
-            return strtolower(sha1(base64_decode($data)));
-        }
-
-        return NULL;
-    }
-
-    public function loadKey($key, $isFile=FALSE, $isCert = FALSE) {
-        if ($isFile) {
-            $this->key = file_get_contents($key);
-        } else {
-            $this->key = $key;
-        }
-        if ($isCert) {
-            $this->key = openssl_x509_read($this->key);
-            openssl_x509_export($this->key, $str_cert);
-            $this->x509Certificate = $str_cert;
-            $this->key = $str_cert;
-        } else {
-            $this->x509Certificate = NULL;
-        }
-        if ($this->cryptParams['library'] == 'openssl') {
-            if ($this->cryptParams['type'] == 'public') {
-                if ($isCert) {
-                    /* Load the thumbprint if this is an X509 certificate. */
-                    $this->X509Thumbprint = self::getRawThumbprint($this->key);
-                }
-                $this->key = openssl_get_publickey($this->key);
-            } else {
-                $this->key = openssl_get_privatekey($this->key, $this->passphrase);
-            }
-        } else if ($this->cryptParams['cipher'] == MCRYPT_RIJNDAEL_128) {
-            /* Check key length */
-            switch ($this->type) {
-                case (XMLSecurityKey::AES256_CBC):
-                    if (strlen($this->key) < 25) {
-                        throw new Exception('Key must contain at least 25 characters for this cipher');
-                    }
-                    break;
-                case (XMLSecurityKey::AES192_CBC):
-                    if (strlen($this->key) < 17) {
-                        throw new Exception('Key must contain at least 17 characters for this cipher');
-                    }
-                    break;
-            }
-        }
-    }
-
-    private function encryptMcrypt($data) {
-        $td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
-        $this->iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-        mcrypt_generic_init($td, $this->key, $this->iv);
-        if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
-            $bs = mcrypt_enc_get_block_size($td);
-            for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
-                $data.=chr(rand(1, 127));
-            $data.=chr($datalen - $datalen0 + 1);
-        }
-        $encrypted_data = $this->iv . mcrypt_generic($td, $data);
-        mcrypt_generic_deinit($td);
-        mcrypt_module_close($td);
-        return $encrypted_data;
-    }
-
-    private function decryptMcrypt($data) {
-        $td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
-        $iv_length = mcrypt_enc_get_iv_size($td);
-
-        $this->iv = substr($data, 0, $iv_length);
-        $data = substr($data, $iv_length);
-
-        mcrypt_generic_init($td, $this->key, $this->iv);
-        $decrypted_data = mdecrypt_generic($td, $data);
-        mcrypt_generic_deinit($td);
-        mcrypt_module_close($td);
-        if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
-            $dataLen = strlen($decrypted_data);
-            $paddingLength = substr($decrypted_data, $dataLen - 1, 1);
-            $decrypted_data = substr($decrypted_data, 0, $dataLen - ord($paddingLength));
-        }
-        return $decrypted_data;
-    }
-
-    private function encryptOpenSSL($data) {
-        if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure encrypting Data');
-                return;
-            }
-        } else {
-            if (!openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure encrypting Data');
-                return;
-            }
-        }
-        return $encrypted_data;
-    }
-
-    private function decryptOpenSSL($data) {
-        if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure decrypting Data');
-                return;
-            }
-        } else {
-            if (!openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
-                throw new Exception('Failure decrypting Data');
-                return;
-            }
-        }
-        return $decrypted;
-    }
-
-    function custom_openssl_sign($data, &$signature, $priv_key_id, $signature_alg = 'sha256WithRSAEncryption') {
-        $pinfo = openssl_pkey_get_details($priv_key_id);
-        $hash = hash('sha256', $data);
-        $t = '3031300d060960864801650304020105000420'; # sha256
-        $t .= $hash;
-        $pslen = $pinfo['bits']/8 - (strlen($t)/2 + 3);
-
-        $eb = '0001' . str_repeat('FF', $pslen) . '00' . $t;
-        $eb = pack('H*', $eb);
-
-        return openssl_private_encrypt($eb, $signature, $priv_key_id, OPENSSL_NO_PADDING);
-    }
-
-    function custom_openssl_verify ($data, &$signature, $priv_key_id, $signature_alg = 'sha256WithRSAEncryption') {
-        $pinfo = openssl_pkey_get_details($priv_key_id);
-        $hash = hash('sha256', $data);
-        $t = '3031300d060960864801650304020105000420'; # sha256
-        $t .= $hash;
-        $pslen = $pinfo['bits']/8 - (strlen($t)/2 + 3);
-
-        $eb = '0001' . str_repeat('FF', $pslen) . '00' . $t;
-        $eb = pack('H*', $eb);
-
-        return openssl_public_decrypt($eb, $signature, $priv_key_id, OPENSSL_NO_PADDING);
-    }
-
-    private function signOpenSSL($data) {
-        $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
-            $algo = $this->cryptParams['digest'];
-        }
-        $signature = '';
-
-        if (!$this->custom_openssl_sign($data, $signature, $this->key)) {
-            throw new Exception('Failure Signing Data: ' . openssl_error_string() . ' - ' . $algo);
-            return;
-        }
-        return $signature;
-    }
-
-    private function verifyOpenSSL($data, $signature) {
-        $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
-            $algo = $this->cryptParams['digest'];
-        }
-        return $this->custom_openssl_verify($data, $signature, $this->key);
-    }
-
-    public function encryptData($data) {
-        switch ($this->cryptParams['library']) {
-            case 'mcrypt':
-                return $this->encryptMcrypt($data);
-                break;
-            case 'openssl':
-                return $this->encryptOpenSSL($data);
-                break;
-        }
-    }
-
-    public function decryptData($data) {
-        switch ($this->cryptParams['library']) {
-            case 'mcrypt':
-                return $this->decryptMcrypt($data);
-                break;
-            case 'openssl':
-                return $this->decryptOpenSSL($data);
-                break;
-        }
-    }
-
-    public function signData($data) {
-        switch ($this->cryptParams['library']) {
-            case 'openssl':
-                return $this->signOpenSSL($data);
-                break;
-        }
-    }
-
-    public function verifySignature($data, $signature) {
-        switch ($this->cryptParams['library']) {
-            case 'openssl':
-                return $this->verifyOpenSSL($data, $signature);
-                break;
-        }
-    }
-
-    public function getAlgorith() {
-        return $this->cryptParams['method'];
-    }
-
-    static function makeAsnSegment($type, $string) {
-        switch ($type) {
-            case 0x02:
-                if (ord($string) > 0x7f)
-                    $string = chr(0) . $string;
-                break;
-            case 0x03:
-                $string = chr(0) . $string;
-                break;
-        }
-
-        $length = strlen($string);
-
-        if ($length < 128) {
-            $output = sprintf("%c%c%s", $type, $length, $string);
-        } else if ($length < 0x0100) {
-            $output = sprintf("%c%c%c%s", $type, 0x81, $length, $string);
-        } else if ($length < 0x010000) {
-            $output = sprintf("%c%c%c%c%s", $type, 0x82, $length / 0x0100, $length % 0x0100, $string);
-        } else {
-            $output = NULL;
-        }
-        return($output);
-    }
-
-    /* Modulus and Exponent must already be base64 decoded */
-
-    static function convertRSA($modulus, $exponent) {
-        /* make an ASN publicKeyInfo */
-        $exponentEncoding = XMLSecurityKey::makeAsnSegment(0x02, $exponent);
-        $modulusEncoding = XMLSecurityKey::makeAsnSegment(0x02, $modulus);
-        $sequenceEncoding = XMLSecurityKey:: makeAsnSegment(0x30, $modulusEncoding . $exponentEncoding);
-        $bitstringEncoding = XMLSecurityKey::makeAsnSegment(0x03, $sequenceEncoding);
-        $rsaAlgorithmIdentifier = pack("H*", "300D06092A864886F70D0101010500");
-        $publicKeyInfo = XMLSecurityKey::makeAsnSegment(0x30, $rsaAlgorithmIdentifier . $bitstringEncoding);
-
-        /* encode the publicKeyInfo in base64 and add PEM brackets */
-        $publicKeyInfoBase64 = base64_encode($publicKeyInfo);
-        $encoding = "-----BEGIN PUBLIC KEY-----\n";
-        $offset = 0;
-        while ($segment = substr($publicKeyInfoBase64, $offset, 64)) {
-            $encoding = $encoding . $segment . "\n";
-            $offset += 64;
-        }
-        return $encoding . "-----END PUBLIC KEY-----\n";
-    }
-
-    public function serializeKey($parent) {
-
-    }
-
-    /**
-     * Retrieve the X509 certificate this key represents.
-     *
-     * Will return the X509 certificate in PEM-format if this key represents
-     * an X509 certificate.
-     *
-     * @return  The X509 certificate or NULL if this key doesn't represent an X509-certificate.
-     */
-    public function getX509Certificate() {
-        return $this->x509Certificate;
-    }
-
-    /* Get the thumbprint of this X509 certificate.
+			for ($i = 0; $i < strlen($key); $i++) {
+				$byte = ord($key[$i]) & 0xfe;
+				$parity = 1;
+				for ($j = 1; $j < 8; $j++) {
+					$parity ^= ($byte >> $j) & 1;
+				}
+				$byte |= $parity;
+				$key[$i] = chr($byte);
+			}
+		}
+
+		$this->key = $key;
+		return $key;
+	}
+
+	public static function getRawThumbprint($cert) {
+
+		$arCert = explode("\n", $cert);
+		$data = '';
+		$inData = FALSE;
+
+		foreach ($arCert AS $curData) {
+			if (!$inData) {
+				if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
+					$inData = TRUE;
+				}
+			} else {
+				if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
+					$inData = FALSE;
+					break;
+				}
+				$data .= trim($curData);
+			}
+		}
+
+		if (!empty($data)) {
+			return strtolower(sha1(base64_decode($data)));
+		}
+
+		return NULL;
+	}
+
+	public function loadKey($key, $isFile=FALSE, $isCert = FALSE) {
+		if ($isFile) {
+			$this->key = file_get_contents($key);
+		} else {
+			$this->key = $key;
+		}
+		if ($isCert) {
+			$this->key = openssl_x509_read($this->key);
+			openssl_x509_export($this->key, $str_cert);
+			$this->x509Certificate = $str_cert;
+			$this->key = $str_cert;
+		} else {
+			$this->x509Certificate = NULL;
+		}
+		if ($this->cryptParams['library'] == 'openssl') {
+			if ($this->cryptParams['type'] == 'public') {
+				if ($isCert) {
+					/* Load the thumbprint if this is an X509 certificate. */
+					$this->X509Thumbprint = self::getRawThumbprint($this->key);
+				}
+				$this->key = openssl_get_publickey($this->key);
+			} else {
+				$this->key = openssl_get_privatekey($this->key, $this->passphrase);
+			}
+		} else if ($this->cryptParams['cipher'] == MCRYPT_RIJNDAEL_128) {
+			/* Check key length */
+			switch ($this->type) {
+				case (XMLSecurityKey::AES256_CBC):
+					if (strlen($this->key) < 25) {
+						throw new Exception('Key must contain at least 25 characters for this cipher');
+					}
+					break;
+				case (XMLSecurityKey::AES192_CBC):
+					if (strlen($this->key) < 17) {
+						throw new Exception('Key must contain at least 17 characters for this cipher');
+					}
+					break;
+			}
+		}
+	}
+
+	private function encryptMcrypt($data) {
+		$td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
+		$this->iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
+		mcrypt_generic_init($td, $this->key, $this->iv);
+		if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
+			$bs = mcrypt_enc_get_block_size($td);
+			for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
+				$data.=chr(rand(1, 127));
+			$data.=chr($datalen - $datalen0 + 1);
+		}
+		$encrypted_data = $this->iv . mcrypt_generic($td, $data);
+		mcrypt_generic_deinit($td);
+		mcrypt_module_close($td);
+		return $encrypted_data;
+	}
+
+	private function decryptMcrypt($data) {
+		$td = mcrypt_module_open($this->cryptParams['cipher'], '', $this->cryptParams['mode'], '');
+		$iv_length = mcrypt_enc_get_iv_size($td);
+
+		$this->iv = substr($data, 0, $iv_length);
+		$data = substr($data, $iv_length);
+
+		mcrypt_generic_init($td, $this->key, $this->iv);
+		$decrypted_data = mdecrypt_generic($td, $data);
+		mcrypt_generic_deinit($td);
+		mcrypt_module_close($td);
+		if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
+			$dataLen = strlen($decrypted_data);
+			$paddingLength = substr($decrypted_data, $dataLen - 1, 1);
+			$decrypted_data = substr($decrypted_data, 0, $dataLen - ord($paddingLength));
+		}
+		return $decrypted_data;
+	}
+
+	private function encryptOpenSSL($data) {
+		if ($this->cryptParams['type'] == 'public') {
+			if (!openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure encrypting Data');
+				return;
+			}
+		} else {
+			if (!openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure encrypting Data');
+				return;
+			}
+		}
+		return $encrypted_data;
+	}
+
+	private function decryptOpenSSL($data) {
+		if ($this->cryptParams['type'] == 'public') {
+			if (!openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure decrypting Data');
+				return;
+			}
+		} else {
+			if (!openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+				throw new Exception('Failure decrypting Data');
+				return;
+			}
+		}
+		return $decrypted;
+	}
+
+	function custom_openssl_sign($data, &$signature, $priv_key_id, $signature_alg = 'sha256WithRSAEncryption') {
+		$pinfo = openssl_pkey_get_details($priv_key_id);
+		$hash = hash('sha256', $data);
+		$t = '3031300d060960864801650304020105000420'; # sha256
+		$t .= $hash;
+		$pslen = $pinfo['bits']/8 - (strlen($t)/2 + 3);
+
+		$eb = '0001' . str_repeat('FF', $pslen) . '00' . $t;
+		$eb = pack('H*', $eb);
+
+		return openssl_private_encrypt($eb, $signature, $priv_key_id, OPENSSL_NO_PADDING);
+	}
+
+	function custom_openssl_verify ($data, &$signature, $priv_key_id, $signature_alg = 'sha256WithRSAEncryption') {
+		$pinfo = openssl_pkey_get_details($priv_key_id);
+		$hash = hash('sha256', $data);
+		$t = '3031300d060960864801650304020105000420'; # sha256
+		$t .= $hash;
+		$pslen = $pinfo['bits']/8 - (strlen($t)/2 + 3);
+
+		$eb = '0001' . str_repeat('FF', $pslen) . '00' . $t;
+		$eb = pack('H*', $eb);
+
+		return openssl_public_decrypt($eb, $signature, $priv_key_id, OPENSSL_NO_PADDING);
+	}
+
+	private function signOpenSSL($data) {
+		$algo = OPENSSL_ALGO_SHA1;
+		if (!empty($this->cryptParams['digest'])) {
+			$algo = $this->cryptParams['digest'];
+		}
+		$signature = '';
+
+		if (!$this->custom_openssl_sign($data, $signature, $this->key)) {
+			throw new Exception('Failure Signing Data: ' . openssl_error_string() . ' - ' . $algo);
+			return;
+		}
+		return $signature;
+	}
+
+	private function verifyOpenSSL($data, $signature) {
+		$algo = OPENSSL_ALGO_SHA1;
+		if (!empty($this->cryptParams['digest'])) {
+			$algo = $this->cryptParams['digest'];
+		}
+		return $this->custom_openssl_verify($data, $signature, $this->key);
+	}
+
+	public function encryptData($data) {
+		switch ($this->cryptParams['library']) {
+			case 'mcrypt':
+				return $this->encryptMcrypt($data);
+				break;
+			case 'openssl':
+				return $this->encryptOpenSSL($data);
+				break;
+		}
+	}
+
+	public function decryptData($data) {
+		switch ($this->cryptParams['library']) {
+			case 'mcrypt':
+				return $this->decryptMcrypt($data);
+				break;
+			case 'openssl':
+				return $this->decryptOpenSSL($data);
+				break;
+		}
+	}
+
+	public function signData($data) {
+		switch ($this->cryptParams['library']) {
+			case 'openssl':
+				return $this->signOpenSSL($data);
+				break;
+		}
+	}
+
+	public function verifySignature($data, $signature) {
+		switch ($this->cryptParams['library']) {
+			case 'openssl':
+				return $this->verifyOpenSSL($data, $signature);
+				break;
+		}
+	}
+
+	public function getAlgorith() {
+		return $this->cryptParams['method'];
+	}
+
+	static function makeAsnSegment($type, $string) {
+		switch ($type) {
+			case 0x02:
+				if (ord($string) > 0x7f)
+					$string = chr(0) . $string;
+				break;
+			case 0x03:
+				$string = chr(0) . $string;
+				break;
+		}
+
+		$length = strlen($string);
+
+		if ($length < 128) {
+			$output = sprintf("%c%c%s", $type, $length, $string);
+		} else if ($length < 0x0100) {
+			$output = sprintf("%c%c%c%s", $type, 0x81, $length, $string);
+		} else if ($length < 0x010000) {
+			$output = sprintf("%c%c%c%c%s", $type, 0x82, $length / 0x0100, $length % 0x0100, $string);
+		} else {
+			$output = NULL;
+		}
+		return($output);
+	}
+
+	/* Modulus and Exponent must already be base64 decoded */
+
+	static function convertRSA($modulus, $exponent) {
+		/* make an ASN publicKeyInfo */
+		$exponentEncoding = XMLSecurityKey::makeAsnSegment(0x02, $exponent);
+		$modulusEncoding = XMLSecurityKey::makeAsnSegment(0x02, $modulus);
+		$sequenceEncoding = XMLSecurityKey:: makeAsnSegment(0x30, $modulusEncoding . $exponentEncoding);
+		$bitstringEncoding = XMLSecurityKey::makeAsnSegment(0x03, $sequenceEncoding);
+		$rsaAlgorithmIdentifier = pack("H*", "300D06092A864886F70D0101010500");
+		$publicKeyInfo = XMLSecurityKey::makeAsnSegment(0x30, $rsaAlgorithmIdentifier . $bitstringEncoding);
+
+		/* encode the publicKeyInfo in base64 and add PEM brackets */
+		$publicKeyInfoBase64 = base64_encode($publicKeyInfo);
+		$encoding = "-----BEGIN PUBLIC KEY-----\n";
+		$offset = 0;
+		while ($segment = substr($publicKeyInfoBase64, $offset, 64)) {
+			$encoding = $encoding . $segment . "\n";
+			$offset += 64;
+		}
+		return $encoding . "-----END PUBLIC KEY-----\n";
+	}
+
+	public function serializeKey($parent) {
+
+	}
+
+	/**
+	 * Retrieve the X509 certificate this key represents.
+	 *
+	 * Will return the X509 certificate in PEM-format if this key represents
+	 * an X509 certificate.
+	 *
+	 * @return  The X509 certificate or NULL if this key doesn't represent an X509-certificate.
+	 */
+	public function getX509Certificate() {
+		return $this->x509Certificate;
+	}
+
+	/* Get the thumbprint of this X509 certificate.
      *
      * Returns:
      *  The thumbprint as a lowercase 40-character hexadecimal number, or NULL
      *  if this isn't a X509 certificate.
      */
 
-    public function getX509Thumbprint() {
-        return $this->X509Thumbprint;
-    }
-
-    /**
-     * Create key from an EncryptedKey-element.
-     *
-     * @param DOMElement $element  The EncryptedKey-element.
-     * @return XMLSecurityKey  The new key.
-     */
-    public static function fromEncryptedKeyElement(DOMElement $element) {
-
-        $objenc = new XMLSecEnc();
-        $objenc->setNode($element);
-        if (!$objKey = $objenc->locateKey()) {
-            throw new Exception("Unable to locate algorithm for this Encrypted Key");
-        }
-        $objKey->isEncrypted = TRUE;
-        $objKey->encryptedCtx = $objenc;
-        XMLSecEnc::staticLocateKeyInfo($objKey, $element);
-        return $objKey;
-    }
+	public function getX509Thumbprint() {
+		return $this->X509Thumbprint;
+	}
+
+	/**
+	 * Create key from an EncryptedKey-element.
+	 *
+	 * @param DOMElement $element  The EncryptedKey-element.
+	 * @return XMLSecurityKey  The new key.
+	 */
+	public static function fromEncryptedKeyElement(DOMElement $element) {
+
+		$objenc = new XMLSecEnc();
+		$objenc->setNode($element);
+		if (!$objKey = $objenc->locateKey()) {
+			throw new Exception("Unable to locate algorithm for this Encrypted Key");
+		}
+		$objKey->isEncrypted = TRUE;
+		$objKey->encryptedCtx = $objenc;
+		XMLSecEnc::staticLocateKeyInfo($objKey, $element);
+		return $objKey;
+	}
 
 }
 
 class XMLSecurityDSig {
-    const XMLDSIGNS = 'http://www.w3.org/2000/09/xmldsig#';
-    const SHA1 = 'http://www.w3.org/2000/09/xmldsig#sha1';
-    const SHA256 = 'http://www.w3.org/2001/04/xmlenc#sha256';
-    const SHA512 = 'http://www.w3.org/2001/04/xmlenc#sha512';
-    const RIPEMD160 = 'http://www.w3.org/2001/04/xmlenc#ripemd160';
-
-    const C14N = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-    const C14N_COMMENTS = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments';
-    const EXC_C14N = 'http://www.w3.org/2001/10/xml-exc-c14n#';
-    const EXC_C14N_COMMENTS = 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments';
-
-    const template = '<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+	const XMLDSIGNS = 'http://www.w3.org/2000/09/xmldsig#';
+	const SHA1 = 'http://www.w3.org/2000/09/xmldsig#sha1';
+	const SHA256 = 'http://www.w3.org/2001/04/xmlenc#sha256';
+	const SHA512 = 'http://www.w3.org/2001/04/xmlenc#sha512';
+	const RIPEMD160 = 'http://www.w3.org/2001/04/xmlenc#ripemd160';
+
+	const C14N = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
+	const C14N_COMMENTS = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments';
+	const EXC_C14N = 'http://www.w3.org/2001/10/xml-exc-c14n#';
+	const EXC_C14N_COMMENTS = 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments';
+
+	const template = '<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
   <SignedInfo>
     <SignatureMethod />
   </SignedInfo>
 </Signature>';
 
-    public $sigNode = NULL;
-    public $idKeys = array();
-    public $idNS = array();
-    private $signedInfo = NULL;
-    private $xPathCtx = NULL;
-    private $canonicalMethod = NULL;
-    private $prefix = NULL;
-    private $searchpfx = 'secdsig';
-
-    /* This variable contains an associative array of validated nodes. */
-    private $validatedNodes = NULL;
-
-    public function __construct() {
-        $sigdoc = new DOMDocument();
-        $sigdoc->loadXML(XMLSecurityDSig::template);
-        $this->sigNode = $sigdoc->documentElement;
-    }
-
-    private function resetXPathObj() {
-        $this->xPathCtx = NULL;
-    }
-
-    private function getXPathObj() {
-        if (empty($this->xPathCtx) && !empty($this->sigNode)) {
-            $xpath = new DOMXPath($this->sigNode->ownerDocument);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-            $this->xPathCtx = $xpath;
-        }
-        return $this->xPathCtx;
-    }
-
-    static function generate_GUID($prefix='pfx') {
-        $uuid = md5(uniqid(rand(), true));
-        $guid = $prefix . substr($uuid, 0, 8) . "-" .
-            substr($uuid, 8, 4) . "-" .
-            substr($uuid, 12, 4) . "-" .
-            substr($uuid, 16, 4) . "-" .
-            substr($uuid, 20, 12);
-        return $guid;
-    }
-
-    public function locateSignature($objDoc) {
-        if ($objDoc instanceof DOMDocument) {
-            $doc = $objDoc;
-        } else {
-            $doc = $objDoc->ownerDocument;
-        }
-        if ($doc) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-            $query = ".//secdsig:Signature";
-            $nodeset = $xpath->query($query, $objDoc);
-            $this->sigNode = $nodeset->item(0);
-            return $this->sigNode;
-        }
-        return NULL;
-    }
-
-    public function createNewSignNode($name, $value=NULL) {
-        $doc = $this->sigNode->ownerDocument;
-        if ($this->prefix != null) {
-            $name = $this->prefix . ':' . $name;
-        }
-        if (!is_null($value)) {
-            $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name, $value);
-        } else {
-            $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name);
-        }
-        return $node;
-    }
-
-    public function setCanonicalMethod($method) {
-        switch ($method) {
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-                $this->canonicalMethod = $method;
-                break;
-            default:
-                throw new Exception('Invalid Canonical Method');
-        }
-        if ($xpath = $this->getXPathObj()) {
-            $query = './' . $this->searchpfx . ':SignedInfo';
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sinfo = $nodeset->item(0)) {
-                $query = './' . $this->searchpfx . 'CanonicalizationMethod';
-                $nodeset = $xpath->query($query, $sinfo);
-                if (!($canonNode = $nodeset->item(0))) {
-                    $canonNode = $this->createNewSignNode('CanonicalizationMethod');
-                    $sinfo->insertBefore($canonNode, $sinfo->firstChild);
-                }
-                $canonNode->setAttribute('Algorithm', $this->canonicalMethod);
-            }
-        }
-    }
-
-    private function canonicalizeData($node, $canonicalmethod, $arXPath=NULL, $prefixList=NULL) {
-        $exclusive = FALSE;
-        $withComments = FALSE;
-        switch ($canonicalmethod) {
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-                $exclusive = FALSE;
-                $withComments = FALSE;
-                break;
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                $withComments = TRUE;
-                break;
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-                $exclusive = TRUE;
-                break;
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-                $exclusive = TRUE;
-                $withComments = TRUE;
-                break;
-        }
-        /* Support PHP versions < 5.2 not containing C14N methods in DOM extension */
-        $php_version = explode('.', PHP_VERSION);
-        if (($php_version[0] < 5) || ($php_version[0] == 5 && $php_version[1] < 2)) {
-            if (!is_null($arXPath)) {
-                throw new Exception("PHP 5.2.0 or higher is required to perform XPath Transformations");
-            }
-            return C14NGeneral($node, $exclusive, $withComments);
-        }
-        return $node->C14N($exclusive, $withComments, $arXPath, $prefixList);
-    }
-
-    public function canonicalizeSignedInfo() {
-
-        $doc = $this->sigNode->ownerDocument;
-        $canonicalmethod = NULL;
-        if ($doc) {
-            $xpath = $this->getXPathObj();
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($signInfoNode = $nodeset->item(0)) {
-                $query = "./secdsig:CanonicalizationMethod";
-                $nodeset = $xpath->query($query, $signInfoNode);
-                if ($canonNode = $nodeset->item(0)) {
-                    $canonicalmethod = $canonNode->getAttribute('Algorithm');
-                }
-                $this->signedInfo = $this->canonicalizeData($signInfoNode, $canonicalmethod);
-                return $this->signedInfo;
-            }
-        }
-        return NULL;
-    }
-
-    public function calculateDigest($digestAlgorithm, $data) {
-        switch ($digestAlgorithm) {
-            case XMLSecurityDSig::SHA1:
-                $alg = 'sha1';
-                break;
-            case XMLSecurityDSig::SHA256:
-                $alg = 'sha256';
-                break;
-            case XMLSecurityDSig::SHA512:
-                $alg = 'sha512';
-                break;
-            case XMLSecurityDSig::RIPEMD160:
-                $alg = 'ripemd160';
-                break;
-            default:
-                throw new Exception("Cannot validate digest: Unsupported Algorith <$digestAlgorithm>");
-        }
-        if (function_exists('hash')) {
-            return base64_encode(hash($alg, $data, TRUE));
-        } elseif (function_exists('mhash')) {
-            $alg = "MHASH_" . strtoupper($alg);
-            return base64_encode(mhash(constant($alg), $data));
-        } elseif ($alg === 'sha1') {
-            return base64_encode(sha1($data, TRUE));
-        } else {
-            throw new Exception('xmlseclibs is unable to calculate a digest. Maybe you need the mhash library?');
-        }
-    }
-
-    public function validateDigest($refNode, $data) {
-        $xpath = new DOMXPath($refNode->ownerDocument);
-        $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = 'string(./secdsig:DigestMethod/@Algorithm)';
-        $digestAlgorithm = $xpath->evaluate($query, $refNode);
-        $digValue = $this->calculateDigest($digestAlgorithm, $data);
-        $query = 'string(./secdsig:DigestValue)';
-        $digestValue = $xpath->evaluate($query, $refNode);
-        return ($digValue == $digestValue);
-    }
-
-    public function processTransforms($refNode, $objData, $includeCommentNodes = TRUE) {
-        $data = $objData;
-        $xpath = new DOMXPath($refNode->ownerDocument);
-        $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = './secdsig:Transforms/secdsig:Transform';
-        $nodelist = $xpath->query($query, $refNode);
-        $canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-        $arXPath = NULL;
-        $prefixList = NULL;
-        foreach ($nodelist AS $transform) {
-            $algorithm = $transform->getAttribute("Algorithm");
-            switch ($algorithm) {
-                case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-                case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-
-                    if (!$includeCommentNodes) {
-                        /* We remove comment nodes by forcing it to use a canonicalization
+	public $sigNode = NULL;
+	public $idKeys = array();
+	public $idNS = array();
+	private $signedInfo = NULL;
+	private $xPathCtx = NULL;
+	private $canonicalMethod = NULL;
+	private $prefix = NULL;
+	private $searchpfx = 'secdsig';
+
+	/* This variable contains an associative array of validated nodes. */
+	private $validatedNodes = NULL;
+
+	public function __construct() {
+		$sigdoc = new DOMDocument();
+		$sigdoc->loadXML(XMLSecurityDSig::template);
+		$this->sigNode = $sigdoc->documentElement;
+	}
+
+	private function resetXPathObj() {
+		$this->xPathCtx = NULL;
+	}
+
+	private function getXPathObj() {
+		if (empty($this->xPathCtx) && !empty($this->sigNode)) {
+			$xpath = new DOMXPath($this->sigNode->ownerDocument);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+			$this->xPathCtx = $xpath;
+		}
+		return $this->xPathCtx;
+	}
+
+	static function generate_GUID($prefix='pfx') {
+		$uuid = md5(uniqid(rand(), true));
+		$guid = $prefix . substr($uuid, 0, 8) . "-" .
+			substr($uuid, 8, 4) . "-" .
+			substr($uuid, 12, 4) . "-" .
+			substr($uuid, 16, 4) . "-" .
+			substr($uuid, 20, 12);
+		return $guid;
+	}
+
+	public function locateSignature($objDoc) {
+		if ($objDoc instanceof DOMDocument) {
+			$doc = $objDoc;
+		} else {
+			$doc = $objDoc->ownerDocument;
+		}
+		if ($doc) {
+			$xpath = new DOMXPath($doc);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+			$query = ".//secdsig:Signature";
+			$nodeset = $xpath->query($query, $objDoc);
+			$this->sigNode = $nodeset->item(0);
+			return $this->sigNode;
+		}
+		return NULL;
+	}
+
+	public function createNewSignNode($name, $value=NULL) {
+		$doc = $this->sigNode->ownerDocument;
+		if ($this->prefix != null) {
+			$name = $this->prefix . ':' . $name;
+		}
+		if (!is_null($value)) {
+			$node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name, $value);
+		} else {
+			$node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name);
+		}
+		return $node;
+	}
+
+	public function setCanonicalMethod($method) {
+		switch ($method) {
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#':
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
+				$this->canonicalMethod = $method;
+				break;
+			default:
+				throw new Exception('Invalid Canonical Method');
+		}
+		if ($xpath = $this->getXPathObj()) {
+			$query = './' . $this->searchpfx . ':SignedInfo';
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sinfo = $nodeset->item(0)) {
+				$query = './' . $this->searchpfx . 'CanonicalizationMethod';
+				$nodeset = $xpath->query($query, $sinfo);
+				if (!($canonNode = $nodeset->item(0))) {
+					$canonNode = $this->createNewSignNode('CanonicalizationMethod');
+					$sinfo->insertBefore($canonNode, $sinfo->firstChild);
+				}
+				$canonNode->setAttribute('Algorithm', $this->canonicalMethod);
+			}
+		}
+	}
+
+	private function canonicalizeData($node, $canonicalmethod, $arXPath=NULL, $prefixList=NULL) {
+		$exclusive = FALSE;
+		$withComments = FALSE;
+		switch ($canonicalmethod) {
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
+				$exclusive = FALSE;
+				$withComments = FALSE;
+				break;
+			case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
+				$withComments = TRUE;
+				break;
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#':
+				$exclusive = TRUE;
+				break;
+			case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
+				$exclusive = TRUE;
+				$withComments = TRUE;
+				break;
+		}
+		/* Support PHP versions < 5.2 not containing C14N methods in DOM extension */
+		$php_version = explode('.', PHP_VERSION);
+		if (($php_version[0] < 5) || ($php_version[0] == 5 && $php_version[1] < 2)) {
+			if (!is_null($arXPath)) {
+				throw new Exception("PHP 5.2.0 or higher is required to perform XPath Transformations");
+			}
+			return C14NGeneral($node, $exclusive, $withComments);
+		}
+		return $node->C14N($exclusive, $withComments, $arXPath, $prefixList);
+	}
+
+	public function canonicalizeSignedInfo() {
+
+		$doc = $this->sigNode->ownerDocument;
+		$canonicalmethod = NULL;
+		if ($doc) {
+			$xpath = $this->getXPathObj();
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($signInfoNode = $nodeset->item(0)) {
+				$query = "./secdsig:CanonicalizationMethod";
+				$nodeset = $xpath->query($query, $signInfoNode);
+				if ($canonNode = $nodeset->item(0)) {
+					$canonicalmethod = $canonNode->getAttribute('Algorithm');
+				}
+				$this->signedInfo = $this->canonicalizeData($signInfoNode, $canonicalmethod);
+				return $this->signedInfo;
+			}
+		}
+		return NULL;
+	}
+
+	public function calculateDigest($digestAlgorithm, $data) {
+		switch ($digestAlgorithm) {
+			case XMLSecurityDSig::SHA1:
+				$alg = 'sha1';
+				break;
+			case XMLSecurityDSig::SHA256:
+				$alg = 'sha256';
+				break;
+			case XMLSecurityDSig::SHA512:
+				$alg = 'sha512';
+				break;
+			case XMLSecurityDSig::RIPEMD160:
+				$alg = 'ripemd160';
+				break;
+			default:
+				throw new Exception("Cannot validate digest: Unsupported Algorith <$digestAlgorithm>");
+		}
+		if (function_exists('hash')) {
+			return base64_encode(hash($alg, $data, TRUE));
+		} elseif (function_exists('mhash')) {
+			$alg = "MHASH_" . strtoupper($alg);
+			return base64_encode(mhash(constant($alg), $data));
+		} elseif ($alg === 'sha1') {
+			return base64_encode(sha1($data, TRUE));
+		} else {
+			throw new Exception('xmlseclibs is unable to calculate a digest. Maybe you need the mhash library?');
+		}
+	}
+
+	public function validateDigest($refNode, $data) {
+		$xpath = new DOMXPath($refNode->ownerDocument);
+		$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = 'string(./secdsig:DigestMethod/@Algorithm)';
+		$digestAlgorithm = $xpath->evaluate($query, $refNode);
+		$digValue = $this->calculateDigest($digestAlgorithm, $data);
+		$query = 'string(./secdsig:DigestValue)';
+		$digestValue = $xpath->evaluate($query, $refNode);
+		return ($digValue == $digestValue);
+	}
+
+	public function processTransforms($refNode, $objData, $includeCommentNodes = TRUE) {
+		$data = $objData;
+		$xpath = new DOMXPath($refNode->ownerDocument);
+		$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = './secdsig:Transforms/secdsig:Transform';
+		$nodelist = $xpath->query($query, $refNode);
+		$canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
+		$arXPath = NULL;
+		$prefixList = NULL;
+		foreach ($nodelist AS $transform) {
+			$algorithm = $transform->getAttribute("Algorithm");
+			switch ($algorithm) {
+				case 'http://www.w3.org/2001/10/xml-exc-c14n#':
+				case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
+
+					if (!$includeCommentNodes) {
+						/* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
-                        $canonicalMethod = 'http://www.w3.org/2001/10/xml-exc-c14n#';
-                    } else {
-                        $canonicalMethod = $algorithm;
-                    }
-
-                    $node = $transform->firstChild;
-                    while ($node) {
-                        if ($node->localName == 'InclusiveNamespaces') {
-                            if ($pfx = $node->getAttribute('PrefixList')) {
-                                $arpfx = array();
-                                $pfxlist = explode(" ", $pfx);
-                                foreach ($pfxlist AS $pfx) {
-                                    $val = trim($pfx);
-                                    if (!empty($val)) {
-                                        $arpfx[] = $val;
-                                    }
-                                }
-                                if (count($arpfx) > 0) {
-                                    $prefixList = $arpfx;
-                                }
-                            }
-                            break;
-                        }
-                        $node = $node->nextSibling;
-                    }
-                    break;
-                case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-                case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                    if (!$includeCommentNodes) {
-                        /* We remove comment nodes by forcing it to use a canonicalization
+						$canonicalMethod = 'http://www.w3.org/2001/10/xml-exc-c14n#';
+					} else {
+						$canonicalMethod = $algorithm;
+					}
+
+					$node = $transform->firstChild;
+					while ($node) {
+						if ($node->localName == 'InclusiveNamespaces') {
+							if ($pfx = $node->getAttribute('PrefixList')) {
+								$arpfx = array();
+								$pfxlist = explode(" ", $pfx);
+								foreach ($pfxlist AS $pfx) {
+									$val = trim($pfx);
+									if (!empty($val)) {
+										$arpfx[] = $val;
+									}
+								}
+								if (count($arpfx) > 0) {
+									$prefixList = $arpfx;
+								}
+							}
+							break;
+						}
+						$node = $node->nextSibling;
+					}
+					break;
+				case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
+				case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
+					if (!$includeCommentNodes) {
+						/* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
-                        $canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-                    } else {
-                        $canonicalMethod = $algorithm;
-                    }
-
-                    break;
-                case 'http://www.w3.org/TR/1999/REC-xpath-19991116':
-                    $node = $transform->firstChild;
-                    while ($node) {
-                        if ($node->localName == 'XPath') {
-                            $arXPath = array();
-                            $arXPath['query'] = '(.//. | .//@* | .//namespace::*)[' . $node->nodeValue . ']';
-                            $arXpath['namespaces'] = array();
-                            $nslist = $xpath->query('./namespace::*', $node);
-                            foreach ($nslist AS $nsnode) {
-                                if ($nsnode->localName != "xml") {
-                                    $arXPath['namespaces'][$nsnode->localName] = $nsnode->nodeValue;
-                                }
-                            }
-                            break;
-                        }
-                        $node = $node->nextSibling;
-                    }
-                    break;
-            }
-        }
-        if ($data instanceof DOMNode) {
-            $data = $this->canonicalizeData($objData, $canonicalMethod, $arXPath, $prefixList);
-        }
-        return $data;
-    }
-
-    public function processRefNode($refNode) {
-        $dataObject = NULL;
-
-        /*
+						$canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
+					} else {
+						$canonicalMethod = $algorithm;
+					}
+
+					break;
+				case 'http://www.w3.org/TR/1999/REC-xpath-19991116':
+					$node = $transform->firstChild;
+					while ($node) {
+						if ($node->localName == 'XPath') {
+							$arXPath = array();
+							$arXPath['query'] = '(.//. | .//@* | .//namespace::*)[' . $node->nodeValue . ']';
+							$arXpath['namespaces'] = array();
+							$nslist = $xpath->query('./namespace::*', $node);
+							foreach ($nslist AS $nsnode) {
+								if ($nsnode->localName != "xml") {
+									$arXPath['namespaces'][$nsnode->localName] = $nsnode->nodeValue;
+								}
+							}
+							break;
+						}
+						$node = $node->nextSibling;
+					}
+					break;
+			}
+		}
+		if ($data instanceof DOMNode) {
+			$data = $this->canonicalizeData($objData, $canonicalMethod, $arXPath, $prefixList);
+		}
+		return $data;
+	}
+
+	public function processRefNode($refNode) {
+		$dataObject = NULL;
+
+		/*
          * Depending on the URI, we may not want to include comments in the result
          * See: http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel
          */
-        $includeCommentNodes = TRUE;
+		$includeCommentNodes = TRUE;
 
-        if ($uri = $refNode->getAttribute("URI")) {
-            $arUrl = parse_url($uri);
-            if (empty($arUrl['path'])) {
-                if ($identifier = $arUrl['fragment']) {
+		if ($uri = $refNode->getAttribute("URI")) {
+			$arUrl = parse_url($uri);
+			if (empty($arUrl['path'])) {
+				if ($identifier = $arUrl['fragment']) {
 
-                    /* This reference identifies a node with the given id by using
+					/* This reference identifies a node with the given id by using
                      * a URI on the form "#identifier". This should not include comments.
                      */
-                    $includeCommentNodes = FALSE;
-
-                    $xPath = new DOMXPath($refNode->ownerDocument);
-                    if ($this->idNS && is_array($this->idNS)) {
-                        foreach ($this->idNS AS $nspf => $ns) {
-                            $xPath->registerNamespace($nspf, $ns);
-                        }
-                    }
-                    $iDlist = '@Id="' . $identifier . '"';
-                    if (is_array($this->idKeys)) {
-                        foreach ($this->idKeys AS $idKey) {
-                            $iDlist .= " or @$idKey='$identifier'";
-                        }
-                    }
-                    $query = '//*[' . $iDlist . ']';
-                    $dataObject = $xPath->query($query)->item(0);
-                } else {
-                    $dataObject = $refNode->ownerDocument;
-                }
-            } else {
-                $dataObject = file_get_contents($arUrl);
-            }
-        } else {
-            /* This reference identifies the root node with an empty URI. This should
+					$includeCommentNodes = FALSE;
+
+					$xPath = new DOMXPath($refNode->ownerDocument);
+					if ($this->idNS && is_array($this->idNS)) {
+						foreach ($this->idNS AS $nspf => $ns) {
+							$xPath->registerNamespace($nspf, $ns);
+						}
+					}
+					$iDlist = '@Id="' . $identifier . '"';
+					if (is_array($this->idKeys)) {
+						foreach ($this->idKeys AS $idKey) {
+							$iDlist .= " or @$idKey='$identifier'";
+						}
+					}
+					$query = '//*[' . $iDlist . ']';
+					$dataObject = $xPath->query($query)->item(0);
+				} else {
+					$dataObject = $refNode->ownerDocument;
+				}
+			} else {
+				$dataObject = file_get_contents($arUrl);
+			}
+		} else {
+			/* This reference identifies the root node with an empty URI. This should
              * not include comments.
              */
-            $includeCommentNodes = FALSE;
-
-            $dataObject = $refNode->ownerDocument;
-        }
-        $data = $this->processTransforms($refNode, $dataObject, $includeCommentNodes);
-        if (!$this->validateDigest($refNode, $data)) {
-            return FALSE;
-        }
-
-        if ($dataObject instanceof DOMNode) {
-            /* Add this node to the list of validated nodes. */
-            if (!empty($identifier)) {
-                $this->validatedNodes[$identifier] = $dataObject;
-            } else {
-                $this->validatedNodes[] = $dataObject;
-            }
-        }
-
-        return TRUE;
-    }
-
-    public function getRefNodeID($refNode) {
-        if ($uri = $refNode->getAttribute("URI")) {
-            $arUrl = parse_url($uri);
-            if (empty($arUrl['path'])) {
-                if ($identifier = $arUrl['fragment']) {
-                    return $identifier;
-                }
-            }
-        }
-        return null;
-    }
-
-    public function getRefIDs() {
-        $refids = array();
-        $doc = $this->sigNode->ownerDocument;
-
-        $xpath = $this->getXPathObj();
-        $query = "./secdsig:SignedInfo/secdsig:Reference";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        if ($nodeset->length == 0) {
-            throw new Exception("Reference nodes not found");
-        }
-        foreach ($nodeset AS $refNode) {
-            $refids[] = $this->getRefNodeID($refNode);
-        }
-        return $refids;
-    }
-
-    public function validateReference() {
-        $doc = $this->sigNode->ownerDocument;
-        if (!$doc->isSameNode($this->sigNode)) {
-            $this->sigNode->parentNode->removeChild($this->sigNode);
-        }
-        $xpath = $this->getXPathObj();
-        $query = "./secdsig:SignedInfo/secdsig:Reference";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        if ($nodeset->length == 0) {
-            throw new Exception("Reference nodes not found");
-        }
-
-        /* Initialize/reset the list of validated nodes. */
-        $this->validatedNodes = array();
-
-        foreach ($nodeset AS $refNode) {
-            if (!$this->processRefNode($refNode)) {
-                /* Clear the list of validated nodes. */
-                $this->validatedNodes = NULL;
-                throw new Exception("Reference validation failed");
-            }
-        }
-        return TRUE;
-    }
-
-    private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms=NULL, $options=NULL) {
-        $prefix = NULL;
-        $prefix_ns = NULL;
-        $id_name = 'Id';
-        $overwrite_id = TRUE;
-        $force_uri = FALSE;
-
-        if (is_array($options)) {
-            $prefix = empty($options['prefix']) ? NULL : $options['prefix'];
-            $prefix_ns = empty($options['prefix_ns']) ? NULL : $options['prefix_ns'];
-            $id_name = empty($options['id_name']) ? 'Id' : $options['id_name'];
-            $overwrite_id = !isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
-            $force_uri = !isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
-        }
-
-        $attname = $id_name;
-        if (!empty($prefix)) {
-            $attname = $prefix . ':' . $attname;
-        }
-
-        $refNode = $this->createNewSignNode('Reference');
-        $sinfoNode->appendChild($refNode);
-
-        if (!$node instanceof DOMDocument) {
-            $uri = NULL;
-            if (!$overwrite_id) {
-                $uri = $node->getAttributeNS($prefix_ns, $attname);
-            }
-            if (empty($uri)) {
-                $uri = XMLSecurityDSig::generate_GUID();
-                $node->setAttributeNS($prefix_ns, $attname, $uri);
-            }
-            $refNode->setAttribute("URI", '#' . $uri);
-        } elseif ($force_uri) {
-            $refNode->setAttribute("URI", '');
-        }
-
-        $transNodes = $this->createNewSignNode('Transforms');
-        $refNode->appendChild($transNodes);
-
-        if (is_array($arTransforms)) {
-            foreach ($arTransforms AS $transform) {
-                $transNode = $this->createNewSignNode('Transform');
-                $transNodes->appendChild($transNode);
-                if (is_array($transform) &&
-                    (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
-                    (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
-                    $transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
-                    $XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
-                    $transNode->appendChild($XPathNode);
-                    if (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
-                        foreach ($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'] AS $prefix => $namespace) {
-                            $XPathNode->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:$prefix", $namespace);
-                        }
-                    }
-                } else {
-                    $transNode->setAttribute('Algorithm', $transform);
-                }
-            }
-        } elseif (!empty($this->canonicalMethod)) {
-            $transNode = $this->createNewSignNode('Transform');
-            $transNodes->appendChild($transNode);
-            $transNode->setAttribute('Algorithm', $this->canonicalMethod);
-        }
-
-        $canonicalData = $this->processTransforms($refNode, $node);
-        $digValue = $this->calculateDigest($algorithm, $canonicalData);
-
-        $digestMethod = $this->createNewSignNode('DigestMethod');
-        $refNode->appendChild($digestMethod);
-        $digestMethod->setAttribute('Algorithm', $algorithm);
-
-        $digestValue = $this->createNewSignNode('DigestValue', $digValue);
-        $refNode->appendChild($digestValue);
-    }
-
-    public function addReference($node, $algorithm, $arTransforms=NULL, $options=NULL) {
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                $this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
-            }
-        }
-    }
-
-    public function addReferenceList($arNodes, $algorithm, $arTransforms=NULL, $options=NULL) {
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                foreach ($arNodes AS $node) {
-                    $this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
-                }
-            }
-        }
-    }
-
-    public function addObject($data, $mimetype=NULL, $encoding=NULL) {
-        $objNode = $this->createNewSignNode('Object');
-        $this->sigNode->appendChild($objNode);
-        if (!empty($mimetype)) {
-            $objNode->setAtribute('MimeType', $mimetype);
-        }
-        if (!empty($encoding)) {
-            $objNode->setAttribute('Encoding', $encoding);
-        }
-
-        if ($data instanceof DOMElement) {
-            $newData = $this->sigNode->ownerDocument->importNode($data, TRUE);
-        } else {
-            $newData = $this->sigNode->ownerDocument->createTextNode($data);
-        }
-        $objNode->appendChild($newData);
-
-        return $objNode;
-    }
-
-    public function locateKey($node=NULL) {
-        if (empty($node)) {
-            $node = $this->sigNode;
-        }
-        if (!$node instanceof DOMNode) {
-            return NULL;
-        }
-        if ($doc = $node->ownerDocument) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-            $query = "string(./secdsig:SignedInfo/secdsig:SignatureMethod/@Algorithm)";
-            $algorithm = $xpath->evaluate($query, $node);
-            if ($algorithm) {
-                try {
-                    $objKey = new XMLSecurityKey($algorithm, array('type' => 'public'));
-                } catch (Exception $e) {
-                    return NULL;
-                }
-                return $objKey;
-            }
-        }
-        return NULL;
-    }
-
-    public function verify($objKey) {
-        $doc = $this->sigNode->ownerDocument;
-        $xpath = new DOMXPath($doc);
-        $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = "string(./secdsig:SignatureValue)";
-        $sigValue = $xpath->evaluate($query, $this->sigNode);
-        if (empty($sigValue)) {
-            throw new Exception("Unable to locate SignatureValue");
-        }
-        return $objKey->verifySignature($this->signedInfo, base64_decode($sigValue));
-    }
-
-    public function signData($objKey, $data) {
-        return $objKey->signData($data);
-    }
-
-    public function sign($objKey, $appendToNode = NULL) {
-        // If we have a parent node append it now so C14N properly works
-        if ($appendToNode != NULL) {
-            $this->resetXPathObj();
-            $this->appendSignature($appendToNode);
-            $this->sigNode = $appendToNode->lastChild;
-        }
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                $query = "./secdsig:SignatureMethod";
-                $nodeset = $xpath->query($query, $sInfo);
-                $sMethod = $nodeset->item(0);
-                $sMethod->setAttribute('Algorithm', $objKey->type);
-                $data = $this->canonicalizeData($sInfo, $this->canonicalMethod);
-                $sigValue = base64_encode($this->signData($objKey, $data));
-                $sigValueNode = $this->createNewSignNode('SignatureValue', $sigValue);
-                if ($infoSibling = $sInfo->nextSibling) {
-                    $infoSibling->parentNode->insertBefore($sigValueNode, $infoSibling);
-                } else {
-                    $this->sigNode->appendChild($sigValueNode);
-                }
-            }
-        }
-    }
-
-    public function appendCert() {
-
-    }
-
-    public function appendKey($objKey, $parent=NULL) {
-        $objKey->serializeKey($parent);
-    }
-
-    /**
-     * This function inserts the signature element.
-     *
-     * The signature element will be appended to the element, unless $beforeNode is specified. If $beforeNode
-     * is specified, the signature element will be inserted as the last element before $beforeNode.
-     *
-     * @param $node  The node the signature element should be inserted into.
-     * @param $beforeNode  The node the signature element should be located before.
-     *
-     * @return DOMNode The signature element node
-     */
-    public function insertSignature($node, $beforeNode = NULL) {
-
-        $document = $node->ownerDocument;
-        $signatureElement = $document->importNode($this->sigNode, TRUE);
-
-        if ($beforeNode == NULL) {
-            return $node->insertBefore($signatureElement);
-        } else {
-            return $node->insertBefore($signatureElement, $beforeNode);
-        }
-    }
-
-    public function appendSignature($parentNode, $insertBefore = FALSE) {
-        $beforeNode = $insertBefore ? $parentNode->firstChild : NULL;
-        return $this->insertSignature($parentNode, $beforeNode);
-    }
-
-    static function get509XCert($cert, $isPEMFormat=TRUE) {
-        $certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
-        if (!empty($certs)) {
-            return $certs[0];
-        }
-        return '';
-    }
-
-    static function staticGet509XCerts($certs, $isPEMFormat=TRUE) {
-        if ($isPEMFormat) {
-            $data = '';
-            $certlist = array();
-            $arCert = explode("\n", $certs);
-            $inData = FALSE;
-            foreach ($arCert AS $curData) {
-                if (!$inData) {
-                    if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
-                        $inData = TRUE;
-                    }
-                } else {
-                    if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
-                        $inData = FALSE;
-                        $certlist[] = $data;
-                        $data = '';
-                        continue;
-                    }
-                    $data .= trim($curData);
-                }
-            }
-            return $certlist;
-        } else {
-            return array($certs);
-        }
-    }
-
-    static function staticAdd509Cert($parentRef, $cert, $isPEMFormat=TRUE, $isURL=False, $xpath=NULL) {
-        if ($isURL) {
-            $cert = file_get_contents($cert);
-        }
-        if (!$parentRef instanceof DOMElement) {
-            throw new Exception('Invalid parent Node parameter');
-        }
-        $baseDoc = $parentRef->ownerDocument;
-
-        if (empty($xpath)) {
-            $xpath = new DOMXPath($parentRef->ownerDocument);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        }
-
-        $query = "./secdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $parentRef);
-        $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
-            $inserted = FALSE;
-            $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:KeyInfo');
-
-            $query = "./secdsig:Object";
-            $nodeset = $xpath->query($query, $parentRef);
-            if ($sObject = $nodeset->item(0)) {
-                $sObject->parentNode->insertBefore($keyInfo, $sObject);
-                $inserted = TRUE;
-            }
-
-            if (!$inserted) {
-                $parentRef->appendChild($keyInfo);
-            }
-        }
-
-        // Add all certs if there are more than one
-        $certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
-
-        // Atach X509 data node
-        $x509DataNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Data');
-        $keyInfo->appendChild($x509DataNode);
-
-        // Atach all certificate nodes
-        foreach ($certs as $X509Cert) {
-            $x509CertNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Certificate', $X509Cert);
-            $x509DataNode->appendChild($x509CertNode);
-        }
-    }
-
-    public function add509Cert($cert, $isPEMFormat=TRUE, $isURL=False) {
-        if ($xpath = $this->getXPathObj()) {
-            self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath);
-        }
-    }
-
-    function addKeyInfoAndName($keyName, $xpath=NULL) {
-
-        $baseDoc = $this->sigNode->ownerDocument;
-
-        if (empty($xpath)) {
-            $xpath = new DOMXPath($baseDoc);
-            $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
-        }
-
-        $query = "./secdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
-            $inserted = FALSE;
-            $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'KeyInfo');
-
-            $query = "./secdsig:Object";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sObject = $nodeset->item(0)) {
-                $sObject->parentNode->insertBefore($keyInfo, $sObject);
-                $inserted = TRUE;
-            }
-            if (!$inserted) {
-                $this->sigNode->appendChild($keyInfo);
-            }
-        }
-        $keyInfo->appendChild($baseDoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'KeyName', $keyName));
-    }
-
-    /* This function retrieves an associative array of the validated nodes.
+			$includeCommentNodes = FALSE;
+
+			$dataObject = $refNode->ownerDocument;
+		}
+		$data = $this->processTransforms($refNode, $dataObject, $includeCommentNodes);
+		if (!$this->validateDigest($refNode, $data)) {
+			return FALSE;
+		}
+
+		if ($dataObject instanceof DOMNode) {
+			/* Add this node to the list of validated nodes. */
+			if (!empty($identifier)) {
+				$this->validatedNodes[$identifier] = $dataObject;
+			} else {
+				$this->validatedNodes[] = $dataObject;
+			}
+		}
+
+		return TRUE;
+	}
+
+	public function getRefNodeID($refNode) {
+		if ($uri = $refNode->getAttribute("URI")) {
+			$arUrl = parse_url($uri);
+			if (empty($arUrl['path'])) {
+				if ($identifier = $arUrl['fragment']) {
+					return $identifier;
+				}
+			}
+		}
+		return null;
+	}
+
+	public function getRefIDs() {
+		$refids = array();
+		$doc = $this->sigNode->ownerDocument;
+
+		$xpath = $this->getXPathObj();
+		$query = "./secdsig:SignedInfo/secdsig:Reference";
+		$nodeset = $xpath->query($query, $this->sigNode);
+		if ($nodeset->length == 0) {
+			throw new Exception("Reference nodes not found");
+		}
+		foreach ($nodeset AS $refNode) {
+			$refids[] = $this->getRefNodeID($refNode);
+		}
+		return $refids;
+	}
+
+	public function validateReference() {
+		$doc = $this->sigNode->ownerDocument;
+		if (!$doc->isSameNode($this->sigNode)) {
+			$this->sigNode->parentNode->removeChild($this->sigNode);
+		}
+		$xpath = $this->getXPathObj();
+		$query = "./secdsig:SignedInfo/secdsig:Reference";
+		$nodeset = $xpath->query($query, $this->sigNode);
+		if ($nodeset->length == 0) {
+			throw new Exception("Reference nodes not found");
+		}
+
+		/* Initialize/reset the list of validated nodes. */
+		$this->validatedNodes = array();
+
+		foreach ($nodeset AS $refNode) {
+			if (!$this->processRefNode($refNode)) {
+				/* Clear the list of validated nodes. */
+				$this->validatedNodes = NULL;
+				throw new Exception("Reference validation failed");
+			}
+		}
+		return TRUE;
+	}
+
+	private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms=NULL, $options=NULL) {
+		$prefix = NULL;
+		$prefix_ns = NULL;
+		$id_name = 'Id';
+		$overwrite_id = TRUE;
+		$force_uri = FALSE;
+
+		if (is_array($options)) {
+			$prefix = empty($options['prefix']) ? NULL : $options['prefix'];
+			$prefix_ns = empty($options['prefix_ns']) ? NULL : $options['prefix_ns'];
+			$id_name = empty($options['id_name']) ? 'Id' : $options['id_name'];
+			$overwrite_id = !isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
+			$force_uri = !isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
+		}
+
+		$attname = $id_name;
+		if (!empty($prefix)) {
+			$attname = $prefix . ':' . $attname;
+		}
+
+		$refNode = $this->createNewSignNode('Reference');
+		$sinfoNode->appendChild($refNode);
+
+		if (!$node instanceof DOMDocument) {
+			$uri = NULL;
+			if (!$overwrite_id) {
+				$uri = $node->getAttributeNS($prefix_ns, $attname);
+			}
+			if (empty($uri)) {
+				$uri = XMLSecurityDSig::generate_GUID();
+				$node->setAttributeNS($prefix_ns, $attname, $uri);
+			}
+			$refNode->setAttribute("URI", '#' . $uri);
+		} elseif ($force_uri) {
+			$refNode->setAttribute("URI", '');
+		}
+
+		$transNodes = $this->createNewSignNode('Transforms');
+		$refNode->appendChild($transNodes);
+
+		if (is_array($arTransforms)) {
+			foreach ($arTransforms AS $transform) {
+				$transNode = $this->createNewSignNode('Transform');
+				$transNodes->appendChild($transNode);
+				if (is_array($transform) &&
+					(!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
+					(!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
+					$transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
+					$XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
+					$transNode->appendChild($XPathNode);
+					if (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
+						foreach ($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'] AS $prefix => $namespace) {
+							$XPathNode->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:$prefix", $namespace);
+						}
+					}
+				} else {
+					$transNode->setAttribute('Algorithm', $transform);
+				}
+			}
+		} elseif (!empty($this->canonicalMethod)) {
+			$transNode = $this->createNewSignNode('Transform');
+			$transNodes->appendChild($transNode);
+			$transNode->setAttribute('Algorithm', $this->canonicalMethod);
+		}
+
+		$canonicalData = $this->processTransforms($refNode, $node);
+		$digValue = $this->calculateDigest($algorithm, $canonicalData);
+
+		$digestMethod = $this->createNewSignNode('DigestMethod');
+		$refNode->appendChild($digestMethod);
+		$digestMethod->setAttribute('Algorithm', $algorithm);
+
+		$digestValue = $this->createNewSignNode('DigestValue', $digValue);
+		$refNode->appendChild($digestValue);
+	}
+
+	public function addReference($node, $algorithm, $arTransforms=NULL, $options=NULL) {
+		if ($xpath = $this->getXPathObj()) {
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sInfo = $nodeset->item(0)) {
+				$this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
+			}
+		}
+	}
+
+	public function addReferenceList($arNodes, $algorithm, $arTransforms=NULL, $options=NULL) {
+		if ($xpath = $this->getXPathObj()) {
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sInfo = $nodeset->item(0)) {
+				foreach ($arNodes AS $node) {
+					$this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
+				}
+			}
+		}
+	}
+
+	public function addObject($data, $mimetype=NULL, $encoding=NULL) {
+		$objNode = $this->createNewSignNode('Object');
+		$this->sigNode->appendChild($objNode);
+		if (!empty($mimetype)) {
+			$objNode->setAtribute('MimeType', $mimetype);
+		}
+		if (!empty($encoding)) {
+			$objNode->setAttribute('Encoding', $encoding);
+		}
+
+		if ($data instanceof DOMElement) {
+			$newData = $this->sigNode->ownerDocument->importNode($data, TRUE);
+		} else {
+			$newData = $this->sigNode->ownerDocument->createTextNode($data);
+		}
+		$objNode->appendChild($newData);
+
+		return $objNode;
+	}
+
+	public function locateKey($node=NULL) {
+		if (empty($node)) {
+			$node = $this->sigNode;
+		}
+		if (!$node instanceof DOMNode) {
+			return NULL;
+		}
+		if ($doc = $node->ownerDocument) {
+			$xpath = new DOMXPath($doc);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+			$query = "string(./secdsig:SignedInfo/secdsig:SignatureMethod/@Algorithm)";
+			$algorithm = $xpath->evaluate($query, $node);
+			if ($algorithm) {
+				try {
+					$objKey = new XMLSecurityKey($algorithm, array('type' => 'public'));
+				} catch (Exception $e) {
+					return NULL;
+				}
+				return $objKey;
+			}
+		}
+		return NULL;
+	}
+
+	public function verify($objKey) {
+		$doc = $this->sigNode->ownerDocument;
+		$xpath = new DOMXPath($doc);
+		$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = "string(./secdsig:SignatureValue)";
+		$sigValue = $xpath->evaluate($query, $this->sigNode);
+		if (empty($sigValue)) {
+			throw new Exception("Unable to locate SignatureValue");
+		}
+		return $objKey->verifySignature($this->signedInfo, base64_decode($sigValue));
+	}
+
+	public function signData($objKey, $data) {
+		return $objKey->signData($data);
+	}
+
+	public function sign($objKey, $appendToNode = NULL) {
+		// If we have a parent node append it now so C14N properly works
+		if ($appendToNode != NULL) {
+			$this->resetXPathObj();
+			$this->appendSignature($appendToNode);
+			$this->sigNode = $appendToNode->lastChild;
+		}
+		if ($xpath = $this->getXPathObj()) {
+			$query = "./secdsig:SignedInfo";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sInfo = $nodeset->item(0)) {
+				$query = "./secdsig:SignatureMethod";
+				$nodeset = $xpath->query($query, $sInfo);
+				$sMethod = $nodeset->item(0);
+				$sMethod->setAttribute('Algorithm', $objKey->type);
+				$data = $this->canonicalizeData($sInfo, $this->canonicalMethod);
+				$sigValue = base64_encode($this->signData($objKey, $data));
+				$sigValueNode = $this->createNewSignNode('SignatureValue', $sigValue);
+				if ($infoSibling = $sInfo->nextSibling) {
+					$infoSibling->parentNode->insertBefore($sigValueNode, $infoSibling);
+				} else {
+					$this->sigNode->appendChild($sigValueNode);
+				}
+			}
+		}
+	}
+
+	public function appendCert() {
+
+	}
+
+	public function appendKey($objKey, $parent=NULL) {
+		$objKey->serializeKey($parent);
+	}
+
+	/**
+	 * This function inserts the signature element.
+	 *
+	 * The signature element will be appended to the element, unless $beforeNode is specified. If $beforeNode
+	 * is specified, the signature element will be inserted as the last element before $beforeNode.
+	 *
+	 * @param $node  The node the signature element should be inserted into.
+	 * @param $beforeNode  The node the signature element should be located before.
+	 *
+	 * @return DOMNode The signature element node
+	 */
+	public function insertSignature($node, $beforeNode = NULL) {
+
+		$document = $node->ownerDocument;
+		$signatureElement = $document->importNode($this->sigNode, TRUE);
+
+		if ($beforeNode == NULL) {
+			return $node->insertBefore($signatureElement);
+		} else {
+			return $node->insertBefore($signatureElement, $beforeNode);
+		}
+	}
+
+	public function appendSignature($parentNode, $insertBefore = FALSE) {
+		$beforeNode = $insertBefore ? $parentNode->firstChild : NULL;
+		return $this->insertSignature($parentNode, $beforeNode);
+	}
+
+	static function get509XCert($cert, $isPEMFormat=TRUE) {
+		$certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
+		if (!empty($certs)) {
+			return $certs[0];
+		}
+		return '';
+	}
+
+	static function staticGet509XCerts($certs, $isPEMFormat=TRUE) {
+		if ($isPEMFormat) {
+			$data = '';
+			$certlist = array();
+			$arCert = explode("\n", $certs);
+			$inData = FALSE;
+			foreach ($arCert AS $curData) {
+				if (!$inData) {
+					if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
+						$inData = TRUE;
+					}
+				} else {
+					if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
+						$inData = FALSE;
+						$certlist[] = $data;
+						$data = '';
+						continue;
+					}
+					$data .= trim($curData);
+				}
+			}
+			return $certlist;
+		} else {
+			return array($certs);
+		}
+	}
+
+	static function staticAdd509Cert($parentRef, $cert, $isPEMFormat=TRUE, $isURL=False, $xpath=NULL) {
+		if ($isURL) {
+			$cert = file_get_contents($cert);
+		}
+		if (!$parentRef instanceof DOMElement) {
+			throw new Exception('Invalid parent Node parameter');
+		}
+		$baseDoc = $parentRef->ownerDocument;
+
+		if (empty($xpath)) {
+			$xpath = new DOMXPath($parentRef->ownerDocument);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		}
+
+		$query = "./secdsig:KeyInfo";
+		$nodeset = $xpath->query($query, $parentRef);
+		$keyInfo = $nodeset->item(0);
+		if (!$keyInfo) {
+			$inserted = FALSE;
+			$keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:KeyInfo');
+
+			$query = "./secdsig:Object";
+			$nodeset = $xpath->query($query, $parentRef);
+			if ($sObject = $nodeset->item(0)) {
+				$sObject->parentNode->insertBefore($keyInfo, $sObject);
+				$inserted = TRUE;
+			}
+
+			if (!$inserted) {
+				$parentRef->appendChild($keyInfo);
+			}
+		}
+
+		// Add all certs if there are more than one
+		$certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
+
+		// Atach X509 data node
+		$x509DataNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Data');
+		$keyInfo->appendChild($x509DataNode);
+
+		// Atach all certificate nodes
+		foreach ($certs as $X509Cert) {
+			$x509CertNode = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:X509Certificate', $X509Cert);
+			$x509DataNode->appendChild($x509CertNode);
+		}
+	}
+
+	public function add509Cert($cert, $isPEMFormat=TRUE, $isURL=False) {
+		if ($xpath = $this->getXPathObj()) {
+			self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath);
+		}
+	}
+
+	function addKeyInfoAndName($keyName, $xpath=NULL) {
+
+		$baseDoc = $this->sigNode->ownerDocument;
+
+		if (empty($xpath)) {
+			$xpath = new DOMXPath($baseDoc);
+			$xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
+		}
+
+		$query = "./secdsig:KeyInfo";
+		$nodeset = $xpath->query($query, $this->sigNode);
+		$keyInfo = $nodeset->item(0);
+		if (!$keyInfo) {
+			$inserted = FALSE;
+			$keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'KeyInfo');
+
+			$query = "./secdsig:Object";
+			$nodeset = $xpath->query($query, $this->sigNode);
+			if ($sObject = $nodeset->item(0)) {
+				$sObject->parentNode->insertBefore($keyInfo, $sObject);
+				$inserted = TRUE;
+			}
+			if (!$inserted) {
+				$this->sigNode->appendChild($keyInfo);
+			}
+		}
+		$keyInfo->appendChild($baseDoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'KeyName', $keyName));
+	}
+
+	/* This function retrieves an associative array of the validated nodes.
      *
      * The array will contain the id of the referenced node as the key and the node itself
      * as the value.
@@ -1409,395 +1409,395 @@ 
      *  An associative array of validated nodes or NULL if no nodes have been validated.
      */
 
-    public function getValidatedNodes() {
-        return $this->validatedNodes;
-    }
+	public function getValidatedNodes() {
+		return $this->validatedNodes;
+	}
 
 }
 
 class XMLSecEnc {
-    const template = "<xenc:EncryptedData xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'>
+	const template = "<xenc:EncryptedData xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'>
    <xenc:CipherData>
       <xenc:CipherValue></xenc:CipherValue>
    </xenc:CipherData>
 </xenc:EncryptedData>";
 
-    const Element = 'http://www.w3.org/2001/04/xmlenc#Element';
-    const Content = 'http://www.w3.org/2001/04/xmlenc#Content';
-    const URI = 3;
-    const XMLENCNS = 'http://www.w3.org/2001/04/xmlenc#';
-
-    private $encdoc = NULL;
-    private $rawNode = NULL;
-    public $type = NULL;
-    public $encKey = NULL;
-    private $references = array();
-
-    public function __construct() {
-        $this->_resetTemplate();
-    }
-
-    private function _resetTemplate() {
-        $this->encdoc = new DOMDocument();
-        $this->encdoc->loadXML(XMLSecEnc::template);
-    }
-
-    public function addReference($name, $node, $type) {
-        if (!$node instanceOf DOMNode) {
-            throw new Exception('$node is not of type DOMNode');
-        }
-        $curencdoc = $this->encdoc;
-        $this->_resetTemplate();
-        $encdoc = $this->encdoc;
-        $this->encdoc = $curencdoc;
-        $refuri = XMLSecurityDSig::generate_GUID();
-        $element = $encdoc->documentElement;
-        $element->setAttribute("Id", $refuri);
-        $this->references[$name] = array("node" => $node, "type" => $type, "encnode" => $encdoc, "refuri" => $refuri);
-    }
-
-    public function setNode($node) {
-        $this->rawNode = $node;
-    }
-
-    public function encryptNode($objKey, $replace=TRUE) {
-        $data = '';
-        if (empty($this->rawNode)) {
-            throw new Exception('Node to encrypt has not been set');
-        }
-        if (!$objKey instanceof XMLSecurityKey) {
-            throw new Exception('Invalid Key');
-        }
-        $doc = $this->rawNode->ownerDocument;
-        $xPath = new DOMXPath($this->encdoc);
-        $objList = $xPath->query('/xenc:EncryptedData/xenc:CipherData/xenc:CipherValue');
-        $cipherValue = $objList->item(0);
-        if ($cipherValue == NULL) {
-            throw new Exception('Error locating CipherValue element within template');
-        }
-        switch ($this->type) {
-            case (XMLSecEnc::Element):
-                $data = $doc->saveXML($this->rawNode);
-                $this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Element);
-                break;
-            case (XMLSecEnc::Content):
-                $children = $this->rawNode->childNodes;
-                foreach ($children AS $child) {
-                    $data .= $doc->saveXML($child);
-                }
-                $this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Content);
-                break;
-            default:
-                throw new Exception('Type is currently not supported');
-                return;
-        }
-
-        $encMethod = $this->encdoc->documentElement->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
-        $encMethod->setAttribute('Algorithm', $objKey->getAlgorith());
-        $cipherValue->parentNode->parentNode->insertBefore($encMethod, $cipherValue->parentNode->parentNode->firstChild);
-
-        $strEncrypt = base64_encode($objKey->encryptData($data));
-        $value = $this->encdoc->createTextNode($strEncrypt);
-        $cipherValue->appendChild($value);
-
-        if ($replace) {
-            switch ($this->type) {
-                case (XMLSecEnc::Element):
-                    if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                        return $this->encdoc;
-                    }
-                    $importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
-                    $this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
-                    return $importEnc;
-                    break;
-                case (XMLSecEnc::Content):
-                    $importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
-                    while ($this->rawNode->firstChild) {
-                        $this->rawNode->removeChild($this->rawNode->firstChild);
-                    }
-                    $this->rawNode->appendChild($importEnc);
-                    return $importEnc;
-                    break;
-            }
-        }
-    }
-
-    public function encryptReferences($objKey) {
-        $curRawNode = $this->rawNode;
-        $curType = $this->type;
-        foreach ($this->references AS $name => $reference) {
-            $this->encdoc = $reference["encnode"];
-            $this->rawNode = $reference["node"];
-            $this->type = $reference["type"];
-            try {
-                $encNode = $this->encryptNode($objKey);
-                $this->references[$name]["encnode"] = $encNode;
-            } catch (Exception $e) {
-                $this->rawNode = $curRawNode;
-                $this->type = $curType;
-                throw $e;
-            }
-        }
-        $this->rawNode = $curRawNode;
-        $this->type = $curType;
-    }
-
-    /**
-     * Retrieve the CipherValue text from this encrypted node.
-     *
-     * @return string|NULL  The Ciphervalue text, or NULL if no CipherValue is found.
-     */
-    public function getCipherValue() {
-        if (empty($this->rawNode)) {
-            throw new Exception('Node to decrypt has not been set');
-        }
-
-        $doc = $this->rawNode->ownerDocument;
-        $xPath = new DOMXPath($doc);
-        $xPath->registerNamespace('xmlencr', XMLSecEnc::XMLENCNS);
-        /* Only handles embedded content right now and not a reference */
-        $query = "./xmlencr:CipherData/xmlencr:CipherValue";
-        $nodeset = $xPath->query($query, $this->rawNode);
-        $node = $nodeset->item(0);
-
-        if (!$node) {
-            return NULL;
-        }
-
-        return base64_decode($node->nodeValue);
-    }
-
-    /**
-     * Decrypt this encrypted node.
-     *
-     * The behaviour of this function depends on the value of $replace.
-     * If $replace is FALSE, we will return the decrypted data as a string.
-     * If $replace is TRUE, we will insert the decrypted element(s) into the
-     * document, and return the decrypted element(s).
-     *
-     * @params XMLSecurityKey $objKey  The decryption key that should be used when decrypting the node.
-     * @params boolean $replace  Whether we should replace the encrypted node in the XML document with the decrypted data. The default is TRUE.
-     * @return string|DOMElement  The decrypted data.
-     */
-    public function decryptNode($objKey, $replace=TRUE) {
-        if (!$objKey instanceof XMLSecurityKey) {
-            throw new Exception('Invalid Key');
-        }
-
-        $encryptedData = $this->getCipherValue();
-        if ($encryptedData) {
-            $decrypted = $objKey->decryptData($encryptedData);
-            if ($replace) {
-                switch ($this->type) {
-                    case (XMLSecEnc::Element):
-                        $newdoc = new DOMDocument();
-                        $newdoc->loadXML($decrypted);
-                        if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                            return $newdoc;
-                        }
-                        $importEnc = $this->rawNode->ownerDocument->importNode($newdoc->documentElement, TRUE);
-                        $this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
-                        return $importEnc;
-                        break;
-                    case (XMLSecEnc::Content):
-                        if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                            $doc = $this->rawNode;
-                        } else {
-                            $doc = $this->rawNode->ownerDocument;
-                        }
-                        $newFrag = $doc->createDocumentFragment();
-                        $newFrag->appendXML($decrypted);
-                        $parent = $this->rawNode->parentNode;
-                        $parent->replaceChild($newFrag, $this->rawNode);
-                        return $parent;
-                        break;
-                    default:
-                        return $decrypted;
-                }
-            } else {
-                return $decrypted;
-            }
-        } else {
-            throw new Exception("Cannot locate encrypted data");
-        }
-    }
-
-    public function encryptKey($srcKey, $rawKey, $append=TRUE) {
-        if ((!$srcKey instanceof XMLSecurityKey) || (!$rawKey instanceof XMLSecurityKey)) {
-            throw new Exception('Invalid Key');
-        }
-        $strEncKey = base64_encode($srcKey->encryptData($rawKey->key));
-        $root = $this->encdoc->documentElement;
-        $encKey = $this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptedKey');
-        if ($append) {
-            $keyInfo = $root->insertBefore($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'), $root->firstChild);
-            $keyInfo->appendChild($encKey);
-        } else {
-            $this->encKey = $encKey;
-        }
-        $encMethod = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
-        $encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
-        if (!empty($srcKey->name)) {
-            $keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
-            $keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));
-        }
-        $cipherData = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherData'));
-        $cipherData->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherValue', $strEncKey));
-        if (is_array($this->references) && count($this->references) > 0) {
-            $refList = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:ReferenceList'));
-            foreach ($this->references AS $name => $reference) {
-                $refuri = $reference["refuri"];
-                $dataRef = $refList->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:DataReference'));
-                $dataRef->setAttribute("URI", '#' . $refuri);
-            }
-        }
-        return;
-    }
-
-    public function decryptKey($encKey) {
-        if (!$encKey->isEncrypted) {
-            throw new Exception("Key is not Encrypted");
-        }
-        if (empty($encKey->key)) {
-            throw new Exception("Key is missing data to perform the decryption");
-        }
-        return $this->decryptNode($encKey, FALSE);
-    }
-
-    public function locateEncryptedData($element) {
-        if ($element instanceof DOMDocument) {
-            $doc = $element;
-        } else {
-            $doc = $element->ownerDocument;
-        }
-        if ($doc) {
-            $xpath = new DOMXPath($doc);
-            $query = "//*[local-name()='EncryptedData' and namespace-uri()='" . XMLSecEnc::XMLENCNS . "']";
-            $nodeset = $xpath->query($query);
-            return $nodeset->item(0);
-        }
-        return NULL;
-    }
-
-    public function locateKey($node=NULL) {
-        if (empty($node)) {
-            $node = $this->rawNode;
-        }
-        if (!$node instanceof DOMNode) {
-            return NULL;
-        }
-        if ($doc = $node->ownerDocument) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
-            $query = ".//xmlsecenc:EncryptionMethod";
-            $nodeset = $xpath->query($query, $node);
-            if ($encmeth = $nodeset->item(0)) {
-                $attrAlgorithm = $encmeth->getAttribute("Algorithm");
-                try {
-                    $objKey = new XMLSecurityKey($attrAlgorithm, array('type' => 'private'));
-                } catch (Exception $e) {
-                    return NULL;
-                }
-                return $objKey;
-            }
-        }
-        return NULL;
-    }
-
-    static function staticLocateKeyInfo($objBaseKey=NULL, $node=NULL) {
-        if (empty($node) || (!$node instanceof DOMNode)) {
-            return NULL;
-        }
-        $doc = $node->ownerDocument;
-        if (!$doc) {
-            return NULL;
-        }
-
-        $xpath = new DOMXPath($doc);
-        $xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
-        $xpath->registerNamespace('xmlsecdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = "./xmlsecdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $node);
-        $encmeth = $nodeset->item(0);
-        if (!$encmeth) {
-            /* No KeyInfo in EncryptedData / EncryptedKey. */
-            return $objBaseKey;
-        }
-
-        foreach ($encmeth->childNodes AS $child) {
-            switch ($child->localName) {
-                case 'KeyName':
-                    if (!empty($objBaseKey)) {
-                        $objBaseKey->name = $child->nodeValue;
-                    }
-                    break;
-                case 'KeyValue':
-                    foreach ($child->childNodes AS $keyval) {
-                        switch ($keyval->localName) {
-                            case 'DSAKeyValue':
-                                throw new Exception("DSAKeyValue currently not supported");
-                                break;
-                            case 'RSAKeyValue':
-                                $modulus = NULL;
-                                $exponent = NULL;
-                                if ($modulusNode = $keyval->getElementsByTagName('Modulus')->item(0)) {
-                                    $modulus = base64_decode($modulusNode->nodeValue);
-                                }
-                                if ($exponentNode = $keyval->getElementsByTagName('Exponent')->item(0)) {
-                                    $exponent = base64_decode($exponentNode->nodeValue);
-                                }
-                                if (empty($modulus) || empty($exponent)) {
-                                    throw new Exception("Missing Modulus or Exponent");
-                                }
-                                $publicKey = XMLSecurityKey::convertRSA($modulus, $exponent);
-                                $objBaseKey->loadKey($publicKey);
-                                break;
-                        }
-                    }
-                    break;
-                case 'RetrievalMethod':
-                    $type = $child->getAttribute('Type');
-                    if ($type !== 'http://www.w3.org/2001/04/xmlenc#EncryptedKey') {
-                        /* Unsupported key type. */
-                        break;
-                    }
-                    $uri = $child->getAttribute('URI');
-                    if ($uri[0] !== '#') {
-                        /* URI not a reference - unsupported. */
-                        break;
-                    }
-                    $id = substr($uri, 1);
-
-                    $query = "//xmlsecenc:EncryptedKey[@Id='$id']";
-                    $keyElement = $xpath->query($query)->item(0);
-                    if (!$keyElement) {
-                        throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
-                    }
-
-                    return XMLSecurityKey::fromEncryptedKeyElement($keyElement);
-                case 'EncryptedKey':
-                    return XMLSecurityKey::fromEncryptedKeyElement($child);
-                case 'X509Data':
-                    if ($x509certNodes = $child->getElementsByTagName('X509Certificate')) {
-                        if ($x509certNodes->length > 0) {
-                            $x509cert = $x509certNodes->item(0)->textContent;
-                            $x509cert = str_replace(array("\r", "\n"), "", $x509cert);
-                            $x509cert = "-----BEGIN CERTIFICATE-----\n" . chunk_split($x509cert, 64, "\n") . "-----END CERTIFICATE-----\n";
-                            $objBaseKey->loadKey($x509cert, FALSE, TRUE);
-                        }
-                    }
-                    break;
-            }
-        }
-        return $objBaseKey;
-    }
-
-    public function locateKeyInfo($objBaseKey=NULL, $node=NULL) {
-        if (empty($node)) {
-            $node = $this->rawNode;
-        }
-        return XMLSecEnc::staticLocateKeyInfo($objBaseKey, $node);
-    }
+	const Element = 'http://www.w3.org/2001/04/xmlenc#Element';
+	const Content = 'http://www.w3.org/2001/04/xmlenc#Content';
+	const URI = 3;
+	const XMLENCNS = 'http://www.w3.org/2001/04/xmlenc#';
+
+	private $encdoc = NULL;
+	private $rawNode = NULL;
+	public $type = NULL;
+	public $encKey = NULL;
+	private $references = array();
+
+	public function __construct() {
+		$this->_resetTemplate();
+	}
+
+	private function _resetTemplate() {
+		$this->encdoc = new DOMDocument();
+		$this->encdoc->loadXML(XMLSecEnc::template);
+	}
+
+	public function addReference($name, $node, $type) {
+		if (!$node instanceOf DOMNode) {
+			throw new Exception('$node is not of type DOMNode');
+		}
+		$curencdoc = $this->encdoc;
+		$this->_resetTemplate();
+		$encdoc = $this->encdoc;
+		$this->encdoc = $curencdoc;
+		$refuri = XMLSecurityDSig::generate_GUID();
+		$element = $encdoc->documentElement;
+		$element->setAttribute("Id", $refuri);
+		$this->references[$name] = array("node" => $node, "type" => $type, "encnode" => $encdoc, "refuri" => $refuri);
+	}
+
+	public function setNode($node) {
+		$this->rawNode = $node;
+	}
+
+	public function encryptNode($objKey, $replace=TRUE) {
+		$data = '';
+		if (empty($this->rawNode)) {
+			throw new Exception('Node to encrypt has not been set');
+		}
+		if (!$objKey instanceof XMLSecurityKey) {
+			throw new Exception('Invalid Key');
+		}
+		$doc = $this->rawNode->ownerDocument;
+		$xPath = new DOMXPath($this->encdoc);
+		$objList = $xPath->query('/xenc:EncryptedData/xenc:CipherData/xenc:CipherValue');
+		$cipherValue = $objList->item(0);
+		if ($cipherValue == NULL) {
+			throw new Exception('Error locating CipherValue element within template');
+		}
+		switch ($this->type) {
+			case (XMLSecEnc::Element):
+				$data = $doc->saveXML($this->rawNode);
+				$this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Element);
+				break;
+			case (XMLSecEnc::Content):
+				$children = $this->rawNode->childNodes;
+				foreach ($children AS $child) {
+					$data .= $doc->saveXML($child);
+				}
+				$this->encdoc->documentElement->setAttribute('Type', XMLSecEnc::Content);
+				break;
+			default:
+				throw new Exception('Type is currently not supported');
+				return;
+		}
+
+		$encMethod = $this->encdoc->documentElement->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
+		$encMethod->setAttribute('Algorithm', $objKey->getAlgorith());
+		$cipherValue->parentNode->parentNode->insertBefore($encMethod, $cipherValue->parentNode->parentNode->firstChild);
+
+		$strEncrypt = base64_encode($objKey->encryptData($data));
+		$value = $this->encdoc->createTextNode($strEncrypt);
+		$cipherValue->appendChild($value);
+
+		if ($replace) {
+			switch ($this->type) {
+				case (XMLSecEnc::Element):
+					if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
+						return $this->encdoc;
+					}
+					$importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
+					$this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
+					return $importEnc;
+					break;
+				case (XMLSecEnc::Content):
+					$importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, TRUE);
+					while ($this->rawNode->firstChild) {
+						$this->rawNode->removeChild($this->rawNode->firstChild);
+					}
+					$this->rawNode->appendChild($importEnc);
+					return $importEnc;
+					break;
+			}
+		}
+	}
+
+	public function encryptReferences($objKey) {
+		$curRawNode = $this->rawNode;
+		$curType = $this->type;
+		foreach ($this->references AS $name => $reference) {
+			$this->encdoc = $reference["encnode"];
+			$this->rawNode = $reference["node"];
+			$this->type = $reference["type"];
+			try {
+				$encNode = $this->encryptNode($objKey);
+				$this->references[$name]["encnode"] = $encNode;
+			} catch (Exception $e) {
+				$this->rawNode = $curRawNode;
+				$this->type = $curType;
+				throw $e;
+			}
+		}
+		$this->rawNode = $curRawNode;
+		$this->type = $curType;
+	}
+
+	/**
+	 * Retrieve the CipherValue text from this encrypted node.
+	 *
+	 * @return string|NULL  The Ciphervalue text, or NULL if no CipherValue is found.
+	 */
+	public function getCipherValue() {
+		if (empty($this->rawNode)) {
+			throw new Exception('Node to decrypt has not been set');
+		}
+
+		$doc = $this->rawNode->ownerDocument;
+		$xPath = new DOMXPath($doc);
+		$xPath->registerNamespace('xmlencr', XMLSecEnc::XMLENCNS);
+		/* Only handles embedded content right now and not a reference */
+		$query = "./xmlencr:CipherData/xmlencr:CipherValue";
+		$nodeset = $xPath->query($query, $this->rawNode);
+		$node = $nodeset->item(0);
+
+		if (!$node) {
+			return NULL;
+		}
+
+		return base64_decode($node->nodeValue);
+	}
+
+	/**
+	 * Decrypt this encrypted node.
+	 *
+	 * The behaviour of this function depends on the value of $replace.
+	 * If $replace is FALSE, we will return the decrypted data as a string.
+	 * If $replace is TRUE, we will insert the decrypted element(s) into the
+	 * document, and return the decrypted element(s).
+	 *
+	 * @params XMLSecurityKey $objKey  The decryption key that should be used when decrypting the node.
+	 * @params boolean $replace  Whether we should replace the encrypted node in the XML document with the decrypted data. The default is TRUE.
+	 * @return string|DOMElement  The decrypted data.
+	 */
+	public function decryptNode($objKey, $replace=TRUE) {
+		if (!$objKey instanceof XMLSecurityKey) {
+			throw new Exception('Invalid Key');
+		}
+
+		$encryptedData = $this->getCipherValue();
+		if ($encryptedData) {
+			$decrypted = $objKey->decryptData($encryptedData);
+			if ($replace) {
+				switch ($this->type) {
+					case (XMLSecEnc::Element):
+						$newdoc = new DOMDocument();
+						$newdoc->loadXML($decrypted);
+						if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
+							return $newdoc;
+						}
+						$importEnc = $this->rawNode->ownerDocument->importNode($newdoc->documentElement, TRUE);
+						$this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
+						return $importEnc;
+						break;
+					case (XMLSecEnc::Content):
+						if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
+							$doc = $this->rawNode;
+						} else {
+							$doc = $this->rawNode->ownerDocument;
+						}
+						$newFrag = $doc->createDocumentFragment();
+						$newFrag->appendXML($decrypted);
+						$parent = $this->rawNode->parentNode;
+						$parent->replaceChild($newFrag, $this->rawNode);
+						return $parent;
+						break;
+					default:
+						return $decrypted;
+				}
+			} else {
+				return $decrypted;
+			}
+		} else {
+			throw new Exception("Cannot locate encrypted data");
+		}
+	}
+
+	public function encryptKey($srcKey, $rawKey, $append=TRUE) {
+		if ((!$srcKey instanceof XMLSecurityKey) || (!$rawKey instanceof XMLSecurityKey)) {
+			throw new Exception('Invalid Key');
+		}
+		$strEncKey = base64_encode($srcKey->encryptData($rawKey->key));
+		$root = $this->encdoc->documentElement;
+		$encKey = $this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptedKey');
+		if ($append) {
+			$keyInfo = $root->insertBefore($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'), $root->firstChild);
+			$keyInfo->appendChild($encKey);
+		} else {
+			$this->encKey = $encKey;
+		}
+		$encMethod = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
+		$encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
+		if (!empty($srcKey->name)) {
+			$keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
+			$keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));
+		}
+		$cipherData = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherData'));
+		$cipherData->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:CipherValue', $strEncKey));
+		if (is_array($this->references) && count($this->references) > 0) {
+			$refList = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:ReferenceList'));
+			foreach ($this->references AS $name => $reference) {
+				$refuri = $reference["refuri"];
+				$dataRef = $refList->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:DataReference'));
+				$dataRef->setAttribute("URI", '#' . $refuri);
+			}
+		}
+		return;
+	}
+
+	public function decryptKey($encKey) {
+		if (!$encKey->isEncrypted) {
+			throw new Exception("Key is not Encrypted");
+		}
+		if (empty($encKey->key)) {
+			throw new Exception("Key is missing data to perform the decryption");
+		}
+		return $this->decryptNode($encKey, FALSE);
+	}
+
+	public function locateEncryptedData($element) {
+		if ($element instanceof DOMDocument) {
+			$doc = $element;
+		} else {
+			$doc = $element->ownerDocument;
+		}
+		if ($doc) {
+			$xpath = new DOMXPath($doc);
+			$query = "//*[local-name()='EncryptedData' and namespace-uri()='" . XMLSecEnc::XMLENCNS . "']";
+			$nodeset = $xpath->query($query);
+			return $nodeset->item(0);
+		}
+		return NULL;
+	}
+
+	public function locateKey($node=NULL) {
+		if (empty($node)) {
+			$node = $this->rawNode;
+		}
+		if (!$node instanceof DOMNode) {
+			return NULL;
+		}
+		if ($doc = $node->ownerDocument) {
+			$xpath = new DOMXPath($doc);
+			$xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
+			$query = ".//xmlsecenc:EncryptionMethod";
+			$nodeset = $xpath->query($query, $node);
+			if ($encmeth = $nodeset->item(0)) {
+				$attrAlgorithm = $encmeth->getAttribute("Algorithm");
+				try {
+					$objKey = new XMLSecurityKey($attrAlgorithm, array('type' => 'private'));
+				} catch (Exception $e) {
+					return NULL;
+				}
+				return $objKey;
+			}
+		}
+		return NULL;
+	}
+
+	static function staticLocateKeyInfo($objBaseKey=NULL, $node=NULL) {
+		if (empty($node) || (!$node instanceof DOMNode)) {
+			return NULL;
+		}
+		$doc = $node->ownerDocument;
+		if (!$doc) {
+			return NULL;
+		}
+
+		$xpath = new DOMXPath($doc);
+		$xpath->registerNamespace('xmlsecenc', XMLSecEnc::XMLENCNS);
+		$xpath->registerNamespace('xmlsecdsig', XMLSecurityDSig::XMLDSIGNS);
+		$query = "./xmlsecdsig:KeyInfo";
+		$nodeset = $xpath->query($query, $node);
+		$encmeth = $nodeset->item(0);
+		if (!$encmeth) {
+			/* No KeyInfo in EncryptedData / EncryptedKey. */
+			return $objBaseKey;
+		}
+
+		foreach ($encmeth->childNodes AS $child) {
+			switch ($child->localName) {
+				case 'KeyName':
+					if (!empty($objBaseKey)) {
+						$objBaseKey->name = $child->nodeValue;
+					}
+					break;
+				case 'KeyValue':
+					foreach ($child->childNodes AS $keyval) {
+						switch ($keyval->localName) {
+							case 'DSAKeyValue':
+								throw new Exception("DSAKeyValue currently not supported");
+								break;
+							case 'RSAKeyValue':
+								$modulus = NULL;
+								$exponent = NULL;
+								if ($modulusNode = $keyval->getElementsByTagName('Modulus')->item(0)) {
+									$modulus = base64_decode($modulusNode->nodeValue);
+								}
+								if ($exponentNode = $keyval->getElementsByTagName('Exponent')->item(0)) {
+									$exponent = base64_decode($exponentNode->nodeValue);
+								}
+								if (empty($modulus) || empty($exponent)) {
+									throw new Exception("Missing Modulus or Exponent");
+								}
+								$publicKey = XMLSecurityKey::convertRSA($modulus, $exponent);
+								$objBaseKey->loadKey($publicKey);
+								break;
+						}
+					}
+					break;
+				case 'RetrievalMethod':
+					$type = $child->getAttribute('Type');
+					if ($type !== 'http://www.w3.org/2001/04/xmlenc#EncryptedKey') {
+						/* Unsupported key type. */
+						break;
+					}
+					$uri = $child->getAttribute('URI');
+					if ($uri[0] !== '#') {
+						/* URI not a reference - unsupported. */
+						break;
+					}
+					$id = substr($uri, 1);
+
+					$query = "//xmlsecenc:EncryptedKey[@Id='$id']";
+					$keyElement = $xpath->query($query)->item(0);
+					if (!$keyElement) {
+						throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
+					}
+
+					return XMLSecurityKey::fromEncryptedKeyElement($keyElement);
+				case 'EncryptedKey':
+					return XMLSecurityKey::fromEncryptedKeyElement($child);
+				case 'X509Data':
+					if ($x509certNodes = $child->getElementsByTagName('X509Certificate')) {
+						if ($x509certNodes->length > 0) {
+							$x509cert = $x509certNodes->item(0)->textContent;
+							$x509cert = str_replace(array("\r", "\n"), "", $x509cert);
+							$x509cert = "-----BEGIN CERTIFICATE-----\n" . chunk_split($x509cert, 64, "\n") . "-----END CERTIFICATE-----\n";
+							$objBaseKey->loadKey($x509cert, FALSE, TRUE);
+						}
+					}
+					break;
+			}
+		}
+		return $objBaseKey;
+	}
+
+	public function locateKeyInfo($objBaseKey=NULL, $node=NULL) {
+		if (empty($node)) {
+			$node = $this->rawNode;
+		}
+		return XMLSecEnc::staticLocateKeyInfo($objBaseKey, $node);
+	}
 
 
 }

Spacing +89 added lines, -89 removed lines

@@ -72,7 +72,7 @@ 
             }
             return;
         }
-        if ($element->nodeType == XML_COMMENT_NODE && !$withcomments) {
+        if ($element->nodeType == XML_COMMENT_NODE && ! $withcomments) {
             return;
         }
         $tree->appendChild($dom->importNode($element, TRUE));
@@ -150,7 +150,7 @@ 
   $withcomments - boolean indicating wether or not to include comments in canonicalized form
  */
 
-function C14NGeneral($element, $exclusive=FALSE, $withcomments=FALSE) {
+function C14NGeneral($element, $exclusive = FALSE, $withcomments = FALSE) {
     /* IF PHP 5.2+ then use built in canonical functionality */
     $php_version = explode('.', PHP_VERSION);
     if (($php_version[0] > 5) || ($php_version[0] == 5 && $php_version[1] >= 2)) {
@@ -158,7 +158,7 @@ 
     }
 
     /* Must be element or document */
-    if (!$element instanceof DOMElement && !$element instanceof DOMDocument) {
+    if ( ! $element instanceof DOMElement && ! $element instanceof DOMDocument) {
         return NULL;
     }
     /* Currently only exclusive XML is supported */
@@ -202,7 +202,7 @@ 
     /* This variable contains the certificate thunbprint if we have loaded an X509-certificate. */
     private $X509Thumbprint = NULL;
 
-    public function __construct($type, $params=NULL) {
+    public function __construct($type, $params = NULL) {
         srand();
         switch ($type) {
             case (XMLSecurityKey::TRIPLEDES_CBC):
@@ -237,7 +237,7 @@ 
                 $this->cryptParams['library'] = 'openssl';
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
                 $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -250,7 +250,7 @@ 
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
                 $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
                 $this->cryptParams['hash'] = NULL;
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -262,7 +262,7 @@ 
                 $this->cryptParams['library'] = 'openssl';
                 $this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -275,7 +275,7 @@ 
                 $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
                 $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
                 $this->cryptParams['digest'] = 'SHA256';
-                if (is_array($params) && !empty($params['type'])) {
+                if (is_array($params) && ! empty($params['type'])) {
                     if ($params['type'] == 'public' || $params['type'] == 'private') {
                         $this->cryptParams['type'] = $params['type'];
                         break;
@@ -299,14 +299,14 @@ 
      * @return int|NULL  The number of bytes in the key.
      */
     public function getSymmetricKeySize() {
-        if (!isset($this->cryptParams['keysize'])) {
+        if ( ! isset($this->cryptParams['keysize'])) {
             return NULL;
         }
         return $this->cryptParams['keysize'];
     }
 
     public function generateSessionKey() {
-        if (!isset($this->cryptParams['keysize'])) {
+        if ( ! isset($this->cryptParams['keysize'])) {
             throw new Exception('Unknown key size for type "' . $this->type . '".');
         }
         $keysize = $this->cryptParams['keysize'];
@@ -345,7 +345,7 @@ 
         $inData = FALSE;
 
         foreach ($arCert AS $curData) {
-            if (!$inData) {
+            if ( ! $inData) {
                 if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
                     $inData = TRUE;
                 }
@@ -358,14 +358,14 @@ 
             }
         }
 
-        if (!empty($data)) {
+        if ( ! empty($data)) {
             return strtolower(sha1(base64_decode($data)));
         }
 
         return NULL;
     }
 
-    public function loadKey($key, $isFile=FALSE, $isCert = FALSE) {
+    public function loadKey($key, $isFile = FALSE, $isCert = FALSE) {
         if ($isFile) {
             $this->key = file_get_contents($key);
         } else {
@@ -413,8 +413,8 @@ 
         if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
             $bs = mcrypt_enc_get_block_size($td);
             for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
-                $data.=chr(rand(1, 127));
-            $data.=chr($datalen - $datalen0 + 1);
+                $data .= chr(rand(1, 127));
+            $data .= chr($datalen - $datalen0 + 1);
         }
         $encrypted_data = $this->iv . mcrypt_generic($td, $data);
         mcrypt_generic_deinit($td);
@@ -443,12 +443,12 @@ 
 
     private function encryptOpenSSL($data) {
         if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_public_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure encrypting Data');
                 return;
             }
         } else {
-            if (!openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_private_encrypt($data, $encrypted_data, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure encrypting Data');
                 return;
             }
@@ -458,12 +458,12 @@ 
 
     private function decryptOpenSSL($data) {
         if ($this->cryptParams['type'] == 'public') {
-            if (!openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure decrypting Data');
                 return;
             }
         } else {
-            if (!openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
+            if ( ! openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
                 throw new Exception('Failure decrypting Data');
                 return;
             }
@@ -476,7 +476,7 @@ 
         $hash = hash('sha256', $data);
         $t = '3031300d060960864801650304020105000420'; # sha256
         $t .= $hash;
-        $pslen = $pinfo['bits']/8 - (strlen($t)/2 + 3);
+        $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
 
         $eb = '0001' . str_repeat('FF', $pslen) . '00' . $t;
         $eb = pack('H*', $eb);
@@ -484,12 +484,12 @@ 
         return openssl_private_encrypt($eb, $signature, $priv_key_id, OPENSSL_NO_PADDING);
     }
 
-    function custom_openssl_verify ($data, &$signature, $priv_key_id, $signature_alg = 'sha256WithRSAEncryption') {
+    function custom_openssl_verify($data, &$signature, $priv_key_id, $signature_alg = 'sha256WithRSAEncryption') {
         $pinfo = openssl_pkey_get_details($priv_key_id);
         $hash = hash('sha256', $data);
         $t = '3031300d060960864801650304020105000420'; # sha256
         $t .= $hash;
-        $pslen = $pinfo['bits']/8 - (strlen($t)/2 + 3);
+        $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
 
         $eb = '0001' . str_repeat('FF', $pslen) . '00' . $t;
         $eb = pack('H*', $eb);
@@ -499,12 +499,12 @@ 
 
     private function signOpenSSL($data) {
         $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
+        if ( ! empty($this->cryptParams['digest'])) {
             $algo = $this->cryptParams['digest'];
         }
         $signature = '';
 
-        if (!$this->custom_openssl_sign($data, $signature, $this->key)) {
+        if ( ! $this->custom_openssl_sign($data, $signature, $this->key)) {
             throw new Exception('Failure Signing Data: ' . openssl_error_string() . ' - ' . $algo);
             return;
         }
@@ -513,7 +513,7 @@ 
 
     private function verifyOpenSSL($data, $signature) {
         $algo = OPENSSL_ALGO_SHA1;
-        if (!empty($this->cryptParams['digest'])) {
+        if ( ! empty($this->cryptParams['digest'])) {
             $algo = $this->cryptParams['digest'];
         }
         return $this->custom_openssl_verify($data, $signature, $this->key);
@@ -645,7 +645,7 @@ 
 
         $objenc = new XMLSecEnc();
         $objenc->setNode($element);
-        if (!$objKey = $objenc->locateKey()) {
+        if ( ! $objKey = $objenc->locateKey()) {
             throw new Exception("Unable to locate algorithm for this Encrypted Key");
         }
         $objKey->isEncrypted = TRUE;
@@ -697,7 +697,7 @@ 
     }
 
     private function getXPathObj() {
-        if (empty($this->xPathCtx) && !empty($this->sigNode)) {
+        if (empty($this->xPathCtx) && ! empty($this->sigNode)) {
             $xpath = new DOMXPath($this->sigNode->ownerDocument);
             $xpath->registerNamespace('secdsig', XMLSecurityDSig::XMLDSIGNS);
             $this->xPathCtx = $xpath;
@@ -705,7 +705,7 @@ 
         return $this->xPathCtx;
     }
 
-    static function generate_GUID($prefix='pfx') {
+    static function generate_GUID($prefix = 'pfx') {
         $uuid = md5(uniqid(rand(), true));
         $guid = $prefix . substr($uuid, 0, 8) . "-" .
             substr($uuid, 8, 4) . "-" .
@@ -732,12 +732,12 @@ 
         return NULL;
     }
 
-    public function createNewSignNode($name, $value=NULL) {
+    public function createNewSignNode($name, $value = NULL) {
         $doc = $this->sigNode->ownerDocument;
         if ($this->prefix != null) {
             $name = $this->prefix . ':' . $name;
         }
-        if (!is_null($value)) {
+        if ( ! is_null($value)) {
             $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name, $value);
         } else {
             $node = $doc->createElementNS(XMLSecurityDSig::XMLDSIGNS, $name);
@@ -762,7 +762,7 @@ 
             if ($sinfo = $nodeset->item(0)) {
                 $query = './' . $this->searchpfx . 'CanonicalizationMethod';
                 $nodeset = $xpath->query($query, $sinfo);
-                if (!($canonNode = $nodeset->item(0))) {
+                if ( ! ($canonNode = $nodeset->item(0))) {
                     $canonNode = $this->createNewSignNode('CanonicalizationMethod');
                     $sinfo->insertBefore($canonNode, $sinfo->firstChild);
                 }
@@ -771,7 +771,7 @@ 
         }
     }
 
-    private function canonicalizeData($node, $canonicalmethod, $arXPath=NULL, $prefixList=NULL) {
+    private function canonicalizeData($node, $canonicalmethod, $arXPath = NULL, $prefixList = NULL) {
         $exclusive = FALSE;
         $withComments = FALSE;
         switch ($canonicalmethod) {
@@ -793,7 +793,7 @@ 
         /* Support PHP versions < 5.2 not containing C14N methods in DOM extension */
         $php_version = explode('.', PHP_VERSION);
         if (($php_version[0] < 5) || ($php_version[0] == 5 && $php_version[1] < 2)) {
-            if (!is_null($arXPath)) {
+            if ( ! is_null($arXPath)) {
                 throw new Exception("PHP 5.2.0 or higher is required to perform XPath Transformations");
             }
             return C14NGeneral($node, $exclusive, $withComments);
@@ -877,7 +877,7 @@ 
                 case 'http://www.w3.org/2001/10/xml-exc-c14n#':
                 case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
 
-                    if (!$includeCommentNodes) {
+                    if ( ! $includeCommentNodes) {
                         /* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
@@ -894,7 +894,7 @@ 
                                 $pfxlist = explode(" ", $pfx);
                                 foreach ($pfxlist AS $pfx) {
                                     $val = trim($pfx);
-                                    if (!empty($val)) {
+                                    if ( ! empty($val)) {
                                         $arpfx[] = $val;
                                     }
                                 }
@@ -909,7 +909,7 @@ 
                     break;
                 case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
                 case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                    if (!$includeCommentNodes) {
+                    if ( ! $includeCommentNodes) {
                         /* We remove comment nodes by forcing it to use a canonicalization
                          * without comments.
                          */
@@ -993,13 +993,13 @@ 
             $dataObject = $refNode->ownerDocument;
         }
         $data = $this->processTransforms($refNode, $dataObject, $includeCommentNodes);
-        if (!$this->validateDigest($refNode, $data)) {
+        if ( ! $this->validateDigest($refNode, $data)) {
             return FALSE;
         }
 
         if ($dataObject instanceof DOMNode) {
             /* Add this node to the list of validated nodes. */
-            if (!empty($identifier)) {
+            if ( ! empty($identifier)) {
                 $this->validatedNodes[$identifier] = $dataObject;
             } else {
                 $this->validatedNodes[] = $dataObject;
@@ -1039,7 +1039,7 @@ 
 
     public function validateReference() {
         $doc = $this->sigNode->ownerDocument;
-        if (!$doc->isSameNode($this->sigNode)) {
+        if ( ! $doc->isSameNode($this->sigNode)) {
             $this->sigNode->parentNode->removeChild($this->sigNode);
         }
         $xpath = $this->getXPathObj();
@@ -1053,7 +1053,7 @@ 
         $this->validatedNodes = array();
 
         foreach ($nodeset AS $refNode) {
-            if (!$this->processRefNode($refNode)) {
+            if ( ! $this->processRefNode($refNode)) {
                 /* Clear the list of validated nodes. */
                 $this->validatedNodes = NULL;
                 throw new Exception("Reference validation failed");
@@ -1062,7 +1062,7 @@ 
         return TRUE;
     }
 
-    private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms=NULL, $options=NULL) {
+    private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms = NULL, $options = NULL) {
         $prefix = NULL;
         $prefix_ns = NULL;
         $id_name = 'Id';
@@ -1073,21 +1073,21 @@ 
             $prefix = empty($options['prefix']) ? NULL : $options['prefix'];
             $prefix_ns = empty($options['prefix_ns']) ? NULL : $options['prefix_ns'];
             $id_name = empty($options['id_name']) ? 'Id' : $options['id_name'];
-            $overwrite_id = !isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
-            $force_uri = !isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
+            $overwrite_id = ! isset($options['overwrite']) ? TRUE : (bool) $options['overwrite'];
+            $force_uri = ! isset($options['force_uri']) ? FALSE : (bool) $options['force_uri'];
         }
 
         $attname = $id_name;
-        if (!empty($prefix)) {
+        if ( ! empty($prefix)) {
             $attname = $prefix . ':' . $attname;
         }
 
         $refNode = $this->createNewSignNode('Reference');
         $sinfoNode->appendChild($refNode);
 
-        if (!$node instanceof DOMDocument) {
+        if ( ! $node instanceof DOMDocument) {
             $uri = NULL;
-            if (!$overwrite_id) {
+            if ( ! $overwrite_id) {
                 $uri = $node->getAttributeNS($prefix_ns, $attname);
             }
             if (empty($uri)) {
@@ -1107,12 +1107,12 @@ 
                 $transNode = $this->createNewSignNode('Transform');
                 $transNodes->appendChild($transNode);
                 if (is_array($transform) &&
-                    (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
-                    (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
+                    ( ! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
+                    ( ! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
                     $transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
                     $XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
                     $transNode->appendChild($XPathNode);
-                    if (!empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
+                    if ( ! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
                         foreach ($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'] AS $prefix => $namespace) {
                             $XPathNode->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:$prefix", $namespace);
                         }
@@ -1121,7 +1121,7 @@ 
                     $transNode->setAttribute('Algorithm', $transform);
                 }
             }
-        } elseif (!empty($this->canonicalMethod)) {
+        } elseif ( ! empty($this->canonicalMethod)) {
             $transNode = $this->createNewSignNode('Transform');
             $transNodes->appendChild($transNode);
             $transNode->setAttribute('Algorithm', $this->canonicalMethod);
@@ -1138,7 +1138,7 @@ 
         $refNode->appendChild($digestValue);
     }
 
-    public function addReference($node, $algorithm, $arTransforms=NULL, $options=NULL) {
+    public function addReference($node, $algorithm, $arTransforms = NULL, $options = NULL) {
         if ($xpath = $this->getXPathObj()) {
             $query = "./secdsig:SignedInfo";
             $nodeset = $xpath->query($query, $this->sigNode);
@@ -1148,7 +1148,7 @@ 
         }
     }
 
-    public function addReferenceList($arNodes, $algorithm, $arTransforms=NULL, $options=NULL) {
+    public function addReferenceList($arNodes, $algorithm, $arTransforms = NULL, $options = NULL) {
         if ($xpath = $this->getXPathObj()) {
             $query = "./secdsig:SignedInfo";
             $nodeset = $xpath->query($query, $this->sigNode);
@@ -1160,13 +1160,13 @@ 
         }
     }
 
-    public function addObject($data, $mimetype=NULL, $encoding=NULL) {
+    public function addObject($data, $mimetype = NULL, $encoding = NULL) {
         $objNode = $this->createNewSignNode('Object');
         $this->sigNode->appendChild($objNode);
-        if (!empty($mimetype)) {
+        if ( ! empty($mimetype)) {
             $objNode->setAtribute('MimeType', $mimetype);
         }
-        if (!empty($encoding)) {
+        if ( ! empty($encoding)) {
             $objNode->setAttribute('Encoding', $encoding);
         }
 
@@ -1180,11 +1180,11 @@ 
         return $objNode;
     }
 
-    public function locateKey($node=NULL) {
+    public function locateKey($node = NULL) {
         if (empty($node)) {
             $node = $this->sigNode;
         }
-        if (!$node instanceof DOMNode) {
+        if ( ! $node instanceof DOMNode) {
             return NULL;
         }
         if ($doc = $node->ownerDocument) {
@@ -1251,7 +1251,7 @@ 
 
     }
 
-    public function appendKey($objKey, $parent=NULL) {
+    public function appendKey($objKey, $parent = NULL) {
         $objKey->serializeKey($parent);
     }
 
@@ -1283,22 +1283,22 @@ 
         return $this->insertSignature($parentNode, $beforeNode);
     }
 
-    static function get509XCert($cert, $isPEMFormat=TRUE) {
+    static function get509XCert($cert, $isPEMFormat = TRUE) {
         $certs = XMLSecurityDSig::staticGet509XCerts($cert, $isPEMFormat);
-        if (!empty($certs)) {
+        if ( ! empty($certs)) {
             return $certs[0];
         }
         return '';
     }
 
-    static function staticGet509XCerts($certs, $isPEMFormat=TRUE) {
+    static function staticGet509XCerts($certs, $isPEMFormat = TRUE) {
         if ($isPEMFormat) {
             $data = '';
             $certlist = array();
             $arCert = explode("\n", $certs);
             $inData = FALSE;
             foreach ($arCert AS $curData) {
-                if (!$inData) {
+                if ( ! $inData) {
                     if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
                         $inData = TRUE;
                     }
@@ -1318,11 +1318,11 @@ 
         }
     }
 
-    static function staticAdd509Cert($parentRef, $cert, $isPEMFormat=TRUE, $isURL=False, $xpath=NULL) {
+    static function staticAdd509Cert($parentRef, $cert, $isPEMFormat = TRUE, $isURL = False, $xpath = NULL) {
         if ($isURL) {
             $cert = file_get_contents($cert);
         }
-        if (!$parentRef instanceof DOMElement) {
+        if ( ! $parentRef instanceof DOMElement) {
             throw new Exception('Invalid parent Node parameter');
         }
         $baseDoc = $parentRef->ownerDocument;
@@ -1335,7 +1335,7 @@ 
         $query = "./secdsig:KeyInfo";
         $nodeset = $xpath->query($query, $parentRef);
         $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
+        if ( ! $keyInfo) {
             $inserted = FALSE;
             $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'ds:KeyInfo');
 
@@ -1346,7 +1346,7 @@ 
                 $inserted = TRUE;
             }
 
-            if (!$inserted) {
+            if ( ! $inserted) {
                 $parentRef->appendChild($keyInfo);
             }
         }
@@ -1365,13 +1365,13 @@ 
         }
     }
 
-    public function add509Cert($cert, $isPEMFormat=TRUE, $isURL=False) {
+    public function add509Cert($cert, $isPEMFormat = TRUE, $isURL = False) {
         if ($xpath = $this->getXPathObj()) {
             self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath);
         }
     }
 
-    function addKeyInfoAndName($keyName, $xpath=NULL) {
+    function addKeyInfoAndName($keyName, $xpath = NULL) {
 
         $baseDoc = $this->sigNode->ownerDocument;
 
@@ -1383,7 +1383,7 @@ 
         $query = "./secdsig:KeyInfo";
         $nodeset = $xpath->query($query, $this->sigNode);
         $keyInfo = $nodeset->item(0);
-        if (!$keyInfo) {
+        if ( ! $keyInfo) {
             $inserted = FALSE;
             $keyInfo = $baseDoc->createElementNS(XMLSecurityDSig::XMLDSIGNS, 'KeyInfo');
 
@@ -1393,7 +1393,7 @@ 
                 $sObject->parentNode->insertBefore($keyInfo, $sObject);
                 $inserted = TRUE;
             }
-            if (!$inserted) {
+            if ( ! $inserted) {
                 $this->sigNode->appendChild($keyInfo);
             }
         }
@@ -1443,7 +1443,7 @@ 
     }
 
     public function addReference($name, $node, $type) {
-        if (!$node instanceOf DOMNode) {
+        if ( ! $node instanceOf DOMNode) {
             throw new Exception('$node is not of type DOMNode');
         }
         $curencdoc = $this->encdoc;
@@ -1460,12 +1460,12 @@ 
         $this->rawNode = $node;
     }
 
-    public function encryptNode($objKey, $replace=TRUE) {
+    public function encryptNode($objKey, $replace = TRUE) {
         $data = '';
         if (empty($this->rawNode)) {
             throw new Exception('Node to encrypt has not been set');
         }
-        if (!$objKey instanceof XMLSecurityKey) {
+        if ( ! $objKey instanceof XMLSecurityKey) {
             throw new Exception('Invalid Key');
         }
         $doc = $this->rawNode->ownerDocument;
@@ -1560,7 +1560,7 @@ 
         $nodeset = $xPath->query($query, $this->rawNode);
         $node = $nodeset->item(0);
 
-        if (!$node) {
+        if ( ! $node) {
             return NULL;
         }
 
@@ -1579,8 +1579,8 @@ 
      * @params boolean $replace  Whether we should replace the encrypted node in the XML document with the decrypted data. The default is TRUE.
      * @return string|DOMElement  The decrypted data.
      */
-    public function decryptNode($objKey, $replace=TRUE) {
-        if (!$objKey instanceof XMLSecurityKey) {
+    public function decryptNode($objKey, $replace = TRUE) {
+        if ( ! $objKey instanceof XMLSecurityKey) {
             throw new Exception('Invalid Key');
         }
 
@@ -1622,8 +1622,8 @@ 
         }
     }
 
-    public function encryptKey($srcKey, $rawKey, $append=TRUE) {
-        if ((!$srcKey instanceof XMLSecurityKey) || (!$rawKey instanceof XMLSecurityKey)) {
+    public function encryptKey($srcKey, $rawKey, $append = TRUE) {
+        if (( ! $srcKey instanceof XMLSecurityKey) || ( ! $rawKey instanceof XMLSecurityKey)) {
             throw new Exception('Invalid Key');
         }
         $strEncKey = base64_encode($srcKey->encryptData($rawKey->key));
@@ -1637,7 +1637,7 @@ 
         }
         $encMethod = $encKey->appendChild($this->encdoc->createElementNS(XMLSecEnc::XMLENCNS, 'xenc:EncryptionMethod'));
         $encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
-        if (!empty($srcKey->name)) {
+        if ( ! empty($srcKey->name)) {
             $keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
             $keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));
         }
@@ -1655,7 +1655,7 @@ 
     }
 
     public function decryptKey($encKey) {
-        if (!$encKey->isEncrypted) {
+        if ( ! $encKey->isEncrypted) {
             throw new Exception("Key is not Encrypted");
         }
         if (empty($encKey->key)) {
@@ -1679,11 +1679,11 @@ 
         return NULL;
     }
 
-    public function locateKey($node=NULL) {
+    public function locateKey($node = NULL) {
         if (empty($node)) {
             $node = $this->rawNode;
         }
-        if (!$node instanceof DOMNode) {
+        if ( ! $node instanceof DOMNode) {
             return NULL;
         }
         if ($doc = $node->ownerDocument) {
@@ -1704,12 +1704,12 @@ 
         return NULL;
     }
 
-    static function staticLocateKeyInfo($objBaseKey=NULL, $node=NULL) {
-        if (empty($node) || (!$node instanceof DOMNode)) {
+    static function staticLocateKeyInfo($objBaseKey = NULL, $node = NULL) {
+        if (empty($node) || ( ! $node instanceof DOMNode)) {
             return NULL;
         }
         $doc = $node->ownerDocument;
-        if (!$doc) {
+        if ( ! $doc) {
             return NULL;
         }
 
@@ -1719,7 +1719,7 @@ 
         $query = "./xmlsecdsig:KeyInfo";
         $nodeset = $xpath->query($query, $node);
         $encmeth = $nodeset->item(0);
-        if (!$encmeth) {
+        if ( ! $encmeth) {
             /* No KeyInfo in EncryptedData / EncryptedKey. */
             return $objBaseKey;
         }
@@ -1727,7 +1727,7 @@ 
         foreach ($encmeth->childNodes AS $child) {
             switch ($child->localName) {
                 case 'KeyName':
-                    if (!empty($objBaseKey)) {
+                    if ( ! empty($objBaseKey)) {
                         $objBaseKey->name = $child->nodeValue;
                     }
                     break;
@@ -1770,7 +1770,7 @@ 
 
                     $query = "//xmlsecenc:EncryptedKey[@Id='$id']";
                     $keyElement = $xpath->query($query)->item(0);
-                    if (!$keyElement) {
+                    if ( ! $keyElement) {
                         throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
                     }
 
@@ -1792,7 +1792,7 @@ 
         return $objBaseKey;
     }
 
-    public function locateKeyInfo($objBaseKey=NULL, $node=NULL) {
+    public function locateKeyInfo($objBaseKey = NULL, $node = NULL) {
         if (empty($node)) {
             $node = $this->rawNode;
         }

Braces +6 added lines, -4 removed lines

@@ -412,8 +412,9 @@ 
         mcrypt_generic_init($td, $this->key, $this->iv);
         if ($this->cryptParams['mode'] == MCRYPT_MODE_CBC) {
             $bs = mcrypt_enc_get_block_size($td);
-            for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++)
-                $data.=chr(rand(1, 127));
+            for ($datalen0 = $datalen = strlen($data); (($datalen % $bs) != ($bs - 1)); $datalen++) {
+                            $data.=chr(rand(1, 127));
+            }
             $data.=chr($datalen - $datalen0 + 1);
         }
         $encrypted_data = $this->iv . mcrypt_generic($td, $data);
@@ -536,8 +537,9 @@ 
     static function makeAsnSegment($type, $string) {
         switch ($type) {
             case 0x02:
-                if (ord($string) > 0x7f)
-                    $string = chr(0) . $string;
+                if (ord($string) > 0x7f) {
+                                    $string = chr(0) . $string;
+                }
                 break;
             case 0x03:
                 $string = chr(0) . $string;

includes/updates/update-3.7.0.php

Spacing +4 added lines, -4 removed lines

@@ -28,8 +28,8 @@ 
 	'Open'      => 'payment_pending',
 );
 
-foreach ( $states as $meta_value => $post_status ) {
-	$condition = empty( $meta_value ) ? 'IS NULL' : '= %s';
+foreach ($states as $meta_value => $post_status) {
+	$condition = empty($meta_value) ? 'IS NULL' : '= %s';
 
 	$query = "
 		UPDATE
@@ -48,7 +48,7 @@ 
 		;
 	";
 
-	$query = $wpdb->prepare( $query, $post_status, $meta_value ); // WPCS: unprepared SQL ok.
+	$query = $wpdb->prepare($query, $post_status, $meta_value); // WPCS: unprepared SQL ok.
 
-	$wpdb->query( $query ); // WPCS: unprepared SQL ok.
+	$wpdb->query($query); // WPCS: unprepared SQL ok.
 }

includes/updates/update-3.3.0.php

Spacing +7 added lines, -7 removed lines

@@ -15,16 +15,16 @@
  * @since 3.3.0
  */
 
-$license_md5 = get_option( 'pronamic_pay_license_key' );
+$license_md5 = get_option('pronamic_pay_license_key');
 
-$url = add_query_arg( 'license', $license_md5, 'http://api.pronamic.eu/licenses/convert-md5/1.0/' );
+$url = add_query_arg('license', $license_md5, 'http://api.pronamic.eu/licenses/convert-md5/1.0/');
 
-$result = wp_remote_get( $url );
+$result = wp_remote_get($url);
 
-if ( 200 === wp_remote_retrieve_response_code( $result ) ) {
-	$body = wp_remote_retrieve_body( $result );
+if (200 === wp_remote_retrieve_response_code($result)) {
+	$body = wp_remote_retrieve_body($result);
 
-	if ( 32 === strlen( $body ) ) {
-		update_option( 'pronamic_pay_license_key', $body );
+	if (32 === strlen($body)) {
+		update_option('pronamic_pay_license_key', $body);
 	}
 }

includes/updates/update-2.0.1.php

Spacing +4 added lines, -4 removed lines

@@ -32,10 +32,10 @@
 	'pronamic_ideal_key' => 'pronamic_pay_license_key',
 );
 
-foreach ( $options as $key_old => $key_new ) {
-	$value = get_option( $key_old );
+foreach ($options as $key_old => $key_new) {
+	$value = get_option($key_old);
 
-	if ( ! empty( $value ) ) {
-		update_option( $key_new, $value );
+	if ( ! empty($value)) {
+		update_option($key_new, $value);
 	}
 }

includes/updates/update-3.7.2.php

Spacing +1 added lines, -1 removed lines

@@ -8,4 +8,4 @@
  * @package   Pronamic\WordPress\Pay
  */
 
-require dirname( __FILE__ ) . '/update-3.7.0.php';
+require dirname(__FILE__) . '/update-3.7.0.php';

includes/updates/update-2.0.0.php

Spacing +70 added lines, -70 removed lines

@@ -16,11 +16,11 @@ 
  */
 
 // Check if there is not already an upgrade running
-if ( get_transient( 'pronamic_pay_upgrade_200' ) ) {
+if (get_transient('pronamic_pay_upgrade_200')) {
 	return;
 }
 
-set_transient( 'pronamic_pay_upgrade_200', true, 3600 ); // 60 minutes
+set_transient('pronamic_pay_upgrade_200', true, 3600); // 60 minutes
 
 // Upgrade
 global $wpdb;
@@ -28,10 +28,10 @@ 
 require_once ABSPATH . '/wp-admin/includes/upgrade.php';
 
 $charset_collate = '';
-if ( ! empty( $wpdb->charset ) ) {
+if ( ! empty($wpdb->charset)) {
 	$charset_collate = 'DEFAULT CHARACTER SET ' . $wpdb->charset;
 }
-if ( ! empty( $wpdb->collate ) ) {
+if ( ! empty($wpdb->collate)) {
 	$charset_collate .= ' COLLATE ' . $wpdb->collate;
 }
 
@@ -77,7 +77,7 @@ 
 	PRIMARY KEY  (id)
 ) $charset_collate;";
 
-dbDelta( $sql );
+dbDelta($sql);
 
 // Query
 $query = "
@@ -94,13 +94,13 @@ 
 
 $have_configs = true;
 
-while ( $have_configs ) {
-	$configs = $wpdb->get_results( $query ); // WPCS: unprepared SQL ok.
+while ($have_configs) {
+	$configs = $wpdb->get_results($query); // WPCS: unprepared SQL ok.
 
-	$have_configs = ! empty( $configs );
+	$have_configs = ! empty($configs);
 
-	foreach ( $configs as $config ) {
-		$title = sprintf( __( 'Configuration %d', 'pronamic_ideal' ), $config->id );
+	foreach ($configs as $config) {
+		$title = sprintf(__('Configuration %d', 'pronamic_ideal'), $config->id);
 
 		// Post
 		$post = array(
@@ -109,9 +109,9 @@ 
 			'post_status' => 'publish',
 		);
 
-		$post_id = wp_insert_post( $post );
+		$post_id = wp_insert_post($post);
 
-		if ( $post_id ) {
+		if ($post_id) {
 			$wpdb->update(
 				$config_table,
 				array(
@@ -126,7 +126,7 @@ 
 
 			// Meta
 			// We ignore (@) all notice of not existing properties
-			$config_meta = json_decode( $config->meta );
+			$config_meta = json_decode($config->meta);
 
 			$meta = array();
 
@@ -147,18 +147,18 @@ 
 			$meta['ideal_private_certificate']  = $config->private_certificate;
 
 			// OmniKassa
-			if ( 'rabobank-omnikassa' === $config->variant_id ) {
+			if ('rabobank-omnikassa' === $config->variant_id) {
 				$meta['omnikassa_merchant_id'] = $config->merchant_id;
 				$meta['omnikassa_secret_key']  = $config->hash_key;
 
 				$key_version = @$config_meta->keyVersion;
 				// In Pronamic iDEAL v1.0 we stored the key version in the iDEAL sub ID
-				$key_version = empty( $key_version ) ? $config->sub_id : $key_version;
+				$key_version = empty($key_version) ? $config->sub_id : $key_version;
 
 				$meta['omnikassa_key_version'] = $key_version;
 
-				unset( $meta['ideal_merchant_id'] );
-				unset( $meta['ideal_hash_key'] );
+				unset($meta['ideal_merchant_id']);
+				unset($meta['ideal_hash_key']);
 			}
 
 			// Buckaroo
@@ -201,11 +201,11 @@ 
 			$meta['common_name']       = @$config_meta->commonName;
 			$meta['email']             = @$config_meta->eMailAddress;
 
-			foreach ( $meta as $key => $value ) {
-				if ( ! empty( $value ) ) {
+			foreach ($meta as $key => $value) {
+				if ( ! empty($value)) {
 					$meta_key = '_pronamic_gateway_' . $key;
 
-					update_post_meta( $post_id, $meta_key, $value );
+					update_post_meta($post_id, $meta_key, $value);
 				}
 			}
 		}
@@ -226,10 +226,10 @@ 
 
 $config_ids_map = array();
 
-$config_ids = $wpdb->get_results( $query ); // WPCS: unprepared SQL ok.
+$config_ids = $wpdb->get_results($query); // WPCS: unprepared SQL ok.
 
-foreach ( $config_ids as $config_id ) {
-	$config_ids_map[ $config_id->id ] = $config_id->post_id;
+foreach ($config_ids as $config_id) {
+	$config_ids_map[$config_id->id] = $config_id->post_id;
 }
 
 /**
@@ -249,7 +249,7 @@ 
 	KEY configuration_id (configuration_id)
 ) $charset_collate;";
 
-dbDelta( $sql );
+dbDelta($sql);
 
 // Query
 $query = "
@@ -266,22 +266,22 @@ 
 
 $have_feeds = true;
 
-while ( $have_feeds ) {
-	$feeds = $wpdb->get_results( $query ); // WPCS: unprepared SQL ok.
+while ($have_feeds) {
+	$feeds = $wpdb->get_results($query); // WPCS: unprepared SQL ok.
 
-	$have_feeds = ! empty( $feeds );
+	$have_feeds = ! empty($feeds);
 
-	foreach ( $feeds as $feed ) {
+	foreach ($feeds as $feed) {
 		// Post
 		$post = array(
-			'post_title'  => sprintf( __( 'Payment Form %d', 'pronamic_ideal' ), $feed->id ),
+			'post_title'  => sprintf(__('Payment Form %d', 'pronamic_ideal'), $feed->id),
 			'post_type'   => 'pronamic_pay_gf',
 			'post_status' => 'publish',
 		);
 
-		$post_id = wp_insert_post( $post );
+		$post_id = wp_insert_post($post);
 
-		if ( $post_id ) {
+		if ($post_id) {
 			$wpdb->update(
 				$feeds_table,
 				array(
@@ -298,10 +298,10 @@ 
 			// We ignore (@) all notice of not existing properties
 			$meta = array();
 
-			$feed_meta = json_decode( $feed->meta, true );
+			$feed_meta = json_decode($feed->meta, true);
 
 			$meta['form_id']                  = $feed->form_id;
-			$meta['config_id']                = @$config_ids_map[ $feed->configuration_id ];
+			$meta['config_id']                = @$config_ids_map[$feed->configuration_id];
 			$meta['is_active']                = $feed->is_active;
 			$meta['transaction_description']  = @$feed_meta['transactionDescription'];
 			$meta['delay_notification_ids']   = @$feed_meta['delayNotificationIds'];
@@ -316,19 +316,19 @@ 
 			$meta['fields']                   = @$feed_meta['fields'];
 			$meta['links']                    = @$feed_meta['links'];
 
-			if ( is_array( $meta['links'] ) ) {
-				foreach ( $meta['links'] as &$link ) {
-					if ( isset( $link['pageId'] ) ) {
+			if (is_array($meta['links'])) {
+				foreach ($meta['links'] as &$link) {
+					if (isset($link['pageId'])) {
 						$link['page_id'] = $link['pageId'];
 					}
 				}
 			}
 
-			foreach ( $meta as $key => $value ) {
-				if ( ! empty( $value ) ) {
+			foreach ($meta as $key => $value) {
+				if ( ! empty($value)) {
 					$meta_key = '_pronamic_pay_gf_' . $key;
 
-					update_post_meta( $post_id, $meta_key, $value );
+					update_post_meta($post_id, $meta_key, $value);
 				}
 			}
 		}
@@ -366,7 +366,7 @@ 
 	PRIMARY KEY  (id)
 ) $charset_collate;";
 
-dbDelta( $sql );
+dbDelta($sql);
 
 // We convert the payments in groups of 100 so not everything will load in memory at once.
 $query = "
@@ -383,24 +383,24 @@ 
 
 $have_payments = true;
 
-while ( $have_payments ) {
-	$payments = $wpdb->get_results( $query ); // WPCS: unprepared SQL ok.
+while ($have_payments) {
+	$payments = $wpdb->get_results($query); // WPCS: unprepared SQL ok.
 
-	$have_payments = ! empty( $payments );
+	$have_payments = ! empty($payments);
 
-	foreach ( $payments as $payment ) {
+	foreach ($payments as $payment) {
 		// Post
 		$post = array(
-			'post_title'    => sprintf( __( 'Payment %d', 'pronamic_ideal' ), $payment->id ),
-			'post_date'     => get_date_from_gmt( $payment->date_gmt ),
+			'post_title'    => sprintf(__('Payment %d', 'pronamic_ideal'), $payment->id),
+			'post_date'     => get_date_from_gmt($payment->date_gmt),
 			'post_date_gmt' => $payment->date_gmt,
 			'post_type'     => 'pronamic_payment',
 			'post_status'   => 'publish',
 		);
 
-		$post_id = wp_insert_post( $post );
+		$post_id = wp_insert_post($post);
 
-		if ( $post_id ) {
+		if ($post_id) {
 			$wpdb->update(
 				$payments_table,
 				array(
@@ -415,7 +415,7 @@ 
 
 			// Meta
 			$meta = array(
-				'config_id'               => @$config_ids_map[ $payment->configuration_id ],
+				'config_id'               => @$config_ids_map[$payment->configuration_id],
 				'purchase_id'             => $payment->purchase_id,
 				'transaction_id'          => $payment->transaction_id,
 				'currency'                => $payment->currency,
@@ -435,11 +435,11 @@ 
 				'email'                   => $payment->email,
 			);
 
-			foreach ( $meta as $key => $value ) {
-				if ( ! empty( $value ) ) {
+			foreach ($meta as $key => $value) {
+				if ( ! empty($value)) {
 					$meta_key = '_pronamic_payment_' . $key;
 
-					update_post_meta( $post_id, $meta_key, $value );
+					update_post_meta($post_id, $meta_key, $value);
 				}
 			}
 		}
@@ -470,13 +470,13 @@ 
 	'pronamic_ideal_wpsc_configuration_id'           => 'pronamic_pay_ideal_wpsc_config_id',
 );
 
-foreach ( $options as $key_old => $key_new ) {
-	$value = get_option( $key_old );
+foreach ($options as $key_old => $key_new) {
+	$value = get_option($key_old);
 
-	if ( ! empty( $value ) ) {
-		$value_new = @$config_ids_map[ $value ];
+	if ( ! empty($value)) {
+		$value_new = @$config_ids_map[$value];
 
-		update_option( $key_new, $value_new );
+		update_option($key_new, $value_new);
 	}
 }
 
@@ -489,23 +489,23 @@ 
 $shopp_meta_table = $wpdb->prefix . 'shopp_meta';
 
 // @see http://cube3x.com/2013/04/how-to-check-if-table-exists-in-wordpress-database/
-if ( $shopp_meta_table === $wpdb->get_var( "SHOW TABLES LIKE '$shopp_meta_table';" ) ) { // WPCS: unprepared SQL ok.
+if ($shopp_meta_table === $wpdb->get_var("SHOW TABLES LIKE '$shopp_meta_table';")) { // WPCS: unprepared SQL ok.
 	$query = "SELECT id, value FROM $shopp_meta_table WHERE type = 'setting' AND name = 'Pronamic_Shopp_IDeal_GatewayModule';";
 
-	$row = $wpdb->get_row( $query ); // WPCS: unprepared SQL ok.
+	$row = $wpdb->get_row($query); // WPCS: unprepared SQL ok.
 
-	if ( $row ) {
-		$settings = maybe_unserialize( $row->value );
+	if ($row) {
+		$settings = maybe_unserialize($row->value);
 
-		if ( is_array( $settings ) && isset( $settings['pronamic_shopp_ideal_configuration'] ) ) {
+		if (is_array($settings) && isset($settings['pronamic_shopp_ideal_configuration'])) {
 			$value = $settings['pronamic_shopp_ideal_configuration'];
 
-			$settings['config_id'] = @$config_ids_map[ $value ];
+			$settings['config_id'] = @$config_ids_map[$value];
 
 			$wpdb->update(
 				$shopp_meta_table,
 				array(
-					'value' => serialize( $settings ),
+					'value' => serialize($settings),
 				),
 				array(
 					'id' => $row->id,
@@ -517,16 +517,16 @@ 
 
 // WooCommerce
 // @see https://github.com/pronamic/wp-pronamic-ideal/blob/1.3.4/classes/Pronamic/WooCommerce/IDeal/IDealGateway.php#L42
-$settings = get_option( 'woocommerce_pronamic_ideal_settings' );
+$settings = get_option('woocommerce_pronamic_ideal_settings');
 
-if ( is_array( $settings ) && isset( $settings['configuration_id'] ) ) {
+if (is_array($settings) && isset($settings['configuration_id'])) {
 	$value = $settings['configuration_id'];
 
-	$settings['config_id'] = @$config_ids_map[ $value ];
+	$settings['config_id'] = @$config_ids_map[$value];
 
-	unset( $settings['configuration_id'] );
+	unset($settings['configuration_id']);
 
-	update_option( 'woocommerce_pronamic_pay_ideal_settings', $settings );
+	update_option('woocommerce_pronamic_pay_ideal_settings', $settings);
 }
 
-delete_transient( 'pronamic_pay_upgrade_200' );
+delete_transient('pronamic_pay_upgrade_200');

includes/functions.php

Spacing +47 added lines, -47 removed lines

@@ -17,8 +17,8 @@ 
  * @param int $post_id A payment post ID.
  * @return Payment
  */
-function get_pronamic_payment( $post_id ) {
-	$payment = new Payment( $post_id );
+function get_pronamic_payment($post_id) {
+	$payment = new Payment($post_id);
 
 	return $payment;
 }
@@ -30,12 +30,12 @@ 
  * @param string $meta_value The Meta value to query for.
  * @return Payment
  */
-function get_pronamic_payment_by_meta( $meta_key, $meta_value ) {
+function get_pronamic_payment_by_meta($meta_key, $meta_value) {
 	global $wpdb;
 
 	$payment = null;
 
-	$db_query = $wpdb->prepare( "
+	$db_query = $wpdb->prepare("
 		SELECT
 			post_id
 		FROM
@@ -45,12 +45,12 @@ 
 				AND
 			meta_value = %s
 			;
-	", $meta_key, $meta_value );
+	", $meta_key, $meta_value);
 
-	$post_id = $wpdb->get_var( $db_query ); // WPCS: unprepared SQL ok.
+	$post_id = $wpdb->get_var($db_query); // WPCS: unprepared SQL ok.
 
-	if ( $post_id ) {
-		$payment = new Payment( $post_id );
+	if ($post_id) {
+		$payment = new Payment($post_id);
 	}
 
 	return $payment;
@@ -63,12 +63,12 @@ 
  * @param string $meta_value The Meta value to query for.
  * @return array
  */
-function get_pronamic_payments_by_meta( $meta_key, $meta_value ) {
+function get_pronamic_payments_by_meta($meta_key, $meta_value) {
 	global $wpdb;
 
 	$payments = array();
 
-	$db_query = $wpdb->prepare( "
+	$db_query = $wpdb->prepare("
 		SELECT
 			post_id
 		FROM
@@ -80,12 +80,12 @@ 
 		ORDER BY
 			meta_id ASC
 			;
-	", $meta_key, $meta_value );
+	", $meta_key, $meta_value);
 
-	$results = $wpdb->get_results( $db_query ); // WPCS: unprepared SQL ok.
+	$results = $wpdb->get_results($db_query); // WPCS: unprepared SQL ok.
 
-	foreach ( $results as $result ) {
-		$payments[] = new Payment( $result->post_id );
+	foreach ($results as $result) {
+		$payments[] = new Payment($result->post_id);
 	}
 
 	return $payments;
@@ -97,8 +97,8 @@ 
  * @param string $purchase_id The purchase ID to query for.
  * @return Payment
  */
-function get_pronamic_payment_by_purchase_id( $purchase_id ) {
-	return get_pronamic_payment_by_meta( '_pronamic_payment_purchase_id', $purchase_id );
+function get_pronamic_payment_by_purchase_id($purchase_id) {
+	return get_pronamic_payment_by_meta('_pronamic_payment_purchase_id', $purchase_id);
 }
 
 /**
@@ -108,8 +108,8 @@ 
  * @param string $entrance_code  The entrance code to query for.
  * @return Payment
  */
-function get_pronamic_payment_by_transaction_id( $transaction_id, $entrance_code = null ) {
-	return get_pronamic_payment_by_meta( '_pronamic_payment_transaction_id', $transaction_id );
+function get_pronamic_payment_by_transaction_id($transaction_id, $entrance_code = null) {
+	return get_pronamic_payment_by_meta('_pronamic_payment_transaction_id', $transaction_id);
 }
 
 /**
@@ -118,8 +118,8 @@ 
  * @param int $post_id A subscription post ID.
  * @return Subscription
  */
-function get_pronamic_subscription( $post_id ) {
-	$subscription = new Subscription( $post_id );
+function get_pronamic_subscription($post_id) {
+	$subscription = new Subscription($post_id);
 
 	return $subscription;
 }
@@ -131,12 +131,12 @@ 
  * @param string $meta_value The Meta value to query for.
  * @return Subscription
  */
-function get_pronamic_subscription_by_meta( $meta_key, $meta_value ) {
+function get_pronamic_subscription_by_meta($meta_key, $meta_value) {
 	global $wpdb;
 
 	$subscription = null;
 
-	$db_query = $wpdb->prepare( "
+	$db_query = $wpdb->prepare("
 		SELECT
 			post_id
 		FROM
@@ -146,12 +146,12 @@ 
 				AND
 			meta_value = %s
 			;
-	", $meta_key, $meta_value );
+	", $meta_key, $meta_value);
 
-	$post_id = $wpdb->get_var( $db_query ); // WPCS: unprepared SQL ok.
+	$post_id = $wpdb->get_var($db_query); // WPCS: unprepared SQL ok.
 
-	if ( $post_id ) {
-		$subscription = new Subscription( $post_id );
+	if ($post_id) {
+		$subscription = new Subscription($post_id);
 	}
 
 	return $subscription;
@@ -165,11 +165,11 @@ 
 
 	global $pronamic_ideal;
 
-	foreach ( $pronamic_ideal->gateway_integrations as $integration ) {
-		if ( isset( $pronamic_pay_providers[ $integration->provider ] ) ) {
-			$provider =& $pronamic_pay_providers[ $integration->provider ];
+	foreach ($pronamic_ideal->gateway_integrations as $integration) {
+		if (isset($pronamic_pay_providers[$integration->provider])) {
+			$provider = & $pronamic_pay_providers[$integration->provider];
 
-			if ( ! isset( $provider['integrations'] ) ) {
+			if ( ! isset($provider['integrations'])) {
 				$provider['integrations'] = array();
 			}
 
@@ -188,11 +188,11 @@ 
  * @param string $size A php.ini notation for nubmer to convert to an integer.
  * @return int
  */
-function pronamic_pay_let_to_num( $size ) {
-	$l   = substr( $size, -1 );
-	$ret = substr( $size, 0, -1 );
+function pronamic_pay_let_to_num($size) {
+	$l   = substr($size, -1);
+	$ret = substr($size, 0, -1);
 
-	switch ( strtoupper( $l ) ) {
+	switch (strtoupper($l)) {
 		case 'P':
 			$ret *= 1024;
 			// no break.
@@ -222,10 +222,10 @@ 
 	global $wp_locale;
 
 	// Seperator.
-	$separator = get_option( 'pronamic_pay_thousands_sep' );
+	$separator = get_option('pronamic_pay_thousands_sep');
 
 	// WordPress.
-	if ( false === $separator ) {
+	if (false === $separator) {
 		// WordPress locale number format was introduced in WordPress version 2.3.
 		// @see https://github.com/WordPress/WordPress/blob/2.3/wp-includes/locale.php#L90-L100.
 		$separator = $wp_locale->number_format['thousands_sep'];
@@ -243,10 +243,10 @@ 
 	global $wp_locale;
 
 	// Seperator.
-	$separator = get_option( 'pronamic_pay_decimal_sep' );
+	$separator = get_option('pronamic_pay_decimal_sep');
 
 	// WordPress.
-	if ( false === $separator ) {
+	if (false === $separator) {
 		// WordPress locale number format was introduced in WordPress version 2.3.
 		// @see https://github.com/WordPress/WordPress/blob/2.3/wp-includes/locale.php#L90-L100.
 		$separator = $wp_locale->number_format['decimal_point'];
@@ -263,10 +263,10 @@ 
  * @param string $page Pronamic Pay page identifier slug.
  * @return int
  */
-function pronamic_pay_get_page_id( $page ) {
-	$option = sprintf( 'pronamic_pay_%s_page_id', $page );
+function pronamic_pay_get_page_id($page) {
+	$option = sprintf('pronamic_pay_%s_page_id', $page);
 
-	return get_option( $option, -1 );
+	return get_option($option, -1);
 }
 
 /**
@@ -276,20 +276,20 @@ 
  * @param int   $post_id The post ID to update the specified meta data for.
  * @param array $data    The data array with meta keys/values.
  */
-function pronamic_pay_update_post_meta_data( $post_id, array $data ) {
+function pronamic_pay_update_post_meta_data($post_id, array $data) {
 	/*
 	 * Post meta values are passed through the stripslashes() function
 	 * upon being stored, so you will need to be careful when passing
 	 * in values such as JSON that might include \ escaped characters.
 	 */
-	$data = wp_slash( $data );
+	$data = wp_slash($data);
 
 	// Meta.
-	foreach ( $data as $key => $value ) {
-		if ( isset( $value ) && '' !== $value ) {
-			update_post_meta( $post_id, $key, $value );
+	foreach ($data as $key => $value) {
+		if (isset($value) && '' !== $value) {
+			update_post_meta($post_id, $key, $value);
 		} else {
-			delete_post_meta( $post_id, $key );
+			delete_post_meta($post_id, $key);
 		}
 	}
 }