YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_internal_method_createdata.php

Indentation +29 added lines, -29 removed lines

@@ -11,34 +11,34 @@
  */
 class Smarty_Internal_Method_CreateData
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * creates a data object
-     *
-     * @api  Smarty::createData()
-     * @link http://www.smarty.net/docs/en/api.create.data.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
-     * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
-     *                                                                                     variables
-     * @param string                                                               $name   optional data block name
-     *
-     * @returns Smarty_Data data object
-     */
-    public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
-    {
-        /* @var Smarty $smarty */
-        $smarty = isset($this->smarty) ? $this->smarty : $obj;
-        $dataObj = new Smarty_Data($parent, $smarty, $name);
-        if ($smarty->debugging) {
-            Smarty_Internal_Debug::register_data($dataObj);
-        }
-        return $dataObj;
-    }
+	/**
+	 * creates a data object
+	 *
+	 * @api  Smarty::createData()
+	 * @link http://www.smarty.net/docs/en/api.create.data.tpl
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
+	 * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
+	 *                                                                                     variables
+	 * @param string                                                               $name   optional data block name
+	 *
+	 * @returns Smarty_Data data object
+	 */
+	public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
+	{
+		/* @var Smarty $smarty */
+		$smarty = isset($this->smarty) ? $this->smarty : $obj;
+		$dataObj = new Smarty_Data($parent, $smarty, $name);
+		if ($smarty->debugging) {
+			Smarty_Internal_Debug::register_data($dataObj);
+		}
+		return $dataObj;
+	}
 }
\ No newline at end of file

libraries/Smarty/libs/sysplugins/smarty_internal_parsetree_text.php

Indentation +20 added lines, -20 removed lines

@@ -16,25 +16,25 @@
  */
 class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
 {
-    /**
-     * Create template text buffer
-     *
-     * @param string $data text
-     */
-    public function __construct($data)
-    {
-        $this->data = $data;
-    }
+	/**
+	 * Create template text buffer
+	 *
+	 * @param string $data text
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+	}
 
-    /**
-     * Return buffer content
-     *
-     * @param \Smarty_Internal_Templateparser $parser
-     *
-     * @return string text
-     */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
-    {
-        return $this->data;
-    }
+	/**
+	 * Return buffer content
+	 *
+	 * @param \Smarty_Internal_Templateparser $parser
+	 *
+	 * @return string text
+	 */
+	public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+	{
+		return $this->data;
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_parsetree_dq.php

Indentation +70 added lines, -70 removed lines

@@ -17,79 +17,79 @@
  */
 class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
 {
-    /**
-     * Create parse tree buffer for double quoted string subtrees
-     *
-     * @param object                    $parser  parser object
-     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
-     */
-    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
-    {
-        $this->subtrees[] = $subtree;
-        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
-        }
-    }
+	/**
+	 * Create parse tree buffer for double quoted string subtrees
+	 *
+	 * @param object                    $parser  parser object
+	 * @param Smarty_Internal_ParseTree $subtree parse tree buffer
+	 */
+	public function __construct($parser, Smarty_Internal_ParseTree $subtree)
+	{
+		$this->subtrees[] = $subtree;
+		if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+			$parser->block_nesting_level = count($parser->compiler->_tag_stack);
+		}
+	}
 
-    /**
-     * Append buffer to subtree
-     *
-     * @param \Smarty_Internal_Templateparser $parser
-     * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
-     */
-    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
-    {
-        $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag &&
-            $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
-        ) {
-            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
-                $this->subtrees[ $last_subtree ]->data =
-                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
-                                                  '<?php echo ' . $subtree->data . ';?>');
-            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
-                $this->subtrees[ $last_subtree ]->data =
-                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
-                                                  '<?php echo "' . $subtree->data . '";?>');
-            } else {
-                $this->subtrees[ $last_subtree ]->data =
-                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data);
-            }
-        } else {
-            $this->subtrees[] = $subtree;
-        }
-        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
-        }
-    }
+	/**
+	 * Append buffer to subtree
+	 *
+	 * @param \Smarty_Internal_Templateparser $parser
+	 * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
+	 */
+	public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+	{
+		$last_subtree = count($this->subtrees) - 1;
+		if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag &&
+			$this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
+		) {
+			if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
+				$this->subtrees[ $last_subtree ]->data =
+					$parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
+												  '<?php echo ' . $subtree->data . ';?>');
+			} elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+				$this->subtrees[ $last_subtree ]->data =
+					$parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
+												  '<?php echo "' . $subtree->data . '";?>');
+			} else {
+				$this->subtrees[ $last_subtree ]->data =
+					$parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data);
+			}
+		} else {
+			$this->subtrees[] = $subtree;
+		}
+		if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+			$parser->block_nesting_level = count($parser->compiler->_tag_stack);
+		}
+	}
 
