AyeCode / invoicing

includes/libraries/GeoIp2/Compat/JsonSerializable.php

Indentation +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
 // @codingStandardsIgnoreFile
 
 /**
-  * This interface exists to provide backwards compatibility with PHP 5.3
-  *
-  * This should _not_ be used by any third-party code.
-  *
-  * @ignore
-  */
+ * This interface exists to provide backwards compatibility with PHP 5.3
+ *
+ * This should _not_ be used by any third-party code.
+ *
+ * @ignore
+ */
 if (interface_exists('JsonSerializable')) {
     interface JsonSerializable extends \JsonSerializable
     {

includes/libraries/class-emogrifier.php

Indentation +776 added lines, -776 removed lines

@@ -9,780 +9,780 @@
  * @author Roman Ožana <ozana@omdesign.cz>
  */
 class Emogrifier {
-	/**
-	 * @var string
-	 */
-	const ENCODING = 'UTF-8';
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_CSS = 0;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_SELECTOR = 1;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_XPATH = 2;
-
-	/**
-	 * @var integer
-	 */
-	const CACHE_KEY_CSS_DECLARATION_BLOCK = 3;
-
-	/**
-	 * for calculating nth-of-type and nth-child selectors.
-	 *
-	 * @var integer
-	 */
-	const INDEX = 0;
-
-	/**
-	 * for calculating nth-of-type and nth-child selectors.
-	 *
-	 * @var integer
-	 */
-	const MULTIPLIER = 1;
-
-	/**
-	 * @var string
-	 */
-	const ID_ATTRIBUTE_MATCHER = '/(\\w+)?\\#([\\w\\-]+)/';
-
-	/**
-	 * @var string
-	 */
-	const CLASS_ATTRIBUTE_MATCHER = '/(\\w+|[\\*\\]])?((\\.[\\w\\-]+)+)/';
-
-	/**
-	 * @var string
-	 */
-	private $html = '';
-
-	/**
-	 * @var string
-	 */
-	private $css = '';
-
-	/**
-	 * @var array<string>
-	 */
-	private $unprocessableHtmlTags = array('wbr');
-
-	/**
-	 * @var array<array>
-	 */
-	private $caches = array(
-		self::CACHE_KEY_CSS => array(),
-		self::CACHE_KEY_SELECTOR => array(),
-		self::CACHE_KEY_XPATH => array(),
-		self::CACHE_KEY_CSS_DECLARATION_BLOCK => array(),
-	);
-
-	/**
-	 * the visited nodes with the XPath paths as array keys.
-	 *
-	 * @var array<\DOMNode>
-	 */
-	private $visitedNodes = array();
-
-	/**
-	 * the styles to apply to the nodes with the XPath paths as array keys for the outer array and the attribute names/values.
-	 * as key/value pairs for the inner array.
-	 *
-	 * @var array<array><string>
-	 */
-	private $styleAttributesForNodes = array();
-
-	/**
-	 * This attribute applies to the case where you want to preserve your original text encoding.
-	 *
-	 * By default, emogrifier translates your text into HTML entities for two reasons:
-	 *
-	 * 1. Because of client incompatibilities, it is better practice to send out HTML entities rather than unicode over email.
-	 *
-	 * 2. It translates any illegal XML characters that DOMDocument cannot work with.
-	 *
-	 * If you would like to preserve your original encoding, set this attribute to TRUE.
-	 *
-	 * @var boolean
-	 */
-	public $preserveEncoding = false;
-
-	public static $_media = '';
-
-	/**
-	 * The constructor.
-	 *
-	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
-	 * @param string $css the CSS to merge, must be UTF-8-encoded
-	 */
-	public function __construct($html = '', $css = '') {
-		$this->setHtml($html);
-		$this->setCss($css);
-	}
-
-	/**
-	 * The destructor.
-	 */
-	public function __destruct() {
-		$this->purgeVisitedNodes();
-	}
-
-	/**
-	 * Sets the HTML to emogrify.
-	 *
-	 * @param string $html the HTML to emogrify, must be UTF-8-encoded
-	 */
-	public function setHtml($html = '') {
-		$this->html = $html;
-	}
-
-	/**
-	 * Sets the CSS to merge with the HTML.
-	 *
-	 * @param string $css the CSS to merge, must be UTF-8-encoded
-	 */
-	public function setCss($css = '') {
-		$this->css = $css;
-	}
-
-	/**
-	 * Clears all caches.
-	 */
-	private function clearAllCaches() {
-		$this->clearCache(self::CACHE_KEY_CSS);
-		$this->clearCache(self::CACHE_KEY_SELECTOR);
-		$this->clearCache(self::CACHE_KEY_XPATH);
-		$this->clearCache(self::CACHE_KEY_CSS_DECLARATION_BLOCK);
-	}
-
-	/**
-	 * Clears a single cache by key.
-	 *
-	 * @param integer $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH or CACHE_KEY_CSS_DECLARATION_BLOCK
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	private function clearCache($key) {
-		$allowedCacheKeys = array(self::CACHE_KEY_CSS, self::CACHE_KEY_SELECTOR, self::CACHE_KEY_XPATH, self::CACHE_KEY_CSS_DECLARATION_BLOCK);
-		if (!in_array($key, $allowedCacheKeys, true)) {
-			throw new InvalidArgumentException('Invalid cache key: ' . $key, 1391822035);
-		}
-
-		$this->caches[$key] = array();
-	}
-
-	/**
-	 * Purges the visited nodes.
-	 */
-	private function purgeVisitedNodes() {
-		$this->visitedNodes = array();
-		$this->styleAttributesForNodes = array();
-	}
-
-	/**
-	 * Marks a tag for removal.
-	 *
-	 * There are some HTML tags that DOMDocument cannot process, and it will throw an error if it encounters them.
-	 * In particular, DOMDocument will complain if you try to use HTML5 tags in an XHTML document.
-	 *
-	 * Note: The tags will not be removed if they have any content.
-	 *
-	 * @param string $tagName the tag name, e.g., "p"
-	 */
-	public function addUnprocessableHtmlTag($tagName) {
-		$this->unprocessableHtmlTags[] = $tagName;
-	}
-
-	/**
-	 * Drops a tag from the removal list.
-	 *
-	 * @param string $tagName the tag name, e.g., "p"
-	 */
-	public function removeUnprocessableHtmlTag($tagName) {
-		$key = array_search($tagName, $this->unprocessableHtmlTags, true);
-		if ($key !== false) {
-			unset($this->unprocessableHtmlTags[$key]);
-		}
-	}
-
-	/**
-	 * Applies the CSS you submit to the HTML you submit.
-	 *
-	 * This method places the CSS inline.
-	 *
-	 * @return string
-	 *
-	 * @throws BadMethodCallException
-	 */
-	public function emogrify() {
-		if ($this->html === '') {
-			throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
-		}
-
-		$xmlDocument = $this->createXmlDocument();
-		$xpath = new DOMXPath($xmlDocument);
-		$this->clearAllCaches();
-
-		// before be begin processing the CSS file, parse the document and normalize all existing CSS attributes (changes 'DISPLAY: none' to 'display: none');
-		// we wouldn't have to do this if DOMXPath supported XPath 2.0.
-		// also store a reference of nodes with existing inline styles so we don't overwrite them
-		$this->purgeVisitedNodes();
-
-		$nodesWithStyleAttributes = $xpath->query('//*[@style]');
-		if ($nodesWithStyleAttributes !== false) {
-			/** @var $nodeWithStyleAttribute DOMNode */
-			foreach ($nodesWithStyleAttributes as $node) {
-				$normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
-
-				// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
-				$nodePath = $node->getNodePath();
-				if (!isset($this->styleAttributesForNodes[$nodePath])) {
-					$this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationBlock($normalizedOriginalStyle);
-					$this->visitedNodes[$nodePath] = $node;
-				}
-
-				$node->setAttribute('style', $normalizedOriginalStyle);
-			}
-		}
-
-		// grab any existing style blocks from the html and append them to the existing CSS
-		// (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
-		$allCss = $this->css;
-
-		$allCss .= $this->getCssFromAllStyleNodes($xpath);
-
-		$cssParts = $this->splitCssAndMediaQuery($allCss);
-		self::$_media = ''; // reset
-
-		$cssKey = md5($cssParts['css']);
-		if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
-			// process the CSS file for selectors and definitions
-			preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $cssParts['css'], $matches, PREG_SET_ORDER);
-
-			$allSelectors = array();
-			foreach ($matches as $key => $selectorString) {
-				// if there is a blank definition, skip
-				if (!strlen(trim($selectorString[2]))) {
-					continue;
-				}
-
-				// else split by commas and duplicate attributes so we can sort by selector precedence
-				$selectors = explode(',', $selectorString[1]);
-				foreach ($selectors as $selector) {
-					// don't process pseudo-elements and behavioral (dynamic) pseudo-classes; ONLY allow structural pseudo-classes
-					if (strpos($selector, ':') !== false && !preg_match('/:\\S+\\-(child|type)\\(/i', $selector)) {
-						continue;
-					}
-
-					$allSelectors[] = array('selector' => trim($selector),
-											 'attributes' => trim($selectorString[2]),
-											 // keep track of where it appears in the file, since order is important
-											 'line' => $key,
-					);
-				}
-			}
-
-			// now sort the selectors by precedence
-			usort($allSelectors, array($this,'sortBySelectorPrecedence'));
-
-			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
-		}
-
-		foreach ($this->caches[self::CACHE_KEY_CSS][$cssKey] as $value) {
-			// query the body for the xpath selector
-			$nodesMatchingCssSelectors = $xpath->query($this->translateCssToXpath($value['selector']));
-
-			/** @var $node \DOMNode */
-			foreach ($nodesMatchingCssSelectors as $node) {
-				// if it has a style attribute, get it, process it, and append (overwrite) new stuff
-				if ($node->hasAttribute('style')) {
-					// break it up into an associative array
-					$oldStyleDeclarations = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-				} else {
-					$oldStyleDeclarations = array();
-				}
-				$newStyleDeclarations = $this->parseCssDeclarationBlock($value['attributes']);
-				$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations));
-			}
-		}
-
-		// now iterate through the nodes that contained inline styles in the original HTML
-		foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
-			$node = $this->visitedNodes[$nodePath];
-			$currentStyleAttributes = $this->parseCssDeclarationBlock($node->getAttribute('style'));
-			$node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($currentStyleAttributes, $styleAttributesForNode));
-		}
-
-		// This removes styles from your email that contain display:none.
-		// We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only supports XPath 1.0,
-		// lower-case() isn't available to us. We've thus far only set attributes to lowercase, not attribute values. Consequently, we need
-		// to translate() the letters that would be in 'NONE' ("NOE") to lowercase.
-		$nodesWithStyleDisplayNone = $xpath->query('//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]');
-		// The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
-		// we don't try to call removeChild on a nonexistent child node
-		if ($nodesWithStyleDisplayNone->length > 0) {
-			/** @var $node \DOMNode */
-			foreach ($nodesWithStyleDisplayNone as $node) {
-				if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
-					$node->parentNode->removeChild($node);
-				}
-			}
-		}
-
-		$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
-
-		if ($this->preserveEncoding) {
-			if ( function_exists( 'mb_convert_encoding' ) ) {
-				return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
-			} else {
-				return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
-			}
-		} else {
-			return $xmlDocument->saveHTML();
-		}
-	}
-
-	public function strtolower(array $m) {
-		return strtolower($m[0]);
-	}
-
-
-	/**
-	 * This method merges old or existing name/value array with new name/value array.
-	 * and then generates a string of the combined style suitable for placing inline.
-	 * This becomes the single point for CSS string generation allowing for consistent.
-	 * CSS output no matter where the CSS originally came from.
-	 * @param array $oldStyles
-	 * @param array $newStyles
-	 * @return string
-	 */
-	private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles) {
-		$combinedStyles = array_merge($oldStyles, $newStyles);
-		$style = '';
-		foreach ($combinedStyles as $attributeName => $attributeValue) {
-			$style .= (strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ');
-		}
-		return trim($style);
-	}
-
-
-	/**
-	 * Copies the media part from CSS array parts to $xmlDocument.
-	 *
-	 * @param array $cssParts
-	 * @param DOMDocument $xmlDocument
-	 */
-	public function copyCssWithMediaToStyleNode(array $cssParts, DOMDocument $xmlDocument) {
-		if (isset($cssParts['media']) && $cssParts['media'] !== '') {
-			$this->addStyleElementToDocument($xmlDocument, $cssParts['media']);
-		}
-	}
-
-	/**
-	 * Returns CSS content.
-	 *
-	 * @param DOMXPath $xpath
-	 * @return string
-	 */
-	private function getCssFromAllStyleNodes(DOMXPath $xpath) {
-		$styleNodes = $xpath->query('//style');
-
-		if ($styleNodes === false) {
-			return '';
-		}
-
-		$css = '';
-		/** @var $styleNode DOMNode */
-		foreach ($styleNodes as $styleNode) {
-			$css .= "\n\n" . $styleNode->nodeValue;
-			$styleNode->parentNode->removeChild($styleNode);
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Adds a style element with $css to $document.
-	 *
-	 * @param DOMDocument $document
-	 * @param string $css
-	 */
-	private function addStyleElementToDocument(DOMDocument $document, $css) {
-		$styleElement = $document->createElement('style', $css);
-		$styleAttribute = $document->createAttribute('type');
-		$styleAttribute->value = 'text/css';
-		$styleElement->appendChild($styleAttribute);
-
-		$head = $this->getOrCreateHeadElement($document);
-		$head->appendChild($styleElement);
-	}
-
-	/**
-	 * Returns the existing or creates a new head element in $document.
-	 *
-	 * @param DOMDocument $document
-	 * @return DOMNode the head element
-	 */
-	private function getOrCreateHeadElement(DOMDocument $document) {
-		$head = $document->getElementsByTagName('head')->item(0);
-
-		if ($head === null) {
-			$head = $document->createElement('head');
-			$html = $document->getElementsByTagName('html')->item(0);
-			$html->insertBefore($head, $document->getElementsByTagName('body')->item(0));
-		}
-
-		return $head;
-	}
-
-	/**
-	 * Splits input CSS code to an array where:
-	 *
-	 * - key "css" will be contains clean CSS code.
-	 * - key "media" will be contains all valuable media queries.
-	 *
-	 * Example:
-	 *
-	 * The CSS code.
-	 *
-	 *   "@import "file.css"; h1 { color:red; } @media { h1 {}} @media tv { h1 {}}"
-	 *
-	 * will be parsed into the following array:
-	 *
-	 *   "css" => "h1 { color:red; }"
-	 *   "media" => "@media { h1 {}}"
-	 *
-	 * @param string $css
-	 * @return array
-	 */
-	private function splitCssAndMediaQuery($css) {
-		$css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
-
-		// filter the CSS
-		$search = array(
-			// get rid of css comment code
-			'/\\/\\*.*\\*\\//sU',
-			// strip out any import directives
-			'/^\\s*@import\\s[^;]+;/misU',
-			// strip remains media enclosures
-			'/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
-		);
-
-		$replace = array(
-			'',
-			'',
-			'',
-		);
-
-		// clean CSS before output
-		$css = preg_replace($search, $replace, $css);
-
-		return array('css' => $css, 'media' => self::$_media);
-	}
-
-	private function _media_concat( $matches ) {
-		self::$_media .= $matches[0];
-	}
-
-	/**
-	 * Creates a DOMDocument instance with the current HTML.
-	 *
-	 * @return DOMDocument
-	 */
-	private function createXmlDocument() {
-		$xmlDocument = new DOMDocument;
-		$xmlDocument->encoding = self::ENCODING;
-		$xmlDocument->strictErrorChecking = false;
-		$xmlDocument->formatOutput = true;
-		$libXmlState = libxml_use_internal_errors(true);
-		$xmlDocument->loadHTML($this->getUnifiedHtml());
-		libxml_clear_errors();
-		libxml_use_internal_errors($libXmlState);
-		$xmlDocument->normalizeDocument();
-
-		return $xmlDocument;
-	}
-
-	/**
-	 * Returns the HTML with the non-ASCII characters converts into HTML entities and the unprocessable HTML tags removed.
-	 *
-	 * @return string the unified HTML
-	 *
-	 * @throws BadMethodCallException
-	 */
-	private function getUnifiedHtml() {
-		if (!empty($this->unprocessableHtmlTags)) {
-			$unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
-			$bodyWithoutUnprocessableTags = preg_replace('/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i', '', $this->html);
-		} else {
-			$bodyWithoutUnprocessableTags = $this->html;
-		}
-
-		if ( function_exists( 'mb_convert_encoding' ) ) {
-			return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
-		} else {
-			return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
-		}
-	}
-
-	/**
-	 * @param array $a
-	 * @param array $b
-	 *
-	 * @return integer
-	 */
-	private function sortBySelectorPrecedence(array $a, array $b) {
-		$precedenceA = $this->getCssSelectorPrecedence($a['selector']);
-		$precedenceB = $this->getCssSelectorPrecedence($b['selector']);
-
-		// We want these sorted in ascending order so selectors with lesser precedence get processed first and
-		// selectors with greater precedence get sorted last.
-		// The parenthesis around the -1 are necessary to avoid a PHP_CodeSniffer warning about missing spaces around
-		// arithmetic operators.
-		// @see http://forge.typo3.org/issues/55605
-		$precedenceForEquals = ($a['line'] < $b['line'] ? (-1) : 1);
-		$precedenceForNotEquals = ($precedenceA < $precedenceB ? (-1) : 1);
-		return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
-	}
-
-	/**
-	 * @param string $selector
-	 *
-	 * @return integer
-	 */
-	private function getCssSelectorPrecedence($selector) {
-		$selectorKey = md5($selector);
-		if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
-			$precedence = 0;
-			$value = 100;
-			// ids: worth 100, classes: worth 10, elements: worth 1
-			$search = array('\\#','\\.','');
-
-			foreach ($search as $s) {
-				if (trim($selector == '')) {
-					break;
-				}
-				$number = 0;
-				$selector = preg_replace('/' . $s . '\\w+/', '', $selector, -1, $number);
-				$precedence += ($value * $number);
-				$value /= 10;
-			}
-			$this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
-		}
-
-		return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
-	}
-
-	/**
-	 * Right now, we support all CSS 1 selectors and most CSS2/3 selectors.
-	 *
-	 * @see http://plasmasturm.org/log/444/
-	 *
-	 * @param string $paramCssSelector
-	 *
-	 * @return string
-	 */
-	private function translateCssToXpath($paramCssSelector) {
-		$cssSelector = ' ' . $paramCssSelector . ' ';
-		$cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
-		$cssSelector = trim($cssSelector);
-		$xpathKey = md5($cssSelector);
-		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
-			// returns an Xpath selector
-			$search = array(
-				// Matches any element that is a child of parent.
-				'/\\s+>\\s+/',
-				// Matches any element that is an adjacent sibling.
-				'/\\s+\\+\\s+/',
-				// Matches any element that is a descendant of an parent element element.
-				'/\\s+/',
-				// first-child pseudo-selector
-				'/([^\\/]+):first-child/i',
-				// last-child pseudo-selector
-				'/([^\\/]+):last-child/i',
-				// Matches attribute only selector
-				'/^\\[(\\w+)\\]/',
-				// Matches element with attribute
-				'/(\\w)\\[(\\w+)\\]/',
-				// Matches element with EXACT attribute
-				'/(\\w)\\[(\\w+)\\=[\'"]?(\\w+)[\'"]?\\]/',
-			);
-			$replace = array(
-				'/',
-				'/following-sibling::*[1]/self::',
-				'//',
-				'*[1]/self::\\1',
-				'*[last()]/self::\\1',
-				'*[@\\1]',
-				'\\1[@\\2]',
-				'\\1[@\\2="\\3"]',
-			);
-
-			$cssSelector = '//' . preg_replace($search, $replace, $cssSelector);
-
-			$cssSelector = preg_replace_callback(self::ID_ATTRIBUTE_MATCHER, array($this, 'matchIdAttributes'), $cssSelector);
-			$cssSelector = preg_replace_callback(self::CLASS_ATTRIBUTE_MATCHER, array($this, 'matchClassAttributes'), $cssSelector);
-
-			// Advanced selectors are going to require a bit more advanced emogrification.
-			// When we required PHP 5.3, we could do this with closures.
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-child\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthChild'), $cssSelector
-			);
-			$cssSelector = preg_replace_callback(
-				'/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
-				array($this, 'translateNthOfType'), $cssSelector
-			);
-
-			$this->caches[self::CACHE_KEY_SELECTOR][$xpathKey] = $cssSelector;
-		}
-		return $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey];
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function matchIdAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function matchClassAttributes(array $match) {
-		return (strlen($match[1]) ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
-			implode(
-				'"," "))][contains(concat(" ",@class," "),concat(" ","',
-				explode('.', substr($match[2], 1))
-			) . '"," "))]';
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function translateNthChild(array $match) {
-		$result = $this->parseNth($match);
-
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('*[(last() - position()) mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
-			} else {
-				return sprintf('*[position() mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
-			}
-		} else {
-			return sprintf('*[%u]/self::%s', $result[self::INDEX], $match[1]);
-		}
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return string
-	 */
-	private function translateNthOfType(array $match) {
-		$result = $this->parseNth($match);
-
-		if (isset($result[self::MULTIPLIER])) {
-			if ($result[self::MULTIPLIER] < 0) {
-				$result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
-				return sprintf('%s[(last() - position()) mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
-			} else {
-				return sprintf('%s[position() mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
-			}
-		} else {
-			return sprintf('%s[%u]', $match[1], $result[self::INDEX]);
-		}
-	}
-
-	/**
-	 * @param array $match
-	 *
-	 * @return array
-	 */
-	private function parseNth(array $match) {
-		if (in_array(strtolower($match[2]), array('even','odd'))) {
-			$index = strtolower($match[2]) == 'even' ? 0 : 1;
-			return array(self::MULTIPLIER => 2, self::INDEX => $index);
-		} elseif (stripos($match[2], 'n') === false) {
-			// if there is a multiplier
-			$index = intval(str_replace(' ', '', $match[2]));
-			return array(self::INDEX => $index);
-		} else {
-			if (isset($match[3])) {
-				$multipleTerm = str_replace($match[3], '', $match[2]);
-				$index = intval(str_replace(' ', '', $match[3]));
-			} else {
-				$multipleTerm = $match[2];
-				$index = 0;
-			}
-
-			$multiplier = str_ireplace('n', '', $multipleTerm);
-
-			if (!strlen($multiplier)) {
-				$multiplier = 1;
-			} elseif ($multiplier == 0) {
-				return array(self::INDEX => $index);
-			} else {
-				$multiplier = intval($multiplier);
-			}
-
-			while ($index < 0) {
-				$index += abs($multiplier);
-			}
-
-			return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
-		}
-	}
-
-	/**
-	 * Parses a CSS declaration block into property name/value pairs.
-	 *
-	 * Example:
-	 *
-	 * The declaration block.
-	 *
-	 *   "color: #000; font-weight: bold;".
-	 *
-	 * will be parsed into the following array:
-	 *
-	 *   "color" => "#000"
-	 *   "font-weight" => "bold"
-	 *
-	 * @param string $cssDeclarationBlock the CSS declaration block without the curly braces, may be empty
-	 *
-	 * @return array the CSS declarations with the property names as array keys and the property values as array values
-	 */
-	private function parseCssDeclarationBlock($cssDeclarationBlock) {
-		if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock])) {
-			return $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock];
-		}
-
-		$properties = array();
-		$declarations = explode(';', $cssDeclarationBlock);
-		foreach ($declarations as $declaration) {
-			$matches = array();
-			if (!preg_match('/ *([A-Za-z\\-]+) *: *([^;]+) */', $declaration, $matches)) {
-				continue;
-			}
-			$propertyName = strtolower($matches[1]);
-			$propertyValue = $matches[2];
-			$properties[$propertyName] = $propertyValue;
-		}
-		$this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock] = $properties;
-
-		return $properties;
-	}
+    /**
+     * @var string
+     */
+    const ENCODING = 'UTF-8';
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_CSS = 0;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_SELECTOR = 1;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_XPATH = 2;
+
+    /**
+     * @var integer
+     */
+    const CACHE_KEY_CSS_DECLARATION_BLOCK = 3;
+
+    /**
+     * for calculating nth-of-type and nth-child selectors.
+     *
+     * @var integer
+     */
+    const INDEX = 0;
+
+    /**
+     * for calculating nth-of-type and nth-child selectors.
+     *
+     * @var integer
+     */
+    const MULTIPLIER = 1;
+
+    /**
+     * @var string
+     */
+    const ID_ATTRIBUTE_MATCHER = '/(\\w+)?\\#([\\w\\-]+)/';
+
+    /**
+     * @var string
+     */
+    const CLASS_ATTRIBUTE_MATCHER = '/(\\w+|[\\*\\]])?((\\.[\\w\\-]+)+)/';
+
+    /**
+     * @var string
+     */
+    private $html = '';
+
+    /**
+     * @var string
+     */
+    private $css = '';
+
+    /**
+     * @var array<string>
+     */
+    private $unprocessableHtmlTags = array('wbr');
+
+    /**
+     * @var array<array>
+     */
+    private $caches = array(
+        self::CACHE_KEY_CSS => array(),
+        self::CACHE_KEY_SELECTOR => array(),
+        self::CACHE_KEY_XPATH => array(),
+        self::CACHE_KEY_CSS_DECLARATION_BLOCK => array(),
+    );
+
+    /**
+     * the visited nodes with the XPath paths as array keys.
+     *
+     * @var array<\DOMNode>
+     */
+    private $visitedNodes = array();
+
+    /**
+     * the styles to apply to the nodes with the XPath paths as array keys for the outer array and the attribute names/values.
+     * as key/value pairs for the inner array.
+     *
+     * @var array<array><string>
+     */
+    private $styleAttributesForNodes = array();
+
+    /**
+     * This attribute applies to the case where you want to preserve your original text encoding.
+     *
+     * By default, emogrifier translates your text into HTML entities for two reasons:
+     *
+     * 1. Because of client incompatibilities, it is better practice to send out HTML entities rather than unicode over email.
+     *
+     * 2. It translates any illegal XML characters that DOMDocument cannot work with.
+     *
+     * If you would like to preserve your original encoding, set this attribute to TRUE.
+     *
+     * @var boolean
+     */
+    public $preserveEncoding = false;
+
+    public static $_media = '';
+
+    /**
+     * The constructor.
+     *
+     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     * @param string $css the CSS to merge, must be UTF-8-encoded
+     */
+    public function __construct($html = '', $css = '') {
+        $this->setHtml($html);
+        $this->setCss($css);
+    }
+
+    /**
+     * The destructor.
+     */
+    public function __destruct() {
+        $this->purgeVisitedNodes();
+    }
+
+    /**
+     * Sets the HTML to emogrify.
+     *
+     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     */
+    public function setHtml($html = '') {
+        $this->html = $html;
+    }
+
+    /**
+     * Sets the CSS to merge with the HTML.
+     *
+     * @param string $css the CSS to merge, must be UTF-8-encoded
+     */
+    public function setCss($css = '') {
+        $this->css = $css;
+    }
+
+    /**
+     * Clears all caches.
+     */
+    private function clearAllCaches() {
+        $this->clearCache(self::CACHE_KEY_CSS);
+        $this->clearCache(self::CACHE_KEY_SELECTOR);
+        $this->clearCache(self::CACHE_KEY_XPATH);
+        $this->clearCache(self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+    }
+
+    /**
+     * Clears a single cache by key.
+     *
+     * @param integer $key the cache key, must be CACHE_KEY_CSS, CACHE_KEY_SELECTOR, CACHE_KEY_XPATH or CACHE_KEY_CSS_DECLARATION_BLOCK
+     *
+     * @throws InvalidArgumentException
+     */
+    private function clearCache($key) {
+        $allowedCacheKeys = array(self::CACHE_KEY_CSS, self::CACHE_KEY_SELECTOR, self::CACHE_KEY_XPATH, self::CACHE_KEY_CSS_DECLARATION_BLOCK);
+        if (!in_array($key, $allowedCacheKeys, true)) {
+            throw new InvalidArgumentException('Invalid cache key: ' . $key, 1391822035);
+        }
+
+        $this->caches[$key] = array();
+    }
+
+    /**
+     * Purges the visited nodes.
+     */
+    private function purgeVisitedNodes() {
+        $this->visitedNodes = array();
+        $this->styleAttributesForNodes = array();
+    }
+
+    /**
+     * Marks a tag for removal.
+     *
+     * There are some HTML tags that DOMDocument cannot process, and it will throw an error if it encounters them.
+     * In particular, DOMDocument will complain if you try to use HTML5 tags in an XHTML document.
+     *
+     * Note: The tags will not be removed if they have any content.
+     *
+     * @param string $tagName the tag name, e.g., "p"
+     */
+    public function addUnprocessableHtmlTag($tagName) {
+        $this->unprocessableHtmlTags[] = $tagName;
+    }
+
+    /**
+     * Drops a tag from the removal list.
+     *
+     * @param string $tagName the tag name, e.g., "p"
+     */
+    public function removeUnprocessableHtmlTag($tagName) {
+        $key = array_search($tagName, $this->unprocessableHtmlTags, true);
+        if ($key !== false) {
+            unset($this->unprocessableHtmlTags[$key]);
+        }
+    }
+
+    /**
+     * Applies the CSS you submit to the HTML you submit.
+     *
+     * This method places the CSS inline.
+     *
+     * @return string
+     *
+     * @throws BadMethodCallException
+     */
+    public function emogrify() {
+        if ($this->html === '') {
+            throw new BadMethodCallException('Please set some HTML first before calling emogrify.', 1390393096);
+        }
+
+        $xmlDocument = $this->createXmlDocument();
+        $xpath = new DOMXPath($xmlDocument);
+        $this->clearAllCaches();
+
+        // before be begin processing the CSS file, parse the document and normalize all existing CSS attributes (changes 'DISPLAY: none' to 'display: none');
+        // we wouldn't have to do this if DOMXPath supported XPath 2.0.
+        // also store a reference of nodes with existing inline styles so we don't overwrite them
+        $this->purgeVisitedNodes();
+
+        $nodesWithStyleAttributes = $xpath->query('//*[@style]');
+        if ($nodesWithStyleAttributes !== false) {
+            /** @var $nodeWithStyleAttribute DOMNode */
+            foreach ($nodesWithStyleAttributes as $node) {
+                $normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
+
+                // in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
+                $nodePath = $node->getNodePath();
+                if (!isset($this->styleAttributesForNodes[$nodePath])) {
+                    $this->styleAttributesForNodes[$nodePath] = $this->parseCssDeclarationBlock($normalizedOriginalStyle);
+                    $this->visitedNodes[$nodePath] = $node;
+                }
+
+                $node->setAttribute('style', $normalizedOriginalStyle);
+            }
+        }
+
+        // grab any existing style blocks from the html and append them to the existing CSS
+        // (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
+        $allCss = $this->css;
+
+        $allCss .= $this->getCssFromAllStyleNodes($xpath);
+
+        $cssParts = $this->splitCssAndMediaQuery($allCss);
+        self::$_media = ''; // reset
+
+        $cssKey = md5($cssParts['css']);
+        if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
+            // process the CSS file for selectors and definitions
+            preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mis', $cssParts['css'], $matches, PREG_SET_ORDER);
+
+            $allSelectors = array();
+            foreach ($matches as $key => $selectorString) {
+                // if there is a blank definition, skip
+                if (!strlen(trim($selectorString[2]))) {
+                    continue;
+                }
+
+                // else split by commas and duplicate attributes so we can sort by selector precedence
+                $selectors = explode(',', $selectorString[1]);
+                foreach ($selectors as $selector) {
+                    // don't process pseudo-elements and behavioral (dynamic) pseudo-classes; ONLY allow structural pseudo-classes
+                    if (strpos($selector, ':') !== false && !preg_match('/:\\S+\\-(child|type)\\(/i', $selector)) {
+                        continue;
+                    }
+
+                    $allSelectors[] = array('selector' => trim($selector),
+                                                'attributes' => trim($selectorString[2]),
+                                                // keep track of where it appears in the file, since order is important
+                                                'line' => $key,
+                    );
+                }
+            }
+
+            // now sort the selectors by precedence
+            usort($allSelectors, array($this,'sortBySelectorPrecedence'));
+
+            $this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
+        }
+
+        foreach ($this->caches[self::CACHE_KEY_CSS][$cssKey] as $value) {
+            // query the body for the xpath selector
+            $nodesMatchingCssSelectors = $xpath->query($this->translateCssToXpath($value['selector']));
+
+            /** @var $node \DOMNode */
+            foreach ($nodesMatchingCssSelectors as $node) {
+                // if it has a style attribute, get it, process it, and append (overwrite) new stuff
+                if ($node->hasAttribute('style')) {
+                    // break it up into an associative array
+                    $oldStyleDeclarations = $this->parseCssDeclarationBlock($node->getAttribute('style'));
+                } else {
+                    $oldStyleDeclarations = array();
+                }
+                $newStyleDeclarations = $this->parseCssDeclarationBlock($value['attributes']);
+                $node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations));
+            }
+        }
+
+        // now iterate through the nodes that contained inline styles in the original HTML
+        foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
+            $node = $this->visitedNodes[$nodePath];
+            $currentStyleAttributes = $this->parseCssDeclarationBlock($node->getAttribute('style'));
+            $node->setAttribute('style', $this->generateStyleStringFromDeclarationsArrays($currentStyleAttributes, $styleAttributesForNode));
+        }
+
+        // This removes styles from your email that contain display:none.
+        // We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only supports XPath 1.0,
+        // lower-case() isn't available to us. We've thus far only set attributes to lowercase, not attribute values. Consequently, we need
+        // to translate() the letters that would be in 'NONE' ("NOE") to lowercase.
+        $nodesWithStyleDisplayNone = $xpath->query('//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]');
+        // The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
+        // we don't try to call removeChild on a nonexistent child node
+        if ($nodesWithStyleDisplayNone->length > 0) {
+            /** @var $node \DOMNode */
+            foreach ($nodesWithStyleDisplayNone as $node) {
+                if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
+                    $node->parentNode->removeChild($node);
+                }
+            }
+        }
+
+        $this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
+
+        if ($this->preserveEncoding) {
+            if ( function_exists( 'mb_convert_encoding' ) ) {
+                return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
+            } else {
+                return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
+            }
+        } else {
+            return $xmlDocument->saveHTML();
+        }
+    }
+
+    public function strtolower(array $m) {
+        return strtolower($m[0]);
+    }
+
+
+    /**
+     * This method merges old or existing name/value array with new name/value array.
+     * and then generates a string of the combined style suitable for placing inline.
+     * This becomes the single point for CSS string generation allowing for consistent.
+     * CSS output no matter where the CSS originally came from.
+     * @param array $oldStyles
+     * @param array $newStyles
+     * @return string
+     */
+    private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles) {
+        $combinedStyles = array_merge($oldStyles, $newStyles);
+        $style = '';
+        foreach ($combinedStyles as $attributeName => $attributeValue) {
+            $style .= (strtolower(trim($attributeName)) . ': ' . trim($attributeValue) . '; ');
+        }
+        return trim($style);
+    }
+
+
+    /**
+     * Copies the media part from CSS array parts to $xmlDocument.
+     *
+     * @param array $cssParts
+     * @param DOMDocument $xmlDocument
+     */
+    public function copyCssWithMediaToStyleNode(array $cssParts, DOMDocument $xmlDocument) {
+        if (isset($cssParts['media']) && $cssParts['media'] !== '') {
+            $this->addStyleElementToDocument($xmlDocument, $cssParts['media']);
+        }
+    }
+
+    /**
+     * Returns CSS content.
+     *
+     * @param DOMXPath $xpath
+     * @return string
+     */
+    private function getCssFromAllStyleNodes(DOMXPath $xpath) {
+        $styleNodes = $xpath->query('//style');
+
+        if ($styleNodes === false) {
+            return '';
+        }
+
+        $css = '';
+        /** @var $styleNode DOMNode */
+        foreach ($styleNodes as $styleNode) {
+            $css .= "\n\n" . $styleNode->nodeValue;
+            $styleNode->parentNode->removeChild($styleNode);
+        }
+
+        return $css;
+    }
+
+    /**
+     * Adds a style element with $css to $document.
+     *
+     * @param DOMDocument $document
+     * @param string $css
+     */
+    private function addStyleElementToDocument(DOMDocument $document, $css) {
+        $styleElement = $document->createElement('style', $css);
+        $styleAttribute = $document->createAttribute('type');
+        $styleAttribute->value = 'text/css';
+        $styleElement->appendChild($styleAttribute);
+
+        $head = $this->getOrCreateHeadElement($document);
+        $head->appendChild($styleElement);
+    }
+
+    /**
+     * Returns the existing or creates a new head element in $document.
+     *
+     * @param DOMDocument $document
+     * @return DOMNode the head element
+     */
+    private function getOrCreateHeadElement(DOMDocument $document) {
+        $head = $document->getElementsByTagName('head')->item(0);
+
+        if ($head === null) {
+            $head = $document->createElement('head');
+            $html = $document->getElementsByTagName('html')->item(0);
+            $html->insertBefore($head, $document->getElementsByTagName('body')->item(0));
+        }
+
+        return $head;
+    }
+
+    /**
+     * Splits input CSS code to an array where:
+     *
+     * - key "css" will be contains clean CSS code.
+     * - key "media" will be contains all valuable media queries.
+     *
+     * Example:
+     *
+     * The CSS code.
+     *
+     *   "@import "file.css"; h1 { color:red; } @media { h1 {}} @media tv { h1 {}}"
+     *
+     * will be parsed into the following array:
+     *
+     *   "css" => "h1 { color:red; }"
+     *   "media" => "@media { h1 {}}"
+     *
+     * @param string $css
+     * @return array
+     */
+    private function splitCssAndMediaQuery($css) {
+        $css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
+
+        // filter the CSS
+        $search = array(
+            // get rid of css comment code
+            '/\\/\\*.*\\*\\//sU',
+            // strip out any import directives
+            '/^\\s*@import\\s[^;]+;/misU',
+            // strip remains media enclosures
+            '/^\\s*@media\\s[^{]+{(.*)}\\s*}\\s/misU',
+        );
+
+        $replace = array(
+            '',
+            '',
+            '',
+        );
+
+        // clean CSS before output
+        $css = preg_replace($search, $replace, $css);
+
+        return array('css' => $css, 'media' => self::$_media);
+    }
+
+    private function _media_concat( $matches ) {
+        self::$_media .= $matches[0];
+    }
+
+    /**
+     * Creates a DOMDocument instance with the current HTML.
+     *
+     * @return DOMDocument
+     */
+    private function createXmlDocument() {
+        $xmlDocument = new DOMDocument;
+        $xmlDocument->encoding = self::ENCODING;
+        $xmlDocument->strictErrorChecking = false;
+        $xmlDocument->formatOutput = true;
+        $libXmlState = libxml_use_internal_errors(true);
+        $xmlDocument->loadHTML($this->getUnifiedHtml());
+        libxml_clear_errors();
+        libxml_use_internal_errors($libXmlState);
+        $xmlDocument->normalizeDocument();
+
+        return $xmlDocument;
+    }
+
+    /**
+     * Returns the HTML with the non-ASCII characters converts into HTML entities and the unprocessable HTML tags removed.
+     *
+     * @return string the unified HTML
+     *
+     * @throws BadMethodCallException
+     */
+    private function getUnifiedHtml() {
+        if (!empty($this->unprocessableHtmlTags)) {
+            $unprocessableHtmlTags = implode('|', $this->unprocessableHtmlTags);
+            $bodyWithoutUnprocessableTags = preg_replace('/<\\/?(' . $unprocessableHtmlTags . ')[^>]*>/i', '', $this->html);
+        } else {
+            $bodyWithoutUnprocessableTags = $this->html;
+        }
+
+        if ( function_exists( 'mb_convert_encoding' ) ) {
+            return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
+        } else {
+            return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
+        }
+    }
+
+    /**
+     * @param array $a
+     * @param array $b
+     *
+     * @return integer
+     */
+    private function sortBySelectorPrecedence(array $a, array $b) {
+        $precedenceA = $this->getCssSelectorPrecedence($a['selector']);
+        $precedenceB = $this->getCssSelectorPrecedence($b['selector']);
+
+        // We want these sorted in ascending order so selectors with lesser precedence get processed first and
+        // selectors with greater precedence get sorted last.
+        // The parenthesis around the -1 are necessary to avoid a PHP_CodeSniffer warning about missing spaces around
+        // arithmetic operators.
+        // @see http://forge.typo3.org/issues/55605
+        $precedenceForEquals = ($a['line'] < $b['line'] ? (-1) : 1);
+        $precedenceForNotEquals = ($precedenceA < $precedenceB ? (-1) : 1);
+        return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
+    }
+
+    /**
+     * @param string $selector
+     *
+     * @return integer
+     */
+    private function getCssSelectorPrecedence($selector) {
+        $selectorKey = md5($selector);
+        if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
+            $precedence = 0;
+            $value = 100;
+            // ids: worth 100, classes: worth 10, elements: worth 1
+            $search = array('\\#','\\.','');
+
+            foreach ($search as $s) {
+                if (trim($selector == '')) {
+                    break;
+                }
+                $number = 0;
+                $selector = preg_replace('/' . $s . '\\w+/', '', $selector, -1, $number);
+                $precedence += ($value * $number);
+                $value /= 10;
+            }
+            $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
+        }
+
+        return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
+    }
+
+    /**
+     * Right now, we support all CSS 1 selectors and most CSS2/3 selectors.
+     *
+     * @see http://plasmasturm.org/log/444/
+     *
+     * @param string $paramCssSelector
+     *
+     * @return string
+     */
+    private function translateCssToXpath($paramCssSelector) {
+        $cssSelector = ' ' . $paramCssSelector . ' ';
+        $cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
+        $cssSelector = trim($cssSelector);
+        $xpathKey = md5($cssSelector);
+        if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
+            // returns an Xpath selector
+            $search = array(
+                // Matches any element that is a child of parent.
+                '/\\s+>\\s+/',
+                // Matches any element that is an adjacent sibling.
+                '/\\s+\\+\\s+/',
+                // Matches any element that is a descendant of an parent element element.
+                '/\\s+/',
+                // first-child pseudo-selector
+                '/([^\\/]+):first-child/i',
+                // last-child pseudo-selector
+                '/([^\\/]+):last-child/i',
+                // Matches attribute only selector
+                '/^\\[(\\w+)\\]/',
+                // Matches element with attribute
+                '/(\\w)\\[(\\w+)\\]/',
+                // Matches element with EXACT attribute
+                '/(\\w)\\[(\\w+)\\=[\'"]?(\\w+)[\'"]?\\]/',
+            );
+            $replace = array(
+                '/',
+                '/following-sibling::*[1]/self::',
+                '//',
+                '*[1]/self::\\1',
+                '*[last()]/self::\\1',
+                '*[@\\1]',
+                '\\1[@\\2]',
+                '\\1[@\\2="\\3"]',
+            );
+
+            $cssSelector = '//' . preg_replace($search, $replace, $cssSelector);
+
+            $cssSelector = preg_replace_callback(self::ID_ATTRIBUTE_MATCHER, array($this, 'matchIdAttributes'), $cssSelector);
+            $cssSelector = preg_replace_callback(self::CLASS_ATTRIBUTE_MATCHER, array($this, 'matchClassAttributes'), $cssSelector);
+
+            // Advanced selectors are going to require a bit more advanced emogrification.
+            // When we required PHP 5.3, we could do this with closures.
+            $cssSelector = preg_replace_callback(
+                '/([^\\/]+):nth-child\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+                array($this, 'translateNthChild'), $cssSelector
+            );
+            $cssSelector = preg_replace_callback(
+                '/([^\\/]+):nth-of-type\\(\s*(odd|even|[+\-]?\\d|[+\\-]?\\d?n(\\s*[+\\-]\\s*\\d)?)\\s*\\)/i',
+                array($this, 'translateNthOfType'), $cssSelector
+            );
+
+            $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey] = $cssSelector;
+        }
+        return $this->caches[self::CACHE_KEY_SELECTOR][$xpathKey];
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function matchIdAttributes(array $match) {
+        return (strlen($match[1]) ? $match[1] : '*') . '[@id="' . $match[2] . '"]';
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function matchClassAttributes(array $match) {
+        return (strlen($match[1]) ? $match[1] : '*') . '[contains(concat(" ",@class," "),concat(" ","' .
+            implode(
+                '"," "))][contains(concat(" ",@class," "),concat(" ","',
+                explode('.', substr($match[2], 1))
+            ) . '"," "))]';
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function translateNthChild(array $match) {
+        $result = $this->parseNth($match);
+
+        if (isset($result[self::MULTIPLIER])) {
+            if ($result[self::MULTIPLIER] < 0) {
+                $result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
+                return sprintf('*[(last() - position()) mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+            } else {
+                return sprintf('*[position() mod %u = %u]/self::%s', $result[self::MULTIPLIER], $result[self::INDEX], $match[1]);
+            }
+        } else {
+            return sprintf('*[%u]/self::%s', $result[self::INDEX], $match[1]);
+        }
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return string
+     */
+    private function translateNthOfType(array $match) {
+        $result = $this->parseNth($match);
+
+        if (isset($result[self::MULTIPLIER])) {
+            if ($result[self::MULTIPLIER] < 0) {
+                $result[self::MULTIPLIER] = abs($result[self::MULTIPLIER]);
+                return sprintf('%s[(last() - position()) mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+            } else {
+                return sprintf('%s[position() mod %u = %u]', $match[1], $result[self::MULTIPLIER], $result[self::INDEX]);
+            }
+        } else {
+            return sprintf('%s[%u]', $match[1], $result[self::INDEX]);
+        }
+    }
+
+    /**
+     * @param array $match
+     *
+     * @return array
+     */
+    private function parseNth(array $match) {
+        if (in_array(strtolower($match[2]), array('even','odd'))) {
+            $index = strtolower($match[2]) == 'even' ? 0 : 1;
+            return array(self::MULTIPLIER => 2, self::INDEX => $index);
+        } elseif (stripos($match[2], 'n') === false) {
+            // if there is a multiplier
+            $index = intval(str_replace(' ', '', $match[2]));
+            return array(self::INDEX => $index);
+        } else {
+            if (isset($match[3])) {
+                $multipleTerm = str_replace($match[3], '', $match[2]);
+                $index = intval(str_replace(' ', '', $match[3]));
+            } else {
+                $multipleTerm = $match[2];
+                $index = 0;
+            }
+
+            $multiplier = str_ireplace('n', '', $multipleTerm);
+
+            if (!strlen($multiplier)) {
+                $multiplier = 1;
+            } elseif ($multiplier == 0) {
+                return array(self::INDEX => $index);
+            } else {
+                $multiplier = intval($multiplier);
+            }
+
+            while ($index < 0) {
+                $index += abs($multiplier);
+            }
+
+            return array(self::MULTIPLIER => $multiplier, self::INDEX => $index);
+        }
+    }
+
+    /**
+     * Parses a CSS declaration block into property name/value pairs.
+     *
+     * Example:
+     *
+     * The declaration block.
+     *
+     *   "color: #000; font-weight: bold;".
+     *
+     * will be parsed into the following array:
+     *
+     *   "color" => "#000"
+     *   "font-weight" => "bold"
+     *
+     * @param string $cssDeclarationBlock the CSS declaration block without the curly braces, may be empty
+     *
+     * @return array the CSS declarations with the property names as array keys and the property values as array values
+     */
+    private function parseCssDeclarationBlock($cssDeclarationBlock) {
+        if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock])) {
+            return $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock];
+        }
+
+        $properties = array();
+        $declarations = explode(';', $cssDeclarationBlock);
+        foreach ($declarations as $declaration) {
+            $matches = array();
+            if (!preg_match('/ *([A-Za-z\\-]+) *: *([^;]+) */', $declaration, $matches)) {
+                continue;
+            }
+            $propertyName = strtolower($matches[1]);
+            $propertyValue = $matches[2];
+            $properties[$propertyName] = $propertyValue;
+        }
+        $this->caches[self::CACHE_KEY_CSS_DECLARATION_BLOCK][$cssDeclarationBlock] = $properties;
+
+        return $properties;
+    }
 }

