YetiForceCompany / YetiForceCRM

libraries/antlr/ANTLRStringStream.php

Braces +2 added lines, -3 removed lines

@@ -85,8 +85,7 @@ 
 			if ($this->markDepth>=sizeof($this->markers)) {
 				$state = new CharStreamState();
 				$this->markers[] = $state;
-			}
-			else {
+			} else {
 				$state = $this->markers[$this->markDepth];
 			}
 			$state->p = $this->p;
@@ -99,7 +98,7 @@ 
 	    public function rewind($m=null) {
 			if($m===null){
 				$this->rewind((int)$this->lastMarker);
-			}else{
+			} else{
 				$state = $this->markers[$m];
 				// restore stream state
 				$this->seek($state->p);

Indentation +23 added lines, -23 removed lines

@@ -28,18 +28,18 @@ 
 			$this->markDepth = 0;
 		}
 
-	    public function consume() {
-	        if ( $this->p < $this->n ) {
+		public function consume() {
+			if ( $this->p < $this->n ) {
 				$this->charPositionInLine++;
 				if ( $this->data[$this->p]==ord("\n") ) {
 					$this->line++;
 					$this->charPositionInLine=0;
 				}
-	            $this->p++;
-	        }
-	    }
+				$this->p++;
+			}
+		}
 
-	    public function LA($i) {
+		public function LA($i) {
 			if ( $i==0 ) {
 				return 0; // undefined
 			}
@@ -51,36 +51,36 @@ 
 			}
 
 			if ( ($this->p+$i-1) >= $this->n ) {
-	            //System.out.println("char LA("+i+")=EOF; p="+p);
-	            return CharStreamConst::$EOF;
-	        }
-	        //System.out.println("char LA("+i+")="+(char)data[p+i-1]+"; p="+p);
+				//System.out.println("char LA("+i+")=EOF; p="+p);
+				return CharStreamConst::$EOF;
+			}
+			//System.out.println("char LA("+i+")="+(char)data[p+i-1]+"; p="+p);
 			//System.out.println("LA("+i+"); p="+p+" n="+n+" data.length="+data.length);
 			return $this->data[$this->p+$i-1];
-	    }
+		}
 
 		public function LT($i) {
 			return $this->LA($i);
 		}
 
 		/** Return the current input symbol index 0..n where n indicates the
-	     *  last symbol has been read.  The index is the index of char to
+		 *  last symbol has been read.  The index is the index of char to
 		 *  be returned from LA(1).
-	     */
-	    public function index() {
-	        return $this->p;
-	    }
+		 */
+		public function index() {
+			return $this->p;
+		}
 
 		public function size() {
 			return $this->n;
 		}
 
 		public function mark() {
-	        if ( $this->markers === null) {
-	            $this->markers = array();
-	            $this->markers[] = null; // depth 0 means no backtracking, leave blank
-	        }
-	        $this->markDepth++;
+			if ( $this->markers === null) {
+				$this->markers = array();
+				$this->markers[] = null; // depth 0 means no backtracking, leave blank
+			}
+			$this->markDepth++;
 			$state = null;
 			if ($this->markDepth>=sizeof($this->markers)) {
 				$state = new CharStreamState();
@@ -94,9 +94,9 @@ 
 			$state->charPositionInLine = $this->charPositionInLine;
 			$this->lastMarker = $this->markDepth;
 			return $this->markDepth;
-	    }
+		}
 