-    /**
-     * Merge subtree buffer content together
-     *
-     * @param \Smarty_Internal_Templateparser $parser
-     *
-     * @return string compiled template code
-     */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
-    {
-        $code = '';
-        foreach ($this->subtrees as $subtree) {
-            if ($code !== "") {
-                $code .= ".";
-            }
-            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-                $more_php = $subtree->assign_to_var($parser);
-            } else {
-                $more_php = $subtree->to_smarty_php($parser);
-            }
+	/**
+	 * Merge subtree buffer content together
+	 *
+	 * @param \Smarty_Internal_Templateparser $parser
+	 *
+	 * @return string compiled template code
+	 */
+	public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+	{
+		$code = '';
+		foreach ($this->subtrees as $subtree) {
+			if ($code !== "") {
+				$code .= ".";
+			}
+			if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+				$more_php = $subtree->assign_to_var($parser);
+			} else {
+				$more_php = $subtree->to_smarty_php($parser);
+			}
 
-            $code .= $more_php;
+			$code .= $more_php;
 
-            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
-                $parser->compiler->has_variable_string = true;
-            }
-        }
+			if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+				$parser->compiler->has_variable_string = true;
+			}
+		}
 
-        return $code;
-    }
+		return $code;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@
     public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
     {
         $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag &&
-            $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
+        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof Smarty_Internal_ParseTree_Tag &&
+            $this->subtrees[$last_subtree]->saved_block_nesting < $parser->block_nesting_level
         ) {
             if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
-                $this->subtrees[ $last_subtree ]->data =
-                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
+                $this->subtrees[$last_subtree]->data =
+                    $parser->compiler->appendCode($this->subtrees[$last_subtree]->data,
                                                   '<?php echo ' . $subtree->data . ';?>');
             } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
-                $this->subtrees[ $last_subtree ]->data =
-                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
+                $this->subtrees[$last_subtree]->data =
+                    $parser->compiler->appendCode($this->subtrees[$last_subtree]->data,
                                                   '<?php echo "' . $subtree->data . '";?>');
             } else {
-                $this->subtrees[ $last_subtree ]->data =
-                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data);
+                $this->subtrees[$last_subtree]->data =
+                    $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, $subtree->data);
             }
         } else {
             $this->subtrees[] = $subtree;

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     /**
      * Create parse tree buffer for double quoted string subtrees
      *
-     * @param object                    $parser  parser object
+     * @param Smarty_Internal_Templateparser                    $parser  parser object
      * @param Smarty_Internal_ParseTree $subtree parse tree buffer
      */
     public function __construct($parser, Smarty_Internal_ParseTree $subtree)

libraries/Smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
                         $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
                     if ($_tpl->mustCompile()) {
                         $_tpl->compileTemplateSource();
-                        $_count ++;
+                        $_count++;
                         echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
                         flush();
                     } else {
@@ -102,7 +102,7 @@ 
                 }
                 catch (Exception $e) {
                     echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
-                    $_error_count ++;
+                    $_error_count++;
                 }
                 // free memory
                 unset($_tpl);

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
                         echo ' is up to date';
                         flush();
                     }
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
                     $_error_count ++;
                 }

Indentation +102 added lines, -102 removed lines

