YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_security.php

Doc Comments +7 added lines, -7 removed lines

@@ -258,7 +258,7 @@ 
      * Check if PHP function is trusted.
      *
      * @param  string $function_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if function is trusted
      * @throws SmartyCompilerException if php function is not trusted
@@ -303,7 +303,7 @@ 
      *
      * @param  string $class_name
      * @param  string $params
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if class method is trusted
      * @throws SmartyCompilerException if static class method is not trusted
@@ -341,7 +341,7 @@ 
      * Check if PHP modifier is trusted.
      *
      * @param  string $modifier_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if modifier is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -363,7 +363,7 @@ 
      * Check if tag is trusted.
      *
      * @param  string $tag_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -398,7 +398,7 @@ 
      * Check if special $smarty variable is trusted.
      *
      * @param  string $var_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -419,7 +419,7 @@ 
      * Check if modifier plugin is trusted.
      *
      * @param  string $modifier_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -454,7 +454,7 @@ 
      * Check if constants are enabled or trusted
      *
      * @param  string $const    constant name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return bool
      */

Indentation +705 added lines, -705 removed lines

@@ -13,710 +13,710 @@
  */
 class Smarty_Security
 {
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
-     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
-     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
-     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $php_handling = Smarty::PHP_PASSTHRU;
-
-    /**
-     * This is the list of template directories that are considered secure.
-     * $template_dir is in this list implicitly.
-     *
-     * @var array
-     */
-    public $secure_dir = array();
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-
-    /**
-     * List of regular expressions (PCRE) that include trusted URIs
-     *
-     * @var array
-     */
-    public $trusted_uri = array();
-
-    /**
-     * List of trusted constants names
-     *
-     * @var array
-     */
-    public $trusted_constants = array();
-
-    /**
-     * This is an array of trusted static classes.
-     * If empty access to all static classes is allowed.
-     * If set to 'none' none is allowed.
-     *
-     * @var array
-     */
-    public $static_classes = array();
-
-    /**
-     * This is an nested array of trusted classes and static methods.
-     * If empty access to all static classes and methods is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
-     *         'class_2' => array(),                       // all methods of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_methods = array();
-
-    /**
-     * This is an array of trusted static properties.
-     * If empty access to all static classes and properties is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
-     *         'class_2' => array(),                   // all properties of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_properties = array();
-
-    /**
-     * This is an array of trusted PHP functions.
-     * If empty all functions are allowed.
-     * To disable all PHP functions set $php_functions = null.
-     *
-     * @var array
-     */
-    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
-
-    /**
-     * This is an array of trusted PHP modifiers.
-     * If empty all modifiers are allowed.
-     * To disable all modifier set $php_modifiers = null.
-     *
-     * @var array
-     */
-    public $php_modifiers = array('escape', 'count', 'nl2br',);
-
-    /**
-     * This is an array of allowed tags.
-     * If empty no restriction by allowed_tags.
-     *
-     * @var array
-     */
-    public $allowed_tags = array();
-
-    /**
-     * This is an array of disabled tags.
-     * If empty no restriction by disabled_tags.
-     *
-     * @var array
-     */
-    public $disabled_tags = array();
-
-    /**
-     * This is an array of allowed modifier plugins.
-     * If empty no restriction by allowed_modifiers.
-     *
-     * @var array
-     */
-    public $allowed_modifiers = array();
-
-    /**
-     * This is an array of disabled modifier plugins.
-     * If empty no restriction by disabled_modifiers.
-     *
-     * @var array
-     */
-    public $disabled_modifiers = array();
-
-    /**
-     * This is an array of disabled special $smarty variables.
-     *
-     * @var array
-     */
-    public $disabled_special_smarty_vars = array();
-
-    /**
-     * This is an array of trusted streams.
-     * If empty all streams are allowed.
-     * To disable all streams set $streams = null.
-     *
-     * @var array
-     */
-    public $streams = array('file');
-
-    /**
-     * + flag if constants can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_constants = true;
-
-    /**
-     * + flag if super globals can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_super_globals = true;
-
-    /**
-     * max template nesting level
-     *
-     * @var int
-     */
-    public $max_template_nesting = 0;
-
-    /**
-     * current template nesting level
-     *
-     * @var int
-     */
-    private $_current_template_nesting = 0;
-
-    /**
-     * Cache for $resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_resource_dir = array();
-
-    /**
-     * Cache for $template_dir lookup
-     *
-     * @var array
-     */
-    protected $_template_dir = array();
-
-    /**
-     * Cache for $config_dir lookup
-     *
-     * @var array
-     */
-    protected $_config_dir = array();
-
-    /**
-     * Cache for $secure_dir lookup
-     *
-     * @var array
-     */
-    protected $_secure_dir = array();
-
-    /**
-     * Cache for $php_resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_php_resource_dir = null;
-
-    /**
-     * Cache for $trusted_dir lookup
-     *
-     * @var array
-     */
-    protected $_trusted_dir = null;
-
-    /**
-     * Cache for include path status
-     *
-     * @var bool
-     */
-    protected $_include_path_status = false;
-
-    /**
-     * Cache for $_include_array lookup
-     *
-     * @var array
-     */
-    protected $_include_dir = array();
-
-    /**
-     * @param Smarty $smarty
-     */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-        $this->smarty->_cache[ 'template_dir_new' ] = true;
-        $this->smarty->_cache[ 'config_dir_new' ] = true;
-    }
-
-    /**
-     * Check if PHP function is trusted.
-     *
-     * @param  string $function_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if function is trusted
-     * @throws SmartyCompilerException if php function is not trusted
-     */
-    public function isTrustedPhpFunction($function_name, $compiler)
-    {
-        if (isset($this->php_functions) &&
-            (empty($this->php_functions) || in_array($function_name, $this->php_functions))
-        ) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class is trusted.
-     *
-     * @param  string $class_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if class is trusted
-     * @throws SmartyCompilerException if static class is not trusted
-     */
-    public function isTrustedStaticClass($class_name, $compiler)
-    {
-        if (isset($this->static_classes) &&
-            (empty($this->static_classes) || in_array($class_name, $this->static_classes))
-        ) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class method/property is trusted.
-     *
-     * @param  string $class_name
-     * @param  string $params
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if class method is trusted
-     * @throws SmartyCompilerException if static class method is not trusted
-     */
-    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
-    {
-        if (!isset($params[ 2 ])) {
-            // fall back
-            return $this->isTrustedStaticClass($class_name, $compiler);
-        }
-        if ($params[ 2 ] == 'method') {
-            $allowed = $this->trusted_static_methods;
-            $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
-        } else {
-            $allowed = $this->trusted_static_properties;
-            // strip '$'
-            $name = substr($params[ 0 ], 1);
-        }
-        if (isset($allowed)) {
-            if (empty($allowed)) {
-                // fall back
-                return $this->isTrustedStaticClass($class_name, $compiler);
-            }
-            if (isset($allowed[ $class_name ]) &&
-                (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
-            ) {
-                return true;
-            }
-        }
-        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if PHP modifier is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if modifier is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedPhpModifier($modifier_name, $compiler)
-    {
-        if (isset($this->php_modifiers) &&
-            (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
-        ) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if tag is trusted.
-     *
-     * @param  string $tag_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedTag($tag_name, $compiler)
-    {
-        // check for internal always required tags
-        if (in_array($tag_name,
-                     array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
-                           'private_object_block_function', 'private_object_function', 'private_registered_function',
-                           'private_registered_block', 'private_special_variable', 'private_print_expression',
-                           'private_modifier'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_tags)) {
-            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
-            }
-        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if special $smarty variable is trusted.
-     *
-     * @param  string $var_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedSpecialSmartyVar($var_name, $compiler)
-    {
-        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting",
-                                              null, true);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if modifier plugin is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedModifier($modifier_name, $compiler)
-    {
-        // check for internal always allowed modifier
-        if (in_array($modifier_name, array('default'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_modifiers)) {
-            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null,
-                                                  true);
-            }
-        } elseif (in_array($modifier_name, $this->allowed_modifiers) &&
-                  !in_array($modifier_name, $this->disabled_modifiers)
-        ) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null,
-                                              true);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if constants are enabled or trusted
-     *
-     * @param  string $const    constant name
-     * @param  object $compiler compiler object
-     *
-     * @return bool
-     */
-    public function isTrustedConstant($const, $compiler)
-    {
-        if (in_array($const, array('true', 'false', 'null'))) {
-            return true;
-        }
-        if (!empty($this->trusted_constants)) {
-            if (!in_array($const, $this->trusted_constants)) {
-                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
-                return false;
-            }
-            return true;
-        }
-        if ($this->allow_constants) {
-            return true;
-        }
-        $compiler->trigger_template_error("Security: access to constants not permitted");
-        return false;
-    }
-
-    /**
-     * Check if stream is trusted.
-     *
-     * @param  string $stream_name
-     *
-     * @return boolean         true if stream is trusted
-     * @throws SmartyException if stream is not trusted
-     */
-    public function isTrustedStream($stream_name)
-    {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
-            return true;
-        }
-
-        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string   $filepath
-     * @param null|bool $isConfig
-     *
-     * @return bool true if directory is trusted
-     * @throws \SmartyException if directory is not trusted
-     */
-    public function isTrustedResourceDir($filepath, $isConfig = null)
-    {
-        if ($this->_include_path_status !== $this->smarty->use_include_path) {
-            foreach ($this->_include_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
-            }
-            if ($this->smarty->use_include_path) {
-                $this->_include_dir = array();
-                $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
-                foreach ($_dirs as $directory) {
-                    $this->_include_dir[] = $directory;
-                    $this->_resource_dir[ $directory ] = true;
-                }
-            }
-            $this->_include_path_status = $this->smarty->use_include_path;
-        }
-        if ($isConfig !== true &&
-            (!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ])
-        ) {
-            $_dir = $this->smarty->getTemplateDir();
-            if ($this->_template_dir !== $_dir) {
-                foreach ($this->_template_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
-                }
-                foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
-                }
-                $this->_template_dir = $_dir;
-            }
-            $this->smarty->_cache[ 'template_dir_new' ] = false;
-        }
-        if ($isConfig !== false &&
-            (!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ])
-        ) {
-            $_dir = $this->smarty->getConfigDir();
-            if ($this->_config_dir !== $_dir) {
-                foreach ($this->_config_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
-                }
-                foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
-                }
-                $this->_config_dir = $_dir;
-            }
-            $this->smarty->_cache[ 'config_dir_new' ] = false;
-        }
-        if ($this->_secure_dir !== (array) $this->secure_dir) {
-            foreach ($this->_secure_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
-            }
-            foreach ((array) $this->secure_dir as $directory) {
-                $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_resource_dir[ $directory ] = true;
-            }
-            $this->_secure_dir = (array) $this->secure_dir;
-        }
-        $this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
-        return true;
-    }
-
-    /**
-     * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
-     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
-     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     *
-     * @param  string $uri
-     *
-     * @return boolean         true if URI is trusted
-     * @throws SmartyException if URI is not trusted
-     * @uses $trusted_uri for list of patterns to match against $uri
-     */
-    public function isTrustedUri($uri)
-    {
-        $_uri = parse_url($uri);
-        if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
-            $_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
-            foreach ($this->trusted_uri as $pattern) {
-                if (preg_match($pattern, $_uri)) {
-                    return true;
-                }
-            }
-        }
-
-        throw new SmartyException("URI '{$uri}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if PHP directory is not trusted
-     */
-    public function isTrustedPHPDir($filepath)
-    {
-        if (empty($this->trusted_dir)) {
-            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
-        }
-
-        // check if index is outdated
-        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
-            $this->_php_resource_dir = array();
-
-            $this->_trusted_dir = $this->trusted_dir;
-            foreach ((array) $this->trusted_dir as $directory) {
-                $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_php_resource_dir[ $directory ] = true;
-            }
-        }
-
-        $this->_php_resource_dir =
-            $this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
-        return true;
-    }
+	/**
+	 * This determines how Smarty handles "<?php ... ?>" tags in templates.
+	 * possible values:
+	 * <ul>
+	 *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
+	 *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
+	 *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
+	 *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
+	 * </ul>
+	 *
+	 * @var integer
+	 */
+	public $php_handling = Smarty::PHP_PASSTHRU;
+
+	/**
+	 * This is the list of template directories that are considered secure.
+	 * $template_dir is in this list implicitly.
+	 *
+	 * @var array
+	 */
+	public $secure_dir = array();
+
+	/**
+	 * This is an array of directories where trusted php scripts reside.
+	 * {@link $security} is disabled during their inclusion/execution.
+	 *
+	 * @var array
+	 */
+	public $trusted_dir = array();
+
+	/**
+	 * List of regular expressions (PCRE) that include trusted URIs
+	 *
+	 * @var array
+	 */
+	public $trusted_uri = array();
+
+	/**
+	 * List of trusted constants names
+	 *
+	 * @var array
+	 */
+	public $trusted_constants = array();
+
+	/**
+	 * This is an array of trusted static classes.
+	 * If empty access to all static classes is allowed.
+	 * If set to 'none' none is allowed.
+	 *
+	 * @var array
+	 */
+	public $static_classes = array();
+
+	/**
+	 * This is an nested array of trusted classes and static methods.
+	 * If empty access to all static classes and methods is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+	 *         'class_2' => array(),                       // all methods of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_methods = array();
+
+	/**
+	 * This is an array of trusted static properties.
+	 * If empty access to all static classes and properties is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+	 *         'class_2' => array(),                   // all properties of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_properties = array();
+
+	/**
+	 * This is an array of trusted PHP functions.
+	 * If empty all functions are allowed.
+	 * To disable all PHP functions set $php_functions = null.
+	 *
+	 * @var array
+	 */
+	public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
+
+	/**
+	 * This is an array of trusted PHP modifiers.
+	 * If empty all modifiers are allowed.
+	 * To disable all modifier set $php_modifiers = null.
+	 *
+	 * @var array
+	 */
+	public $php_modifiers = array('escape', 'count', 'nl2br',);
+
+	/**
+	 * This is an array of allowed tags.
+	 * If empty no restriction by allowed_tags.
+	 *
+	 * @var array
+	 */
+	public $allowed_tags = array();
+
+	/**
+	 * This is an array of disabled tags.
+	 * If empty no restriction by disabled_tags.
+	 *
+	 * @var array
+	 */
+	public $disabled_tags = array();
+
+	/**
+	 * This is an array of allowed modifier plugins.
+	 * If empty no restriction by allowed_modifiers.
+	 *
+	 * @var array
+	 */
+	public $allowed_modifiers = array();
+
+	/**
+	 * This is an array of disabled modifier plugins.
+	 * If empty no restriction by disabled_modifiers.
+	 *
+	 * @var array
+	 */
+	public $disabled_modifiers = array();
+
+	/**
+	 * This is an array of disabled special $smarty variables.
+	 *
+	 * @var array
+	 */
+	public $disabled_special_smarty_vars = array();
+
+	/**
+	 * This is an array of trusted streams.
+	 * If empty all streams are allowed.
+	 * To disable all streams set $streams = null.
+	 *
+	 * @var array
+	 */
+	public $streams = array('file');
+
+	/**
+	 * + flag if constants can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_constants = true;
+
+	/**
+	 * + flag if super globals can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_super_globals = true;
+
+	/**
+	 * max template nesting level
+	 *
+	 * @var int
+	 */
+	public $max_template_nesting = 0;
+
+	/**
+	 * current template nesting level
+	 *
+	 * @var int
+	 */
+	private $_current_template_nesting = 0;
+
+	/**
+	 * Cache for $resource_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_resource_dir = array();
+
+	/**
+	 * Cache for $template_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_template_dir = array();
+
+	/**
+	 * Cache for $config_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_config_dir = array();
+
+	/**
+	 * Cache for $secure_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_secure_dir = array();
+
+	/**
+	 * Cache for $php_resource_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_php_resource_dir = null;
+
+	/**
+	 * Cache for $trusted_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_trusted_dir = null;
+
+	/**
+	 * Cache for include path status
+	 *
+	 * @var bool
+	 */
+	protected $_include_path_status = false;
+
+	/**
+	 * Cache for $_include_array lookup
+	 *
+	 * @var array
+	 */
+	protected $_include_dir = array();
+
+	/**
+	 * @param Smarty $smarty
+	 */
+	public function __construct($smarty)
+	{
+		$this->smarty = $smarty;
+		$this->smarty->_cache[ 'template_dir_new' ] = true;
+		$this->smarty->_cache[ 'config_dir_new' ] = true;
+	}
+
+	/**
+	 * Check if PHP function is trusted.
+	 *
+	 * @param  string $function_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if function is trusted
+	 * @throws SmartyCompilerException if php function is not trusted
+	 */
+	public function isTrustedPhpFunction($function_name, $compiler)
+	{
+		if (isset($this->php_functions) &&
+			(empty($this->php_functions) || in_array($function_name, $this->php_functions))
+		) {
+			return true;
+		}
+
+		$compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if static class is trusted.
+	 *
+	 * @param  string $class_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if class is trusted
+	 * @throws SmartyCompilerException if static class is not trusted
+	 */
+	public function isTrustedStaticClass($class_name, $compiler)
+	{
+		if (isset($this->static_classes) &&
+			(empty($this->static_classes) || in_array($class_name, $this->static_classes))
+		) {
+			return true;
+		}
+
+		$compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if static class method/property is trusted.
+	 *
+	 * @param  string $class_name
+	 * @param  string $params
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if class method is trusted
+	 * @throws SmartyCompilerException if static class method is not trusted
+	 */
+	public function isTrustedStaticClassAccess($class_name, $params, $compiler)
+	{
+		if (!isset($params[ 2 ])) {
+			// fall back
+			return $this->isTrustedStaticClass($class_name, $compiler);
+		}
+		if ($params[ 2 ] == 'method') {
+			$allowed = $this->trusted_static_methods;
+			$name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
+		} else {
+			$allowed = $this->trusted_static_properties;
+			// strip '$'
+			$name = substr($params[ 0 ], 1);
+		}
+		if (isset($allowed)) {
+			if (empty($allowed)) {
+				// fall back
+				return $this->isTrustedStaticClass($class_name, $compiler);
+			}
+			if (isset($allowed[ $class_name ]) &&
+				(empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
+			) {
+				return true;
+			}
+		}
+		$compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if PHP modifier is trusted.
+	 *
+	 * @param  string $modifier_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if modifier is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedPhpModifier($modifier_name, $compiler)
+	{
+		if (isset($this->php_modifiers) &&
+			(empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+		) {
+			return true;
+		}
+
+		$compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if tag is trusted.
+	 *
+	 * @param  string $tag_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedTag($tag_name, $compiler)
+	{
+		// check for internal always required tags
+		if (in_array($tag_name,
+					 array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
+						   'private_object_block_function', 'private_object_function', 'private_registered_function',
+						   'private_registered_block', 'private_special_variable', 'private_print_expression',
+						   'private_modifier'))) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_tags)) {
+			if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
+			}
+		} elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+		}
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if special $smarty variable is trusted.
+	 *
+	 * @param  string $var_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedSpecialSmartyVar($var_name, $compiler)
+	{
+		if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting",
+											  null, true);
+		}
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if modifier plugin is trusted.
+	 *
+	 * @param  string $modifier_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedModifier($modifier_name, $compiler)
+	{
+		// check for internal always allowed modifier
+		if (in_array($modifier_name, array('default'))) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_modifiers)) {
+			if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null,
+												  true);
+			}
+		} elseif (in_array($modifier_name, $this->allowed_modifiers) &&
+				  !in_array($modifier_name, $this->disabled_modifiers)
+		) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null,
+											  true);
+		}
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if constants are enabled or trusted
+	 *
+	 * @param  string $const    constant name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return bool
+	 */
+	public function isTrustedConstant($const, $compiler)
+	{
+		if (in_array($const, array('true', 'false', 'null'))) {
+			return true;
+		}
+		if (!empty($this->trusted_constants)) {
+			if (!in_array($const, $this->trusted_constants)) {
+				$compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+				return false;
+			}
+			return true;
+		}
+		if ($this->allow_constants) {
+			return true;
+		}
+		$compiler->trigger_template_error("Security: access to constants not permitted");
+		return false;
+	}
+
+	/**
+	 * Check if stream is trusted.
+	 *
+	 * @param  string $stream_name
+	 *
+	 * @return boolean         true if stream is trusted
+	 * @throws SmartyException if stream is not trusted
+	 */
+	public function isTrustedStream($stream_name)
+	{
+		if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+			return true;
+		}
+
+		throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
+	}
+
+	/**
+	 * Check if directory of file resource is trusted.
+	 *
+	 * @param  string   $filepath
+	 * @param null|bool $isConfig
+	 *
+	 * @return bool true if directory is trusted
+	 * @throws \SmartyException if directory is not trusted
+	 */
+	public function isTrustedResourceDir($filepath, $isConfig = null)
+	{
+		if ($this->_include_path_status !== $this->smarty->use_include_path) {
+			foreach ($this->_include_dir as $directory) {
+				unset($this->_resource_dir[ $directory ]);
+			}
+			if ($this->smarty->use_include_path) {
+				$this->_include_dir = array();
+				$_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
+				foreach ($_dirs as $directory) {
+					$this->_include_dir[] = $directory;
+					$this->_resource_dir[ $directory ] = true;
+				}
+			}
+			$this->_include_path_status = $this->smarty->use_include_path;
+		}
+		if ($isConfig !== true &&
+			(!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ])
+		) {
+			$_dir = $this->smarty->getTemplateDir();
+			if ($this->_template_dir !== $_dir) {
+				foreach ($this->_template_dir as $directory) {
+					unset($this->_resource_dir[ $directory ]);
+				}
+				foreach ($_dir as $directory) {
+					$this->_resource_dir[ $directory ] = true;
+				}
+				$this->_template_dir = $_dir;
+			}
+			$this->smarty->_cache[ 'template_dir_new' ] = false;
+		}
+		if ($isConfig !== false &&
+			(!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ])
+		) {
+			$_dir = $this->smarty->getConfigDir();
+			if ($this->_config_dir !== $_dir) {
+				foreach ($this->_config_dir as $directory) {
+					unset($this->_resource_dir[ $directory ]);
+				}
+				foreach ($_dir as $directory) {
+					$this->_resource_dir[ $directory ] = true;
+				}
+				$this->_config_dir = $_dir;
+			}
+			$this->smarty->_cache[ 'config_dir_new' ] = false;
+		}
+		if ($this->_secure_dir !== (array) $this->secure_dir) {
+			foreach ($this->_secure_dir as $directory) {
+				unset($this->_resource_dir[ $directory ]);
+			}
+			foreach ((array) $this->secure_dir as $directory) {
+				$directory = $this->smarty->_realpath($directory . DS, true);
+				$this->_resource_dir[ $directory ] = true;
+			}
+			$this->_secure_dir = (array) $this->secure_dir;
+		}
+		$this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
+		return true;
+	}
+
+	/**
+	 * Check if URI (e.g. {fetch} or {html_image}) is trusted
+	 * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
+	 * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
+	 * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
+	 *
+	 * @param  string $uri
+	 *
+	 * @return boolean         true if URI is trusted
+	 * @throws SmartyException if URI is not trusted
+	 * @uses $trusted_uri for list of patterns to match against $uri
+	 */
+	public function isTrustedUri($uri)
+	{
+		$_uri = parse_url($uri);
+		if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
+			$_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
+			foreach ($this->trusted_uri as $pattern) {
+				if (preg_match($pattern, $_uri)) {
+					return true;
+				}
+			}
+		}
+
+		throw new SmartyException("URI '{$uri}' not allowed by security setting");
+	}
+
+	/**
+	 * Check if directory of file resource is trusted.
+	 *
+	 * @param  string $filepath
+	 *
+	 * @return boolean         true if directory is trusted
+	 * @throws SmartyException if PHP directory is not trusted
+	 */
+	public function isTrustedPHPDir($filepath)
+	{
+		if (empty($this->trusted_dir)) {
+			throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
+		}
+
+		// check if index is outdated
+		if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
+			$this->_php_resource_dir = array();
+
+			$this->_trusted_dir = $this->trusted_dir;
+			foreach ((array) $this->trusted_dir as $directory) {
+				$directory = $this->smarty->_realpath($directory . DS, true);
+				$this->_php_resource_dir[ $directory ] = true;
+			}
+		}
+
+		$this->_php_resource_dir =
+			$this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
+		return true;
+	}
     