includes/libraries/wp-session/wp-cli.php

Indentation +145 added lines, -145 removed lines

@@ -8,151 +8,151 @@
  */
 class WP_Session_Command extends \WP_CLI_Command {
 
-	/**
-	 * Count the total number of sessions stored in the database.
-	 *
-	 *
-	 * ## EXAMPLES
-	 *
-	 *      wp session count
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @param array $args
-	 * @param array $assoc_args
-	 */
-	public function count( $args, $assoc_args ) {
-		$sessions = WP_Session_Utils::count_sessions();
-
-		\WP_CLI::line( sprintf( '%d sessions currently exist.', absint( $sessions ) ) );
-	}
-
-	/**
-	 * Delete sessions from the database.
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--all]
-	 * : Flag whether or not to purge all sessions from the database.
-	 *
-	 * [--batch=<batch>]
-	 * : Set the batch size for deleting old sessions
-	 *
-	 * [--limit=<limit>]
-	 * : Delete just this number of old sessions
-	 *
-	 * ## EXAMPLES
-	 *
-	 *      wp session delete
-	 *      wp session delete [--batch=<batch>]
-	 *      wp session delete [--limit=<limit>]
-	 *      wp session delete [--all]
-	 *
-	 * @synopsis [--all] [--batch=<batch>] [--limit=<limit>]
-	 *
-	 * @param array $args
-	 * @param array $assoc_args
-	 */
-	public function delete( $args, $assoc_args ) {
-		if ( isset( $assoc_args['limit'] ) ) {
-			$limit = absint( $assoc_args['limit'] );
-
-			$count = WP_Session_Utils::delete_old_sessions( $limit );
-
-			if ( $count > 0 ) {
-				\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
-			}
-
-			// Clear memory
-			self::free_up_memory();
-			return;
-		}
-
-		// Determine if we're deleting all sessions or just a subset.
-		$all = isset( $assoc_args['all'] );
-
-		/**
-		 * Determine the size of each batch for deletion.
-		 *
-		 * @param int
-		 */
-		$batch = isset( $assoc_args['batch'] ) ? absint( $assoc_args['batch'] ) : apply_filters( 'wp_session_delete_batch_size', 1000 );
-
-		switch ( $all ) {
-			case true:
-				$count = WP_Session_Utils::delete_all_sessions();
-
-				\WP_CLI::line( sprintf( 'Deleted all %d sessions.', $count ) );
-				break;
-			case false:
-				do {
-					$count = WP_Session_Utils::delete_old_sessions( $batch );
-
-					if ( $count > 0 ) {
-						\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
-					}
-
-					// Clear memory
-					self::free_up_memory();
-				} while ( $count > 0 );
-				break;
-		}
-	}
-
-	/**
-	 * Generate a number of dummy sessions for testing purposes.
-	 *
-	 * ## OPTIONS
-	 *
-	 * <count>
-	 * : Number of sessions to create.
-	 *
-	 * [--expires=<date>]
-	 * : Optional expiration time tagged for each session. Will use WordPress' local time.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *      wp session generate 5000
-	 *      wp session generate 5000 --expires="2014-11-09T08:00"
-	 *
-	 * @synopsis <count> [--expires=<date>]
-	 *
-	 * @param array $args
-	 * @param array $assoc_args
-	 */
-	public function generate( $args, $assoc_args ) {
-		$count = absint( $args[0] );
-		$date  = isset( $assoc_args['expires'] ) ? $assoc_args['expires'] : null;
-
-		$notify = \WP_CLI\Utils\make_progress_bar( 'Generating sessions', $count );
-
-		for ( $i = 0; $i < $count; $i ++ ) {
-			WP_Session_Utils::create_dummy_session( $date );
-			$notify->tick();
-		}
-
-		$notify->finish();
-	}
-
-	/**
-	 * Free up memory
-	 *
-	 * @global WP_Object_Cache $wp_object_cache
-	 * @global wpdb            $wpdb
-	 */
-	private function free_up_memory() {
-		global $wp_object_cache, $wpdb;
-		$wpdb->queries = array();
-
-		if ( ! is_object( $wp_object_cache ) ) {
-			return;
-		}
-
-		$wp_object_cache->group_ops      = array();
-		$wp_object_cache->stats          = array();
-		$wp_object_cache->memcache_debug = array();
-		$wp_object_cache->cache          = array();
-	}
+    /**
+     * Count the total number of sessions stored in the database.
+     *
+     *
+     * ## EXAMPLES
+     *
+     *      wp session count
+     *
+     * @global wpdb $wpdb
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function count( $args, $assoc_args ) {
+        $sessions = WP_Session_Utils::count_sessions();
+
+        \WP_CLI::line( sprintf( '%d sessions currently exist.', absint( $sessions ) ) );
+    }
+
+    /**
+     * Delete sessions from the database.
+     *
+     * ## OPTIONS
+     *
+     * [--all]
+     * : Flag whether or not to purge all sessions from the database.
+     *
+     * [--batch=<batch>]
+     * : Set the batch size for deleting old sessions
+     *
+     * [--limit=<limit>]
+     * : Delete just this number of old sessions
+     *
+     * ## EXAMPLES
+     *
+     *      wp session delete
+     *      wp session delete [--batch=<batch>]
+     *      wp session delete [--limit=<limit>]
+     *      wp session delete [--all]
+     *
+     * @synopsis [--all] [--batch=<batch>] [--limit=<limit>]
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function delete( $args, $assoc_args ) {
+        if ( isset( $assoc_args['limit'] ) ) {
+            $limit = absint( $assoc_args['limit'] );
+
+            $count = WP_Session_Utils::delete_old_sessions( $limit );
+
+            if ( $count > 0 ) {
+                \WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+            }
+
+            // Clear memory
+            self::free_up_memory();
+            return;
+        }
+
+        // Determine if we're deleting all sessions or just a subset.
+        $all = isset( $assoc_args['all'] );
+
+        /**
+         * Determine the size of each batch for deletion.
+         *
+         * @param int
+         */
+        $batch = isset( $assoc_args['batch'] ) ? absint( $assoc_args['batch'] ) : apply_filters( 'wp_session_delete_batch_size', 1000 );
+
+        switch ( $all ) {
+            case true:
+                $count = WP_Session_Utils::delete_all_sessions();
+
+                \WP_CLI::line( sprintf( 'Deleted all %d sessions.', $count ) );
+                break;
+            case false:
+                do {
+                    $count = WP_Session_Utils::delete_old_sessions( $batch );
+
+                    if ( $count > 0 ) {
+                        \WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+                    }
+
+                    // Clear memory
+                    self::free_up_memory();
+                } while ( $count > 0 );
+                break;
+        }
+    }
+
+    /**
+     * Generate a number of dummy sessions for testing purposes.
+     *
+     * ## OPTIONS
+     *
+     * <count>
+     * : Number of sessions to create.
+     *
+     * [--expires=<date>]
+     * : Optional expiration time tagged for each session. Will use WordPress' local time.
+     *
+     * ## EXAMPLES
+     *
+     *      wp session generate 5000
+     *      wp session generate 5000 --expires="2014-11-09T08:00"
+     *
+     * @synopsis <count> [--expires=<date>]
+     *
+     * @param array $args
+     * @param array $assoc_args
+     */
+    public function generate( $args, $assoc_args ) {
+        $count = absint( $args[0] );
+        $date  = isset( $assoc_args['expires'] ) ? $assoc_args['expires'] : null;
+
+        $notify = \WP_CLI\Utils\make_progress_bar( 'Generating sessions', $count );
+
+        for ( $i = 0; $i < $count; $i ++ ) {
+            WP_Session_Utils::create_dummy_session( $date );
+            $notify->tick();
+        }
+
+        $notify->finish();
+    }
+
+    /**
+     * Free up memory
+     *
+     * @global WP_Object_Cache $wp_object_cache
+     * @global wpdb            $wpdb
+     */
+    private function free_up_memory() {
+        global $wp_object_cache, $wpdb;
+        $wpdb->queries = array();
+
+        if ( ! is_object( $wp_object_cache ) ) {
+            return;
+        }
+
+        $wp_object_cache->group_ops      = array();
+        $wp_object_cache->stats          = array();
+        $wp_object_cache->memcache_debug = array();
+        $wp_object_cache->cache          = array();
+    }
 }
 
 \WP_CLI::add_command( 'session', 'WP_Session_Command' );