@@ -11,108 +11,108 @@
  */
 class Smarty_Internal_Method_CompileAllTemplates
 {
-    /**
-     * Valid for Smarty object
-     *
-     * @var int
-     */
-    public $objMap = 1;
+	/**
+	 * Valid for Smarty object
+	 *
+	 * @var int
+	 */
+	public $objMap = 1;
 
-    /**
-     * Compile all template files
-     *
-     * @api  Smarty::compileAllTemplates()
-     *
-     * @param \Smarty $smarty        passed smarty object
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
-     */
-    public function compileAllTemplates(Smarty $smarty, $extension = '.tpl', $force_compile = false, $time_limit = 0,
-                                        $max_errors = null)
-    {
-        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
-    }
+	/**
+	 * Compile all template files
+	 *
+	 * @api  Smarty::compileAllTemplates()
+	 *
+	 * @param \Smarty $smarty        passed smarty object
+	 * @param  string $extension     file extension
+	 * @param  bool   $force_compile force all to recompile
+	 * @param  int    $time_limit
+	 * @param  int    $max_errors
+	 *
+	 * @return integer number of template files recompiled
+	 */
+	public function compileAllTemplates(Smarty $smarty, $extension = '.tpl', $force_compile = false, $time_limit = 0,
+										$max_errors = null)
+	{
+		return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
+	}
 
-    /**
-     * Compile all template or config files
-     *
-     * @param \Smarty $smarty
-     * @param  string $extension     template file name extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit    set maximum execution time
-     * @param  int    $max_errors    set maximum allowed errors
-     * @param bool    $isConfig      flag true if called for config files
-     *
-     * @return int number of template files compiled
-     */
-    protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors,
-                                  $isConfig = false)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $_count = 0;
-        $_error_count = 0;
-        $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
-        // loop over array of source directories
-        foreach ($sourceDir as $_dir) {
-            $_dir_1 = new RecursiveDirectoryIterator($_dir, defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
-                FilesystemIterator::FOLLOW_SYMLINKS : 0);
-            $_dir_2 = new RecursiveIteratorIterator($_dir_1);
-            foreach ($_dir_2 as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
-                    continue;
-                }
-                if ($_fileinfo->getPath() !== substr($_dir, 0, - 1)) {
-                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo "\n<br>", $_dir, '---', $_file;
-                flush();
-                $_start_time = microtime(true);
-                $_smarty = clone $smarty;
-                // 
-                $_smarty->_cache = array();
-                $_smarty->ext = new Smarty_Internal_Extension_Handler();
-                $_smarty->ext->objType = $_smarty->_objType;
-                $_smarty->force_compile = $force_compile;
-                try {
-                    /* @var Smarty_Internal_Template $_tpl */
-                    $_tpl = new $smarty->template_class($_file, $_smarty);
-                    $_tpl->caching = Smarty::CACHING_OFF;
-                    $_tpl->source =
-                        $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        $_count ++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
-                    $_error_count ++;
-                }
-                // free memory
-                unset($_tpl);
-                $_smarty->_clearTemplateCache();
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    throw new \Exception\AppException('Too many errors');
-                }
-            }
-        }
-        echo "\n<br>";
-        return $_count;
-    }
+	/**
+	 * Compile all template or config files
+	 *
+	 * @param \Smarty $smarty
+	 * @param  string $extension     template file name extension
+	 * @param  bool   $force_compile force all to recompile
+	 * @param  int    $time_limit    set maximum execution time
+	 * @param  int    $max_errors    set maximum allowed errors
+	 * @param bool    $isConfig      flag true if called for config files
+	 *
+	 * @return int number of template files compiled
+	 */
+	protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors,
+								  $isConfig = false)
+	{
+		// switch off time limit
+		if (function_exists('set_time_limit')) {
+			@set_time_limit($time_limit);
+		}
+		$_count = 0;
+		$_error_count = 0;
+		$sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
+		// loop over array of source directories
+		foreach ($sourceDir as $_dir) {
+			$_dir_1 = new RecursiveDirectoryIterator($_dir, defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
+				FilesystemIterator::FOLLOW_SYMLINKS : 0);
+			$_dir_2 = new RecursiveIteratorIterator($_dir_1);
+			foreach ($_dir_2 as $_fileinfo) {
+				$_file = $_fileinfo->getFilename();
+				if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+					continue;
+				}
+				if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
+					continue;
+				}
+				if ($_fileinfo->getPath() !== substr($_dir, 0, - 1)) {
+					$_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+				}
+				echo "\n<br>", $_dir, '---', $_file;
+				flush();
+				$_start_time = microtime(true);
+				$_smarty = clone $smarty;
+				// 
+				$_smarty->_cache = array();
+				$_smarty->ext = new Smarty_Internal_Extension_Handler();
+				$_smarty->ext->objType = $_smarty->_objType;
+				$_smarty->force_compile = $force_compile;
+				try {
+					/* @var Smarty_Internal_Template $_tpl */
+					$_tpl = new $smarty->template_class($_file, $_smarty);
+					$_tpl->caching = Smarty::CACHING_OFF;
+					$_tpl->source =
+						$isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
+					if ($_tpl->mustCompile()) {
+						$_tpl->compileTemplateSource();
+						$_count ++;
+						echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+						flush();
+					} else {
+						echo ' is up to date';
+						flush();
+					}
+				}
+				catch (Exception $e) {
+					echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
+					$_error_count ++;
+				}
+				// free memory
+				unset($_tpl);
+				$_smarty->_clearTemplateCache();
+				if ($max_errors !== null && $_error_count == $max_errors) {
+					throw new \Exception\AppException('Too many errors');
+				}
+			}
+		}
+		echo "\n<br>";
+		return $_count;
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php

Indentation +201 added lines, -201 removed lines

