YetiForceCompany / YetiForceCRM

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 +85 added lines, -60 removed lines

@@ -97,18 +97,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='" . \App\Language::translate('LBL_SELECT') . " " . \App\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='" . \App\Language::translate('LBL_SELECT') . " " . \App\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -134,8 +136,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;
 
 		\App\Log::trace("Exiting get_campaigns method ...");
@@ -161,16 +164,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='" . \App\Language::translate('LBL_SELECT') . " " . \App\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='" . \App\Language::translate('LBL_SELECT') . " " . \App\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -202,8 +207,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;
 
 		\App\Log::trace("Exiting get_contacts method ...");
@@ -229,16 +235,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='" . \App\Language::translate('LBL_SELECT') . " " . \App\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='" . \App\Language::translate('LBL_SELECT') . " " . \App\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -263,8 +271,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;
 
 		\App\Log::trace("Exiting get_tickets method ...");
@@ -290,16 +299,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='" . \App\Language::translate('LBL_SELECT') . " " . \App\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='" . \App\Language::translate('LBL_SELECT') . " " . \App\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -327,8 +338,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;
 
 		\App\Log::trace("Exiting get_products method ...");
@@ -370,10 +382,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);
+		}
 
 		\App\Log::trace("Exiting create_export_query method ...");
 		return $query;
@@ -732,8 +745,9 @@ 
 	public function unlinkRelationship($id, $return_module, $return_id, $relatedName = false)
 	{
 
-		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]);
@@ -750,8 +764,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 {
@@ -795,8 +810,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='" . \App\Language::translate('LBL_SELECT') . " " . \App\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='" . \App\Language::translate('LBL_SELECT') . " " . \App\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -837,8 +853,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;
 	}
@@ -865,10 +882,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]";
 			}
 		}
@@ -911,8 +930,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='" . \App\Language::translate('LBL_SELECT') . " " . \App\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');\"" .
@@ -937,10 +957,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]";
 			}
 		}
@@ -962,8 +984,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;
@@ -973,14 +996,16 @@ 
 	public function getRelatedContactsIds($id = null)
 	{
 
-		if ($id === null)
-			$id = $this->id;
+		if ($id === null) {
+					$id = $this->id;
+		}
 		$query = (new \App\Db\Query())->select('contactid')->from('vtiger_contactdetails')
 			->innerJoin('vtiger_crmentity', 'vtiger_contactdetails.contactid = vtiger_crmentity.crmid')
 			->where(['vtiger_contactdetails.parentid' => $id, 'vtiger_crmentity.deleted' => 0]);
 		$entityIds = $query->column();
-		if (empty($entityIds))
-			$entityIds = [];
+		if (empty($entityIds)) {
+					$entityIds = [];
+		}
 
 		return $entityIds;
 	}

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

@@ -52,7 +52,7 @@ 
 		$queryGenerator = new QueryGenerator($module, $currentUser);
 		$queryGenerator->setFields($fields);
 		$sql = $queryGenerator->getQuery();
-		$sql.= \App\PrivilegeQuery::getAccessConditions($module, $currentUser->getId());
+		$sql .= \App\PrivilegeQuery::getAccessConditions($module, $currentUser->getId());
 		if (!empty($assetStatus)) {
 			$assetStatus = implode("','", $assetConfig['assetstatus']);
 			$sql .= " && vtiger_assets.assetstatus NOT IN ('$assetStatus')";
@@ -65,7 +65,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();

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();

Braces +16 added lines, -11 removed lines

@@ -222,13 +222,15 @@ 
 				$que = "select * from vtiger_sharedcalendar where sharedid=? and userid=?";
 				$row = $adb->pquery($que, array($currentUser->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']);
@@ -296,8 +298,9 @@ 
 		$roleid = $currentUser->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...
@@ -311,12 +314,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 = \App\Language::translate('LBL_NOT_ACCESSIBLE');
+		}
+	} else {
 			$pick_val = $exist_val;
-		else
-			$pick_val = \App\Language::translate('LBL_NOT_ACCESSIBLE');
-	} else
-		$pick_val = $exist_val;
+	}
 
 	return $pick_val;
 }

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);
 				}

modules/com_vtiger_workflow/VTTaskManager.inc

Doc Comments +6 added lines

@@ -152,6 +152,9 @@ 
 		}
 	}
 