\ No newline at end of file

includes/libraries/wp-session/wp-session.php

Indentation +46 added lines, -46 removed lines

@@ -16,16 +16,16 @@ 
  * @return int
  */
 function wp_session_cache_expire() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->cache_expiration();
+    return $wp_session->cache_expiration();
 }
 
 /**
  * Alias of wp_session_write_close()
  */
 function wp_session_commit() {
-	wp_session_write_close();
+    wp_session_write_close();
 }
 
 /**
@@ -34,9 +34,9 @@ 
  * @param string $data
  */
 function wp_session_decode( $data ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+    return $wp_session->json_in( $data );
 }
 
 /**
@@ -45,9 +45,9 @@ 
  * @return string
  */
 function wp_session_encode() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_out();
+    return $wp_session->json_out();
 }
 
 /**
@@ -58,11 +58,11 @@ 
  * @return bool
  */
 function wp_session_regenerate_id( $delete_old_session = false ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+    $wp_session->regenerate_id( $delete_old_session );
 
-	return true;
+    return true;
 }
 
 /**
@@ -73,13 +73,13 @@ 
  * @return bool
  */
 function wp_session_start() {
-	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+    $wp_session = WP_Session::get_instance();
+    do_action( 'wp_session_start' );
 
-	return $wp_session->session_started();
+    return $wp_session->session_started();
 }
 if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'plugins_loaded', 'wp_session_start' );