@@ -17,205 +17,205 @@
 class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
 {
 
-    /**
-     * Preg search pattern
-     *
-     * @var string
-     */
-    private $propertyPreg = '';
-
-    /**
-     * Offsets in preg match result
-     *
-     * @var array
-     */
-    private $resultOffsets = array();
-
-    /**
-     * Start offset
-     *
-     * @var int
-     */
-    private $startOffset = 0;
-
-    /**
-     * Name of this tag
-     *
-     * @var string
-     */
-    public $tagName = '';
-
-    /**
-     * Valid properties of $smarty.xxx variable
-     *
-     * @var array
-     */
-    public $nameProperties = array();
-
-    /**
-     * {section} tag has no item properties
-     *
-     * @var array
-     */
-    public $itemProperties = null;
-
-    /**
-     * {section} tag has always name attribute
-     *
-     * @var bool
-     */
-    public $isNamed = true;
-
-    /**
-     * @var array
-     */
-    public $matchResults = array();
-
-    /**
-     * Scan sources for used tag attributes
-     *
-     * @param  array                                $attributes
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->propertyPreg = '~(';
-        $this->startOffset = 0;
-        $this->resultOffsets = array();
-        $this->matchResults = array('named' => array(), 'item' => array());
-        if ($this->isNamed) {
-            $this->buildPropertyPreg(true, $attributes);
-        }
-        if (isset($this->itemProperties)) {
-            if ($this->isNamed) {
-                $this->propertyPreg .= '|';
-            }
-            $this->buildPropertyPreg(false, $attributes);
-        }
-        $this->propertyPreg .= ')\W~i';
-        // Template source
-        $this->matchTemplateSource($compiler);
-        // Parent template source
-        $this->matchParentTemplateSource($compiler);
-        // {block} source
-        $this->matchBlockSource($compiler);
-    }
-
-    /**
-     * Build property preg string
-     *
-     * @param bool  $named
-     * @param array $attributes
-     */
-    public function buildPropertyPreg($named, $attributes)
-    {
-        if ($named) {
-            $this->resultOffsets[ 'named' ] = $this->startOffset + 3;
-            $this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.](";
-            $properties = $this->nameProperties;
-        } else {
-            $this->resultOffsets[ 'item' ] = $this->startOffset + 3;
-            $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
-            $properties = $this->itemProperties;
-        }
-        $this->startOffset += count($properties) + 2;
-        $propName = reset($properties);
-        while ($propName) {
-            $this->propertyPreg .= "({$propName})";
-            $propName = next($properties);
-            if ($propName) {
-                $this->propertyPreg .= '|';
-            }
-        }
-        $this->propertyPreg .= '))';
-    }
-
-    /**
-     * Find matches in source string
-     *
-     * @param string $source
-     */
-    public function matchProperty($source)
-    {
-        preg_match_all($this->propertyPreg, $source, $match, PREG_SET_ORDER);
-        foreach ($this->resultOffsets as $key => $offset) {
-            foreach ($match as $m) {
-                if (isset($m[ $offset ]) && !empty($m[ $offset ])) {
-                    $this->matchResults[ $key ][ strtolower($m[ $offset ]) ] = true;
-                }
-            }
-        }
-    }
-
-    /**
-     * Find matches in template source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->matchProperty($compiler->parser->lex->data);
-    }
-
-    /**
-     * Find matches in all parent template source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // search parent compiler template source
-        $nextCompiler = $compiler;
-        while ($nextCompiler !== $nextCompiler->parent_compiler) {
-            $nextCompiler = $nextCompiler->parent_compiler;
-            if ($compiler !== $nextCompiler) {
-                // get template source
-                $_content = $nextCompiler->template->source->getContent();
-                if ($_content != '') {
-                    // run pre filter if required
-                    if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) ||
-                         isset($nextCompiler->smarty->registered_filters[ 'pre' ]))
-                    ) {
-                        $_content = $nextCompiler->smarty->ext->_filterHandler->runFilter('pre', $_content,
-                                                                                          $nextCompiler->template);
-                    }
-                    $this->matchProperty($_content);
-                }
-            }
-        }
-    }
-
-    /**
-     * Find matches in {block} tag source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-    }
-
-    /**
-     * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $tag = strtolower(trim($parameter[ 0 ], '"\''));
-        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
-        if (!$name) {
-            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
-        }
-        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
-        if (!$property || !in_array($property, $this->nameProperties)) {
-            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
-        }
-        $tagVar = "'__smarty_{$tag}_{$name}'";
-        return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
-    }
+	/**
+	 * Preg search pattern
+	 *
+	 * @var string
+	 */
+	private $propertyPreg = '';
+
+	/**
+	 * Offsets in preg match result
+	 *
+	 * @var array
+	 */
+	private $resultOffsets = array();
+
+	/**
+	 * Start offset
+	 *
+	 * @var int
+	 */
+	private $startOffset = 0;
+
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	public $tagName = '';
+
+	/**
+	 * Valid properties of $smarty.xxx variable
+	 *
+	 * @var array
+	 */
+	public $nameProperties = array();
+
+	/**
+	 * {section} tag has no item properties
+	 *
+	 * @var array
+	 */
+	public $itemProperties = null;
+
+	/**
+	 * {section} tag has always name attribute
+	 *
+	 * @var bool
+	 */
+	public $isNamed = true;
+
+	/**
+	 * @var array
+	 */
+	public $matchResults = array();
+
+	/**
+	 * Scan sources for used tag attributes
+	 *
+	 * @param  array                                $attributes
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 */
+	public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$this->propertyPreg = '~(';
+		$this->startOffset = 0;
+		$this->resultOffsets = array();
+		$this->matchResults = array('named' => array(), 'item' => array());
+		if ($this->isNamed) {
+			$this->buildPropertyPreg(true, $attributes);
+		}
+		if (isset($this->itemProperties)) {
+			if ($this->isNamed) {
+				$this->propertyPreg .= '|';
+			}
+			$this->buildPropertyPreg(false, $attributes);
+		}
+		$this->propertyPreg .= ')\W~i';
+		// Template source
+		$this->matchTemplateSource($compiler);
+		// Parent template source
+		$this->matchParentTemplateSource($compiler);
+		// {block} source
+		$this->matchBlockSource($compiler);
+	}
+
+	/**
+	 * Build property preg string
+	 *
+	 * @param bool  $named
+	 * @param array $attributes
+	 */
+	public function buildPropertyPreg($named, $attributes)
+	{
+		if ($named) {
+			$this->resultOffsets[ 'named' ] = $this->startOffset + 3;
+			$this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.](";
+			$properties = $this->nameProperties;
+		} else {
+			$this->resultOffsets[ 'item' ] = $this->startOffset + 3;
+			$this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+			$properties = $this->itemProperties;
+		}
+		$this->startOffset += count($properties) + 2;
+		$propName = reset($properties);
+		while ($propName) {
+			$this->propertyPreg .= "({$propName})";
+			$propName = next($properties);
+			if ($propName) {
+				$this->propertyPreg .= '|';
+			}
+		}
+		$this->propertyPreg .= '))';
+	}
+
+	/**
+	 * Find matches in source string
+	 *
+	 * @param string $source
+	 */
+	public function matchProperty($source)
+	{
+		preg_match_all($this->propertyPreg, $source, $match, PREG_SET_ORDER);
+		foreach ($this->resultOffsets as $key => $offset) {
+			foreach ($match as $m) {
+				if (isset($m[ $offset ]) && !empty($m[ $offset ])) {
+					$this->matchResults[ $key ][ strtolower($m[ $offset ]) ] = true;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find matches in template source
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 */
+	public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$this->matchProperty($compiler->parser->lex->data);
+	}
+
+	/**
+	 * Find matches in all parent template source
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 */
+	public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		// search parent compiler template source
+		$nextCompiler = $compiler;
+		while ($nextCompiler !== $nextCompiler->parent_compiler) {
+			$nextCompiler = $nextCompiler->parent_compiler;
+			if ($compiler !== $nextCompiler) {
+				// get template source
+				$_content = $nextCompiler->template->source->getContent();
+				if ($_content != '') {
+					// run pre filter if required
+					if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) ||
+						 isset($nextCompiler->smarty->registered_filters[ 'pre' ]))
+					) {
+						$_content = $nextCompiler->smarty->ext->_filterHandler->runFilter('pre', $_content,
+																						  $nextCompiler->template);
+					}
+					$this->matchProperty($_content);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find matches in {block} tag source
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 */
+	public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+	}
+
+	/**
+	 * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \SmartyCompilerException
+	 */
+	public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		$tag = strtolower(trim($parameter[ 0 ], '"\''));
+		$name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+		if (!$name) {
+			$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+		}
+		$property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+		if (!$property || !in_array($property, $this->nameProperties)) {
+			$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+		}
+		$tagVar = "'__smarty_{$tag}_{$name}'";
+		return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
+	}
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -110,11 +110,11 @@ 
     public function buildPropertyPreg($named, $attributes)
     {
         if ($named) {
-            $this->resultOffsets[ 'named' ] = $this->startOffset + 3;
+            $this->resultOffsets['named'] = $this->startOffset + 3;
             $this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.](";
             $properties = $this->nameProperties;
         } else {
-            $this->resultOffsets[ 'item' ] = $this->startOffset + 3;
+            $this->resultOffsets['item'] = $this->startOffset + 3;
             $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
             $properties = $this->itemProperties;
         }
@@ -140,8 +140,8 @@ 
         preg_match_all($this->propertyPreg, $source, $match, PREG_SET_ORDER);
         foreach ($this->resultOffsets as $key => $offset) {
             foreach ($match as $m) {
-                if (isset($m[ $offset ]) && !empty($m[ $offset ])) {
-                    $this->matchResults[ $key ][ strtolower($m[ $offset ]) ] = true;
+                if (isset($m[$offset]) && !empty($m[$offset])) {
+                    $this->matchResults[$key][strtolower($m[$offset])] = true;
                 }
             }
         }
@@ -173,8 +173,8 @@ 
                 $_content = $nextCompiler->template->source->getContent();
                 if ($_content != '') {
                     // run pre filter if required
-                    if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) ||
-                         isset($nextCompiler->smarty->registered_filters[ 'pre' ]))
+                    if ((isset($nextCompiler->smarty->autoload_filters['pre']) ||
+                         isset($nextCompiler->smarty->registered_filters['pre']))
                     ) {
                         $_content = $nextCompiler->smarty->ext->_filterHandler->runFilter('pre', $_content,
                                                                                           $nextCompiler->template);
@@ -206,12 +206,12 @@ 
      */
     public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $tag = strtolower(trim($parameter[ 0 ], '"\''));
-        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        $tag = strtolower(trim($parameter[0], '"\''));
+        $name = isset($parameter[1]) ? $compiler->getId($parameter[1]) : false;
         if (!$name) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
         }
-        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+        $property = isset($parameter[2]) ? strtolower($compiler->getId($parameter[2])) : false;
         if (!$property || !in_array($property, $this->nameProperties)) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
         }

libraries/Smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php

Indentation +27 added lines, -27 removed lines

@@ -11,32 +11,32 @@
  */
 class Smarty_Internal_Method_AddDefaultModifiers
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Add default modifiers
-     *
-     * @api Smarty::addDefaultModifiers()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  array|string                                                   $modifiers modifier or list of modifiers
-     *                                                                                   to add
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        if (is_array($modifiers)) {
-            $smarty->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
-        } else {
-            $smarty->default_modifiers[] = $modifiers;
-        }
-        return $obj;
-    }
+	/**
+	 * Add default modifiers
+	 *
+	 * @api Smarty::addDefaultModifiers()
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  array|string                                                   $modifiers modifier or list of modifiers
+	 *                                                                                   to add
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 */
+	public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		if (is_array($modifiers)) {
+			$smarty->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
+		} else {
+			$smarty->default_modifiers[] = $modifiers;
+		}
+		return $obj;
+	}
 }