-	    public function rewind($m=null) {
+		public function rewind($m=null) {
 			if($m===null){
 				$this->rewind((int)$this->lastMarker);
 			}else{

Spacing +20 added lines, -20 removed lines

@@ -5,13 +5,13 @@ 
 
 		/** Copy data in string to a local char array */
 		public function __construct($input) {
-			$this->p=0;
+			$this->p = 0;
 			$this->line = 1;
 			$this->charPositionInLine = 0;
 			$this->markDepth = 0;
 			$this->markers = null;
-			$this->lastMarker=0;
-			$this->name=null;
+			$this->lastMarker = 0;
+			$this->name = null;
 			
 			$this->data = strToIntArray($input);
 			$this->n = strlen($input);
@@ -29,34 +29,34 @@ 
 		}
 
 	    public function consume() {
-	        if ( $this->p < $this->n ) {
+	        if ($this->p < $this->n) {
 				$this->charPositionInLine++;
-				if ( $this->data[$this->p]==ord("\n") ) {
+				if ($this->data[$this->p] == ord("\n")) {
 					$this->line++;
-					$this->charPositionInLine=0;
+					$this->charPositionInLine = 0;
 				}
 	            $this->p++;
 	        }
 	    }
 
 	    public function LA($i) {
-			if ( $i==0 ) {
+			if ($i == 0) {
 				return 0; // undefined
 			}
-			if ( $i<0 ) {
+			if ($i < 0) {
 				$i++; // e.g., translate LA(-1) to use offset i=0; then data[p+0-1]
-				if ( ($this->p+$i-1) < 0 ) {
+				if (($this->p + $i - 1) < 0) {
 					return CharStreamConst::$EOF; // invalid; no char before first char
 				}
 			}
 
-			if ( ($this->p+$i-1) >= $this->n ) {
+			if (($this->p + $i - 1) >= $this->n) {
 	            //System.out.println("char LA("+i+")=EOF; p="+p);
 	            return CharStreamConst::$EOF;
 	        }
 	        //System.out.println("char LA("+i+")="+(char)data[p+i-1]+"; p="+p);
 			//System.out.println("LA("+i+"); p="+p+" n="+n+" data.length="+data.length);
-			return $this->data[$this->p+$i-1];
+			return $this->data[$this->p + $i - 1];
 	    }
 
 		public function LT($i) {
@@ -76,13 +76,13 @@ 
 		}
 
 		public function mark() {
-	        if ( $this->markers === null) {
+	        if ($this->markers === null) {
 	            $this->markers = array();
 	            $this->markers[] = null; // depth 0 means no backtracking, leave blank
 	        }
 	        $this->markDepth++;
 			$state = null;
-			if ($this->markDepth>=sizeof($this->markers)) {
+			if ($this->markDepth >= sizeof($this->markers)) {
 				$state = new CharStreamState();
 				$this->markers[] = $state;
 			}
@@ -96,10 +96,10 @@ 
 			return $this->markDepth;
 	    }
 
-	    public function rewind($m=null) {
-			if($m===null){
-				$this->rewind((int)$this->lastMarker);
-			}else{
+	    public function rewind($m = null) {
+			if ($m === null) {
+				$this->rewind((int) $this->lastMarker);
+			} else {
 				$state = $this->markers[$m];
 				// restore stream state
 				$this->seek($state->p);
@@ -120,18 +120,18 @@ 
 		 *  update line and charPositionInLine.
 		 */
 		public function seek($index) {
-			if ( $index<=$this->p ) {
+			if ($index <= $this->p) {
 				$this->p = $index; // just jump; don't update stream state (line, ...)
 				return;
 			}
 			// seek forward, consume until p hits index
-			while ( $this->p<$index ) {
+			while ($this->p < $index) {
 				$this->consume();
 			}
 		}
 
 		public function substring($start, $stop) {
-			return implode(array_map('chr', array_slice($this->data, $start, $stop-$start+1)));
+			return implode(array_map('chr', array_slice($this->data, $start, $stop - $start + 1)));
 		}
 
 		public function getLine() {

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/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/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/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;
+		}
+
+	}
 
 }

libraries/SabreDAV/DAV/Locks/Backend/PDO.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         // pure sql. MySQL's non-standard string concatenation prevents us
         // from doing this though.
         $query = sprintf('SELECT owner, token, timeout, created, scope, depth, uri FROM %s WHERE (created > (? - timeout)) && ((uri = ?)', $this->tableName);
-        $params = [time(),$uri];
+        $params = [time(), $uri];
 
         // We need to check locks for every part in the uri.
         $uriParts = explode('/', $uri);

Indentation +160 added lines, -160 removed lines

@@ -16,165 +16,165 @@
  */
 class PDO extends AbstractBackend {
 
-    /**
-     * The PDO tablename this backend uses.
-     *
-     * @var string
-     */
-    public $tableName = 'locks';
-
-    /**
-     * The PDO connection object
-     *
-     * @var pdo
-     */
-    protected $pdo;
-
-    /**
-     * Constructor
-     *
-     * @param PDO $pdo
-     */
-    public function __construct(\PDO $pdo) {
-
-        $this->pdo = $pdo;
-
-    }
-
-    /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        // NOTE: the following 10 lines or so could be easily replaced by
-        // pure sql. MySQL's non-standard string concatenation prevents us
-        // from doing this though.
-        $query = sprintf('SELECT owner, token, timeout, created, scope, depth, uri FROM %s WHERE (created > (? - timeout)) && ((uri = ?)', $this->tableName);
-        $params = [time(),$uri];
-
-        // We need to check locks for every part in the uri.
-        $uriParts = explode('/', $uri);
-
-        // We already covered the last part of the uri
-        array_pop($uriParts);
-
-        $currentPath = '';
-
-        foreach ($uriParts as $part) {
-
-            if ($currentPath) $currentPath .= '/';
-            $currentPath .= $part;
-
-            $query .= ' OR (depth!=0 && uri = ?)';
-            $params[] = $currentPath;
-
-        }
-
-        if ($returnChildLocks) {
-
-            $query .= ' OR (uri LIKE ?)';
-            $params[] = $uri . '/%';
-
-        }
-        $query .= ')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($params);
-        $result = $stmt->fetchAll();
-
-        $lockList = [];
-        foreach ($result as $row) {
-
-            $lockInfo = new LockInfo();
-            $lockInfo->owner = $row['owner'];
-            $lockInfo->token = $row['token'];
-            $lockInfo->timeout = $row['timeout'];
-            $lockInfo->created = $row['created'];
-            $lockInfo->scope = $row['scope'];
-            $lockInfo->depth = $row['depth'];
-            $lockInfo->uri   = $row['uri'];
-            $lockList[] = $lockInfo;
-
-        }
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 30 * 60;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getLocks($uri, false);
-        $exists = false;
-        foreach ($locks as $lock) {
-            if ($lock->token == $lockInfo->token) $exists = true;
-        }
-
-        if ($exists) {
-            $stmt = $this->pdo->prepare(sprintf('UPDATE %s SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?', $this->tableName));
-            $stmt->execute([
-                $lockInfo->owner,
-                $lockInfo->timeout,
-                $lockInfo->scope,
-                $lockInfo->depth,
-                $uri,
-                $lockInfo->created,
-                $lockInfo->token
-            ]);
-        } else {
-            $stmt = $this->pdo->prepare('INSERT INTO ' . $this->tableName . ' (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
-            $stmt->execute([
-                $lockInfo->owner,
-                $lockInfo->timeout,
-                $lockInfo->scope,
-                $lockInfo->depth,
-                $uri,
-                $lockInfo->created,
-                $lockInfo->token
-            ]);
-        }
-
-        return true;
-
-    }
-
-
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, LockInfo $lockInfo) {
-
-        $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE uri = ? && token = ?', $this->tableName));
-        $stmt->execute([$uri, $lockInfo->token]);
-
-        return $stmt->rowCount() === 1;
-
-    }
+	/**
+	 * The PDO tablename this backend uses.
+	 *
+	 * @var string
+	 */
+	public $tableName = 'locks';
+
+	/**
+	 * The PDO connection object
+	 *
+	 * @var pdo
+	 */
+	protected $pdo;
+
+	/**
+	 * Constructor
+	 *
+	 * @param PDO $pdo
+	 */
+	public function __construct(\PDO $pdo) {
+
+		$this->pdo = $pdo;
+
+	}
+
+	/**
+	 * Returns a list of Sabre\DAV\Locks\LockInfo objects
+	 *
+	 * This method should return all the locks for a particular uri, including
+	 * locks that might be set on a parent uri.
+	 *
+	 * If returnChildLocks is set to true, this method should also look for
+	 * any locks in the subtree of the uri for locks.
+	 *
+	 * @param string $uri
+	 * @param bool $returnChildLocks
+	 * @return array
+	 */
+	public function getLocks($uri, $returnChildLocks) {
+
+		// NOTE: the following 10 lines or so could be easily replaced by
+		// pure sql. MySQL's non-standard string concatenation prevents us
+		// from doing this though.
+		$query = sprintf('SELECT owner, token, timeout, created, scope, depth, uri FROM %s WHERE (created > (? - timeout)) && ((uri = ?)', $this->tableName);
+		$params = [time(),$uri];
+
+		// We need to check locks for every part in the uri.
+		$uriParts = explode('/', $uri);
+
+		// We already covered the last part of the uri
+		array_pop($uriParts);
+
+		$currentPath = '';
+
+		foreach ($uriParts as $part) {
+
+			if ($currentPath) $currentPath .= '/';
+			$currentPath .= $part;
+
+			$query .= ' OR (depth!=0 && uri = ?)';
+			$params[] = $currentPath;
+
+		}
+
+		if ($returnChildLocks) {
+
+			$query .= ' OR (uri LIKE ?)';
+			$params[] = $uri . '/%';
+
+		}
+		$query .= ')';
+
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute($params);
+		$result = $stmt->fetchAll();
+
+		$lockList = [];
+		foreach ($result as $row) {
+
+			$lockInfo = new LockInfo();
+			$lockInfo->owner = $row['owner'];
+			$lockInfo->token = $row['token'];
+			$lockInfo->timeout = $row['timeout'];
+			$lockInfo->created = $row['created'];
+			$lockInfo->scope = $row['scope'];
+			$lockInfo->depth = $row['depth'];
+			$lockInfo->uri   = $row['uri'];
+			$lockList[] = $lockInfo;
+
+		}
+
+		return $lockList;
+
+	}
+
+	/**
+	 * Locks a uri
+	 *
+	 * @param string $uri
+	 * @param LockInfo $lockInfo
+	 * @return bool
+	 */
+	public function lock($uri, LockInfo $lockInfo) {
+
+		// We're making the lock timeout 30 minutes
+		$lockInfo->timeout = 30 * 60;
+		$lockInfo->created = time();
+		$lockInfo->uri = $uri;
+
+		$locks = $this->getLocks($uri, false);
+		$exists = false;
+		foreach ($locks as $lock) {
+			if ($lock->token == $lockInfo->token) $exists = true;
+		}
+
+		if ($exists) {
+			$stmt = $this->pdo->prepare(sprintf('UPDATE %s SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?', $this->tableName));
+			$stmt->execute([
+				$lockInfo->owner,
+				$lockInfo->timeout,
+				$lockInfo->scope,
+				$lockInfo->depth,
+				$uri,
+				$lockInfo->created,
+				$lockInfo->token
+			]);
+		} else {
+			$stmt = $this->pdo->prepare('INSERT INTO ' . $this->tableName . ' (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
+			$stmt->execute([
+				$lockInfo->owner,
+				$lockInfo->timeout,
+				$lockInfo->scope,
+				$lockInfo->depth,
+				$uri,
+				$lockInfo->created,
+				$lockInfo->token
+			]);
+		}
+
+		return true;
+
+	}
+
+
+
+	/**
+	 * Removes a lock from a uri
+	 *
+	 * @param string $uri
+	 * @param LockInfo $lockInfo
+	 * @return bool
+	 */
+	public function unlock($uri, LockInfo $lockInfo) {
+
+		$stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE uri = ? && token = ?', $this->tableName));
+		$stmt->execute([$uri, $lockInfo->token]);
+
+		return $stmt->rowCount() === 1;
+
+	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     /**
      * Constructor
      *
-     * @param PDO $pdo
+     * @param \PDO $pdo
      */
     public function __construct(\PDO $pdo) {
 

Braces +6 added lines, -2 removed lines

@@ -72,7 +72,9 @@ 
 
         foreach ($uriParts as $part) {
 
-            if ($currentPath) $currentPath .= '/';
+            if ($currentPath) {
+            	$currentPath .= '/';
+            }
             $currentPath .= $part;
 
             $query .= ' OR (depth!=0 && uri = ?)';
@@ -128,7 +130,9 @@ 
         $locks = $this->getLocks($uri, false);
         $exists = false;
         foreach ($locks as $lock) {
-            if ($lock->token == $lockInfo->token) $exists = true;
+            if ($lock->token == $lockInfo->token) {
+            	$exists = true;
+            }
         }
 
         if ($exists) {

libraries/SabreDAV/DAV/Locks/Backend/File.php

Braces +9 added lines, -3 removed lines

@@ -73,7 +73,9 @@ 
 
         // Checking if we can remove any of these locks
         foreach ($newLocks as $k => $lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
+            if (time() > $lock->timeout + $lock->created) {
+            	unset($newLocks[$k]);
+            }
         }
         return $newLocks;
 
@@ -140,7 +142,9 @@ 
      */
     protected function getData() {
 
-        if (!file_exists($this->locksFile)) return [];
+        if (!file_exists($this->locksFile)) {
+        	return [];
+        }
 
         // opening up the file, and creating a shared lock
         $handle = fopen($this->locksFile, 'r');
@@ -155,7 +159,9 @@ 
 
         // Unserializing and checking if the resource file contains data for this file
         $data = unserialize($data);
-        if (!$data) return [];
+        if (!$data) {
+        	return [];
+        }
         return $data;
 
     }

Indentation +160 added lines, -160 removed lines

@@ -19,167 +19,167 @@
  */
 class File extends AbstractBackend {
 
-    /**
-     * The storage file
-     *
-     * @var string
-     */
-    private $locksFile;
-
-    /**
-     * Constructor
-     *
-     * @param string $locksFile path to file
-     */
-    public function __construct($locksFile) {
-
-        $this->locksFile = $locksFile;
-
-    }
-
-    /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $newLocks = [];
-
-        $locks = $this->getData();
-
-        foreach ($locks as $lock) {
-
-            if ($lock->uri === $uri ||
-                //deep locks on parents
-                ($lock->depth != 0 && strpos($uri, $lock->uri . '/') === 0) ||
-
-                // locks on children
-                ($returnChildLocks && (strpos($lock->uri, $uri . '/') === 0))) {
-
-                $newLocks[] = $lock;
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach ($newLocks as $k => $lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
-        }
-        return $newLocks;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getData();
-
-        foreach ($locks as $k => $lock) {
-            if (
-                ($lock->token == $lockInfo->token) ||
-                (time() > $lock->timeout + $lock->created)
-            ) {
-                unset($locks[$k]);
-            }
-        }
-        $locks[] = $lockInfo;
-        $this->putData($locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, LockInfo $lockInfo) {
-
-        $locks = $this->getData();
-        foreach ($locks as $k => $lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Loads the lockdata from the filesystem.
-     *
-     * @return array
-     */
-    protected function getData() {
-
-        if (!file_exists($this->locksFile)) return [];
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($this->locksFile, 'r');
-        flock($handle, LOCK_SH);
-
-        // Reading data until the eof
-        $data = stream_get_contents($handle);
+	/**
+	 * The storage file
+	 *
+	 * @var string
+	 */
+	private $locksFile;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $locksFile path to file
+	 */
+	public function __construct($locksFile) {
+
+		$this->locksFile = $locksFile;
+
+	}
+
+	/**
+	 * Returns a list of Sabre\DAV\Locks\LockInfo objects
+	 *
+	 * This method should return all the locks for a particular uri, including
+	 * locks that might be set on a parent uri.
+	 *
+	 * If returnChildLocks is set to true, this method should also look for
+	 * any locks in the subtree of the uri for locks.
+	 *
+	 * @param string $uri
+	 * @param bool $returnChildLocks
+	 * @return array
+	 */
+	public function getLocks($uri, $returnChildLocks) {
+
+		$newLocks = [];
+
+		$locks = $this->getData();
+
+		foreach ($locks as $lock) {
+
+			if ($lock->uri === $uri ||
+				//deep locks on parents
+				($lock->depth != 0 && strpos($uri, $lock->uri . '/') === 0) ||
+
+				// locks on children
+				($returnChildLocks && (strpos($lock->uri, $uri . '/') === 0))) {
+
+				$newLocks[] = $lock;
+
+			}
+
+		}
+
+		// Checking if we can remove any of these locks
+		foreach ($newLocks as $k => $lock) {
+			if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
+		}
+		return $newLocks;
+
+	}
+
+	/**
+	 * Locks a uri
+	 *
+	 * @param string $uri
+	 * @param LockInfo $lockInfo
+	 * @return bool
+	 */
+	public function lock($uri, LockInfo $lockInfo) {
+
+		// We're making the lock timeout 30 minutes
+		$lockInfo->timeout = 1800;
+		$lockInfo->created = time();
+		$lockInfo->uri = $uri;
+
+		$locks = $this->getData();
+
+		foreach ($locks as $k => $lock) {
+			if (
+				($lock->token == $lockInfo->token) ||
+				(time() > $lock->timeout + $lock->created)
+			) {
+				unset($locks[$k]);
+			}
+		}
+		$locks[] = $lockInfo;
+		$this->putData($locks);
+		return true;
+
+	}
+
+	/**
+	 * Removes a lock from a uri
+	 *
+	 * @param string $uri
+	 * @param LockInfo $lockInfo
+	 * @return bool
+	 */
+	public function unlock($uri, LockInfo $lockInfo) {
+
+		$locks = $this->getData();
+		foreach ($locks as $k => $lock) {
+
+			if ($lock->token == $lockInfo->token) {
+
+				unset($locks[$k]);
+				$this->putData($locks);
+				return true;
+
+			}
+		}
+		return false;
+
+	}
+
+	/**
+	 * Loads the lockdata from the filesystem.
+	 *
+	 * @return array
+	 */
+	protected function getData() {
+
+		if (!file_exists($this->locksFile)) return [];
+
+		// opening up the file, and creating a shared lock
+		$handle = fopen($this->locksFile, 'r');
+		flock($handle, LOCK_SH);
+
+		// Reading data until the eof
+		$data = stream_get_contents($handle);
 
-        // We're all good
-        flock($handle, LOCK_UN);
-        fclose($handle);
+		// We're all good
+		flock($handle, LOCK_UN);
+		fclose($handle);
 
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return [];
-        return $data;
-
-    }
-
-    /**
-     * Saves the lockdata
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putData(array $newData) {
-
-        // opening up the file, and creating an exclusive lock
-        $handle = fopen($this->locksFile, 'a+');
-        flock($handle, LOCK_EX);
-
-        // We can only truncate and rewind once the lock is acquired.
-        ftruncate($handle, 0);
-        rewind($handle);
-
-        fwrite($handle, serialize($newData));
-        flock($handle, LOCK_UN);
-        fclose($handle);
-
-    }
+		// Unserializing and checking if the resource file contains data for this file
+		$data = unserialize($data);
+		if (!$data) return [];
+		return $data;
+
+	}
+
+	/**
+	 * Saves the lockdata
+	 *
+	 * @param array $newData
+	 * @return void
+	 */
+	protected function putData(array $newData) {
+
+		// opening up the file, and creating an exclusive lock
+		$handle = fopen($this->locksFile, 'a+');
+		flock($handle, LOCK_EX);
+
+		// We can only truncate and rewind once the lock is acquired.
+		ftruncate($handle, 0);
+		rewind($handle);
+
+		fwrite($handle, serialize($newData));
+		flock($handle, LOCK_UN);
+		fclose($handle);
+
+	}
 
 }