+    add_action( 'plugins_loaded', 'wp_session_start' );
 }
 
 /**
@@ -88,35 +88,35 @@ 
  * @return int
  */
 function wp_session_status() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
-		return PHP_SESSION_ACTIVE;
-	}
+    if ( $wp_session->session_started() ) {
+        return PHP_SESSION_ACTIVE;
+    }
 
-	return PHP_SESSION_NONE;
+    return PHP_SESSION_NONE;
 }
 
 /**
  * Unset all session variables.
  */
 function wp_session_unset() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->reset();
+    $wp_session->reset();
 }
 
 /**
  * Write session data and end session
  */
 function wp_session_write_close() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+    $wp_session->write_data();
+    do_action( 'wp_session_commit' );
 }
 if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'shutdown', 'wp_session_write_close' );
+    add_action( 'shutdown', 'wp_session_write_close' );
 }
 
 /**
@@ -127,24 +127,24 @@ 
  * of a scheduled task or cron job.
  */
 function wp_session_cleanup() {
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
-		return;
-	}
-
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		/**
-		 * Determine the size of each batch for deletion.
-		 *
-		 * @param int
-		 */
-		$batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
-
-		// Delete a batch of old sessions
-		WP_Session_Utils::delete_old_sessions( $batch_size );
-	}
-
-	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+    if ( defined( 'WP_SETUP_CONFIG' ) ) {
+        return;
+    }
+
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        /**
+         * Determine the size of each batch for deletion.
+         *
+         * @param int
+         */
+        $batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
+
+        // Delete a batch of old sessions
+        WP_Session_Utils::delete_old_sessions( $batch_size );
+    }
+
+    // Allow other plugins to hook in to the garbage collection process.
+    do_action( 'wp_session_cleanup' );
 }
 add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
 