\ No newline at end of file

libraries/Smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php

Indentation +20 added lines, -20 removed lines

@@ -11,25 +11,25 @@
  */
 class Smarty_Internal_Method_GetDefaultModifiers
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Get default modifiers
-     *
-     * @api Smarty::getDefaultModifiers()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     *
-     * @return array list of default modifiers
-     */
-    public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        return $smarty->default_modifiers;
-    }
+	/**
+	 * Get default modifiers
+	 *
+	 * @api Smarty::getDefaultModifiers()
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 *
+	 * @return array list of default modifiers
+	 */
+	public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		return $smarty->default_modifiers;
+	}
 }
\ No newline at end of file

libraries/SabreDAV/DAVACL/AbstractPrincipalCollection.php

Braces +6 added lines, -3 removed lines

@@ -91,8 +91,9 @@ 
      */
     function getChildren() {
 
-        if ($this->disableListing)
-            throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
+        if ($this->disableListing) {
+                    throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
+        }
 
         $children = [];
         foreach ($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
@@ -115,7 +116,9 @@ 
     function getChild($name) {
 
         $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
+        if (!$principalInfo) {
+        	throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
+        }
         return $this->getChildForPrincipal($principalInfo);
 
     }

Indentation +158 added lines, -158 removed lines

@@ -19,163 +19,163 @@
  */
 abstract class AbstractPrincipalCollection extends DAV\Collection implements IPrincipalCollection {
 
-    /**
-     * Principal backend
-     *
-     * @var PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * The path to the principals we're listing from.
-     *
-     * @var string
-     */
-    protected $principalPrefix;
-
-    /**
-     * If this value is set to true, it effectively disables listing of users
-     * it still allows user to find other users if they have an exact url.
-     *
-     * @var bool
-     */
-    public $disableListing = false;
-
-    /**
-     * Creates the object
-     *
-     * This object must be passed the principal backend. This object will
-     * filter all principals from a specified prefix ($principalPrefix). The
-     * default is 'principals', if your principals are stored in a different
-     * collection, override $principalPrefix
-     *
-     *
-     * @param PrincipalBackend\BackendInterface $principalBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(PrincipalBackend\BackendInterface $principalBackend, $principalPrefix = 'principals') {
-
-        $this->principalPrefix = $principalPrefix;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principalInfo
-     * @return IPrincipal
-     */
-    abstract function getChildForPrincipal(array $principalInfo);
-
-    /**
-     * Returns the name of this collection.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(, $name) = URLUtil::splitPath($this->principalPrefix);
-        return $name;
-
-    }
-
-    /**
-     * Return the list of users
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        if ($this->disableListing)
-            throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
-
-        $children = [];
-        foreach ($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
-
-            $children[] = $this->getChildForPrincipal($principalInfo);
-
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return IPrincipal
-     */
-    public function getChild($name) {
-
-        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
-        return $this->getChildForPrincipal($principalInfo);
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * By default, if multiple properties are submitted to this method, the
-     * various properties should be combined with 'AND'. If $test is set to
-     * 'anyof', it should be combined using 'OR'.
-     *
-     * This method should simply return a list of 'child names', which may be
-     * used to call $this->getChild in the future.
-     *
-     * @param array $searchProperties
-     * @param string $test
-     * @return array
-     */
-    public function searchPrincipals(array $searchProperties, $test = 'allof') {
-
-        $result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties, $test);
-        $r = [];
-
-        foreach ($result as $row) {
-            list(, $r[]) = URLUtil::splitPath($row);
-        }
-
-        return $r;
-
-    }
-
-    /**
-     * Finds a principal by its URI.
-     *
-     * This method may receive any type of uri, but mailto: addresses will be
-     * the most common.
-     *
-     * Implementation of this API is optional. It is currently used by the
-     * CalDAV system to find principals based on their email addresses. If this
-     * API is not implemented, some features may not work correctly.
-     *
-     * This method must return a relative principal path, or null, if the
-     * principal was not found or you refuse to find it.
-     *
-     * @param string $uri
-     * @return string
-     */
-    public function findByUri($uri) {
-
-        return $this->principalBackend->findByUri($uri, $this->principalPrefix);
-
-    }
+	/**
+	 * Principal backend
+	 *
+	 * @var PrincipalBackend\BackendInterface
+	 */
+	protected $principalBackend;
+
+	/**
+	 * The path to the principals we're listing from.
+	 *
+	 * @var string
+	 */
+	protected $principalPrefix;
+
+	/**
+	 * If this value is set to true, it effectively disables listing of users
+	 * it still allows user to find other users if they have an exact url.
+	 *
+	 * @var bool
+	 */
+	public $disableListing = false;
+
+	/**
+	 * Creates the object
+	 *
+	 * This object must be passed the principal backend. This object will
+	 * filter all principals from a specified prefix ($principalPrefix). The
+	 * default is 'principals', if your principals are stored in a different
+	 * collection, override $principalPrefix
+	 *
+	 *
+	 * @param PrincipalBackend\BackendInterface $principalBackend
+	 * @param string $principalPrefix
+	 */
+	public function __construct(PrincipalBackend\BackendInterface $principalBackend, $principalPrefix = 'principals') {
+
+		$this->principalPrefix = $principalPrefix;
+		$this->principalBackend = $principalBackend;
+
+	}
+
+	/**
+	 * This method returns a node for a principal.
+	 *
+	 * The passed array contains principal information, and is guaranteed to
+	 * at least contain a uri item. Other properties may or may not be
+	 * supplied by the authentication backend.
+	 *
+	 * @param array $principalInfo
+	 * @return IPrincipal
+	 */
+	abstract function getChildForPrincipal(array $principalInfo);
+
+	/**
+	 * Returns the name of this collection.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		list(, $name) = URLUtil::splitPath($this->principalPrefix);
+		return $name;
+
+	}
+
+	/**
+	 * Return the list of users
+	 *
+	 * @return array
+	 */
+	public function getChildren() {
+
+		if ($this->disableListing)
+			throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
+
+		$children = [];
+		foreach ($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
+
+			$children[] = $this->getChildForPrincipal($principalInfo);
+
+
+		}
+		return $children;
+
+	}
+
+	/**
+	 * Returns a child object, by its name.
+	 *
+	 * @param string $name
+	 * @throws DAV\Exception\NotFound
+	 * @return IPrincipal
+	 */
+	public function getChild($name) {
+
+		$principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
+		if (!$principalInfo) throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
+		return $this->getChildForPrincipal($principalInfo);
+
+	}
+
+	/**
+	 * This method is used to search for principals matching a set of
+	 * properties.
+	 *
+	 * This search is specifically used by RFC3744's principal-property-search
+	 * REPORT. You should at least allow searching on
+	 * http://sabredav.org/ns}email-address.
+	 *
+	 * The actual search should be a unicode-non-case-sensitive search. The
+	 * keys in searchProperties are the WebDAV property names, while the values
+	 * are the property values to search on.
+	 *
+	 * By default, if multiple properties are submitted to this method, the
+	 * various properties should be combined with 'AND'. If $test is set to
+	 * 'anyof', it should be combined using 'OR'.
+	 *
+	 * This method should simply return a list of 'child names', which may be
+	 * used to call $this->getChild in the future.
+	 *
+	 * @param array $searchProperties
+	 * @param string $test
+	 * @return array
+	 */
+	public function searchPrincipals(array $searchProperties, $test = 'allof') {
+
+		$result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties, $test);
+		$r = [];
+
+		foreach ($result as $row) {
+			list(, $r[]) = URLUtil::splitPath($row);
+		}
+
+		return $r;
+
+	}
+
+	/**
+	 * Finds a principal by its URI.
+	 *
+	 * This method may receive any type of uri, but mailto: addresses will be
+	 * the most common.
+	 *
+	 * Implementation of this API is optional. It is currently used by the
+	 * CalDAV system to find principals based on their email addresses. If this
+	 * API is not implemented, some features may not work correctly.
+	 *
+	 * This method must return a relative principal path, or null, if the
+	 * principal was not found or you refuse to find it.
+	 *
+	 * @param string $uri
+	 * @return string
+	 */
+	public function findByUri($uri) {
+
+		return $this->principalBackend->findByUri($uri, $this->principalPrefix);
+
+	}
 
 }

libraries/SabreDAV/DAVACL/FS/Collection.php

Braces +6 added lines, -2 removed lines

@@ -59,8 +59,12 @@
 
         $path = $this->path . '/' . $name;
 
-        if (!file_exists($path)) throw new NotFound('File could not be located');
-        if ($name == '.' || $name == '..') throw new Forbidden('Permission denied to . and ..');
+        if (!file_exists($path)) {
+        	throw new NotFound('File could not be located');
+        }
+        if ($name == '.' || $name == '..') {
+        	throw new Forbidden('Permission denied to . and ..');
+        }
 
         if (is_dir($path)) {
 

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\DAVACL\FS;
 
-use Sabre\DAV\FSExt\Directory as BaseCollection;
 use Sabre\DAVACL\IACL;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\FSExt\Directory as BaseCollection;
 
 /**
  * This is an ACL-enabled collection.

Indentation +133 added lines, -133 removed lines

@@ -16,138 +16,138 @@
  */
 class Collection extends BaseCollection implements IACL {
 
-    /**
-     * A list of ACL rules.
-     *
-     * @var array
-     */
-    protected $acl;
-
-    /**
-     * Owner uri, or null for no owner.
-     *
-     * @var string|null
-     */
-    protected $owner;
-
-    /**
-     * Constructor
-     *
-     * @param string $path on-disk path.
-     * @param array $acl ACL rules.
-     * @param string|null $owner principal owner string.
-     */
-    public function __construct($path, array $acl, $owner = null) {
-
-        parent::__construct($path);
-        $this->acl = $acl;
-        $this->owner = $owner;
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return DAV\INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new NotFound('File could not be located');
-        if ($name == '.' || $name == '..') throw new Forbidden('Permission denied to . and ..');
-
-        if (is_dir($path)) {
-
-            return new self($path, $this->acl, $this->owner);
-
-        } else {
-
-            return new File($path, $this->acl, $this->owner);
-
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->owner;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return $this->acl;
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * A list of ACL rules.
+	 *
+	 * @var array
+	 */
+	protected $acl;
+
+	/**
+	 * Owner uri, or null for no owner.
+	 *
+	 * @var string|null
+	 */
+	protected $owner;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $path on-disk path.
+	 * @param array $acl ACL rules.
+	 * @param string|null $owner principal owner string.
+	 */
+	public function __construct($path, array $acl, $owner = null) {
+
+		parent::__construct($path);
+		$this->acl = $acl;
+		$this->owner = $owner;
+
+	}
+
+	/**
+	 * Returns a specific child node, referenced by its name
+	 *
+	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+	 * exist.
+	 *
+	 * @param string $name
+	 * @throws DAV\Exception\NotFound
+	 * @return DAV\INode
+	 */
+	public function getChild($name) {
+
+		$path = $this->path . '/' . $name;
+
+		if (!file_exists($path)) throw new NotFound('File could not be located');
+		if ($name == '.' || $name == '..') throw new Forbidden('Permission denied to . and ..');
+
+		if (is_dir($path)) {
+
+			return new self($path, $this->acl, $this->owner);
+
+		} else {
+
+			return new File($path, $this->acl, $this->owner);
+
+		}
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+
+		return $this->owner;
+
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL() {
+
+		return $this->acl;
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's as an array argument.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new Forbidden('Setting ACL is not allowed here');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }