YetiForceCompany / YetiForceCRM

libraries/antlr/MismatchedSetException.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	}
 
 	public function __toString() {
-		return "MismatchedSetException(".$this->getUnexpectedType()."!=".$this->expecting.")";
+		return "MismatchedSetException(" . $this->getUnexpectedType() . "!=" . $this->expecting . ")";
 	}
 }
 

libraries/antlr/Set.php

Spacing +8 added lines, -8 removed lines

@@ -1,30 +1,30 @@
 <?php
 	//Todo: find a decent set implementation for php
-	class Set{
-		public function __construct($arr){
+	class Set {
+		public function __construct($arr) {
 			$this->store = array();
-			foreach($arr as $el){
+			foreach ($arr as $el) {
 				$this->store[$el] = $el;
 			}
 		}
 		
-		public function add($value){
+		public function add($value) {
 			$this->store[$value] = $value;
 		}
 		
-		public function member($value){
+		public function member($value) {
 			return array_key_exists($value, $this->store);
 		}
 		
-		public function union($otherSet){
+		public function union($otherSet) {
 			return new Set(array_merge($this->store, $otherSet->store));
 		}
 		
-		public function unionInPlace($otherSet){
+		public function unionInPlace($otherSet) {
 			$this->store = $this->union($otherSet)->store;
 		}
 		
-		public function remove($value){
+		public function remove($value) {
 			unset($this->store[$value]);
 		}
 	}

libraries/antlr/RecognitionException.php

Spacing +18 added lines, -18 removed lines

@@ -59,7 +59,7 @@ 
  */
 class RecognitionException extends Exception {
 
-	public $line=0;
+	public $line = 0;
 
 
 	public function __construct($input) {
@@ -72,41 +72,41 @@ 
 		 *  can retrieve the ith Token, we have to track the Token object.
 		 *  For parsers.  Even when it's a tree parser, token might be set.
 		 */
-		$this->token=null;
+		$this->token = null;
 
 		/** If this is a tree parser exception, node is set to the node with
 		 *  the problem.
 		 */
-		$this->node=null;
+		$this->node = null;
 
 		/** The current char when an error occurred. For lexers. */
-		$this->c=0;
+		$this->c = 0;
 
 		/** Track the line at which the error occurred in case this is
 		 *  generated from a lexer.  We need to track this since the
 		 *  unexpected char doesn't carry the line info.
 		 */
-		$this->line=0;
+		$this->line = 0;
 
-		$this->charPositionInLine=0;
+		$this->charPositionInLine = 0;
 
 		/** If you are parsing a tree node stream, you will encounter som
 		 *  imaginary nodes w/o line/col info.  We now search backwards looking
 		 *  for most recent token with line/col info, but notify getErrorHeader()
 		 *  that info is approximate.
 		 */
-		$this->approximateLineInfo=false;
+		$this->approximateLineInfo = false;
 		
 
-		if ( $this->input instanceof TokenStream ) {
+		if ($this->input instanceof TokenStream) {
 			$this->token = $input->LT(1);
 			$this->line = $this->token->getLine();
 			$this->charPositionInLine = $this->token->getCharPositionInLine();
 		}
-		if ( $this->input instanceof TreeNodeStream ) {
+		if ($this->input instanceof TreeNodeStream) {
 			$this->extractInformationFromTreeNodeStream($input);
 		}
-		else if ( $input instanceof CharStream ) {
+		else if ($input instanceof CharStream) {
 			$this->c = $input->LA(1);
 			$this->line = $input->getLine();
 			$this->charPositionInLine = $input->getCharPositionInLine();
@@ -121,15 +121,15 @@ 
 		$this->node = $nodes->LT(1);
 		$adaptor = $nodes->getTreeAdaptor();
 		$payload = $adaptor->getToken($this->node);
-		if ( $payload!=null ) {
+		if ($payload != null) {
 			$this->token = $payload;
-			if ( $payload->getLine()<= 0 ) {
+			if ($payload->getLine() <= 0) {
 				// imaginary node; no line/pos info; scan backwards
 				$i = -1;
 				$priorNode = $nodes->LT($i);
-				while ( $priorNode!=null ) {
+				while ($priorNode != null) {
 					$priorPayload = $adaptor->getToken($priorNode);
-					if ( $priorPayload!=null && $priorPayload->getLine()>0 ) {
+					if ($priorPayload != null && $priorPayload->getLine() > 0) {
 						// we found the most recent real line / pos info
 						$this->line = $priorPayload->getLine();
 						$this->charPositionInLine = $priorPayload->getCharPositionInLine();
@@ -145,10 +145,10 @@ 
 				$this->charPositionInLine = $payload->getCharPositionInLine();
 			}
 		}
-		else if ( $this->node instanceof Tree) {
+		else if ($this->node instanceof Tree) {
 			$this->line = $this->node->getLine();
 			$this->charPositionInLine = $this->node->getCharPositionInLine();
-			if ( $this->node instanceof CommonTree) {
+			if ($this->node instanceof CommonTree) {
 				$this->token = $this->node->token;
 			}
 		}
@@ -161,10 +161,10 @@ 
 
 	/** Return the token type or char of the unexpected input element */
 	public function getUnexpectedType() {
-		if ( $this->input instanceof TokenStream ) {
+		if ($this->input instanceof TokenStream) {
 			return $this->token->getType();
 		}
-		else if ( $this->input instanceof TreeNodeStream ) {
+		else if ($this->input instanceof TreeNodeStream) {
 			$nodes = $this->input;
 			$adaptor = $nodes->getTreeAdaptor();
 			return $adaptor->getType($this->node);

Braces +7 added lines, -14 removed lines

@@ -105,13 +105,11 @@ 
 		}
 		if ( $this->input instanceof TreeNodeStream ) {
 			$this->extractInformationFromTreeNodeStream($input);
-		}
-		else if ( $input instanceof CharStream ) {
+		} else if ( $input instanceof CharStream ) {
 			$this->c = $input->LA(1);
 			$this->line = $input->getLine();
 			$this->charPositionInLine = $input->getCharPositionInLine();
-		}
-		else {
+		} else {
 			$this->c = $input->LA(1);
 		}
 	}
@@ -139,20 +137,17 @@ 
 					--$i;
 					$priorNode = $nodes->LT($i);
 				}
-			}
-			else { // node created from real token
+			} else { // node created from real token
 				$this->line = $payload->getLine();
 				$this->charPositionInLine = $payload->getCharPositionInLine();
 			}
-		}
-		else if ( $this->node instanceof Tree) {
+		} else if ( $this->node instanceof Tree) {
 			$this->line = $this->node->getLine();
 			$this->charPositionInLine = $this->node->getCharPositionInLine();
 			if ( $this->node instanceof CommonTree) {
 				$this->token = $this->node->token;
 			}
-		}
-		else {
+		} else {
 			$type = $adaptor->getType($this->node);
 			$text = $adaptor->getText($this->node);
 			$this->token = CommonToken::forTypeAndText($type, $text);
@@ -163,13 +158,11 @@ 
 	public function getUnexpectedType() {
 		if ( $this->input instanceof TokenStream ) {
 			return $this->token->getType();
-		}
-		else if ( $this->input instanceof TreeNodeStream ) {
+		} else if ( $this->input instanceof TreeNodeStream ) {
 			$nodes = $this->input;
 			$adaptor = $nodes->getTreeAdaptor();
 			return $adaptor->getType($this->node);
-		}
-		else {
+		} else {
 			return $this->c;
 		}
 	}

libraries/antlr/CommonTokenStream.php

Spacing +49 added lines, -49 removed lines

@@ -62,11 +62,11 @@ 
      */
     protected $p = -1;
 
-	public function __construct($tokenSource, $channel=null) {
+	public function __construct($tokenSource, $channel = null) {
 		$this->channel = TokenConst::$DEFAULT_CHANNEL;
 		$this->tokens = array();
 		$this->tokenSource = $tokenSource;
-		if($channel != null){
+		if ($channel != null) {
 			$this->channel = $channel;
 		}
 	}
@@ -86,24 +86,24 @@ 
 	protected function fillBuffer() {
 		$index = 0;
 		$t = $this->tokenSource->nextToken();
-		while ( $t!=null && $t->getType()!=CharStreamConst::$EOF ) {
+		while ($t != null && $t->getType() != CharStreamConst::$EOF) {
 			$discard = false;
 			// is there a channel override for token type?
-			if ( $this->channelOverrideMap!=null ) {
+			if ($this->channelOverrideMap != null) {
 				$channelI = $this->channelOverrideMap[$t->getType()];
-				if ( $channelI!=null ) {
+				if ($channelI != null) {
 					$t->setChannel($channelI);
 				}
 			}
-			if ( $this->discardSet!=null &&
+			if ($this->discardSet != null &&
 				 $this->discardSet->contains($t->getType()))
 			{
 				$discard = true;
 			}
-			else if ( $this->discardOffChannelTokens && $t->getChannel()!=$this->channel ) {
+			else if ($this->discardOffChannelTokens && $t->getChannel() != $this->channel) {
 				$discard = true;
 			}
-			if ( !$discard )	{
+			if (!$discard) {
 				$t->setTokenIndex($index);
 				$this->tokens[] = $t;
 				$index++;
@@ -123,7 +123,7 @@ 
 	 *  Walk past any token not on the channel the parser is listening to.
 	 */
 	public function consume() {
-		if ( $this->p<sizeof($this->tokens)) {
+		if ($this->p < sizeof($this->tokens)) {
             $this->p++;
 			$this->p = $this->skipOffTokenChannels($this->p); // leave p on valid token
         }
@@ -134,14 +134,14 @@ 
 	 */
 	protected function skipOffTokenChannels($i) {
 		$n = sizeof($this->tokens);
-		while ( $i<$n && $this->tokens[$i]->getChannel()!=$this->channel ) {
+		while ($i < $n && $this->tokens[$i]->getChannel() != $this->channel) {
 			$i++;
 		}
 		return $i;
 	}
 
 	protected function skipOffTokenChannelsReverse($i) {
-		while ( $i>=0 && $this->tokens[$i]->getChannel()!=$this->channel) {
+		while ($i >= 0 && $this->tokens[$i]->getChannel() != $this->channel) {
 			$i--;
 		}
 		return $i;
@@ -154,17 +154,17 @@ 
 	 *  channel.
 	 */
 	public function setTokenTypeChannel($ttype, $channel) {
-		if ( $this->channelOverrideMap==null ) {
+		if ($this->channelOverrideMap == null) {
 			$this->channelOverrideMap = array();
 		}
         $this->channelOverrideMap[$ttype] = $channel;
 	}
 
 	public function discardTokenType($ttype) {
-		if ( $this->discardSet==null ) {
+		if ($this->discardSet == null) {
 			$this->discardSet = new Set();
 		}
-        $this->discardSet.add($ttype);
+        $this->discardSet . add($ttype);
 	}
 
 	public function discardOffChannelTokens($discardOffChannelTokens) {
@@ -172,7 +172,7 @@ 
 	}
 
 	public function getTokens() {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
 		return $this->tokens;
@@ -187,35 +187,35 @@ 
 	 *  method looks at both on and off channel tokens.
 	 */
 	public function getTokensOfTypeInSet($start, $stop, $types) {
-		if ( $p == -1 ) {
+		if ($p == -1) {
 			fillBuffer();
 		}
-		if ( $stop>=sizeof($this->tokens)) {
-			$stop=sizeof($this->tokens) - 1;
+		if ($stop >= sizeof($this->tokens)) {
+			$stop = sizeof($this->tokens) - 1;
 		}
-		if ( $start<0 ) {
-			$start=0;
+		if ($start < 0) {
+			$start = 0;
 		}
-		if ( $start>$stop ) {
+		if ($start > $stop) {
 			return null;
 		}
 
 		// list = tokens[start:stop]:{Token t, t.getType() in types}
 		$filteredTokens = array();
-		for ($i=$start; $i<=$stop; $i++) {
+		for ($i = $start; $i <= $stop; $i++) {
 			$t = $this->tokens[$i];
-			if ( $types==null || $types->member($t->getType())) {
+			if ($types == null || $types->member($t->getType())) {
 				$filteredTokens->add($t);
 			}
 		}
-		if ( sizeof($filteredTokens)==0 ) {
+		if (sizeof($filteredTokens) == 0) {
 			$filteredTokens = null;
 		}
 		return $filteredTokens;
 	}
 
 	public function getTokensOfTypeInArray($start, $stop, $types) {
-		return $this->getTokens($start, $stop,new Set(types));
+		return $this->getTokens($start, $stop, new Set(types));
 	}
 
 	public function getTokensofType($start, $stop, $ttype) {
@@ -226,29 +226,29 @@ 
 	 *  first symbol of lookahead.
 	 */
 	public function LT($k) {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		if ( $k==0 ) {
+		if ($k == 0) {
 			return null;
 		}
-		if ( $k<0 ) {
+		if ($k < 0) {
 			return $this->LB(-$k);
 		}
 		//System.out.print("LT(p="+p+","+k+")=");
-		if ( ($this->p+$k-1) >= sizeof($this->tokens)) {
+		if (($this->p + $k - 1) >= sizeof($this->tokens)) {
 			return TokenConst::$EOF_TOKEN;
 		}
 		//System.out.println(tokens.get(p+k-1));
 		$i = $this->p;
 		$n = 1;
 		// find k good tokens
-		while ( $n<$k ) {
+		while ($n < $k) {
 			// skip off-channel tokens
-			$i = $this->skipOffTokenChannels($i+1); // leave p on valid token
+			$i = $this->skipOffTokenChannels($i + 1); // leave p on valid token
 			$n++;
 		}
-		if ( $i>=sizeof($this->tokens)) {
+		if ($i >= sizeof($this->tokens)) {
 			return TokenConst::$EOF_TOKEN;
 		}
         return $this->tokens[$i];
@@ -257,13 +257,13 @@ 
 	/** Look backwards k tokens on-channel tokens */
 	protected function LB($k) {
 		//System.out.print("LB(p="+p+","+k+") ");
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		if ( $k==0 ) {
+		if ($k == 0) {
 			return null;
 		}
-		if ( ($this->p-$k)<0 ) {
+		if (($this->p - $k) < 0) {
 			return null;
 		}
 		
@@ -271,12 +271,12 @@ 
 		$i = $this->p;
 		$n = 1;
 		// find k good tokens looking backwards
-		while ( $n<=$k ) {
+		while ($n <= $k) {
 			// skip off-channel tokens
-			$i = $this->skipOffTokenChannelsReverse($i-1); // leave p on valid token
+			$i = $this->skipOffTokenChannelsReverse($i - 1); // leave p on valid token
 			$n++;
 		}
-		if ( $i<0 ) {
+		if ($i < 0) {
 			return null;
 		}
 		return $this->tokens[$i];
@@ -295,7 +295,7 @@ 
     }
 
     public function mark() {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
 		$this->lastMarker = $this->index();
@@ -315,7 +315,7 @@ 
     }
 
 	public function rewind($marker = null) {
-		if($marker===null){
+		if ($marker === null) {
 			$marker = $this->lastmarker;
 		}
 		$this->seek($marker);
@@ -340,38 +340,38 @@ 
 	}
 
 	public function toString() {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		return $this->toStringBetween(0, sizeof($this->tokens)-1);
+		return $this->toStringBetween(0, sizeof($this->tokens) - 1);
 	}
 
 	public function toStringBetween($start, $stop) {
-		if ( $start<0 || $stop<0 ) {
+		if ($start < 0 || $stop < 0) {
 			return null;
 		}
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		if ( $stop>=sizeof($this->tokens)) {
-			$stop = sizeof($this->tokens)-1;
+		if ($stop >= sizeof($this->tokens)) {
+			$stop = sizeof($this->tokens) - 1;
 		}
 		$buf = "";
 		for ($i = $start; $i <= $stop; $i++) {
 			$t = $this->tokens[$i];
-			$buf.=$t->getText();
+			$buf .= $t->getText();
 		}
 		return $buf;
 	}
 
 	public function toStringBetweenTokens($start, $stop) {
-		if ( $start!=null && $stop!=null ) {
+		if ($start != null && $stop != null) {
 			return toString($this->start->getTokenIndex(), $this->stop->getTokenIndex());
 		}
 		return null;
 	}
 	
-	public function __toString(){
+	public function __toString() {
 		return $this->toString();
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
 				 $this->discardSet->contains($t->getType()))
 			{
 				$discard = true;
-			}
-			else if ( $this->discardOffChannelTokens && $t->getChannel()!=$this->channel ) {
+			} else if ( $this->discardOffChannelTokens && $t->getChannel()!=$this->channel ) {
 				$discard = true;
 			}
 			if ( !$discard )	{

Indentation +19 added lines, -19 removed lines

@@ -28,7 +28,7 @@ 
 */
 
 class CommonTokenStream implements TokenStream {
-    protected $tokenSource;
+	protected $tokenSource;
 
 	/** Record every single token pulled from the source so we can reproduce
 	 *  chunks of it later.
@@ -51,9 +51,9 @@ 
 	protected $lastMarker = 0;
 
 	/** The index into the tokens list of the current token (next token
-     *  to consume).  p==-1 indicates that the tokens list is empty
-     */
-    protected $p = -1;
+	 *  to consume).  p==-1 indicates that the tokens list is empty
+	 */
+	protected $p = -1;
 
 	public function __construct($tokenSource, $channel=null) {
 		$this->channel = TokenConst::$DEFAULT_CHANNEL;
@@ -106,7 +106,7 @@ 
 		// leave p pointing at first token on channel
 		$this->p = 0;
 		$this->p = $this->skipOffTokenChannels($this->p);
-    }
+	}
 
 	/** Move the input pointer to the next incoming token.  The stream
 	 *  must become active with LT(1) available.  consume() simply
@@ -117,10 +117,10 @@ 
 	 */
 	public function consume() {
 		if ( $this->p<sizeof($this->tokens)) {
-            $this->p++;
+			$this->p++;
 			$this->p = $this->skipOffTokenChannels($this->p); // leave p on valid token
-        }
-    }
+		}
+	}
 
 	/** Given a starting index, return the index of the first on-channel
 	 *  token.
@@ -150,14 +150,14 @@ 
 		if ( $this->channelOverrideMap==null ) {
 			$this->channelOverrideMap = array();
 		}
-        $this->channelOverrideMap[$ttype] = $channel;
+		$this->channelOverrideMap[$ttype] = $channel;
 	}
 
 	public function discardTokenType($ttype) {
 		if ( $this->discardSet==null ) {
 			$this->discardSet = new Set();
 		}
-        $this->discardSet.add($ttype);
+		$this->discardSet.add($ttype);
 	}
 
 	public function discardOffChannelTokens($discardOffChannelTokens) {
@@ -244,8 +244,8 @@ 
 		if ( $i>=sizeof($this->tokens)) {
 			return TokenConst::$EOF_TOKEN;
 		}
-        return $this->tokens[$i];
-    }
+		return $this->tokens[$i];
+	}
 
 	/** Look backwards k tokens on-channel tokens */
 	protected function LB($k) {
@@ -282,12 +282,12 @@ 
 		return $this->tokens[$i];
 	}
 
-    public function LA($i) {
+	public function LA($i) {
 		$lt = $this->LT($i);
-        return $this->LT($i)->getType();
-    }
+		return $this->LT($i)->getType();
+	}
 
-    public function mark() {
+	public function mark() {
 		if ( $this->p == -1 ) {
 			$this->fillBuffer();
 		}
@@ -303,9 +303,9 @@ 
 		return sizeof($this->tokens);
 	}
 
-    public function index() {
-        return $this->p;
-    }
+	public function index() {
+		return $this->p;
+	}
 
 	public function rewind($marker = null) {
 		if($marker===null){

libraries/HTTP_Session/Session/Container/MDB2.php

Switch Indentation +9 added lines, -9 removed lines

@@ -339,15 +339,15 @@
         }
         if ($this->options['autooptimize']) {
             switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
+            	case 'mysql':
+                	$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+                	break;
+            	case 'pgsql':
+                	$query = sprintf("VACUUM %s", $this->options['table']);
+                	break;
+            	default:
+                	$query = null;
+                	break;
             }
             if (isset($query)) {
                 $result = $this->db->query($query);

Spacing +1 added lines, -1 removed lines

@@ -338,7 +338,7 @@
             return false;
         }
         if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
+            switch ($this->db->phptype) {
             case 'mysql':
                 $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
                 break;

Indentation +279 added lines, -279 removed lines

@@ -59,306 +59,306 @@
  */
 class HTTP_Session_Container_MDB2 extends HTTP_Session_Container
 {
-    /**
-     * MDB2 connection object
-     *
-     * @var object MDB2
-     * @access private
-     */
-    public $db = null;
+	/**
+	 * MDB2 connection object
+	 *
+	 * @var object MDB2
+	 * @access private
+	 */
+	public $db = null;
 
-    /**
-     * Session data cache id
-     *
-     * @var mixed
-     * @access private
-     */
-    public $crc = false;
+	/**
+	 * Session data cache id
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	public $crc = false;
 
-    /**
-     * Constructor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'dsn' - The DSN string</li>
-     * <li>'table' - Table with session data, default is 'sessiondata'</li>
-     * <li>'autooptimize' - Boolean, 'true' to optimize
-     * the table on garbage collection, default is 'false'.</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return void
-     */
-    public function HTTP_Session_Container_MDB2($options)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        } else {
-            $this->options['dsn'] = $options;
-        }
-    }
+	/**
+	 * Constructor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'dsn' - The DSN string</li>
+	 * <li>'table' - Table with session data, default is 'sessiondata'</li>
+	 * <li>'autooptimize' - Boolean, 'true' to optimize
+	 * the table on garbage collection, default is 'false'.</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function HTTP_Session_Container_MDB2($options)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		} else {
+			$this->options['dsn'] = $options;
+		}
+	}
 
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $dsn DSN string
-     *
-     * @access private
-     * @return mixed   Object on error, otherwise bool
-     */
-    public function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-            $this->db = MDB2::connect($dsn);
-        } else if (is_object($dsn) && is_a($dsn, 'MDB2_Driver_Common')) {
-            $this->db = $dsn;
-        } else if (is_object($dsn) && MDB2::isError($dsn)) {
-            return $dsn;
-        } else {
-            return new PEAR_Error("The given dsn was not valid in file " . __FILE__
-                                  . " at line " . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                  );
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $dsn DSN string
+	 *
+	 * @access private
+	 * @return mixed   Object on error, otherwise bool
+	 */
+	public function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			$this->db = MDB2::connect($dsn);
+		} else if (is_object($dsn) && is_a($dsn, 'MDB2_Driver_Common')) {
+			$this->db = $dsn;
+		} else if (is_object($dsn) && MDB2::isError($dsn)) {
+			return $dsn;
+		} else {
+			return new PEAR_Error("The given dsn was not valid in file " . __FILE__
+								  . " at line " . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								  );
 
-        }
+		}
 
-        if (MDB2::isError($this->db)) {
-            return new MDB2_Error($this->db->code, PEAR_ERROR_DIE);
-        }
+		if (MDB2::isError($this->db)) {
+			return new MDB2_Error($this->db->code, PEAR_ERROR_DIE);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['dsn']          = null;
-        $this->options['table']        = 'sessiondata';
-        $this->options['autooptimize'] = false;
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['dsn']          = null;
+		$this->options['table']        = 'sessiondata';
+		$this->options['autooptimize'] = false;
+	}
 
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        if (MDB2::isError($this->_connect($this->options['dsn']))) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		if (MDB2::isError($this->_connect($this->options['dsn']))) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Free resources
-     *
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * Free resources
+	 *
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @return mixed
-     */
-    public function read($id)
-    {
-        $query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
-                         $this->options['table'],
-                         $this->db->quote(md5($id), 'text'),
-                         time());
-        $result = $this->db->queryOne($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        $this->crc = strlen($result) . crc32($result);
-        return $result;
-    }
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return mixed
+	 */
+	public function read($id)
+	{
+		$query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
+						 $this->options['table'],
+						 $this->db->quote(md5($id), 'text'),
+						 time());
+		$result = $this->db->queryOne($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		$this->crc = strlen($result) . crc32($result);
+		return $result;
+	}
 
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Data
-     *
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        if ((false !== $this->crc) &&
-            ($this->crc === strlen($data) . crc32($data))) {
-            // $_SESSION hasn't been touched, no need to update the blob column
-            $query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
-                             $this->options['table'],
-                             time() + ini_get('session.gc_maxlifetime'),
-                             $this->db->quote(md5($id), 'text'));
-        } else {
-            // Check if table row already exists
-            $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
-            $result = $this->db->queryOne($query);
-            if (MDB2::isError($result)) {
-                $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-                return false;
-            }
-            if (0 == intval($result)) {
-                // Insert new row into table
-                $query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
-                                 $this->options['table'],
-                                 $this->db->quote(md5($id), 'text'),
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quote($data, 'text'));
-            } else {
-                // Update existing row
-                $query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
-                                 $this->options['table'],
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quote($data, 'text'),
-                                 $this->db->quote(md5($id), 'text'));
-            }
-        }
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Data
+	 *
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		if ((false !== $this->crc) &&
+			($this->crc === strlen($data) . crc32($data))) {
+			// $_SESSION hasn't been touched, no need to update the blob column
+			$query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
+							 $this->options['table'],
+							 time() + ini_get('session.gc_maxlifetime'),
+							 $this->db->quote(md5($id), 'text'));
+		} else {
+			// Check if table row already exists
+			$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
+			$result = $this->db->queryOne($query);
+			if (MDB2::isError($result)) {
+				$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+				return false;
+			}
+			if (0 == intval($result)) {
+				// Insert new row into table
+				$query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
+								 $this->options['table'],
+								 $this->db->quote(md5($id), 'text'),
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quote($data, 'text'));
+			} else {
+				// Update existing row
+				$query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
+								 $this->options['table'],
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quote($data, 'text'),
+								 $this->db->quote(md5($id), 'text'));
+			}
+		}
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        $query = sprintf("DELETE FROM %s WHERE id = %s",
-                         $this->options['table'],
-                         $this->db->quote(md5($id), 'text'));
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		$query = sprintf("DELETE FROM %s WHERE id = %s",
+						 $this->options['table'],
+						 $this->db->quote(md5($id), 'text'));
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Replicate session data to table specified in option 'replicateBeforeDestroy'
-     *
-     * @param string $targetTable Table to replicate to
-     * @param string $id          Id of record to replicate
-     *
-     * @access private
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        if (is_null($id)) {
-            $id = HTTP_Session::id();
-        }
+	/**
+	 * Replicate session data to table specified in option 'replicateBeforeDestroy'
+	 *
+	 * @param string $targetTable Table to replicate to
+	 * @param string $id          Id of record to replicate
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		if (is_null($id)) {
+			$id = HTTP_Session::id();
+		}
 
-        // Check if table row already exists
-        $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                         $targetTable,
-                         $this->db->quote(md5($id), 'text'));
-        $result = $this->db->queryOne($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		// Check if table row already exists
+		$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+						 $targetTable,
+						 $this->db->quote(md5($id), 'text'));
+		$result = $this->db->queryOne($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        // Insert new row into dest table
-        if (0 == intval($result)) {
-            $query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
+		// Insert new row into dest table
+		if (0 == intval($result)) {
+			$query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
 
-        } else {
-            // Update existing row
-            $query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
-        }
+		} else {
+			// Update existing row
+			$query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
+		}
 
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        $query = sprintf("DELETE FROM %s WHERE expiry < %d",
-                         $this->options['table'],
-                         time());
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
-            }
-            if (isset($query)) {
-                $result = $this->db->query($query);
-                if (MDB2::isError($result)) {
-                    $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-                    return false;
-                }
-            }
-        }
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		$query = sprintf("DELETE FROM %s WHERE expiry < %d",
+						 $this->options['table'],
+						 time());
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		if ($this->options['autooptimize']) {
+			switch($this->db->phptype) {
+			case 'mysql':
+				$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+				break;
+			case 'pgsql':
+				$query = sprintf("VACUUM %s", $this->options['table']);
+				break;
+			default:
+				$query = null;
+				break;
+			}
+			if (isset($query)) {
+				$result = $this->db->query($query);
+				if (MDB2::isError($result)) {
+					$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/SabreDAV/DAV/Sync/Plugin.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
         });
 
-        $server->on('propFind',       [$this, 'propFind']);
+        $server->on('propFind', [$this, 'propFind']);
         $server->on('validateTokens', [$this, 'validateTokens']);
 
     }

Indentation +253 added lines, -253 removed lines

@@ -20,258 +20,258 @@
  */
 class Plugin extends DAV\ServerPlugin {
 
-    /**
-     * Reference to server object
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    const SYNCTOKEN_PREFIX = 'http://sabre.io/ns/sync/';
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'sync';
-
-    }
-
-    /**
-     * Initializes the plugin.
-     *
-     * This is when the plugin registers it's hooks.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->xml->elementMap['{DAV:}sync-collection'] = 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport';
-
-        $self = $this;
-
-        $server->on('report', function($reportName, $dom, $uri) use ($self) {
-
-            if ($reportName === '{DAV:}sync-collection') {
-                $this->server->transactionType = 'report-sync-collection';
-                $self->syncCollection($uri, $dom);
-                return false;
-            }
-
-        });
-
-        $server->on('propFind',       [$this, 'propFind']);
-        $server->on('validateTokens', [$this, 'validateTokens']);
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof ISyncCollection && $node->getSyncToken()) {
-            return [
-                '{DAV:}sync-collection',
-            ];
-        }
-
-        return [];
-
-    }
-
-
-    /**
-     * This method handles the {DAV:}sync-collection HTTP REPORT.
-     *
-     * @param string $uri
-     * @param SyncCollectionReport $report
-     * @return void
-     */
-    public function syncCollection($uri, SyncCollectionReport $report) {
-
-        // Getting the data
-        $node = $this->server->tree->getNodeForPath($uri);
-        if (!$node instanceof ISyncCollection) {
-            throw new DAV\Exception\ReportNotSupported('The {DAV:}sync-collection REPORT is not supported on this url.');
-        }
-        $token = $node->getSyncToken();
-        if (!$token) {
-            throw new DAV\Exception\ReportNotSupported('No sync information is available at this node');
-        }
-
-        $syncToken = $report->syncToken;
-        if (!is_null($syncToken)) {
-            // Sync-token must start with our prefix
-            if (substr($syncToken, 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
-                throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
-            }
-
-            $syncToken = substr($syncToken, strlen(self::SYNCTOKEN_PREFIX));
-
-        }
-        $changeInfo = $node->getChanges($syncToken, $report->syncLevel, $report->limit);
-
-        if (is_null($changeInfo)) {
-
-            throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
-
-        }
-
-        // Encoding the response
-        $this->sendSyncCollectionResponse(
-            $changeInfo['syncToken'],
-            $uri,
-            $changeInfo['added'],
-            $changeInfo['modified'],
-            $changeInfo['deleted'],
-            $report->properties
-        );
-
-    }
-
-    /**
-     * Sends the response to a sync-collection request.
-     *
-     * @param string $syncToken
-     * @param string $collectionUrl
-     * @param array $added
-     * @param array $modified
-     * @param array $deleted
-     * @param array $properties
-     * @return void
-     */
-    protected function sendSyncCollectionResponse($syncToken, $collectionUrl, array $added, array $modified, array $deleted, array $properties) {
-
-
-        $fullPaths = [];
-
-        // Pre-fetching children, if this is possible.
-        foreach (array_merge($added, $modified) as $item) {
-            $fullPath = $collectionUrl . '/' . $item;
-            $fullPaths[] = $fullPath;
-        }
-
-        $responses = [];
-        foreach ($this->server->getPropertiesForMultiplePaths($fullPaths, $properties) as $fullPath => $props) {
-
-            // The 'Property_Response' class is responsible for generating a
-            // single {DAV:}response xml element.
-            $responses[] = new DAV\Xml\Element\Response($fullPath, $props);
-
-        }
-
-
-
-        // Deleted items also show up as 'responses'. They have no properties,
-        // and a single {DAV:}status element set as 'HTTP/1.1 404 Not Found'.
-        foreach ($deleted as $item) {
-
-            $fullPath = $collectionUrl . '/' . $item;
-            $responses[] = new DAV\Xml\Element\Response($fullPath, [], 404);
-
-        }
-        $multiStatus = new DAV\Xml\Response\MultiStatus($responses, self::SYNCTOKEN_PREFIX . $syncToken);
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setBody(
-            $this->server->xml->write('{DAV:}multistatus', $multiStatus, $this->server->getBaseUri())
-        );
-
-    }
-
-    /**
-     * This method is triggered whenever properties are requested for a node.
-     * We intercept this to see if we must return a {DAV:}sync-token.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
-
-        $propFind->handle('{DAV:}sync-token', function() use ($node) {
-            if (!$node instanceof ISyncCollection || !$token = $node->getSyncToken()) {
-                return;
-            }
-            return self::SYNCTOKEN_PREFIX . $token;
-        });
-
-    }
-
-    /**
-     * The validateTokens event is triggered before every request.
-     *
-     * It's a moment where this plugin can check all the supplied lock tokens
-     * in the If: header, and check if they are valid.
-     *
-     * @param RequestInterface $request
-     * @param array $conditions
-     * @return void
-     */
-    public function validateTokens(RequestInterface $request, &$conditions) {
-
-        foreach ($conditions as $kk => $condition) {
-
-            foreach ($condition['tokens'] as $ii => $token) {
-
-                // Sync-tokens must always start with our designated prefix.
-                if (substr($token['token'], 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
-                    continue;
-                }
-
-                // Checking if the token is a match.
-                $node = $this->server->tree->getNodeForPath($condition['uri']);
-
-                if (
-                    $node instanceof ISyncCollection &&
-                    $node->getSyncToken() == substr($token['token'], strlen(self::SYNCTOKEN_PREFIX))
-                ) {
-                    $conditions[$kk]['tokens'][$ii]['validToken'] = true;
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Adds support for WebDAV Collection Sync (rfc6578)',
-            'link'        => 'http://sabre.io/dav/sync/',
-        ];
-
-    }
+	/**
+	 * Reference to server object
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	const SYNCTOKEN_PREFIX = 'http://sabre.io/ns/sync/';
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'sync';
+
+	}
+
+	/**
+	 * Initializes the plugin.
+	 *
+	 * This is when the plugin registers it's hooks.
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$server->xml->elementMap['{DAV:}sync-collection'] = 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport';
+
+		$self = $this;
+
+		$server->on('report', function($reportName, $dom, $uri) use ($self) {
+
+			if ($reportName === '{DAV:}sync-collection') {
+				$this->server->transactionType = 'report-sync-collection';
+				$self->syncCollection($uri, $dom);
+				return false;
+			}
+
+		});
+
+		$server->on('propFind',       [$this, 'propFind']);
+		$server->on('validateTokens', [$this, 'validateTokens']);
+
+	}
+
+	/**
+	 * Returns a list of reports this plugin supports.
+	 *
+	 * This will be used in the {DAV:}supported-report-set property.
+	 * Note that you still need to subscribe to the 'report' event to actually
+	 * implement them
+	 *
+	 * @param string $uri
+	 * @return array
+	 */
+	public function getSupportedReportSet($uri) {
+
+		$node = $this->server->tree->getNodeForPath($uri);
+		if ($node instanceof ISyncCollection && $node->getSyncToken()) {
+			return [
+				'{DAV:}sync-collection',
+			];
+		}
+
+		return [];
+
+	}
+
+
+	/**
+	 * This method handles the {DAV:}sync-collection HTTP REPORT.
+	 *
+	 * @param string $uri
+	 * @param SyncCollectionReport $report
+	 * @return void
+	 */
+	public function syncCollection($uri, SyncCollectionReport $report) {
+
+		// Getting the data
+		$node = $this->server->tree->getNodeForPath($uri);
+		if (!$node instanceof ISyncCollection) {
+			throw new DAV\Exception\ReportNotSupported('The {DAV:}sync-collection REPORT is not supported on this url.');
+		}
+		$token = $node->getSyncToken();
+		if (!$token) {
+			throw new DAV\Exception\ReportNotSupported('No sync information is available at this node');
+		}
+
+		$syncToken = $report->syncToken;
+		if (!is_null($syncToken)) {
+			// Sync-token must start with our prefix
+			if (substr($syncToken, 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
+				throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
+			}
+
+			$syncToken = substr($syncToken, strlen(self::SYNCTOKEN_PREFIX));
+
+		}
+		$changeInfo = $node->getChanges($syncToken, $report->syncLevel, $report->limit);
+
+		if (is_null($changeInfo)) {
+
+			throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
+
+		}
+
+		// Encoding the response
+		$this->sendSyncCollectionResponse(
+			$changeInfo['syncToken'],
+			$uri,
+			$changeInfo['added'],
+			$changeInfo['modified'],
+			$changeInfo['deleted'],
+			$report->properties
+		);
+
+	}
+
+	/**
+	 * Sends the response to a sync-collection request.
+	 *
+	 * @param string $syncToken
+	 * @param string $collectionUrl
+	 * @param array $added
+	 * @param array $modified
+	 * @param array $deleted
+	 * @param array $properties
+	 * @return void
+	 */
+	protected function sendSyncCollectionResponse($syncToken, $collectionUrl, array $added, array $modified, array $deleted, array $properties) {
+
+
+		$fullPaths = [];
+
+		// Pre-fetching children, if this is possible.
+		foreach (array_merge($added, $modified) as $item) {
+			$fullPath = $collectionUrl . '/' . $item;
+			$fullPaths[] = $fullPath;
+		}
+
+		$responses = [];
+		foreach ($this->server->getPropertiesForMultiplePaths($fullPaths, $properties) as $fullPath => $props) {
+
+			// The 'Property_Response' class is responsible for generating a
+			// single {DAV:}response xml element.
+			$responses[] = new DAV\Xml\Element\Response($fullPath, $props);
+
+		}
+
+
+
+		// Deleted items also show up as 'responses'. They have no properties,
+		// and a single {DAV:}status element set as 'HTTP/1.1 404 Not Found'.
+		foreach ($deleted as $item) {
+
+			$fullPath = $collectionUrl . '/' . $item;
+			$responses[] = new DAV\Xml\Element\Response($fullPath, [], 404);
+
+		}
+		$multiStatus = new DAV\Xml\Response\MultiStatus($responses, self::SYNCTOKEN_PREFIX . $syncToken);
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setBody(
+			$this->server->xml->write('{DAV:}multistatus', $multiStatus, $this->server->getBaseUri())
+		);
+
+	}
+
+	/**
+	 * This method is triggered whenever properties are requested for a node.
+	 * We intercept this to see if we must return a {DAV:}sync-token.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @return void
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
+
+		$propFind->handle('{DAV:}sync-token', function() use ($node) {
+			if (!$node instanceof ISyncCollection || !$token = $node->getSyncToken()) {
+				return;
+			}
+			return self::SYNCTOKEN_PREFIX . $token;
+		});
+
+	}
+
+	/**
+	 * The validateTokens event is triggered before every request.
+	 *
+	 * It's a moment where this plugin can check all the supplied lock tokens
+	 * in the If: header, and check if they are valid.
+	 *
+	 * @param RequestInterface $request
+	 * @param array $conditions
+	 * @return void
+	 */
+	public function validateTokens(RequestInterface $request, &$conditions) {
+
+		foreach ($conditions as $kk => $condition) {
+
+			foreach ($condition['tokens'] as $ii => $token) {
+
+				// Sync-tokens must always start with our designated prefix.
+				if (substr($token['token'], 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
+					continue;
+				}
+
+				// Checking if the token is a match.
+				$node = $this->server->tree->getNodeForPath($condition['uri']);
+
+				if (
+					$node instanceof ISyncCollection &&
+					$node->getSyncToken() == substr($token['token'], strlen(self::SYNCTOKEN_PREFIX))
+				) {
+					$conditions[$kk]['tokens'][$ii]['validToken'] = true;
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Adds support for WebDAV Collection Sync (rfc6578)',
+			'link'        => 'http://sabre.io/dav/sync/',
+		];
+
+	}
 
 }

libraries/SabreDAV/DAV/Version.php

Indentation +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@
  */
 class Version {
 
-    /**
-     * Full version number
-     */
-    const VERSION = '3.1.3';
+	/**
+	 * Full version number
+	 */
+	const VERSION = '3.1.3';
 
 }

libraries/SabreDAV/DAV/PropFind.php

Braces +3 added lines, -1 removed lines

@@ -284,7 +284,9 @@
             }
         }
         // Removing the 404's for multi-status requests.
-        if ($this->requestType === self::ALLPROPS) unset($r[404]);
+        if ($this->requestType === self::ALLPROPS) {
+        	unset($r[404]);
+        }
         return $r;
 
     }

Indentation +333 added lines, -333 removed lines

@@ -10,338 +10,338 @@
  */
 class PropFind {
 
-    /**
-     * A normal propfind
-     */
-    const NORMAL = 0;
-
-    /**
-     * An allprops request.
-     *
-     * While this was originally intended for instructing the server to really
-     * fetch every property, because it was used so often and it's so heavy
-     * this turned into a small list of default properties after a while.
-     *
-     * So 'all properties' now means a hardcoded list.
-     */
-    const ALLPROPS = 1;
-
-    /**
-     * A propname request. This just returns a list of properties that are
-     * defined on a node, without their values.
-     */
-    const PROPNAME = 2;
-
-    /**
-     * Creates the PROPFIND object
-     *
-     * @param string $path
-     * @param array $properties
-     * @param int $depth
-     * @param int $requestType
-     */
-    public function __construct($path, array $properties, $depth = 0, $requestType = self::NORMAL) {
-
-        $this->path = $path;
-        $this->properties = $properties;
-        $this->depth = $depth;
-        $this->requestType = $requestType;
-
-        if ($requestType === self::ALLPROPS) {
-            $this->properties = [
-                '{DAV:}getlastmodified',
-                '{DAV:}getcontentlength',
-                '{DAV:}resourcetype',
-                '{DAV:}quota-used-bytes',
-                '{DAV:}quota-available-bytes',
-                '{DAV:}getetag',
-                '{DAV:}getcontenttype',
-            ];
-        }
-
-        foreach ($this->properties as $propertyName) {
-
-            // Seeding properties with 404's.
-            $this->result[$propertyName] = [404, null];
-
-        }
-        $this->itemsLeft = count($this->result);
-
-    }
-
-    /**
-     * Handles a specific property.
-     *
-     * This method checks wether the specified property was requested in this
-     * PROPFIND request, and if so, it will call the callback and use the
-     * return value for it's value.
-     *
-     * Example:
-     *
-     * $propFind->handle('{DAV:}displayname', function() {
-     *      return 'hello';
-     * });
-     *
-     * Note that handle will only work the first time. If null is returned, the
-     * value is ignored.
-     *
-     * It's also possible to not pass a callback, but immediately pass a value
-     *
-     * @param string $propertyName
-     * @param mixed $valueOrCallBack
-     * @return void
-     */
-    public function handle($propertyName, $valueOrCallBack) {
-
-        if ($this->itemsLeft && isset($this->result[$propertyName]) && $this->result[$propertyName][0] === 404) {
-            if (is_callable($valueOrCallBack)) {
-                $value = $valueOrCallBack();
-            } else {
-                $value = $valueOrCallBack;
-            }
-            if (!is_null($value)) {
-                $this->itemsLeft--;
-                $this->result[$propertyName] = [200, $value];
-            }
-        }
-
-    }
-
-    /**
-     * Sets the value of the property
-     *
-     * If status is not supplied, the status will default to 200 for non-null
-     * properties, and 404 for null properties.
-     *
-     * @param string $propertyName
-     * @param mixed $value
-     * @param int $status
-     * @return void
-     */
-    public function set($propertyName, $value, $status = null) {
-
-        if (is_null($status)) {
-            $status = is_null($value) ? 404 : 200;
-        }
-        // If this is an ALLPROPS request and the property is
-        // unknown, add it to the result; else ignore it:
-        if (!isset($this->result[$propertyName])) {
-            if ($this->requestType === self::ALLPROPS) {
-                $this->result[$propertyName] = [$status, $value];
-            }
-            return;
-        }
-        if ($status !== 404 && $this->result[$propertyName][0] === 404) {
-            $this->itemsLeft--;
-        } elseif ($status === 404 && $this->result[$propertyName][0] !== 404) {
-            $this->itemsLeft++;
-        }
-        $this->result[$propertyName] = [$status, $value];
-
-    }
-
-    /**
-     * Returns the current value for a property.
-     *
-     * @param string $propertyName
-     * @return mixed
-     */
-    public function get($propertyName) {
-
-        return isset($this->result[$propertyName]) ? $this->result[$propertyName][1] : null;
-
-    }
-
-    /**
-     * Returns the current status code for a property name.
-     *
-     * If the property does not appear in the list of requested properties,
-     * null will be returned.
-     *
-     * @param string $propertyName
-     * @return int|null
-     */
-    public function getStatus($propertyName) {
-
-        return isset($this->result[$propertyName]) ? $this->result[$propertyName][0] : null;
-
-    }
-
-    /**
-     * Updates the path for this PROPFIND.
-     *
-     * @param string $path
-     * @return void
-     */
-    public function setPath($path) {
-
-        $this->path = $path;
-
-    }
-
-    /**
-     * Returns the path this PROPFIND request is for.
-     *
-     * @return string
-     */
-    public function getPath() {
-
-        return $this->path;
-
-    }
-
-    /**
-     * Returns the depth of this propfind request.
-     *
-     * @return int
-     */
-    public function getDepth() {
-
-        return $this->depth;
-
-    }
-
-    /**
-     * Updates the depth of this propfind request.
-     *
-     * @param int $depth
-     * @return void
-     */
-    public function setDepth($depth) {
-
-        $this->depth = $depth;
-
-    }
-
-    /**
-     * Returns all propertynames that have a 404 status, and thus don't have a
-     * value yet.
-     *
-     * @return array
-     */
-    public function get404Properties() {
-
-        if ($this->itemsLeft === 0) {
-            return [];
-        }
-        $result = [];
-        foreach ($this->result as $propertyName => $stuff) {
-            if ($stuff[0] === 404) {
-                $result[] = $propertyName;
-            }
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns the full list of requested properties.
-     *
-     * This returns just their names, not a status or value.
-     *
-     * @return array
-     */
-    public function getRequestedProperties() {
-
-        return $this->properties;
-
-    }
-
-    /**
-     * Returns true if this was an '{DAV:}allprops' request.
-     *
-     * @return bool
-     */
-    public function isAllProps() {
-
-        return $this->requestType === self::ALLPROPS;
-
-    }
-
-    /**
-     * Returns a result array that's often used in multistatus responses.
-     *
-     * The array uses status codes as keys, and property names and value pairs
-     * as the value of the top array.. such as :
-     *
-     * [
-     *  200 => [ '{DAV:}displayname' => 'foo' ],
-     * ]
-     *
-     * @return array
-     */
-    public function getResultForMultiStatus() {
-
-        $r = [
-            200 => [],
-            404 => [],
-        ];
-        foreach ($this->result as $propertyName => $info) {
-            if (!isset($r[$info[0]])) {
-                $r[$info[0]] = [$propertyName => $info[1]];
-            } else {
-                $r[$info[0]][$propertyName] = $info[1];
-            }
-        }
-        // Removing the 404's for multi-status requests.
-        if ($this->requestType === self::ALLPROPS) unset($r[404]);
-        return $r;
-
-    }
-
-    /**
-     * The path that we're fetching properties for.
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * The Depth of the request.
-     *
-     * 0 means only the current item. 1 means the current item + its children.
-     * It can also be DEPTH_INFINITY if this is enabled in the server.
-     *
-     * @var int
-     */
-    protected $depth = 0;
-
-    /**
-     * The type of request. See the TYPE constants
-     */
-    protected $requestType;
-
-    /**
-     * A list of requested properties
-     *
-     * @var array
-     */
-    protected $properties = [];
-
-    /**
-     * The result of the operation.
-     *
-     * The keys in this array are property names.
-     * The values are an array with two elements: the http status code and then
-     * optionally a value.
-     *
-     * Example:
-     *
-     * [
-     *    "{DAV:}owner" : [404],
-     *    "{DAV:}displayname" : [200, "Admin"]
-     * ]
-     *
-     * @var array
-     */
-    protected $result = [];
-
-    /**
-     * This is used as an internal counter for the number of properties that do
-     * not yet have a value.
-     *
-     * @var int
-     */
-    protected $itemsLeft;
+	/**
+	 * A normal propfind
+	 */
+	const NORMAL = 0;
+
+	/**
+	 * An allprops request.
+	 *
+	 * While this was originally intended for instructing the server to really
+	 * fetch every property, because it was used so often and it's so heavy
+	 * this turned into a small list of default properties after a while.
+	 *
+	 * So 'all properties' now means a hardcoded list.
+	 */
+	const ALLPROPS = 1;
+
+	/**
+	 * A propname request. This just returns a list of properties that are
+	 * defined on a node, without their values.
+	 */
+	const PROPNAME = 2;
+
+	/**
+	 * Creates the PROPFIND object
+	 *
+	 * @param string $path
+	 * @param array $properties
+	 * @param int $depth
+	 * @param int $requestType
+	 */
+	public function __construct($path, array $properties, $depth = 0, $requestType = self::NORMAL) {
+
+		$this->path = $path;
+		$this->properties = $properties;
+		$this->depth = $depth;
+		$this->requestType = $requestType;
+
+		if ($requestType === self::ALLPROPS) {
+			$this->properties = [
+				'{DAV:}getlastmodified',
+				'{DAV:}getcontentlength',
+				'{DAV:}resourcetype',
+				'{DAV:}quota-used-bytes',
+				'{DAV:}quota-available-bytes',
+				'{DAV:}getetag',
+				'{DAV:}getcontenttype',
+			];
+		}
+
+		foreach ($this->properties as $propertyName) {
+
+			// Seeding properties with 404's.
+			$this->result[$propertyName] = [404, null];
+
+		}
+		$this->itemsLeft = count($this->result);
+
+	}
+
+	/**
+	 * Handles a specific property.
+	 *
+	 * This method checks wether the specified property was requested in this
+	 * PROPFIND request, and if so, it will call the callback and use the
+	 * return value for it's value.
+	 *
+	 * Example:
+	 *
+	 * $propFind->handle('{DAV:}displayname', function() {
+	 *      return 'hello';
+	 * });
+	 *
+	 * Note that handle will only work the first time. If null is returned, the
+	 * value is ignored.
+	 *
+	 * It's also possible to not pass a callback, but immediately pass a value
+	 *
+	 * @param string $propertyName
+	 * @param mixed $valueOrCallBack
+	 * @return void
+	 */
+	public function handle($propertyName, $valueOrCallBack) {
+
+		if ($this->itemsLeft && isset($this->result[$propertyName]) && $this->result[$propertyName][0] === 404) {
+			if (is_callable($valueOrCallBack)) {
+				$value = $valueOrCallBack();
+			} else {
+				$value = $valueOrCallBack;
+			}
+			if (!is_null($value)) {
+				$this->itemsLeft--;
+				$this->result[$propertyName] = [200, $value];
+			}
+		}
+
+	}
+
+	/**
+	 * Sets the value of the property
+	 *
+	 * If status is not supplied, the status will default to 200 for non-null
+	 * properties, and 404 for null properties.
+	 *
+	 * @param string $propertyName
+	 * @param mixed $value
+	 * @param int $status
+	 * @return void
+	 */
+	public function set($propertyName, $value, $status = null) {
+
+		if (is_null($status)) {
+			$status = is_null($value) ? 404 : 200;
+		}
+		// If this is an ALLPROPS request and the property is
+		// unknown, add it to the result; else ignore it:
+		if (!isset($this->result[$propertyName])) {
+			if ($this->requestType === self::ALLPROPS) {
+				$this->result[$propertyName] = [$status, $value];
+			}
+			return;
+		}
+		if ($status !== 404 && $this->result[$propertyName][0] === 404) {
+			$this->itemsLeft--;
+		} elseif ($status === 404 && $this->result[$propertyName][0] !== 404) {
+			$this->itemsLeft++;
+		}
+		$this->result[$propertyName] = [$status, $value];
+
+	}
+
+	/**
+	 * Returns the current value for a property.
+	 *
+	 * @param string $propertyName
+	 * @return mixed
+	 */
+	public function get($propertyName) {
+
+		return isset($this->result[$propertyName]) ? $this->result[$propertyName][1] : null;
+
+	}
+
+	/**
+	 * Returns the current status code for a property name.
+	 *
+	 * If the property does not appear in the list of requested properties,
+	 * null will be returned.
+	 *
+	 * @param string $propertyName
+	 * @return int|null
+	 */
+	public function getStatus($propertyName) {
+
+		return isset($this->result[$propertyName]) ? $this->result[$propertyName][0] : null;
+
+	}
+
+	/**
+	 * Updates the path for this PROPFIND.
+	 *
+	 * @param string $path
+	 * @return void
+	 */
+	public function setPath($path) {
+
+		$this->path = $path;
+
+	}
+
+	/**
+	 * Returns the path this PROPFIND request is for.
+	 *
+	 * @return string
+	 */
+	public function getPath() {
+
+		return $this->path;
+
+	}
+
+	/**
+	 * Returns the depth of this propfind request.
+	 *
+	 * @return int
+	 */
+	public function getDepth() {
+
+		return $this->depth;
+
+	}
+
+	/**
+	 * Updates the depth of this propfind request.
+	 *
+	 * @param int $depth
+	 * @return void
+	 */
+	public function setDepth($depth) {
+
+		$this->depth = $depth;
+
+	}
+
+	/**
+	 * Returns all propertynames that have a 404 status, and thus don't have a
+	 * value yet.
+	 *
+	 * @return array
+	 */
+	public function get404Properties() {
+
+		if ($this->itemsLeft === 0) {
+			return [];
+		}
+		$result = [];
+		foreach ($this->result as $propertyName => $stuff) {
+			if ($stuff[0] === 404) {
+				$result[] = $propertyName;
+			}
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Returns the full list of requested properties.
+	 *
+	 * This returns just their names, not a status or value.
+	 *
+	 * @return array
+	 */
+	public function getRequestedProperties() {
+
+		return $this->properties;
+
+	}
+
+	/**
+	 * Returns true if this was an '{DAV:}allprops' request.
+	 *
+	 * @return bool
+	 */
+	public function isAllProps() {
+
+		return $this->requestType === self::ALLPROPS;
+
+	}
+
+	/**
+	 * Returns a result array that's often used in multistatus responses.
+	 *
+	 * The array uses status codes as keys, and property names and value pairs
+	 * as the value of the top array.. such as :
+	 *
+	 * [
+	 *  200 => [ '{DAV:}displayname' => 'foo' ],
+	 * ]
+	 *
+	 * @return array
+	 */
+	public function getResultForMultiStatus() {
+
+		$r = [
+			200 => [],
+			404 => [],
+		];
+		foreach ($this->result as $propertyName => $info) {
+			if (!isset($r[$info[0]])) {
+				$r[$info[0]] = [$propertyName => $info[1]];
+			} else {
+				$r[$info[0]][$propertyName] = $info[1];
+			}
+		}
+		// Removing the 404's for multi-status requests.
+		if ($this->requestType === self::ALLPROPS) unset($r[404]);
+		return $r;
+
+	}
+
+	/**
+	 * The path that we're fetching properties for.
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * The Depth of the request.
+	 *
+	 * 0 means only the current item. 1 means the current item + its children.
+	 * It can also be DEPTH_INFINITY if this is enabled in the server.
+	 *
+	 * @var int
+	 */
+	protected $depth = 0;
+
+	/**
+	 * The type of request. See the TYPE constants
+	 */
+	protected $requestType;
+
+	/**
+	 * A list of requested properties
+	 *
+	 * @var array
+	 */
+	protected $properties = [];
+
+	/**
+	 * The result of the operation.
+	 *
+	 * The keys in this array are property names.
+	 * The values are an array with two elements: the http status code and then
+	 * optionally a value.
+	 *
+	 * Example:
+	 *
+	 * [
+	 *    "{DAV:}owner" : [404],
+	 *    "{DAV:}displayname" : [200, "Admin"]
+	 * ]
+	 *
+	 * @var array
+	 */
+	protected $result = [];
+
+	/**
+	 * This is used as an internal counter for the number of properties that do
+	 * not yet have a value.
+	 *
+	 * @var int
+	 */
+	protected $itemsLeft;
 
 }

libraries/SabreDAV/DAV/StringUtil.php

Indentation +72 added lines, -72 removed lines

@@ -15,77 +15,77 @@
  */
 class StringUtil {
 
-    /**
-     * Checks if a needle occurs in a haystack ;)
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param string $collation
-     * @param string $matchType
-     * @return bool
-     */
-    static function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
-
-        switch ($collation) {
-
-            case 'i;ascii-casemap' :
-                // default strtolower takes locale into consideration
-                // we don't want this.
-                $haystack = str_replace(range('a', 'z'), range('A', 'Z'), $haystack);
-                $needle = str_replace(range('a', 'z'), range('A', 'Z'), $needle);
-                break;
-
-            case 'i;octet' :
-                // Do nothing
-                break;
-
-            case 'i;unicode-casemap' :
-                $haystack = mb_strtoupper($haystack, 'UTF-8');
-                $needle = mb_strtoupper($needle, 'UTF-8');
-                break;
-
-            default :
-                throw new Exception\BadRequest('Collation type: ' . $collation . ' is not supported');
-
-        }
-
-        switch ($matchType) {
-
-            case 'contains' :
-                return strpos($haystack, $needle) !== false;
-            case 'equals' :
-                return $haystack === $needle;
-            case 'starts-with' :
-                return strpos($haystack, $needle) === 0;
-            case 'ends-with' :
-                return strrpos($haystack, $needle) === strlen($haystack) - strlen($needle);
-            default :
-                throw new Exception\BadRequest('Match-type: ' . $matchType . ' is not supported');
-
-        }
-
-    }
-
-    /**
-     * This method takes an input string, checks if it's not valid UTF-8 and
-     * attempts to convert it to UTF-8 if it's not.
-     *
-     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1),
-     * anything else will likely fail.
-     *
-     * @param string $input
-     * @return string
-     */
-    static function ensureUTF8($input) {
-
-        $encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1'], true);
-
-        if ($encoding === 'ISO-8859-1') {
-            return utf8_encode($input);
-        } else {
-            return $input;
-        }
-
-    }
+	/**
+	 * Checks if a needle occurs in a haystack ;)
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 * @param string $collation
+	 * @param string $matchType
+	 * @return bool
+	 */
+	static function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
+
+		switch ($collation) {
+
+			case 'i;ascii-casemap' :
+				// default strtolower takes locale into consideration
+				// we don't want this.
+				$haystack = str_replace(range('a', 'z'), range('A', 'Z'), $haystack);
+				$needle = str_replace(range('a', 'z'), range('A', 'Z'), $needle);
+				break;
+
+			case 'i;octet' :
+				// Do nothing
+				break;
+
+			case 'i;unicode-casemap' :
+				$haystack = mb_strtoupper($haystack, 'UTF-8');
+				$needle = mb_strtoupper($needle, 'UTF-8');
+				break;
+
+			default :
+				throw new Exception\BadRequest('Collation type: ' . $collation . ' is not supported');
+
+		}
+
+		switch ($matchType) {
+
+			case 'contains' :
+				return strpos($haystack, $needle) !== false;
+			case 'equals' :
+				return $haystack === $needle;
+			case 'starts-with' :
+				return strpos($haystack, $needle) === 0;
+			case 'ends-with' :
+				return strrpos($haystack, $needle) === strlen($haystack) - strlen($needle);
+			default :
+				throw new Exception\BadRequest('Match-type: ' . $matchType . ' is not supported');
+
+		}
+
+	}
+
+	/**
+	 * This method takes an input string, checks if it's not valid UTF-8 and
+	 * attempts to convert it to UTF-8 if it's not.
+	 *
+	 * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1),
+	 * anything else will likely fail.
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	static function ensureUTF8($input) {
+
+		$encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1'], true);
+
+		if ($encoding === 'ISO-8859-1') {
+			return utf8_encode($input);
+		} else {
+			return $input;
+		}
+
+	}
 
 }