@@ -152,8 +152,8 @@ 
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
-	}
+    if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
+        wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
+    }
 }
 add_action( 'wp', 'wp_session_register_garbage_collection' );

includes/libraries/wp-session/class-wp-session.php

Indentation +205 added lines, -205 removed lines

@@ -17,215 +17,215 @@
  * @since   3.7.0
  */
 final class WP_Session extends Recursive_ArrayAccess {
-	/**
-	 * ID of the current session.
-	 *
-	 * @var string
-	 */
-	public $session_id;
-
-	/**
-	 * Unix timestamp when session expires.
-	 *
-	 * @var int
-	 */
-	protected $expires;
-
-	/**
-	 * Unix timestamp indicating when the expiration time needs to be reset.
-	 *
-	 * @var int
-	 */
-	protected $exp_variant;
-
-	/**
-	 * Singleton instance.
-	 *
-	 * @var bool|WP_Session
-	 */
-	private static $instance = false;
-
-	/**
-	 * Retrieve the current session instance.
-	 *
-	 * @param bool $session_id Session ID from which to populate data.
-	 *
-	 * @return bool|WP_Session
-	 */
-	public static function get_instance() {
-		if ( ! self::$instance ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Default constructor.
-	 * Will rebuild the session collection from the given session ID if it exists. Otherwise, will
-	 * create a new session with that ID.
-	 *
-	 * @param $session_id
-	 * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
-	 */
-	protected function __construct() {
-		if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
-			$cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
-			$cookie_crumbs = explode( '||', $cookie );
+    /**
+     * ID of the current session.
+     *
+     * @var string
+     */
+    public $session_id;
+
+    /**
+     * Unix timestamp when session expires.
+     *
+     * @var int
+     */
+    protected $expires;
+
+    /**
+     * Unix timestamp indicating when the expiration time needs to be reset.
+     *
+     * @var int
+     */
+    protected $exp_variant;
+
+    /**
+     * Singleton instance.
+     *
+     * @var bool|WP_Session
+     */
+    private static $instance = false;
+
+    /**
+     * Retrieve the current session instance.
+     *
+     * @param bool $session_id Session ID from which to populate data.
+     *
+     * @return bool|WP_Session
+     */
+    public static function get_instance() {
+        if ( ! self::$instance ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Default constructor.
+     * Will rebuild the session collection from the given session ID if it exists. Otherwise, will
+     * create a new session with that ID.
+     *
+     * @param $session_id
+     * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
+     */
+    protected function __construct() {
+        if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
+            $cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
+            $cookie_crumbs = explode( '||', $cookie );
 
             $this->session_id = preg_replace("/[^A-Za-z0-9_]/", '', $cookie_crumbs[0] );
             $this->expires = absint( $cookie_crumbs[1] );
             $this->exp_variant = absint( $cookie_crumbs[2] );
 
-			// Update the session expiration if we're past the variant time
-			if ( time() > $this->exp_variant ) {
-				$this->set_expiration();
-				delete_option( "_wp_session_expires_{$this->session_id}" );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
-			}
-		} else {
-			$this->session_id = WP_Session_Utils::generate_id();
-			$this->set_expiration();
-		}
-
-		$this->read_data();
-
-		$this->set_cookie();
-
-	}
-
-	/**
-	 * Set both the expiration time and the expiration variant.
-	 *
-	 * If the current time is below the variant, we don't update the session's expiration time. If it's
-	 * greater than the variant, then we update the expiration time in the database.  This prevents
-	 * writing to the database on every page load for active sessions and only updates the expiration
-	 * time if we're nearing when the session actually expires.
-	 *
-	 * By default, the expiration time is set to 30 minutes.
-	 * By default, the expiration variant is set to 24 minutes.
-	 *
-	 * As a result, the session expiration time - at a maximum - will only be written to the database once
-	 * every 24 minutes.  After 30 minutes, the session will have been expired. No cookie will be sent by
-	 * the browser, and the old session will be queued for deletion by the garbage collector.
-	 *
-	 * @uses apply_filters Calls `wp_session_expiration_variant` to get the max update window for session data.
-	 * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
-	 */
-	protected function set_expiration() {
-		$this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
-		$this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
-	}
-
-	/**
-	* Set the session cookie
-	* @uses apply_filters Calls `wp_session_cookie_secure` to set the $secure parameter of setcookie()
-	* @uses apply_filters Calls `wp_session_cookie_httponly` to set the $httponly parameter of setcookie()
-	*/
-	protected function set_cookie() {
-		if ( !defined( 'WPI_TESTING_MODE' ) ) {
-			try {
-				$secure = apply_filters('wp_session_cookie_secure', false);
-				$httponly = apply_filters('wp_session_cookie_httponly', false);
-				setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN, $secure, $httponly );
-			} catch(Exception $e) {
-				error_log( 'Set Cookie Error: ' . $e->getMessage() );
-			}
-		}
-	}
-
-	/**
-	 * Read data from a transient for the current session.
-	 *
-	 * Automatically resets the expiration time for the session transient to some time in the future.
-	 *
-	 * @return array
-	 */
-	protected function read_data() {
-		$this->container = get_option( "_wp_session_{$this->session_id}", array() );
-
-		return $this->container;
-	}
-
-	/**
-	 * Write the data from the current session to the data storage system.
-	 */
-	public function write_data() {
-		$option_key = "_wp_session_{$this->session_id}";
+            // Update the session expiration if we're past the variant time
+            if ( time() > $this->exp_variant ) {
+                $this->set_expiration();
+                delete_option( "_wp_session_expires_{$this->session_id}" );
+                add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+            }
+        } else {
+            $this->session_id = WP_Session_Utils::generate_id();
+            $this->set_expiration();
+        }
+
+        $this->read_data();
+
+        $this->set_cookie();
+
+    }
+
+    /**
+     * Set both the expiration time and the expiration variant.
+     *
+     * If the current time is below the variant, we don't update the session's expiration time. If it's
+     * greater than the variant, then we update the expiration time in the database.  This prevents
+     * writing to the database on every page load for active sessions and only updates the expiration
+     * time if we're nearing when the session actually expires.
+     *
+     * By default, the expiration time is set to 30 minutes.
+     * By default, the expiration variant is set to 24 minutes.
+     *
+     * As a result, the session expiration time - at a maximum - will only be written to the database once
+     * every 24 minutes.  After 30 minutes, the session will have been expired. No cookie will be sent by
+     * the browser, and the old session will be queued for deletion by the garbage collector.
+     *
+     * @uses apply_filters Calls `wp_session_expiration_variant` to get the max update window for session data.
+     * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
+     */
+    protected function set_expiration() {
+        $this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
+        $this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+    }
+
+    /**
+     * Set the session cookie
+     * @uses apply_filters Calls `wp_session_cookie_secure` to set the $secure parameter of setcookie()
+     * @uses apply_filters Calls `wp_session_cookie_httponly` to set the $httponly parameter of setcookie()
+     */
+    protected function set_cookie() {
+        if ( !defined( 'WPI_TESTING_MODE' ) ) {
+            try {
+                $secure = apply_filters('wp_session_cookie_secure', false);
+                $httponly = apply_filters('wp_session_cookie_httponly', false);
+                setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN, $secure, $httponly );
+            } catch(Exception $e) {
+                error_log( 'Set Cookie Error: ' . $e->getMessage() );
+            }
+        }
+    }
+
+    /**
+     * Read data from a transient for the current session.
+     *
+     * Automatically resets the expiration time for the session transient to some time in the future.
+     *
+     * @return array
+     */
+    protected function read_data() {
+        $this->container = get_option( "_wp_session_{$this->session_id}", array() );
+
+        return $this->container;
+    }
+
+    /**
+     * Write the data from the current session to the data storage system.
+     */
+    public function write_data() {
+        $option_key = "_wp_session_{$this->session_id}";
 		
-		if ( false === get_option( $option_key ) ) {
-			add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-			add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
-		} else {
-			delete_option( "_wp_session_{$this->session_id}" );
-			add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-		}
-	}
-
-	/**
-	 * Output the current container contents as a JSON-encoded string.
-	 *
-	 * @return string
-	 */
-	public function json_out() {
-		return json_encode( $this->container );
-	}
-
-	/**
-	 * Decodes a JSON string and, if the object is an array, overwrites the session container with its contents.
-	 *
-	 * @param string $data
-	 *
-	 * @return bool
-	 */
-	public function json_in( $data ) {
-		$array = json_decode( $data );
-
-		if ( is_array( $array ) ) {
-			$this->container = $array;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Regenerate the current session's ID.
-	 *
-	 * @param bool $delete_old Flag whether or not to delete the old session data from the server.
-	 */
-	public function regenerate_id( $delete_old = false ) {
-		if ( $delete_old ) {
-			delete_option( "_wp_session_{$this->session_id}" );
-		}
-
-		$this->session_id = WP_Session_Utils::generate_id();
-
-		$this->set_cookie();
-	}
-
-	/**
-	 * Check if a session has been initialized.
-	 *
-	 * @return bool
-	 */
-	public function session_started() {
-		return !!self::$instance;
-	}
-
-	/**
-	 * Return the read-only cache expiration value.
-	 *
-	 * @return int
-	 */
-	public function cache_expiration() {
-		return $this->expires;
-	}
-
-	/**
-	 * Flushes all session variables.
-	 */
-	public function reset() {
-		$this->container = array();
-	}
+        if ( false === get_option( $option_key ) ) {
+            add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+            add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+        } else {
+            delete_option( "_wp_session_{$this->session_id}" );
+            add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+        }
+    }
+
+    /**
+     * Output the current container contents as a JSON-encoded string.
+     *
+     * @return string
+     */
+    public function json_out() {
+        return json_encode( $this->container );
+    }
+
+    /**
+     * Decodes a JSON string and, if the object is an array, overwrites the session container with its contents.
+     *
+     * @param string $data
+     *
+     * @return bool
+     */
+    public function json_in( $data ) {
+        $array = json_decode( $data );
+
+        if ( is_array( $array ) ) {
+            $this->container = $array;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Regenerate the current session's ID.
+     *
+     * @param bool $delete_old Flag whether or not to delete the old session data from the server.
+     */
+    public function regenerate_id( $delete_old = false ) {
+        if ( $delete_old ) {
+            delete_option( "_wp_session_{$this->session_id}" );
+        }
+
+        $this->session_id = WP_Session_Utils::generate_id();
+
+        $this->set_cookie();
+    }
+
+    /**
+     * Check if a session has been initialized.
+     *
+     * @return bool
+     */
+    public function session_started() {
+        return !!self::$instance;
+    }
+
+    /**
+     * Return the read-only cache expiration value.
+     *
+     * @return int
+     */
+    public function cache_expiration() {
+        return $this->expires;
+    }
+
+    /**
+     * Flushes all session variables.
+     */
+    public function reset() {
+        $this->container = array();
+    }
 }

includes/libraries/wp-session/class-recursive-arrayaccess.php

Indentation +191 added lines, -191 removed lines

@@ -17,197 +17,197 @@
  * @since 3.7.0
  */
 class Recursive_ArrayAccess implements ArrayAccess, Iterator, Countable {
-	/**
-	 * Internal data collection.
-	 *
-	 * @var array
-	 */
-	protected $container = array();
-
-	/**
-	 * Flag whether or not the internal collection has been changed.
-	 *
-	 * @var bool
-	 */
-	protected $dirty = false;
-
-	/**
-	 * Default object constructor.
-	 *
-	 * @param array $data
-	 */
-	protected function __construct( $data = array() ) {
-		foreach ( $data as $key => $value ) {
-			$this[ $key ] = $value;
-		}
-	}
-
-	/**
-	 * Allow deep copies of objects
-	 */
-	public function __clone() {
-		foreach ( $this->container as $key => $value ) {
-			if ( $value instanceof self ) {
-				$this[ $key ] = clone $value;
-			}
-		}
-	}
-
-	/**
-	 * Output the data container as a multidimensional array.
-	 *
-	 * @return array
-	 */
-	public function toArray() {
-		$data = $this->container;
-		foreach ( $data as $key => $value ) {
-			if ( $value instanceof self ) {
-				$data[ $key ] = $value->toArray();
-			}
-		}
-		return $data;
-	}
-
-	/*****************************************************************/
-	/*                   ArrayAccess Implementation                  */
-	/*****************************************************************/
-
-	/**
-	 * Whether a offset exists
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-	 *
-	 * @param mixed $offset An offset to check for.
-	 *
-	 * @return boolean true on success or false on failure.
-	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->container[ $offset ]) ;
-	}
-
-	/**
-	 * Offset to retrieve
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
-	 *
-	 * @param mixed $offset The offset to retrieve.
-	 *
-	 * @return mixed Can return all value types.
-	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
-	}
-
-	/**
-	 * Offset to set
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
-	 *
-	 * @param mixed $offset The offset to assign the value to.
-	 * @param mixed $value  The value to set.
-	 *
-	 * @return void
-	 */
-	public function offsetSet( $offset, $data ) {
-		if ( is_array( $data ) ) {
-			$data = new self( $data );
-		}
-		if ( $offset === null ) { // don't forget this!
-			$this->container[] = $data;
-		} else {
-			$this->container[ $offset ] = $data;
-		}
-
-		$this->dirty = true;
-	}
-
-	/**
-	 * Offset to unset
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-	 *
-	 * @param mixed $offset The offset to unset.
-	 *
-	 * @return void
-	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->container[ $offset ] );
-
-		$this->dirty = true;
-	}
+    /**
+     * Internal data collection.
+     *
+     * @var array
+     */
+    protected $container = array();
+
+    /**
+     * Flag whether or not the internal collection has been changed.
+     *
+     * @var bool
+     */
+    protected $dirty = false;
+
+    /**
+     * Default object constructor.
+     *
+     * @param array $data
+     */
+    protected function __construct( $data = array() ) {
+        foreach ( $data as $key => $value ) {
+            $this[ $key ] = $value;
+        }
+    }
+
+    /**
+     * Allow deep copies of objects
+     */
+    public function __clone() {
+        foreach ( $this->container as $key => $value ) {
+            if ( $value instanceof self ) {
+                $this[ $key ] = clone $value;
+            }
+        }
+    }
+
+    /**
+     * Output the data container as a multidimensional array.
+     *
+     * @return array
+     */
+    public function toArray() {
+        $data = $this->container;
+        foreach ( $data as $key => $value ) {
+            if ( $value instanceof self ) {
+                $data[ $key ] = $value->toArray();
+            }
+        }
+        return $data;
+    }
+
+    /*****************************************************************/
+    /*                   ArrayAccess Implementation                  */
+    /*****************************************************************/
+
+    /**
+     * Whether a offset exists
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+     *
+     * @param mixed $offset An offset to check for.
+     *
+     * @return boolean true on success or false on failure.
+     */
+    public function offsetExists( $offset ) {
+        return isset( $this->container[ $offset ]) ;
+    }
+
+    /**
+     * Offset to retrieve
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetget.php
+     *
+     * @param mixed $offset The offset to retrieve.
+     *
+     * @return mixed Can return all value types.
+     */
+    public function offsetGet( $offset ) {
+        return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
+    }
+
+    /**
+     * Offset to set
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetset.php
+     *
+     * @param mixed $offset The offset to assign the value to.
+     * @param mixed $value  The value to set.
+     *
+     * @return void
+     */
+    public function offsetSet( $offset, $data ) {
+        if ( is_array( $data ) ) {
+            $data = new self( $data );
+        }
+        if ( $offset === null ) { // don't forget this!
+            $this->container[] = $data;
+        } else {
+            $this->container[ $offset ] = $data;
+        }
+
+        $this->dirty = true;
+    }
+
+    /**
+     * Offset to unset
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+     *
+     * @param mixed $offset The offset to unset.
+     *
+     * @return void
+     */
+    public function offsetUnset( $offset ) {
+        unset( $this->container[ $offset ] );
+
+        $this->dirty = true;
+    }
 	
 	
-	/*****************************************************************/
-	/*                     Iterator Implementation                   */
-	/*****************************************************************/
-
-	/**
-	 * Current position of the array.
-	 *
-	 * @link http://php.net/manual/en/iterator.current.php
-	 *
-	 * @return mixed
-	 */
-	public function current() {
-		return current( $this->container );
-	}
-
-	/**
-	 * Key of the current element.
-	 *
-	 * @link http://php.net/manual/en/iterator.key.php
-	 *
-	 * @return mixed
-	 */
-	public function key() {
-		return key( $this->container );
-	}
-
-	/**
-	 * Move the internal point of the container array to the next item
-	 *
-	 * @link http://php.net/manual/en/iterator.next.php
-	 *
-	 * @return void
-	 */
-	public function next() {
-		next( $this->container );
-	}
-
-	/**
-	 * Rewind the internal point of the container array.
-	 *
-	 * @link http://php.net/manual/en/iterator.rewind.php
-	 *
-	 * @return void
-	 */
-	public function rewind() {
-		reset( $this->container );
-	}
-
-	/**
-	 * Is the current key valid?
-	 *
-	 * @link http://php.net/manual/en/iterator.rewind.php
-	 *
-	 * @return bool
-	 */
-	public function valid() {
-		return $this->offsetExists( $this->key() );
-	}
-
-	/*****************************************************************/
-	/*                    Countable Implementation                   */
-	/*****************************************************************/
-
-	/**
-	 * Get the count of elements in the container array.
-	 *
-	 * @link http://php.net/manual/en/countable.count.php
-	 *
-	 * @return int
-	 */
-	public function count() {
-		return count( $this->container );
-	}
+    /*****************************************************************/
+    /*                     Iterator Implementation                   */
+    /*****************************************************************/
+
+    /**
+     * Current position of the array.
+     *
+     * @link http://php.net/manual/en/iterator.current.php
+     *
+     * @return mixed
+     */
+    public function current() {
+        return current( $this->container );
+    }
+
+    /**
+     * Key of the current element.
+     *
+     * @link http://php.net/manual/en/iterator.key.php
+     *
+     * @return mixed
+     */
+    public function key() {
+        return key( $this->container );
+    }
+
+    /**
+     * Move the internal point of the container array to the next item
+     *
+     * @link http://php.net/manual/en/iterator.next.php
+     *
+     * @return void
+     */
+    public function next() {
+        next( $this->container );
+    }
+
+    /**
+     * Rewind the internal point of the container array.
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     *
+     * @return void
+     */
+    public function rewind() {
+        reset( $this->container );
+    }
+
+    /**
+     * Is the current key valid?
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     *
+     * @return bool
+     */
+    public function valid() {
+        return $this->offsetExists( $this->key() );
+    }
+
+    /*****************************************************************/
+    /*                    Countable Implementation                   */
+    /*****************************************************************/
+
+    /**
+     * Get the count of elements in the container array.
+     *
+     * @link http://php.net/manual/en/countable.count.php
+     *
+     * @return int
+     */
+    public function count() {
+        return count( $this->container );
+    }
 }

includes/libraries/wp-session/class-wp-session-utils.php

Indentation +130 added lines, -130 removed lines

@@ -6,134 +6,134 @@
  * THIS CLASS SHOULD NEVER BE INSTANTIATED
  */
 class WP_Session_Utils {
-	/**
-	 * Count the total sessions in the database.
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @return int
-	 */
-	public static function count_sessions() {
-		global $wpdb;
-
-		$query = "SELECT COUNT(*) FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'";
-
-		/**
-		 * Filter the query in case tables are non-standard.
-		 *
-		 * @param string $query Database count query
-		 */
-		$query = apply_filters( 'wp_session_count_query', $query );
-
-		$sessions = $wpdb->get_var( $query );
-
-		return absint( $sessions );
-	}
-
-	/**
-	 * Create a new, random session in the database.
-	 *
-	 * @param null|string $date
-	 */
-	public static function create_dummy_session( $date = null ) {
-		// Generate our date
-		if ( null !== $date ) {
-			$time = strtotime( $date );
-
-			if ( false === $time ) {
-				$date = null;
-			} else {
-				$expires = date( 'U', strtotime( $date ) );
-			}
-		}
-
-		// If null was passed, or if the string parsing failed, fall back on a default
-		if ( null === $date ) {
-			/**
-			 * Filter the expiration of the session in the database
-			 *
-			 * @param int
-			 */
-			$expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
-		}
-
-		$session_id = self::generate_id();
-
-		// Store the session
-		add_option( "_wp_session_{$session_id}", array(), '', 'no' );
-		add_option( "_wp_session_expires_{$session_id}", $expires, '', 'no' );
-	}
-
-	/**
-	 * Delete old sessions from the database.
-	 *
-	 * @param int $limit Maximum number of sessions to delete.
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @return int Sessions deleted.
-	 */
-	public static function delete_old_sessions( $limit = 1000 ) {
-		global $wpdb;
-
-		$limit = absint( $limit );
-		$keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%' ORDER BY option_value ASC LIMIT 0, {$limit}" );
-
-		$now = time();
-		$expired = array();
-		$count = 0;
-
-		foreach( $keys as $expiration ) {
-			$key = $expiration->option_name;
-			$expires = $expiration->option_value;
-
-			if ( $now > $expires ) {
-				$session_id = preg_replace("/[^A-Za-z0-9_]/", '', substr( $key, 20 ) );
-
-				$expired[] = $key;
-				$expired[] = "_wp_session_{$session_id}";
-
-				$count += 1;
-			}
-		}
-
-		// Delete expired sessions
-		if ( ! empty( $expired ) ) {
-		    $placeholders = array_fill( 0, count( $expired ), '%s' );
-		    $format = implode( ', ', $placeholders );
-		    $query = "DELETE FROM $wpdb->options WHERE option_name IN ($format)";
-
-		    $prepared = $wpdb->prepare( $query, $expired );
-			$wpdb->query( $prepared );
-		}
-
-		return $count;
-	}
-
-	/**
-	 * Remove all sessions from the database, regardless of expiration.
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @return int Sessions deleted
-	 */
-	public static function delete_all_sessions() {
-		global $wpdb;
-
-		$count = $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE '_wp_session_%'" );
-
-		return (int) ( $count / 2 );
-	}
-
-	/**
-	 * Generate a new, random session ID.
-	 *
-	 * @return string
-	 */
-	public static function generate_id() {
-		require_once( ABSPATH . 'wp-includes/class-phpass.php' );
-		$hash = new PasswordHash( 8, false );
-
-		return md5( $hash->get_random_bytes( 32 ) );
-	}
+    /**
+     * Count the total sessions in the database.
+     *
+     * @global wpdb $wpdb
+     *
+     * @return int
+     */
+    public static function count_sessions() {
+        global $wpdb;
+
+        $query = "SELECT COUNT(*) FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'";
+
+        /**
+         * Filter the query in case tables are non-standard.
+         *
+         * @param string $query Database count query
+         */
+        $query = apply_filters( 'wp_session_count_query', $query );
+
+        $sessions = $wpdb->get_var( $query );
+
+        return absint( $sessions );
+    }
+
+    /**
+     * Create a new, random session in the database.
+     *
+     * @param null|string $date
+     */
+    public static function create_dummy_session( $date = null ) {
+        // Generate our date
+        if ( null !== $date ) {
+            $time = strtotime( $date );
+
+            if ( false === $time ) {
+                $date = null;
+            } else {
+                $expires = date( 'U', strtotime( $date ) );
+            }
+        }
+
+        // If null was passed, or if the string parsing failed, fall back on a default
+        if ( null === $date ) {
+            /**
+             * Filter the expiration of the session in the database
+             *
+             * @param int
+             */
+            $expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+        }
+
+        $session_id = self::generate_id();
+
+        // Store the session
+        add_option( "_wp_session_{$session_id}", array(), '', 'no' );
+        add_option( "_wp_session_expires_{$session_id}", $expires, '', 'no' );
+    }
+
+    /**
+     * Delete old sessions from the database.
+     *
+     * @param int $limit Maximum number of sessions to delete.
+     *
+     * @global wpdb $wpdb
+     *
+     * @return int Sessions deleted.
+     */
+    public static function delete_old_sessions( $limit = 1000 ) {
+        global $wpdb;
+
+        $limit = absint( $limit );
+        $keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%' ORDER BY option_value ASC LIMIT 0, {$limit}" );
+
+        $now = time();
+        $expired = array();
+        $count = 0;
+
+        foreach( $keys as $expiration ) {
+            $key = $expiration->option_name;
+            $expires = $expiration->option_value;
+
+            if ( $now > $expires ) {
+                $session_id = preg_replace("/[^A-Za-z0-9_]/", '', substr( $key, 20 ) );
+
+                $expired[] = $key;
+                $expired[] = "_wp_session_{$session_id}";
+
+                $count += 1;
+            }
+        }
+
+        // Delete expired sessions
+        if ( ! empty( $expired ) ) {
+            $placeholders = array_fill( 0, count( $expired ), '%s' );
+            $format = implode( ', ', $placeholders );
+            $query = "DELETE FROM $wpdb->options WHERE option_name IN ($format)";
+
+            $prepared = $wpdb->prepare( $query, $expired );
+            $wpdb->query( $prepared );
+        }
+
+        return $count;
+    }
+
+    /**
+     * Remove all sessions from the database, regardless of expiration.
+     *
+     * @global wpdb $wpdb
+     *
+     * @return int Sessions deleted
+     */
+    public static function delete_all_sessions() {
+        global $wpdb;
+
+        $count = $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE '_wp_session_%'" );
+
+        return (int) ( $count / 2 );
+    }
+
+    /**
+     * Generate a new, random session ID.
+     *
+     * @return string
+     */
+    public static function generate_id() {
+        require_once( ABSPATH . 'wp-includes/class-phpass.php' );
+        $hash = new PasswordHash( 8, false );
+
+        return md5( $hash->get_random_bytes( 32 ) );
+    }
 } 
\ No newline at end of file

includes/class-wpinv-session.php

Indentation +274 added lines, -274 removed lines

@@ -8,291 +8,291 @@
  * @since 1.0.0
  */
 class WPInv_Session {
-	/**
-	 * Holds our session data.
-	 *
-	 * @var array
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $session;
-
-	/**
-	 * Whether to use PHP $_SESSION or WP_Session.
-	 *
-	 * @var bool
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $use_php_sessions = false;
-
-	/**
-	 * Session index prefix.
-	 *
-	 * @var string
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $prefix = '';
-
-	/**
-	 * Get things started.
-	 *
-	 * Defines our WP_Session constants, includes the necessary libraries and
-	 * retrieves the WP Session instance.
-	 *
-	 * @since 1.0.0
-	 */
-	public function __construct() {
-		$this->use_php_sessions = $this->use_php_sessions();
-
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
-				$this->prefix = '_' . get_current_blog_id();
-			}
-
-			// Use PHP SESSION (must be enabled via the WPINV_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
-		} else {
-			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'wpinv_wp_session' );
-			}
-
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-recursive-arrayaccess.php';
-			}
+    /**
+     * Holds our session data.
+     *
+     * @var array
+     * @access private
+     * @since 1.0.0
+     */
+    private $session;
+
+    /**
+     * Whether to use PHP $_SESSION or WP_Session.
+     *
+     * @var bool
+     * @access private
+     * @since 1.0.0
+     */
+    private $use_php_sessions = false;
+
+    /**
+     * Session index prefix.
+     *
+     * @var string
+     * @access private
+     * @since 1.0.0
+     */
+    private $prefix = '';
+
+    /**
+     * Get things started.
+     *
+     * Defines our WP_Session constants, includes the necessary libraries and
+     * retrieves the WP Session instance.
+     *
+     * @since 1.0.0
+     */
+    public function __construct() {
+        $this->use_php_sessions = $this->use_php_sessions();
+
+        if ( $this->use_php_sessions ) {
+            if ( is_multisite() ) {
+                $this->prefix = '_' . get_current_blog_id();
+            }
+
+            // Use PHP SESSION (must be enabled via the WPINV_USE_PHP_SESSIONS constant)
+            add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+        } else {
+            // Use WP_Session (default)
+            if ( !defined( 'WP_SESSION_COOKIE' ) ) {
+                define( 'WP_SESSION_COOKIE', 'wpinv_wp_session' );
+            }
+
+            if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-recursive-arrayaccess.php';
+            }
             
-			if ( !class_exists( 'WP_Session_Utils' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session-utils.php';
-			}
+            if ( !class_exists( 'WP_Session_Utils' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session-utils.php';
+            }
             
-			if ( defined( 'WP_CLI' ) && WP_CLI && !class_exists( 'WP_Session_Command' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-cli.php';
-			}
-
-			if ( !class_exists( 'WP_Session' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session.php';
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-session.php';
-			}
-
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
-		}
-
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
-		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
-		}
-	}
-
-	/**
-	 * Setup the WP_Session instance.
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return void
-	 */
-	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['wpi' . $this->prefix ] ) && is_array( $_SESSION['wpi' . $this->prefix ] ) ? $_SESSION['wpi' . $this->prefix ] : array();
-		} else {
-			$this->session = WP_Session::get_instance();
-		}
-
-		return $this->session;
-	}
-
-	/**
-	 * Retrieve session ID.
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return string Session ID
-	 */
-	public function get_id() {
-		if ( $this->use_php_sessions ) {
-			$session_id = !empty( $_SESSION ) && function_exists( 'session_id' ) ? session_id() : NULL;
-		} else {
-			$session_id = !empty( $this->session ) && isset( $this->session->session_id ) ? $this->session->session_id : NULL;
-		}
-		return $session_id;
-	}
-
-	/**
-	 * Retrieve a session variable.
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @param string $key Session key
-	 * @return string Session variable
-	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
-	}
-
-	/**
-	 * Set a session variable
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $key Session key
-	 * @param integer $value Session variable
-	 * @return string Session variable
-	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
-
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
-		} else {
-			$this->session[ $key ] = $value;
-		}
-
-		if ( $this->use_php_sessions ) {
-			$_SESSION['wpi' . $this->prefix ] = $this->session;
-		}
-
-		return $this->session[ $key ];
-	}
+            if ( defined( 'WP_CLI' ) && WP_CLI && !class_exists( 'WP_Session_Command' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-cli.php';
+            }
+
+            if ( !class_exists( 'WP_Session' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session.php';
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-session.php';
+            }
+
+            add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
+            add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+        }
+
+        if ( empty( $this->session ) && ! $this->use_php_sessions ) {
+            add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+        } else {
+            add_action( 'init', array( $this, 'init' ), -1 );
+        }
+    }
+
+    /**
+     * Setup the WP_Session instance.
+     *
+     * @access public
+     * @since 1.0.0
+     * @return void
+     */
+    public function init() {
+        if ( $this->use_php_sessions ) {
+            $this->session = isset( $_SESSION['wpi' . $this->prefix ] ) && is_array( $_SESSION['wpi' . $this->prefix ] ) ? $_SESSION['wpi' . $this->prefix ] : array();
+        } else {
+            $this->session = WP_Session::get_instance();
+        }
+
+        return $this->session;
+    }
+
+    /**
+     * Retrieve session ID.
+     *
+     * @access public
+     * @since 1.0.0
+     * @return string Session ID
+     */
+    public function get_id() {
+        if ( $this->use_php_sessions ) {
+            $session_id = !empty( $_SESSION ) && function_exists( 'session_id' ) ? session_id() : NULL;
+        } else {
+            $session_id = !empty( $this->session ) && isset( $this->session->session_id ) ? $this->session->session_id : NULL;
+        }
+        return $session_id;
+    }
+
+    /**
+     * Retrieve a session variable.
+     *
+     * @access public
+     * @since 1.0.0
+     * @param string $key Session key
+     * @return string Session variable
+     */
+    public function get( $key ) {
+        $key = sanitize_key( $key );
+        return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+    }
+
+    /**
+     * Set a session variable
+     *
+     * @since 1.0.0
+     *
+     * @param string $key Session key
+     * @param integer $value Session variable
+     * @return string Session variable
+     */
+    public function set( $key, $value ) {
+        $key = sanitize_key( $key );
+
+        if ( is_array( $value ) ) {
+            $this->session[ $key ] = maybe_serialize( $value );
+        } else {
+            $this->session[ $key ] = $value;
+        }
+
+        if ( $this->use_php_sessions ) {
+            $_SESSION['wpi' . $this->prefix ] = $this->session;
+        }
+
+        return $this->session[ $key ];
+    }
 	
-	/**
-	 * Unset a session variable.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string|array $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
-	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
-			return false;
-		}
+    /**
+     * Unset a session variable.
+     *
+     * @since 1.0.0
+     *
+     * @param string|array $key Session key.
+     * @param integer $value Session variable.
+     * @return string Session variable.
+     */
+    public function un_set( $key ) {
+        if ( empty( $key ) ) {
+            return false;
+        }
 		
-		if ( is_array( $key ) ) {
-			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+        if ( is_array( $key ) ) {
+            foreach ($key as $index) {
+                $index = sanitize_key( $index );
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
-				}
-			}
-		} else {
-			$key = sanitize_key( $key );
+                if ( $index && isset( $this->session[ $index ] ) ) {
+                    unset( $this->session[ $index ] );
+                }
+            }
+        } else {
+            $key = sanitize_key( $key );
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
-			}
-		}
+            if ( isset( $this->session[ $key ] ) ) {
+                unset( $this->session[ $key ] );
+            }
+        }
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['wpi' . $this->prefix ] = $this->session;
-		}
+        if ( $this->use_php_sessions ) {
+            $_SESSION['wpi' . $this->prefix ] = $this->session;
+        }
 
-		return true;
-	}
+        return true;
+    }
 	
-	/**
-	 * Check a session variable is set or not.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
-	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+    /**
+     * Check a session variable is set or not.
+     *
+     * @since 1.0.0
+     *
+     * @param string $key Session key.
+     * @param integer $value Session variable.
+     * @return string Session variable.
+     */
+    public function is_set( $key ) {
+        $key = sanitize_key( $key );
 		
-		if ( empty( $key ) ) {
-			return false;
-		}
-
-		if ( isset( $this->session[ $key ] ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Force the cookie expiration variant time to 23 hours
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @param int $exp Default expiration (1 hour)
-	 * @return int
-	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
-	}
-
-	/**
-	 * Force the cookie expiration time to 24 hours
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @param int $exp Default expiration (1 hour)
-	 * @return int
-	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
-	}
-
-	/**
-	 * Starts a new session if one hasn't started yet.
-	 *
-	 * @return boolean
-	 * Checks to see if the server supports PHP sessions
-	 * or if the WPINV_USE_PHP_SESSIONS constant is defined
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return boolean $ret True if we are using PHP sessions, false otherwise
-	 */
-	public function use_php_sessions() {
-		$ret = false;
-
-		// If the database variable is already set, no need to run autodetection
-		$wpinv_use_php_sessions = (bool)get_option( 'wpinv_use_php_sessions' );
-
-		if (!$wpinv_use_php_sessions ) {
-			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'wpinv_use_php_sessions', 1 );
+        if ( empty( $key ) ) {
+            return false;
+        }
+
+        if ( isset( $this->session[ $key ] ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Force the cookie expiration variant time to 23 hours
+     *
+     * @access public
+     * @since 1.0.0
+     * @param int $exp Default expiration (1 hour)
+     * @return int
+     */
+    public function set_expiration_variant_time( $exp ) {
+        return ( 30 * 60 * 23 );
+    }
+
+    /**
+     * Force the cookie expiration time to 24 hours
+     *
+     * @access public
+     * @since 1.0.0
+     * @param int $exp Default expiration (1 hour)
+     * @return int
+     */
+    public function set_expiration_time( $exp ) {
+        return ( 30 * 60 * 24 );
+    }
+
+    /**
+     * Starts a new session if one hasn't started yet.
+     *
+     * @return boolean
+     * Checks to see if the server supports PHP sessions
+     * or if the WPINV_USE_PHP_SESSIONS constant is defined
+     *
+     * @access public
+     * @since 1.0.0
+     * @return boolean $ret True if we are using PHP sessions, false otherwise
+     */
+    public function use_php_sessions() {
+        $ret = false;
+
+        // If the database variable is already set, no need to run autodetection
+        $wpinv_use_php_sessions = (bool)get_option( 'wpinv_use_php_sessions' );
+
+        if (!$wpinv_use_php_sessions ) {
+            // Attempt to detect if the server supports PHP sessions
+            if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
+                $this->set( 'wpinv_use_php_sessions', 1 );
 				
-				if ( $this->get( 'wpinv_use_php_sessions' ) ) {
-					$ret = true;
-
-					// Set the database option
-					update_option( 'wpinv_use_php_sessions', true );
-				}
-			}
-		} else {
-			$ret = $wpinv_use_php_sessions;
-		}
-
-		// Enable or disable PHP Sessions based on the WPINV_USE_PHP_SESSIONS constant
-		if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && WPINV_USE_PHP_SESSIONS ) {
-			$ret = true;
-		} else if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && ! WPINV_USE_PHP_SESSIONS ) {
-			$ret = false;
-		}
-
-		return (bool) apply_filters( 'wpinv_use_php_sessions', $ret );
-	}
-
-	/**
-	 * Starts a new session if one hasn't started yet.
-	 */
-	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
-			session_start();
-		}
-	}
+                if ( $this->get( 'wpinv_use_php_sessions' ) ) {
+                    $ret = true;
+
+                    // Set the database option
+                    update_option( 'wpinv_use_php_sessions', true );
+                }
+            }
+        } else {
+            $ret = $wpinv_use_php_sessions;
+        }
+
+        // Enable or disable PHP Sessions based on the WPINV_USE_PHP_SESSIONS constant
+        if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && WPINV_USE_PHP_SESSIONS ) {
+            $ret = true;
+        } else if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && ! WPINV_USE_PHP_SESSIONS ) {
+            $ret = false;
+        }
+
+        return (bool) apply_filters( 'wpinv_use_php_sessions', $ret );
+    }
+
+    /**
+     * Starts a new session if one hasn't started yet.
+     */
+    public function maybe_start_session() {
+        if ( !session_id() && !headers_sent() ) {
+            session_start();
+        }
+    }
 }
 
 global $wpi_session;

includes/gateways/authorizenet/Authorize.Net-XML/AuthnetXML.class.php

Indentation +47 added lines, -47 removed lines

@@ -40,7 +40,7 @@ 
     const EXCEPTION_CURL = 10;
 
     private $ch;
-	private $login;
+    private $login;
     private $response;
     private $response_xml;
     private $results;
@@ -48,9 +48,9 @@ 
     private $url;
     private $xml;
 
-	public function __construct($login, $transkey, $test = self::USE_PRODUCTION_SERVER)
-	{
-		$login    = trim($login);
+    public function __construct($login, $transkey, $test = self::USE_PRODUCTION_SERVER)
+    {
+        $login    = trim($login);
         $transkey = trim($transkey);
         if (empty($login) || empty($transkey))
         {
@@ -63,7 +63,7 @@ 
 
         $subdomain = ($test) ? 'apitest' : 'api';
         $this->url = 'https://' . $subdomain . '.authorize.net/xml/v1/request.api';
-	}
+    }
 
     /**
      * remove XML response namespaces
@@ -78,9 +78,9 @@ 
         return str_replace(' xmlns:xsd="http://www.w3.org/2001/XMLSchema"','',$input);
     }
 
-	public function __toString()
-	{
-	    $output  = '';
+    public function __toString()
+    {
+        $output  = '';
         $output .= '<table summary="Authorize.Net Results" id="authnet">' . "\n";
         $output .= '<tr>' . "\n\t\t" . '<th colspan="2"><b>Class Parameters</b></th>' . "\n" . '</tr>' . "\n";
         $output .= '<tr>' . "\n\t\t" . '<td><b>API Login ID</b></td><td>' . $this->login . '</td>' . "\n" . '</tr>' . "\n";
@@ -117,9 +117,9 @@ 
         $output .= '</table>';
 
         return $output;
-	}
+    }
 
-	public function __destruct()
+    public function __destruct()
     {
         if (isset($this->ch))
         {
@@ -128,31 +128,31 @@ 
     }
 
     public function __get($var)
-	{
-	    return $this->response_xml->$var;
-	}
-
-	public function __set($key, $value)
-	{
-	    trigger_error('You cannot set parameters directly in ' . __CLASS__ . '.', E_USER_WARNING);
-	    return false;
-	}
-
-	public function __call($api_call, $args)
-	{
-	    $this->xml = new SimpleXMLElement('<' . $api_call . '></' . $api_call . '>');
+    {
+        return $this->response_xml->$var;
+    }
+
+    public function __set($key, $value)
+    {
+        trigger_error('You cannot set parameters directly in ' . __CLASS__ . '.', E_USER_WARNING);
+        return false;
+    }
+
+    public function __call($api_call, $args)
+    {
+        $this->xml = new SimpleXMLElement('<' . $api_call . '></' . $api_call . '>');
         $this->xml->addAttribute('xmlns', 'AnetApi/xml/v1/schema/AnetApiSchema.xsd');
-	    $merch_auth = $this->xml->addChild('merchantAuthentication');
+        $merch_auth = $this->xml->addChild('merchantAuthentication');
         $merch_auth->addChild('name', $this->login);
-	    $merch_auth->addChild('transactionKey', $this->transkey);
+        $merch_auth->addChild('transactionKey', $this->transkey);
 
-		$this->setParameters($this->xml, $args[0]);
-		$this->process();
-	}
+        $this->setParameters($this->xml, $args[0]);
+        $this->process();
+    }
 
-	private function setParameters($xml, $array)
-	{
-	    if (is_array($array))
+    private function setParameters($xml, $array)
+    {
+        if (is_array($array))
         {
             $first = true;
             foreach ($array as $key => $value)
@@ -184,34 +184,34 @@ 
                 }
             }
         }
-	}
+    }
 
-	private function process()
-	{
-		$this->xml = $this->xml->asXML();
+    private function process()
+    {
+        $this->xml = $this->xml->asXML();
 
-		$this->ch = curl_init();
+        $this->ch = curl_init();
         curl_setopt($this->ch, CURLOPT_URL, $this->url);
-    	curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, 1);
-    	curl_setopt($this->ch, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
-    	curl_setopt($this->ch, CURLOPT_HEADER, 0);
-    	curl_setopt($this->ch, CURLOPT_POSTFIELDS, $this->xml);
-    	curl_setopt($this->ch, CURLOPT_POST, 1);
-    	curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, 2);
-    	curl_setopt($this->ch, CURLOPT_CAINFO, dirname(__FILE__) . '/ssl/cert.pem');
+        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($this->ch, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
+        curl_setopt($this->ch, CURLOPT_HEADER, 0);
+        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $this->xml);
+        curl_setopt($this->ch, CURLOPT_POST, 1);
+        curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, 2);
+        curl_setopt($this->ch, CURLOPT_CAINFO, dirname(__FILE__) . '/ssl/cert.pem');
 
         if(($this->response = curl_exec($this->ch)) !== false)
         {
             $this->response_xml = @new SimpleXMLElement($this->response);
 
-		    curl_close($this->ch);
+            curl_close($this->ch);
             unset($this->ch);
             return;
-		}
+        }
         throw new AuthnetXMLException('Connection error: ' . curl_error($this->ch) . ' (' . curl_errno($this->ch) . ')', self::EXCEPTION_CURL);
-	}
+    }
 
-	public function isSuccessful()
+    public function isSuccessful()
     {
         return $this->response_xml->messages->resultCode == 'Ok';
     }