-    /**
-     * Check if file is inside a valid directory
-     *
-     * @param string $filepath
-     * @param array  $dirs valid directories
-     *
-     * @return array
-     * @throws \SmartyException
-     */
-    private function _checkDir($filepath, $dirs)
-    {
-        $directory = dirname($filepath) . DS;
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[ $directory ] = true;
-            // test if the directory is trusted
-            if (isset($dirs[ $directory ])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $dirs = array_merge($dirs, $_directory);
-
-                return $dirs;
-            }
-            // abort if we've reached root
-            if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
-                break;
-            }
-            // bubble up one level
-            $directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
-        }
-
-        // give up
-        throw new SmartyException("directory '{$filepath}' not allowed by security setting");
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param \Smarty                 $smarty
-     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
-     *
-     * @return \Smarty current Smarty instance for chaining
-     * @throws \SmartyException when an invalid class name is provided
-     */
-    public static function enableSecurity(Smarty $smarty, $security_class)
-    {
-        if ($security_class instanceof Smarty_Security) {
-            $smarty->security_policy = $security_class;
-            return;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $smarty->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $smarty->security_policy = new $security_class($smarty);
-        }
-        return;
-    }
-    /**
-     * Start template processing
-     *
-     * @param $template
-     *
-     * @throws SmartyException
-     */
-    public function startTemplate($template)
-    {
-        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
-            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
-        }
-    }
-
-    /**
-     * Exit template processing
-     *
-     */
-    public function endTemplate()
-    {
-        if ($this->max_template_nesting > 0) {
-            $this->_current_template_nesting --;
-        }
-    }
-
-    /**
-     * Register callback functions call at start/end of template rendering
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function registerCallBacks(Smarty_Internal_Template $template)
-    {
-        $template->startRenderCallbacks[] = array($this, 'startTemplate');
-        $template->endRenderCallbacks[] = array($this, 'endTemplate');
-    }
+	/**
+	 * Check if file is inside a valid directory
+	 *
+	 * @param string $filepath
+	 * @param array  $dirs valid directories
+	 *
+	 * @return array
+	 * @throws \SmartyException
+	 */
+	private function _checkDir($filepath, $dirs)
+	{
+		$directory = dirname($filepath) . DS;
+		$_directory = array();
+		while (true) {
+			// remember the directory to add it to _resource_dir in case we're successful
+			$_directory[ $directory ] = true;
+			// test if the directory is trusted
+			if (isset($dirs[ $directory ])) {
+				// merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
+				$dirs = array_merge($dirs, $_directory);
+
+				return $dirs;
+			}
+			// abort if we've reached root
+			if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
+				break;
+			}
+			// bubble up one level
+			$directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
+		}
+
+		// give up
+		throw new SmartyException("directory '{$filepath}' not allowed by security setting");
+	}
+
+	/**
+	 * Loads security class and enables security
+	 *
+	 * @param \Smarty                 $smarty
+	 * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+	 *
+	 * @return \Smarty current Smarty instance for chaining
+	 * @throws \SmartyException when an invalid class name is provided
+	 */
+	public static function enableSecurity(Smarty $smarty, $security_class)
+	{
+		if ($security_class instanceof Smarty_Security) {
+			$smarty->security_policy = $security_class;
+			return;
+		} elseif (is_object($security_class)) {
+			throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+		}
+		if ($security_class == null) {
+			$security_class = $smarty->security_class;
+		}
+		if (!class_exists($security_class)) {
+			throw new SmartyException("Security class '$security_class' is not defined");
+		} elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+			throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+		} else {
+			$smarty->security_policy = new $security_class($smarty);
+		}
+		return;
+	}
+	/**
+	 * Start template processing
+	 *
+	 * @param $template
+	 *
+	 * @throws SmartyException
+	 */
+	public function startTemplate($template)
+	{
+		if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+			throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+		}
+	}
+
+	/**
+	 * Exit template processing
+	 *
+	 */
+	public function endTemplate()
+	{
+		if ($this->max_template_nesting > 0) {
+			$this->_current_template_nesting --;
+		}
+	}
+
+	/**
+	 * Register callback functions call at start/end of template rendering
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function registerCallBacks(Smarty_Internal_Template $template)
+	{
+		$template->startRenderCallbacks[] = array($this, 'startTemplate');
+		$template->endRenderCallbacks[] = array($this, 'endTemplate');
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -250,8 +250,8 @@ 
     public function __construct($smarty)
     {
         $this->smarty = $smarty;
-        $this->smarty->_cache[ 'template_dir_new' ] = true;
-        $this->smarty->_cache[ 'config_dir_new' ] = true;
+        $this->smarty->_cache['template_dir_new'] = true;
+        $this->smarty->_cache['config_dir_new'] = true;
     }
 
     /**
@@ -310,25 +310,25 @@ 
      */
     public function isTrustedStaticClassAccess($class_name, $params, $compiler)
     {
-        if (!isset($params[ 2 ])) {
+        if (!isset($params[2])) {
             // fall back
             return $this->isTrustedStaticClass($class_name, $compiler);
         }
-        if ($params[ 2 ] == 'method') {
+        if ($params[2] == 'method') {
             $allowed = $this->trusted_static_methods;
-            $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
+            $name = substr($params[0], 0, strpos($params[0], '('));
         } else {
             $allowed = $this->trusted_static_properties;
             // strip '$'
-            $name = substr($params[ 0 ], 1);
+            $name = substr($params[0], 1);
         }
         if (isset($allowed)) {
             if (empty($allowed)) {
                 // fall back
                 return $this->isTrustedStaticClass($class_name, $compiler);
             }
-            if (isset($allowed[ $class_name ]) &&
-                (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
+            if (isset($allowed[$class_name]) &&
+                (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name]))
             ) {
                 return true;
             }
@@ -507,55 +507,55 @@ 
     {
         if ($this->_include_path_status !== $this->smarty->use_include_path) {
             foreach ($this->_include_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
+                unset($this->_resource_dir[$directory]);
             }
             if ($this->smarty->use_include_path) {
                 $this->_include_dir = array();
                 $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
                 foreach ($_dirs as $directory) {
                     $this->_include_dir[] = $directory;
-                    $this->_resource_dir[ $directory ] = true;
+                    $this->_resource_dir[$directory] = true;
                 }
             }
             $this->_include_path_status = $this->smarty->use_include_path;
         }
         if ($isConfig !== true &&
-            (!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ])
+            (!isset($this->smarty->_cache['template_dir_new']) || $this->smarty->_cache['template_dir_new'])
         ) {
             $_dir = $this->smarty->getTemplateDir();
             if ($this->_template_dir !== $_dir) {
                 foreach ($this->_template_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
+                    unset($this->_resource_dir[$directory]);
                 }
                 foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
+                    $this->_resource_dir[$directory] = true;
                 }
                 $this->_template_dir = $_dir;
             }
-            $this->smarty->_cache[ 'template_dir_new' ] = false;
+            $this->smarty->_cache['template_dir_new'] = false;
         }
         if ($isConfig !== false &&
-            (!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ])
+            (!isset($this->smarty->_cache['config_dir_new']) || $this->smarty->_cache['config_dir_new'])
         ) {
             $_dir = $this->smarty->getConfigDir();
             if ($this->_config_dir !== $_dir) {
                 foreach ($this->_config_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
+                    unset($this->_resource_dir[$directory]);
                 }
                 foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
+                    $this->_resource_dir[$directory] = true;
                 }
                 $this->_config_dir = $_dir;
             }
-            $this->smarty->_cache[ 'config_dir_new' ] = false;
+            $this->smarty->_cache['config_dir_new'] = false;
         }
         if ($this->_secure_dir !== (array) $this->secure_dir) {
             foreach ($this->_secure_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
+                unset($this->_resource_dir[$directory]);
             }
             foreach ((array) $this->secure_dir as $directory) {
                 $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_resource_dir[ $directory ] = true;
+                $this->_resource_dir[$directory] = true;
             }
             $this->_secure_dir = (array) $this->secure_dir;
         }
@@ -578,8 +578,8 @@ 
     public function isTrustedUri($uri)
     {
         $_uri = parse_url($uri);
-        if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
-            $_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
+        if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
+            $_uri = $_uri['scheme'] . '://' . $_uri['host'];
             foreach ($this->trusted_uri as $pattern) {
                 if (preg_match($pattern, $_uri)) {
                     return true;
@@ -611,7 +611,7 @@ 
             $this->_trusted_dir = $this->trusted_dir;
             foreach ((array) $this->trusted_dir as $directory) {
                 $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_php_resource_dir[ $directory ] = true;
+                $this->_php_resource_dir[$directory] = true;
             }
         }
 
@@ -635,9 +635,9 @@ 
         $_directory = array();
         while (true) {
             // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[ $directory ] = true;
+            $_directory[$directory] = true;
             // test if the directory is trusted
-            if (isset($dirs[ $directory ])) {
+            if (isset($dirs[$directory])) {
                 // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
                 $dirs = array_merge($dirs, $_directory);
 
@@ -693,7 +693,7 @@ 
      */
     public function startTemplate($template)
     {
-        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+        if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
             throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
         }
     }
@@ -705,7 +705,7 @@ 
     public function endTemplate()
     {
         if ($this->max_template_nesting > 0) {
-            $this->_current_template_nesting --;
+            $this->_current_template_nesting--;
         }
     }
 

libraries/Smarty/libs/sysplugins/smarty_template_source.php

Doc Comments -1 removed lines

@@ -126,7 +126,6 @@
     /**
      * create Source Object container
      *
-     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
      * @param Smarty          $smarty   Smarty instance this source object belongs to
      * @param string          $resource full template_resource
      * @param string          $type     type of resource

Indentation +196 added lines, -196 removed lines

@@ -11,200 +11,200 @@
  */
 class Smarty_Template_Source
 {
-    /**
-     * Unique Template ID
-     *
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     *
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     *
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     *
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Source Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Source Timestamp
-     *
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Source Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Source File Base name
-     *
-     * @var string
-     */
-    public $basename = null;
-
-    /**
-     * The Components an extended template is made of
-     *
-     * @var \Smarty_Template_Source[]
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     *
-     * @var \Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * Resource is source
-     *
-     * @var bool
-     */
-    public $isConfig = false;
-
-    /**
-     * Template source content eventually set by default handler
-     *
-     * @var string
-     */
-    public $content = null;
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
-     * @param Smarty          $smarty   Smarty instance this source object belongs to
-     * @param string          $resource full template_resource
-     * @param string          $type     type of resource
-     * @param string          $name     resource name
-     *
-     */
-    public function __construct(Smarty $smarty, $resource, $type, $name)
-    {
-        $this->handler =
-            isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
-                Smarty_Resource::load($smarty, $type);
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param  Smarty_Internal_Template $_template         template object
-     * @param  Smarty                   $smarty            smarty object
-     * @param  string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Source Source Object
-     * @throws SmartyException
-     */
-    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
-                                $template_resource = null)
-    {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-        if (empty($template_resource)) {
-            throw new SmartyException('Source: Missing  name');
-        }
-        // parse resource_name, load resource handler, identify unique resource name
-        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
-            $type = $match[ 1 ];
-            $name = $match[ 2 ];
-        } else {
-            // no resource given, use default
-            // or single character before the colon is not a resource type, but part of the filepath
-            $type = $smarty->default_resource_type;
-            $name = $template_resource;
-        }
-        // create new source  object
-        $source = new Smarty_Template_Source($smarty, $template_resource, $type, $name);
-        $source->handler->populate($source, $_template);
-        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
-            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
-            $source->handler->populate($source, $_template);
-        }
-        return $source;
-    }
-
-    /**
-     * Get source time stamp
-     *
-     * @return int
-     */
-    public function getTimeStamp()
-    {
-        if (!isset($this->timestamp)) {
-            $this->handler->populateTimestamp($this);
-        }
-        return $this->timestamp;
-    }
-
-    /**
-     * Get source content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return isset($this->content) ? $this->content : $this->handler->getContent($this);
-    }
+	/**
+	 * Unique Template ID
+	 *
+	 * @var string
+	 */
+	public $uid = null;
+
+	/**
+	 * Template Resource (Smarty_Internal_Template::$template_resource)
+	 *
+	 * @var string
+	 */
+	public $resource = null;
+
+	/**
+	 * Resource Type
+	 *
+	 * @var string
+	 */
+	public $type = null;
+
+	/**
+	 * Resource Name
+	 *
+	 * @var string
+	 */
+	public $name = null;
+
+	/**
+	 * Source Filepath
+	 *
+	 * @var string
+	 */
+	public $filepath = null;
+
+	/**
+	 * Source Timestamp
+	 *
+	 * @var integer
+	 */
+	public $timestamp = null;
+
+	/**
+	 * Source Existence
+	 *
+	 * @var boolean
+	 */
+	public $exists = false;
+
+	/**
+	 * Source File Base name
+	 *
+	 * @var string
+	 */
+	public $basename = null;
+
+	/**
+	 * The Components an extended template is made of
+	 *
+	 * @var \Smarty_Template_Source[]
+	 */
+	public $components = null;
+
+	/**
+	 * Resource Handler
+	 *
+	 * @var \Smarty_Resource
+	 */
+	public $handler = null;
+
+	/**
+	 * Smarty instance
+	 *
+	 * @var Smarty
+	 */
+	public $smarty = null;
+
+	/**
+	 * Resource is source
+	 *
+	 * @var bool
+	 */
+	public $isConfig = false;
+
+	/**
+	 * Template source content eventually set by default handler
+	 *
+	 * @var string
+	 */
+	public $content = null;
+
+	/**
+	 * Name of the Class to compile this resource's contents with
+	 *
+	 * @var string
+	 */
+	public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+
+	/**
+	 * Name of the Class to tokenize this resource's contents with
+	 *
+	 * @var string
+	 */
+	public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+
+	/**
+	 * Name of the Class to parse this resource's contents with
+	 *
+	 * @var string
+	 */
+	public $template_parser_class = 'Smarty_Internal_Templateparser';
+
+	/**
+	 * create Source Object container
+	 *
+	 * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+	 * @param Smarty          $smarty   Smarty instance this source object belongs to
+	 * @param string          $resource full template_resource
+	 * @param string          $type     type of resource
+	 * @param string          $name     resource name
+	 *
+	 */
+	public function __construct(Smarty $smarty, $resource, $type, $name)
+	{
+		$this->handler =
+			isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
+				Smarty_Resource::load($smarty, $type);
+		$this->smarty = $smarty;
+		$this->resource = $resource;
+		$this->type = $type;
+		$this->name = $name;
+	}
+
+	/**
+	 * initialize Source Object for given resource
+	 * Either [$_template] or [$smarty, $template_resource] must be specified
+	 *
+	 * @param  Smarty_Internal_Template $_template         template object
+	 * @param  Smarty                   $smarty            smarty object
+	 * @param  string                   $template_resource resource identifier
+	 *
+	 * @return Smarty_Template_Source Source Object
+	 * @throws SmartyException
+	 */
+	public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+								$template_resource = null)
+	{
+		if ($_template) {
+			$smarty = $_template->smarty;
+			$template_resource = $_template->template_resource;
+		}
+		if (empty($template_resource)) {
+			throw new SmartyException('Source: Missing  name');
+		}
+		// parse resource_name, load resource handler, identify unique resource name
+		if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
+			$type = $match[ 1 ];
+			$name = $match[ 2 ];
+		} else {
+			// no resource given, use default
+			// or single character before the colon is not a resource type, but part of the filepath
+			$type = $smarty->default_resource_type;
+			$name = $template_resource;
+		}
+		// create new source  object
+		$source = new Smarty_Template_Source($smarty, $template_resource, $type, $name);
+		$source->handler->populate($source, $_template);
+		if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
+			Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+			$source->handler->populate($source, $_template);
+		}
+		return $source;
+	}
+
+	/**
+	 * Get source time stamp
+	 *
+	 * @return int
+	 */
+	public function getTimeStamp()
+	{
+		if (!isset($this->timestamp)) {
+			$this->handler->populateTimestamp($this);
+		}
+		return $this->timestamp;
+	}
+
+	/**
+	 * Get source content
+	 *
+	 * @return string
+	 */
+	public function getContent()
+	{
+		return isset($this->content) ? $this->content : $this->handler->getContent($this);
+	}
 }

Spacing +3 added lines, -4 removed lines

@@ -136,8 +136,7 @@ 
     public function __construct(Smarty $smarty, $resource, $type, $name)
     {
         $this->handler =
-            isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
-                Smarty_Resource::load($smarty, $type);
+            isset($smarty->_cache['resource_handlers'][$type]) ? $smarty->_cache['resource_handlers'][$type] : Smarty_Resource::load($smarty, $type);
         $this->smarty = $smarty;
         $this->resource = $resource;
         $this->type = $type;
@@ -167,8 +166,8 @@ 
         }
         // parse resource_name, load resource handler, identify unique resource name
         if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
-            $type = $match[ 1 ];
-            $name = $match[ 2 ];
+            $type = $match[1];
+            $name = $match[2];
         } else {
             // no resource given, use default
             // or single character before the colon is not a resource type, but part of the filepath

modules/Accounts/Accounts.php

Doc Comments +2 added lines, -1 removed lines

@@ -611,6 +611,7 @@ 
 	 * @param  integer   $id      		- accountid
 	 * @param  array   $parent_accounts   - Array of all the parent accounts
 	 * returns All the parent accounts of the given accountid in array format
+	 * @param integer[] $encountered_accounts
 	 */
 	public function __getParentAccounts($id, &$parent_accounts, &$encountered_accounts, $depthBase = 0)
 	{
@@ -673,7 +674,7 @@ 
 	 * Function to Recursively get all the child accounts of a given Account
 	 * @param  integer   $id      		- accountid
 	 * @param  array   $child_accounts   - Array of all the child accounts
-	 * @param  integer   $depth          - Depth at which the particular account has to be placed in the hierarchy
+	 * @param  integer   $depthBase          - Depth at which the particular account has to be placed in the hierarchy
 	 * returns All the child accounts of the given accountid in array format
 	 */
 	public function __getChildAccounts($id, &$child_accounts, $depthBase)

Braces +82 added lines, -58 removed lines

@@ -99,18 +99,20 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		if ($singlepane_view == 'true')
-			$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
-		else
-			$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		if ($singlepane_view == 'true') {
+					$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
+		} else {
+					$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		}
 
 		$button = '';
 
 		$button .= '<input type="hidden" name="email_directing_module"><input type="hidden" name="record">';
 
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -136,8 +138,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_campaigns method ...");
@@ -163,16 +166,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		if ($singlepane_view == 'true')
-			$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
-		else
-			$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		if ($singlepane_view == 'true') {
+					$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
+		} else {
+					$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		}
 
 		$button = '';
 		$current_user = vglobal('current_user');
 		if ($actions && getFieldVisibilityPermission($related_module, $current_user->id, 'account_id', 'readwrite') == '0') {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -204,8 +209,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_contacts method ...");
@@ -231,16 +237,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		if ($singlepane_view == 'true')
-			$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
-		else
-			$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		if ($singlepane_view == 'true') {
+					$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
+		} else {
+					$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		}
 
 		$button = '';
 		$current_user = vglobal('current_user');
 		if ($actions && getFieldVisibilityPermission($related_module, $current_user->id, 'parent_id', 'readwrite') == '0') {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -265,8 +273,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_tickets method ...");
@@ -292,16 +301,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		if ($singlepane_view == 'true')
-			$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
-		else
-			$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		if ($singlepane_view == 'true') {
+					$returnset = '&return_module=' . $this_module . '&return_action=DetailView&return_id=' . $id;
+		} else {
+					$returnset = '&return_module=' . $this_module . '&return_action=CallRelatedList&return_id=' . $id;
+		}
 
 		$button = '';
 
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -329,8 +340,9 @@ 
 		$query = sprintf($query, $entityIds);
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_products method ...");
@@ -372,10 +384,11 @@ 
 		$query .= $this->getNonAdminAccessControlQuery('Accounts', $current_user);
 		$where_auto = " vtiger_crmentity.deleted = 0 ";
 
-		if ($where != '')
-			$query .= sprintf(' where (%s) && %s', $where, $where_auto);
-		else
-			$query .= sprintf(' where %s', $where_auto);
+		if ($where != '') {
+					$query .= sprintf(' where (%s) && %s', $where, $where_auto);
+		} else {
+					$query .= sprintf(' where %s', $where_auto);
+		}
 
 		$log->debug("Exiting create_export_query method ...");
 		return $query;
@@ -768,8 +781,9 @@ 
 	public function unlinkRelationship($id, $return_module, $return_id, $relatedName = false)
 	{
 		$log = vglobal('log');
-		if (empty($return_module) || empty($return_id))
-			return;
+		if (empty($return_module) || empty($return_id)) {
+					return;
+		}
 
 		if ($return_module == 'Campaigns') {
 			$this->db->delete('vtiger_campaign_records', 'crmid=? && campaignid=?', [$id, $return_id]);
@@ -786,8 +800,9 @@ 
 		$db = PearDatabase::getInstance();
 		$currentUser = Users_Record_Model::getCurrentUserModel();
 
-		if (!is_array($with_crmids))
-			$with_crmids = [$with_crmids];
+		if (!is_array($with_crmids)) {
+					$with_crmids = [$with_crmids];
+		}
 		if (!in_array($with_module, ['Products', 'Campaigns'])) {
 			parent::save_related_module($module, $crmid, $with_module, $with_crmids, $relatedName);
 		} else {
@@ -831,8 +846,9 @@ 
 		$singular_modname = vtlib_toSingular($related_module);
 		$button = '';
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -873,8 +889,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 		return $return_value;
 	}
@@ -901,10 +918,12 @@ 
 					continue;
 				}
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$join .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -947,8 +966,9 @@ 
 
 		$button = '';
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' " .
 					" type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$current_module&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\"" .
@@ -973,10 +993,12 @@ 
 		if (!empty($other->related_tables)) {
 			foreach ($other->related_tables as $tname => $relmap) {
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$more_relation .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -998,8 +1020,9 @@ 
 
 		$return_value = GetRelatedList($current_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		return $return_value;
@@ -1009,8 +1032,9 @@ 
 	public function getRelatedContactsIds($id = null)
 	{
 		$adb = PearDatabase::getInstance();
-		if ($id == null)
-			$id = $this->id;
+		if ($id == null) {
+					$id = $this->id;
+		}
 		$entityIds = [];
 		$query = 'SELECT contactid FROM vtiger_contactdetails
 				INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid

modules/Assets/dashboards/ExpiringSoldProducts.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 		}
 	}
 
+	/**
+	 * @param Vtiger_Widget_Model $widget
+	 */
 	public function getData(Vtiger_Request $request, $widget)
 	{
 		$db = PearDatabase::getInstance();

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 		$sql = $queryGenerator->getQuery();
 
 		if ($securityParameter != '')
-			$sql.= $securityParameter;
+			$sql .= $securityParameter;
 
 		if (!empty($assetStatus)) {
 			$assetStatus = implode("','", $assetConfig['assetstatus']);
@@ -70,7 +70,7 @@ 
 		}
 
 		$params[] = $currentUser->getId();
-		$sql.= ' ORDER BY vtiger_assets.dateinservice ASC LIMIT %s';
+		$sql .= ' ORDER BY vtiger_assets.dateinservice ASC LIMIT %s';
 		$sql = sprintf($sql, $limit);
 		$result = $db->pquery($sql, $params);
 		$returnData = array();

Braces +3 added lines, -2 removed lines

@@ -55,8 +55,9 @@
 		$queryGenerator->setFields($fields);
 		$sql = $queryGenerator->getQuery();
 
-		if ($securityParameter != '')
-			$sql.= $securityParameter;
+		if ($securityParameter != '') {
+					$sql.= $securityParameter;
+		}
 
 		if (!empty($assetStatus)) {
 			$assetStatus = implode("','", $assetConfig['assetstatus']);

modules/Calendar/Activity.php

Doc Comments +6 added lines, -3 removed lines

@@ -179,7 +179,7 @@ 
 	}
 
 	/** Function to insert values in vtiger_activity_remainder table for the specified module,
-	 * @param $table_name -- table name:: Type varchar
+	 * @param string $table_name -- table name:: Type varchar
 	 * @param $module -- module:: Type varchar
 	 */
 	public function insertIntoReminderTable($table_name, $module, $recurid)
@@ -213,7 +213,7 @@ 
 
 	// Code included by Jaguar - starts
 	/** Function to insert values in vtiger_recurringevents table for the specified tablename,module
-	 * @param $recurObj -- Recurring Object:: Type varchar
+	 * @param RecurringType $recurObj -- Recurring Object:: Type varchar
 	 */
 	public function insertIntoRecurringTable(& $recurObj)
 	{
@@ -710,7 +710,7 @@ 
 
 	/**
 	 * Function to get calendar query for outlookplugin
-	 * @param   string    $username     -  User name                                                                            * return   string    $query        -  sql query                                                                            */
+	 * @param   string    $user_name     -  User name                                                                            * return   string    $query        -  sql query                                                                            */
 	public function get_calendarsforol($user_name)
 	{
 		$adb = PearDatabase::getInstance();
@@ -903,6 +903,9 @@ 
 		return $query;
 	}
 
+	/**
+	 * @param null|type $tabId
+	 */
 	protected function setupTemporaryTable($tableName, $tabId, $user, $parentRole, $userGroups)
 	{
 		$module = null;

Spacing +12 added lines, -12 removed lines

@@ -821,40 +821,40 @@
 		$query = $this->getRelationQuery($module, $secmodule, "vtiger_activity", "activityid", $queryPlanner);
 
 		if ($queryPlanner->requireTable("vtiger_crmentityCalendar", $matrix)) {
-			$query .=" left join vtiger_crmentity as vtiger_crmentityCalendar on vtiger_crmentityCalendar.crmid=vtiger_activity.activityid and vtiger_crmentityCalendar.deleted=0";
+			$query .= " left join vtiger_crmentity as vtiger_crmentityCalendar on vtiger_crmentityCalendar.crmid=vtiger_activity.activityid and vtiger_crmentityCalendar.deleted=0";
 		}
 		if ($queryPlanner->requireTable("vtiger_contactdetailsCalendar")) {
-			$query .=" 	left join vtiger_contactdetails as vtiger_contactdetailsCalendar on vtiger_contactdetailsCalendar.contactid= vtiger_activity.link";
+			$query .= " 	left join vtiger_contactdetails as vtiger_contactdetailsCalendar on vtiger_contactdetailsCalendar.contactid= vtiger_activity.link";
 		}
 		if ($queryPlanner->requireTable("vtiger_activitycf")) {
-			$query .=" 	left join vtiger_activitycf on vtiger_activitycf.activityid = vtiger_activity.activityid";
+			$query .= " 	left join vtiger_activitycf on vtiger_activitycf.activityid = vtiger_activity.activityid";
 		}
 		if ($queryPlanner->requireTable("vtiger_activity_reminder")) {
-			$query .=" 	left join vtiger_activity_reminder on vtiger_activity_reminder.activity_id = vtiger_activity.activityid";
+			$query .= " 	left join vtiger_activity_reminder on vtiger_activity_reminder.activity_id = vtiger_activity.activityid";
 		}
 		if ($queryPlanner->requireTable("vtiger_recurringevents")) {
-			$query .=" 	left join vtiger_recurringevents on vtiger_recurringevents.activityid = vtiger_activity.activityid";
+			$query .= " 	left join vtiger_recurringevents on vtiger_recurringevents.activityid = vtiger_activity.activityid";
 		}
 		if ($queryPlanner->requireTable("vtiger_accountRelCalendar")) {
-			$query .=" 	left join vtiger_account as vtiger_accountRelCalendar on vtiger_accountRelCalendar.accountid=vtiger_activity.link";
+			$query .= " 	left join vtiger_account as vtiger_accountRelCalendar on vtiger_accountRelCalendar.accountid=vtiger_activity.link";
 		}
 		if ($queryPlanner->requireTable("vtiger_leaddetailsRelCalendar")) {
-			$query .=" 	left join vtiger_leaddetails as vtiger_leaddetailsRelCalendar on vtiger_leaddetailsRelCalendar.leadid = vtiger_activity.link";
+			$query .= " 	left join vtiger_leaddetails as vtiger_leaddetailsRelCalendar on vtiger_leaddetailsRelCalendar.leadid = vtiger_activity.link";
 		}
 		if ($queryPlanner->requireTable("vtiger_troubleticketsRelCalendar")) {
-			$query .=" left join vtiger_troubletickets as vtiger_troubleticketsRelCalendar on vtiger_troubleticketsRelCalendar.ticketid = vtiger_activity.process";
+			$query .= " left join vtiger_troubletickets as vtiger_troubleticketsRelCalendar on vtiger_troubleticketsRelCalendar.ticketid = vtiger_activity.process";
 		}
 		if ($queryPlanner->requireTable("vtiger_campaignRelCalendar")) {
-			$query .=" 	left join vtiger_campaign as vtiger_campaignRelCalendar on vtiger_campaignRelCalendar.campaignid = vtiger_activity.process";
+			$query .= " 	left join vtiger_campaign as vtiger_campaignRelCalendar on vtiger_campaignRelCalendar.campaignid = vtiger_activity.process";
 		}
 		if ($queryPlanner->requireTable("vtiger_groupsCalendar")) {
-			$query .=" left join vtiger_groups as vtiger_groupsCalendar on vtiger_groupsCalendar.groupid = vtiger_crmentityCalendar.smownerid";
+			$query .= " left join vtiger_groups as vtiger_groupsCalendar on vtiger_groupsCalendar.groupid = vtiger_crmentityCalendar.smownerid";
 		}
 		if ($queryPlanner->requireTable("vtiger_usersCalendar")) {
-			$query .=" 	left join vtiger_users as vtiger_usersCalendar on vtiger_usersCalendar.id = vtiger_crmentityCalendar.smownerid";
+			$query .= " 	left join vtiger_users as vtiger_usersCalendar on vtiger_usersCalendar.id = vtiger_crmentityCalendar.smownerid";
 		}
 		if ($queryPlanner->requireTable("vtiger_lastModifiedByCalendar")) {
-			$query .="  left join vtiger_users as vtiger_lastModifiedByCalendar on vtiger_lastModifiedByCalendar.id = vtiger_crmentityCalendar.modifiedby ";
+			$query .= "  left join vtiger_users as vtiger_lastModifiedByCalendar on vtiger_lastModifiedByCalendar.id = vtiger_crmentityCalendar.modifiedby ";
 		}
 		if ($queryPlanner->requireTable("vtiger_createdbyCalendar")) {
 			$query .= " left join vtiger_users as vtiger_createdbyCalendar on vtiger_createdbyCalendar.id = vtiger_crmentityCalendar.smcreatorid ";

Braces +29 added lines, -22 removed lines

@@ -112,8 +112,9 @@ 
 		if (isset($this->column_fields['recurringtype']) && $this->column_fields['recurringtype'] != '' && $this->column_fields['recurringtype'] != '--None--') {
 			$recur_type = trim($this->column_fields['recurringtype']);
 			$recur_data = \vtlib\Functions::getRecurringObjValue();
-			if (is_object($recur_data))
-				$this->insertIntoRecurringTable($recur_data);
+			if (is_object($recur_data)) {
+							$this->insertIntoRecurringTable($recur_data);
+			}
 		}
 
 		//Insert into vtiger_activity_remainder table
@@ -249,10 +250,10 @@ 
 					$sql = 'delete  from vtiger_activity_reminder where activity_id=?';
 					$adb->pquery($sql, array($activity_id));
 					$flag = "false";
-				} else
-					$flag = "false";
-			}
-			else {
+				} else {
+									$flag = "false";
+				}
+			} else {
 				$sql = 'delete from vtiger_activity_reminder where activity_id=?';
 				$adb->pquery($sql, array($activity_id));
 				$sql = 'delete  from vtiger_recurringevents where activityid=?';
@@ -361,8 +362,9 @@ 
 	 */
 	public function getJoinClause($tableName)
 	{
-		if ($tableName == "vtiger_activity_reminder")
-			return 'LEFT JOIN';
+		if ($tableName == "vtiger_activity_reminder") {
+					return 'LEFT JOIN';
+		}
 		return parent::getJoinClause($tableName);
 	}
 
@@ -375,10 +377,11 @@ 
 	{
 		$log = LoggerManager::getInstance();
 		$log->debug('Entering getSortOrder() method ...');
-		if (AppRequest::has('sorder'))
-			$sorder = $this->db->sql_escape_string(AppRequest::get('sorder'));
-		else
-			$sorder = (($_SESSION['ACTIVITIES_SORT_ORDER'] != '') ? ($_SESSION['ACTIVITIES_SORT_ORDER']) : ($this->default_sort_order));
+		if (AppRequest::has('sorder')) {
+					$sorder = $this->db->sql_escape_string(AppRequest::get('sorder'));
+		} else {
+					$sorder = (($_SESSION['ACTIVITIES_SORT_ORDER'] != '') ? ($_SESSION['ACTIVITIES_SORT_ORDER']) : ($this->default_sort_order));
+		}
 		$log->debug('Exiting getSortOrder method ...');
 		return $sorder;
 	}
@@ -397,10 +400,11 @@ 
 			$use_default_order_by = $this->default_order_by;
 		}
 
-		if (AppRequest::has('order_by'))
-			$order_by = $this->db->sql_escape_string(AppRequest::get('order_by'));
-		else
-			$order_by = (($_SESSION['ACTIVITIES_ORDER_BY'] != '') ? ($_SESSION['ACTIVITIES_ORDER_BY']) : ($use_default_order_by));
+		if (AppRequest::has('order_by')) {
+					$order_by = $this->db->sql_escape_string(AppRequest::get('order_by'));
+		} else {
+					$order_by = (($_SESSION['ACTIVITIES_ORDER_BY'] != '') ? ($_SESSION['ACTIVITIES_ORDER_BY']) : ($use_default_order_by));
+		}
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}
@@ -431,8 +435,9 @@ 
 		$button = '';
 
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -448,8 +453,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_contacts method ...");
@@ -478,8 +484,9 @@ 
 		$query = sprintf($query, $id);
 		$return_data = GetRelatedList('Calendar', 'Users', $focus, $query, $button, $returnset);
 
-		if ($return_data == null)
-			$return_data = [];
+		if ($return_data == null) {
+					$return_data = [];
+		}
 		$return_data['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_users method ...");

modules/Calendar/Appointment.php

Doc Comments +4 added lines, -1 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param $userid -- The user Id:: Type integer
 	 * @param $from_datetime -- The start date Obj :: Type Array
 	 * @param $to_datetime -- The end date Obj :: Type Array
-	 * @param $view -- The calendar view :: Type String
+	 * @param string $view -- The calendar view :: Type String
 	 * @returns $list :: Type Array
 	 */
 	public function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
@@ -286,6 +286,9 @@ 
 	return ($a->start_time->ts < $b->start_time->ts) ? -1 : 1;
 }
 
+/**
+ * @param string $fldname
+ */
 function getRoleBasesdPickList($fldname, $exist_val)
 {
 	$adb = PearDatabase::getInstance();

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 		//Get Recurring events
 		$q = "SELECT vtiger_activity.*, vtiger_crmentity.*, case when (vtiger_users.user_name not like '') then $userNameSql else vtiger_groups.groupname end as user_name , vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_groups.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left join vtiger_groups on vtiger_groups.groupid = vtiger_crmentity.smownerid LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid";
 		$q .= getNonAdminAccessControlQuery('Calendar', $current_user);
-		$q.=" where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype not in ('Emails','Task') && (cast(concat(recurringdate, ' ', time_start) as datetime) between ? and ?) ";
+		$q .= " where vtiger_crmentity.deleted = 0 and vtiger_activity.activitytype not in ('Emails','Task') && (cast(concat(recurringdate, ' ', time_start) as datetime) between ? and ?) ";
 
 		// User Select Customization
 		$q .= $query_filter_prefix;

Braces +16 added lines, -11 removed lines

@@ -221,13 +221,15 @@ 
 				$que = "select * from vtiger_sharedcalendar where sharedid=? and userid=?";
 				$row = $adb->pquery($que, array($current_user->id, $act_array["smownerid"]));
 				$no = $adb->getRowCount($row);
-				if ($no > 0)
-					$this->shared = true;
+				if ($no > 0) {
+									$this->shared = true;
+				}
 			}
 		}
 		$this->image_name = $act_array["activitytype"] . ".gif";
-		if (!empty($act_array["recurringid"]) && !empty($act_array["recurringtype"]))
-			$this->recurring = "Recurring.gif";
+		if (!empty($act_array["recurringid"]) && !empty($act_array["recurringtype"])) {
+					$this->recurring = "Recurring.gif";
+		}
 
 		$this->record = $act_array["activityid"];
 		$date = new DateTimeField($act_array["date_start"] . ' ' . $act_array['time_start']);
@@ -295,8 +297,9 @@ 
 		$roleid = $current_user->roleid;
 		$roleids = Array();
 		$subrole = getRoleSubordinates($roleid);
-		if (count($subrole) > 0)
-			$roleids = $subrole;
+		if (count($subrole) > 0) {
+					$roleids = $subrole;
+		}
 		array_push($roleids, $roleid);
 
 		//here we are checking wheather the table contains the sortorder column .If  sortorder is present in the main picklist table, then the role2picklist will be applicable for this table...
@@ -310,12 +313,14 @@ 
 			$res_val = $adb->pquery($pick_query, array($roleids));
 			$num_val = $adb->num_rows($res_val);
 		}
-		if ($num_val > 0)
+		if ($num_val > 0) {
+					$pick_val = $exist_val;
+		} else {
+					$pick_val = \includes\Language::translate('LBL_NOT_ACCESSIBLE');
+		}
+	} else {
 			$pick_val = $exist_val;
-		else
-			$pick_val = \includes\Language::translate('LBL_NOT_ACCESSIBLE');
-	} else
-		$pick_val = $exist_val;
+	}
 
 	return $pick_val;
 }

modules/Calendar/Calendar.php

Doc Comments +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
 
 /**
  * this function returns the days in a month in an array format
- * @param object $date_time - the date time object for the current month
+ * @param vt_DateTime|null $date_time - the date time object for the current month
  * @return array $result - the array containing current months days information
  */
 function getCalendarDaysInMonth($date_time)

Braces +18 added lines, -12 removed lines

@@ -127,10 +127,12 @@ 
 	 */
 	public function get_datechange_info($type)
 	{
-		if ($type == 'next')
-			$mode = 'increment';
-		if ($type == 'prev')
-			$mode = 'decrment';
+		if ($type == 'next') {
+					$mode = 'increment';
+		}
+		if ($type == 'prev') {
+					$mode = 'decrment';
+		}
 		switch ($this->view) {
 			case 'day':
 				$day = $this->date_time->get_changed_day($mode);
@@ -209,8 +211,9 @@ 
 						$this->year_array[$value->formatted_datetime]->activities = array();
 					}
 					array_push($this->year_array[$value->formatted_datetime]->activities, $value);
-				} else
-					die("view:" . $this->view . " is not defined");
+				} else {
+									die("view:" . $this->view . " is not defined");
+				}
 			}
 		}
 	}
@@ -233,12 +236,15 @@ 
 	{
 		$this->view = $view;
 		$this->start_time = $time;
-		if ($view == 'month')
-			$this->end_time = $this->start_time->getMonthendtime();
-		if ($view == 'day')
-			$this->end_time = $this->start_time->getDayendtime();
-		if ($view == 'hour')
-			$this->end_time = $this->start_time->getHourendtime();
+		if ($view == 'month') {
+					$this->end_time = $this->start_time->getMonthendtime();
+		}
+		if ($view == 'day') {
+					$this->end_time = $this->start_time->getDayendtime();
+		}
+		if ($view == 'hour') {
+					$this->end_time = $this->start_time->getHourendtime();
+		}
 	}
 
 	/**

modules/Calendar/Date.php

Doc Comments +1 added lines, -5 removed lines

@@ -384,7 +384,7 @@ 
 
 	/**
 	 *
-	 * @return Date
+	 * @return string
 	 */
 	public function get_DB_formatted_date()
 	{
@@ -529,10 +529,6 @@ 
 	 * This should be used whereever possible
 	 *
 	 * @param integer       $index - number between 0 to 42
-	 * @param string        $day   - date
-	 * @param string        $month - month
-	 * @param string        $year  - year
-	 * return vt_DateTime obj  $datetimevalue
 	 */
 	public function getThisMonthsDayByIndex($index)
 	{

Braces +37 added lines, -26 removed lines

@@ -87,12 +87,15 @@ 
 	 */
 	public function getTodayDatetimebyIndex($index, $day = '', $month = '', $year = '')
 	{
-		if ($day === '')
-			$day = $this->day;
-		if ($month === '')
-			$month = $this->month;
-		if ($year === '')
-			$year = $this->year;
+		if ($day === '') {
+					$day = $this->day;
+		}
+		if ($month === '') {
+					$month = $this->month;
+		}
+		if ($year === '') {
+					$year = $this->year;
+		}
 		$day_array = array();
 
 		if ($index < 0 || $index > 23) {
@@ -140,12 +143,15 @@ 
 	 */
 	public function getThismonthDaysbyIndex($index, $day = '', $month = '', $year = '')
 	{
-		if ($day == '')
-			$day = $index + 1;
-		if ($month == '')
-			$month = $this->month;
-		if ($year == '')
-			$year = $this->year;
+		if ($day == '') {
+					$day = $index + 1;
+		}
+		if ($month == '') {
+					$month = $this->month;
+		}
+		if ($year == '') {
+					$year = $this->year;
+		}
 		$month_array = array();
 		$month_array['day'] = $day;
 		$month_array['month'] = $month;
@@ -356,8 +362,9 @@ 
 		} else {
 			die("year was not set");
 		}
-		if (empty($hour) && $hour !== 0)
-			$hour = 0;
+		if (empty($hour) && $hour !== 0) {
+					$hour = 0;
+		}
 		$this->ts = mktime($hour, $minute, $second, $month, $day, $year);
 		$this->setDateTime($this->ts);
 	}
@@ -399,10 +406,12 @@ 
 	{
 		$hour = $this->z_hour;
 		$min = $this->minute;
-		if (empty($hour))
-			$hour = '00';
-		if (empty($min))
-			$min = '00';
+		if (empty($hour)) {
+					$hour = '00';
+		}
+		if (empty($min)) {
+					$min = '00';
+		}
 		return $hour . ':' . $min;
 	}
 
@@ -413,10 +422,11 @@ 
 	 */
 	public function get_changed_day($mode)
 	{
-		if ($mode == 'increment')
-			$day = $this->day + 1;
-		else
-			$day = $this->day - 1;
+		if ($mode == 'increment') {
+					$day = $this->day + 1;
+		} else {
+					$day = $this->day - 1;
+		}
 		$date_data = array('day' => $day,
 			'month' => $this->month,
 			'year' => $this->year
@@ -432,10 +442,11 @@ 
 	public function get_first_day_of_changed_week($mode)
 	{
 		$first_day = $this->getThisweekDaysbyIndex(1);
-		if ($mode == 'increment')
-			$day = $first_day->day + 7;
-		else
-			$day = $first_day->day - 7;
+		if ($mode == 'increment') {
+					$day = $first_day->day + 7;
+		} else {
+					$day = $first_day->day - 7;
+		}
 		$date_data = array('day' => $day,
 			'month' => $first_day->month,
 			'year' => $first_day->year

modules/com_vtiger_workflow/VTJsonCondition.inc

Doc Comments +4 added lines

@@ -11,6 +11,10 @@
 class VTJsonCondition
 {
 
+	/**
+	 * @param VTEntityCache $entityCache
+	 * @param string $id
+	 */
 	function evaluate($condition, $entityCache, $id)
 	{
 		$expr = \includes\utils\Json::decode($condition);

Braces +9 added lines, -6 removed lines

@@ -24,8 +24,9 @@ 
 			$i = 0;
 			foreach ($expr as $cond) {
 				$conditionGroup = $cond['groupid'];
-				if (empty($conditionGroup))
-					$conditionGroup = 0;
+				if (empty($conditionGroup)) {
+									$conditionGroup = 0;
+				}
 				preg_match('/(\w+) : \((\w+)\) (\w+)/', $cond['fieldname'], $matches);
 				if (count($matches) == 0) {
 					$expressionResults[$conditionGroup][$i]['result'] = $this->checkCondition($entityData, $cond);
@@ -117,8 +118,9 @@ 
 		$data = $entityData->getData();
 
 		$condition = $cond['operation'];
-		if (empty($condition))
-			return false;
+		if (empty($condition)) {
+					return false;
+		}
 		if ($cond['fieldname'] == 'date_start' || $cond['fieldname'] == 'due_date') {
 			$fieldName = $cond['fieldname'];
 			$dateTimePair = array('date_start' => 'time_start', 'due_date' => 'time_end');
@@ -238,8 +240,9 @@ 
 				}
 				return strpos($fieldValue, $value) !== FALSE;
 			case 'does not contain':
-				if (empty($value))
-					unset($value);
+				if (empty($value)) {
+									unset($value);
+				}
 				if (is_array($value)) {
 					return !in_array($fieldValue, $value);
 				}