+	/**
+	 * @param VTTaskType $taskTypeInstance
+	 */
 	public function retrieveTemplatePath($moduleName, $taskTypeInstance)
 	{
 		$taskTemplatePath = $taskTypeInstance->get('templatepath');
@@ -226,6 +229,9 @@ 
 
 	var $data;
 
+	/**
+	 * @param string $key
+	 */
 	public function get($key)
 	{
 		return $this->data[$key];

modules/com_vtiger_workflow/VTWorkflowApplication.inc

Doc Comments +6 added lines

@@ -11,6 +11,9 @@ 
 class VTWorkflowApplication
 {
 
+	/**
+	 * @param string $action
+	 */
 	function __construct($action)
 	{
 		$this->request;
@@ -36,6 +39,9 @@ 
 		return $_SERVER["REQUEST_URI"];
 	}
 
+	/**
+	 * @return string
+	 */
 	function returnUrl()
 	{
 		return $this->returnUrl;

modules/com_vtiger_workflow/VTWorkflowManager.inc

Doc Comments +3 added lines, -3 removed lines

@@ -480,7 +480,7 @@ 
 	/**
 	 * Function gets the next trigger for the workflows
 	 * @global <String> $default_timezone
-	 * @return type
+	 * @return string|null
 	 */
 	function getNextTriggerTime()
 	{
@@ -525,8 +525,8 @@ 
 
 	/**
 	 * get next trigger time for daily
-	 * @param type $schTime
-	 * @return time
+	 * @param type $scheduledTime
+	 * @return string
 	 */
 	function getNextTriggerTimeForDaily($scheduledTime)
 	{

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 								module_name=?, summary=?, test=?, execution_condition=?, defaultworkflow=?, filtersavedinnew=?,
 								schtypeid=?, schtime=?, schdayofmonth=?, schdayofweek=?, schannualdates=?, nexttrigger_time=? where workflow_id=?", array($wf->moduleName, $wf->description, $wf->test, $wf->executionCondition, $wf->defaultworkflow, $wf->filtersavedinnew,
 				$wf->schtypeid, $wf->schtime, $wf->schdayofmonth, $wf->schdayofweek, $wf->schannualdates, $wf->nexttrigger_time, $wf->id));
-		}else {
+		} else {
 			$workflowId = $adb->getUniqueID("com_vtiger_workflows");
 			$workflow->id = $workflowId;
 			$wf = $workflow;

Braces +10 added lines, -7 removed lines

@@ -35,18 +35,20 @@ 
 		$adb = $this->adb;
 		if (isset($workflow->id)) {
 			$wf = $workflow;
-			if ($wf->filtersavedinnew == null)
-				$wf->filtersavedinnew = 5;
+			if ($wf->filtersavedinnew == null) {
+							$wf->filtersavedinnew = 5;
+			}
 			$adb->pquery("update com_vtiger_workflows set
 								module_name=?, summary=?, test=?, execution_condition=?, defaultworkflow=?, filtersavedinnew=?,
 								schtypeid=?, schtime=?, schdayofmonth=?, schdayofweek=?, schannualdates=?, nexttrigger_time=? where workflow_id=?", array($wf->moduleName, $wf->description, $wf->test, $wf->executionCondition, $wf->defaultworkflow, $wf->filtersavedinnew,
 				$wf->schtypeid, $wf->schtime, $wf->schdayofmonth, $wf->schdayofweek, $wf->schannualdates, $wf->nexttrigger_time, $wf->id));
-		}else {
+		} else {
 			$workflowId = $adb->getUniqueID("com_vtiger_workflows");
 			$workflow->id = $workflowId;
 			$wf = $workflow;
-			if ($wf->filtersavedinnew == null)
-				$wf->filtersavedinnew = 5;
+			if ($wf->filtersavedinnew == null) {
+							$wf->filtersavedinnew = 5;
+			}
 
 			$result = $adb->getColumnNames("com_vtiger_workflows");
 			if (in_array("type", $result)) {
@@ -155,8 +157,9 @@ 
 			$workflow = $this->getWorkflowInstance($row->type);
 			$workflow->setup($row->data);
 
-			if (!is_a($workflow, 'Workflow'))
-				continue;
+			if (!is_a($workflow, 'Workflow')) {
+							continue;
+			}
 
 			$workflows[$i++] = $workflow;
 		}