YetiForceCompany / YetiForceCRM

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

modules/com_vtiger_workflow/VTWorkflowTemplateManager.inc

Doc Comments +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	 * Retrieve a template given it's id
 	 *
 	 * @param $templateId The id of the template
-	 * @return The template object
+	 * @return VTWorkflowTemplate template object
 	 */
 	public function retrieveTemplate($templateId)
 	{
@@ -62,7 +62,7 @@ 
 	 *
 	 * The new workflow will also be added to the database.
 	 *
-	 * @param $template The template to use
+	 * @param VTWorkflowTemplate $template The template to use
 	 * @return A workflow object.
 	 */
 	public function createWorkflow($template)
@@ -145,7 +145,7 @@ 
 	 * This can be used for exporting templates from one 
 	 * machine to another
 	 *
-	 * @return The string dump of the templates.
+	 * @return string string dump of the templates.
 	 */
 	public function dumpAllTemplates()
 	{

Spacing +1 added lines, -2 removed lines

@@ -113,8 +113,7 @@
 		$adb = $this->adb;
 		if (is_numeric($template->id)) {//How do I check whether a member exists in php?
 			$templateId = $template->id;
-			$adb->pquery("update com_vtiger_workflowtemplates set title=?," +
-				" module_name=?, template=? where template_id=?", array($template->title, $template->moduleName,
+			$adb->pquery("update com_vtiger_workflowtemplates set title=?," +" module_name=?, template=? where template_id=?", array($template->title, $template->moduleName,
 				$template->template, $templateId));
 			return $templateId;
 		} else {

modules/com_vtiger_workflow/VTWorkflowUtils.php

Doc Comments +4 added lines

@@ -108,6 +108,7 @@ 
 
 	/**
 	 * Insert redirection script
+	 * @param string $to
 	 */
 	public function redirectTo($to, $message)
 	{
@@ -132,6 +133,9 @@ 
 	 * @params :: $modulename - name of the module
 	 */
 
+	/**
+	 * @param boolean $modulename
+	 */
 	public static function checkModuleWorkflow($modulename)
 	{
 		$adb = PearDatabase::getInstance();

modules/com_vtiger_workflow/WorkFlowScheduler.php

Doc Comments +4 added lines, -1 removed lines

@@ -126,6 +126,9 @@ 
 		$scheduledWorkflows = null;
 	}
 
+	/**
+	 * @param QueryGenerator $queryGenerator
+	 */
 	public function addWorkflowConditionsToQueryGenerator($queryGenerator, $conditions)
 	{
 		$conditionMapping = array(
@@ -232,7 +235,7 @@ 
 	/**
 	 * Function parse the value based on the condition
 	 * @param <Array> $condition
-	 * @return <String>
+	 * @return string
 	 */
 	public function _parseValueForDate($condition)
 	{

Braces +3 added lines, -2 removed lines

@@ -175,8 +175,9 @@
 				$operation = $condition['operation'];
 
 				//Cannot handle this condition for scheduled workflows
-				if ($operation == 'has changed')
-					continue;
+				if ($operation == 'has changed') {
+									continue;
+				}
 
 				$value = $condition['value'];
 				if (in_array($operation, $this->_specialDateTimeOperator())) {

modules/Contacts/Contacts.php

Doc Comments +2 added lines, -4 removed lines

@@ -119,8 +119,6 @@ 
 
 	// Mike Crowe Mod --------------------------------------------------------Default ordering for us
 	/** Function to get the number of Contacts assigned to a particular User.
-	 *  @param varchar $user name - Assigned to User
-	 *  Returns the count of contacts assigned to user.
 	 */
 	public function getCount($user_name)
 	{
@@ -154,7 +152,7 @@ 
 	}
 
 	/** Function to process list query for a given query
-	 *  @param $query
+	 *  @param string $query
 	 *  Returns the results of query in array format
 	 */
 	public function process_list_query1($query)
@@ -195,7 +193,7 @@ 
 	}
 
 	/** Function to process list query for Plugin with Security Parameters for a given query
-	 *  @param $query
+	 *  @param string $query
 	 *  Returns the results of query in array format
 	 */
 	public function plugin_process_list_query($query)

Braces +55 added lines, -40 removed lines

@@ -276,16 +276,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 && 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;";
 			}
@@ -311,8 +313,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = Array();
+		if ($return_value == null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_tickets method ...");
@@ -339,16 +342,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;";
 			}
@@ -379,8 +384,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = Array();
+		if ($return_value == null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_products method ...");
@@ -406,18 +412,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;";
 			}
@@ -441,8 +449,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = Array();
+		if ($return_value == null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_campaigns method ...");
@@ -469,16 +478,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 && 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;";
 			}
@@ -502,8 +513,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = Array();
+		if ($return_value == null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_vendors method ...");
@@ -542,10 +554,11 @@ 
 		$query .= getNonAdminAccessControlQuery('Contacts', $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->info("Export Query Constructed Successfully");
 		$log->debug("Exiting create_export_query method ...");
@@ -898,8 +911,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 == 'Accounts') {
 			$sql = 'UPDATE vtiger_contactdetails SET parentid = ? WHERE contactid = ?';
@@ -922,8 +936,9 @@ 
 		$adb = PearDatabase::getInstance();
 		$currentUser = Users_Record_Model::getCurrentUserModel();
 
-		if (!is_array($withCrmid))
-			$withCrmid = [$withCrmid];
+		if (!is_array($withCrmid)) {
+					$withCrmid = [$withCrmid];
+		}
 		if (!in_array($withModule, ['Products', 'Campaigns', 'Vendors'])) {
 			parent::save_related_module($module, $crmid, $withModule, $withCrmid, $relatedName);
 		} else {

modules/CustomView/CustomView.php

Doc Comments +2 added lines, -2 removed lines

@@ -550,7 +550,7 @@ 
 
 	/**
 	 *  Function which will give condition list for date fields
-	 * @return array of std filter conditions
+	 * @return string[] of std filter conditions
 	 */
 	public function getStdFilterConditions()
 	{
@@ -991,7 +991,7 @@ 
 	 * @param $tablename :: type string
 	 * @param $fieldname :: type string
 	 * @param $comparator :: type string
-	 * @param $value :: type string
+	 * @param string $value :: type string
 	 * @returns  $value as a string in the following format
 	 * 	  $tablename.$fieldname comparator
 	 */

Indentation -2 removed lines

@@ -431,8 +431,6 @@
 	  Array('BlockLabeln' =>
 	  Array('$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata'=>$fieldlabel,
 	  Array('$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1'=>$fieldlabel1,
-
-
 	 */
 	public function getModuleColumnsList($module)
 	{

Spacing +17 added lines, -17 removed lines

@@ -339,31 +339,31 @@ 
 		if ($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) {
 			$tab_ids = explode(",", $tabid);
 			$sql = 'select * from vtiger_field ';
-			$sql.= ' where vtiger_field.tabid in (%s) and vtiger_field.block in (%s) and vtiger_field.presence in (0,2) and';
-			$sql.= $display_type;
+			$sql .= ' where vtiger_field.tabid in (%s) and vtiger_field.block in (%s) and vtiger_field.presence in (0,2) and';
+			$sql .= $display_type;
 			if ($tabid == 9 || $tabid == 16) {
-				$sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')";
+				$sql .= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')";
 			}
-			$sql.= " order by sequence";
+			$sql .= " order by sequence";
 			$params = array($tab_ids, $block_ids);
 		} else {
 			$tab_ids = explode(",", $tabid);
 			$profileList = getCurrentUserProfileList();
 			$sql = 'select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ';
-			$sql.= ' where vtiger_field.tabid in (%s) and vtiger_field.block in (%s) and';
-			$sql.= $display_type . 'and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.presence in (0,2)';
+			$sql .= ' where vtiger_field.tabid in (%s) and vtiger_field.block in (%s) and';
+			$sql .= $display_type . 'and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.presence in (0,2)';
 
 			$params = array($tab_ids, $block_ids);
 
 			if (count($profileList) > 0) {
-				$sql.= "  and vtiger_profile2field.profileid in (" . generateQuestionMarks($profileList) . ")";
+				$sql .= "  and vtiger_profile2field.profileid in (" . generateQuestionMarks($profileList) . ")";
 				array_push($params, $profileList);
 			}
 			if ($tabid == 9 || $tabid == 16) {
-				$sql.= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')";
+				$sql .= " and vtiger_field.fieldname not in('notime','duration_minutes','duration_hours')";
 			}
 
-			$sql.= " group by columnname order by sequence";
+			$sql .= " group by columnname order by sequence";
 		}
 		if ($tabid == '9,16')
 			$tabid = "9";
@@ -514,23 +514,23 @@ 
 
 		if ($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) {
 			$sql = 'select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid ';
-			$sql.= ' where vtiger_field.tabid=? and vtiger_field.block in (%s)
+			$sql .= ' where vtiger_field.tabid=? and vtiger_field.block in (%s)
                         and vtiger_field.uitype in (5,6,23,70)';
-			$sql.= ' and vtiger_field.presence in (0,2) order by vtiger_field.sequence';
+			$sql .= ' and vtiger_field.presence in (0,2) order by vtiger_field.sequence';
 			$params = [$tabid, $blockids];
 		} else {
 			$profileList = getCurrentUserProfileList();
 			$sql = 'select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join  vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ';
-			$sql.= ' where vtiger_field.tabid=? and vtiger_field.block in (%s) and vtiger_field.uitype in (5,6,23,70)';
-			$sql.= " and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.presence in (0,2)";
+			$sql .= ' where vtiger_field.tabid=? and vtiger_field.block in (%s) and vtiger_field.uitype in (5,6,23,70)';
+			$sql .= " and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.presence in (0,2)";
 			$params = [$tabid, $blockids];
 
 			if (count($profileList) > 0) {
-				$sql.= " and vtiger_profile2field.profileid in (" . generateQuestionMarks($profileList) . ")";
+				$sql .= " and vtiger_profile2field.profileid in (" . generateQuestionMarks($profileList) . ")";
 				array_push($params, $profileList);
 			}
 
-			$sql.= " order by vtiger_field.sequence";
+			$sql .= " order by vtiger_field.sequence";
 		}
 		$sql = sprintf($sql, generateQuestionMarks($block_ids));
 		$result = $adb->pquery($sql, $params);
@@ -642,7 +642,7 @@ 
 						inner join vtiger_cvadvfilter on vtiger_cvadvfilter.cvid = vtiger_customview.cvid
 						left join vtiger_cvadvfilter_grouping on vtiger_cvadvfilter.cvid = vtiger_cvadvfilter_grouping.cvid
 								and vtiger_cvadvfilter.groupid = vtiger_cvadvfilter_grouping.groupid';
-			$ssql.= " where vtiger_customview.cvid = ? && vtiger_cvadvfilter.groupid = ? order by vtiger_cvadvfilter.columnindex";
+			$ssql .= " where vtiger_customview.cvid = ? && vtiger_cvadvfilter.groupid = ? order by vtiger_cvadvfilter.columnindex";
 
 			$result = $adb->pquery($ssql, array($cvid, $groupId));
 			$noOfColumns = $adb->num_rows($result);
@@ -1033,7 +1033,7 @@ 
 			$userNameSql = \vtlib\Deprecated::getSqlForNameInDisplayFormat(array('first_name' =>
 					'vtiger_users' . $tableNameSuffix . '.first_name', 'last_name' => 'vtiger_users' . $tableNameSuffix . '.last_name'), 'Users');
 			$temp_value = '( trim(' . $userNameSql . ')' . $this->getAdvComparator($comparator, $value, $datatype);
-			$temp_value.= " ||  vtiger_groups$tableNameSuffix.groupname" . $this->getAdvComparator($comparator, $value, $datatype) . ')';
+			$temp_value .= " ||  vtiger_groups$tableNameSuffix.groupname" . $this->getAdvComparator($comparator, $value, $datatype) . ')';
 			$value = $temp_value; // Hot fix: removed unbalanced closing bracket ")";
 		} elseif ($fieldname == "inventorymanager") {
 			$value = $tablename . "." . $fieldname . $this->getAdvComparator($comparator, getUserId_Ol($value), $datatype);

Braces +77 added lines, -57 removed lines

@@ -110,8 +110,9 @@ 
 			} else {
 				$viewid = $viewname;
 			}
-			if ($this->isPermittedCustomView($viewid, $nowAction, $module) != 'yes')
-				$viewid = 0;
+			if ($this->isPermittedCustomView($viewid, $nowAction, $module) != 'yes') {
+							$viewid = 0;
+			}
 		}
 		ListViewSession::setCurrentView($module, $viewid);
 		$log->debug('Exiting ' . __CLASS__ . '::' . __METHOD__ . ' method ...');
@@ -248,8 +249,9 @@ 
 		$shtml_others = '';
 
 		$selected = 'selected';
-		if ($markselected === false)
-			$selected = '';
+		if ($markselected === false) {
+					$selected = '';
+		}
 
 		$ssql = "select vtiger_customview.*, vtiger_users.first_name,vtiger_users.last_name from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype
 					left join vtiger_users on vtiger_customview.userid = vtiger_users.id ";
@@ -292,23 +294,27 @@ 
 				if ($cvrow['status'] == CV_STATUS_DEFAULT || $cvrow['userid'] == $current_user->id) {
 					$shtml_user .= $option;
 				} elseif ($cvrow['status'] == CV_STATUS_PUBLIC) {
-					if ($shtml_public == '')
-						$shtml_public = "<option disabled>--- " . \includes\Language::translate('LBL_PUBLIC') . " ---</option>";
+					if ($shtml_public == '') {
+											$shtml_public = "<option disabled>--- " . \includes\Language::translate('LBL_PUBLIC') . " ---</option>";
+					}
 					$shtml_public .= $option;
 				} elseif ($cvrow['status'] == CV_STATUS_PENDING) {
-					if ($shtml_pending == '')
-						$shtml_pending = "<option disabled>--- " . \includes\Language::translate('LBL_PENDING') . " ---</option>";
+					if ($shtml_pending == '') {
+											$shtml_pending = "<option disabled>--- " . \includes\Language::translate('LBL_PENDING') . " ---</option>";
+					}
 					$shtml_pending .= $option;
 				} else {
-					if ($shtml_others == '')
-						$shtml_others = "<option disabled>--- " . \includes\Language::translate('LBL_OTHERS') . " ---</option>";
+					if ($shtml_others == '') {
+											$shtml_others = "<option disabled>--- " . \includes\Language::translate('LBL_OTHERS') . " ---</option>";
+					}
 					$shtml_others .= $option;
 				}
 			}
 		}
 		$shtml = $shtml_user;
-		if ($is_admin === true)
-			$shtml .= $shtml_pending;
+		if ($is_admin === true) {
+					$shtml .= $shtml_pending;
+		}
 		$shtml = $shtml . $shtml_public . $shtml_others;
 		return $shtml;
 	}
@@ -332,8 +338,9 @@ 
 		if (empty($this->meta) && $module != 'Calendar') {
 			$this->meta = $this->getMeta($module, $current_user);
 		}
-		if ($tabid == 9)
-			$tabid = "9,16";
+		if ($tabid == 9) {
+					$tabid = "9,16";
+		}
 		$display_type = " vtiger_field.displaytype in (1,2,3)";
 
 		if ($is_admin === true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0) {
@@ -365,8 +372,9 @@ 
 
 			$sql.= " group by columnname order by sequence";
 		}
-		if ($tabid == '9,16')
-			$tabid = "9";
+		if ($tabid == '9,16') {
+					$tabid = "9";
+		}
 		$sql = sprintf($sql, generateQuestionMarks($tab_ids), generateQuestionMarks($block_ids));
 		$result = $adb->pquery($sql, $params);
 		$noofrows = $adb->num_rows($result);
@@ -405,8 +413,9 @@ 
 				$fieldlabel1 . ":" . $fieldtypeofdata;
 			//added to escape attachments fields in customview as we have multiple attachments
 			$fieldlabel = \includes\Language::translate($fieldlabel); //added to support i18n issue
-			if ($module != 'HelpDesk' || $fieldname != 'filename')
-				$module_columnlist[$optionvalue] = $fieldlabel;
+			if ($module != 'HelpDesk' || $fieldname != 'filename') {
+							$module_columnlist[$optionvalue] = $fieldlabel;
+			}
 			if ($fieldtype[1] == "M") {
 				$this->mandatoryvalues[] = "'" . $optionvalue . "'";
 				$this->showvalues[] = $fieldlabel;
@@ -646,8 +655,9 @@ 
 
 			$result = $adb->pquery($ssql, array($cvid, $groupId));
 			$noOfColumns = $adb->num_rows($result);
-			if ($noOfColumns <= 0)
-				continue;
+			if ($noOfColumns <= 0) {
+							continue;
+			}
 
 			while ($relcriteriarow = $adb->fetch_array($result)) {
 				$criteria = $this->getAdvftCriteria($relcriteriarow);
@@ -677,8 +687,9 @@ 
 		}
 
 		// Clear the condition (and/or) for last group, if any.
-		if (!empty($advft_criteria[$i - 1]['condition']))
-			$advft_criteria[$i - 1]['condition'] = '';
+		if (!empty($advft_criteria[$i - 1]['condition'])) {
+					$advft_criteria[$i - 1]['condition'] = '';
+		}
 
 		return $advft_criteria;
 	}
@@ -794,8 +805,9 @@ 
 								'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
 						$sqllist_column = "case when (vtiger_users.user_name not like '') then $userNameSql else vtiger_groups.groupname end as user_name";
 					}
-					if ($list[0] == "vtiger_contactdetails" && $list[1] == "lastname")
-						$sqllist_column = "vtiger_contactdetails.lastname,vtiger_contactdetails.firstname";
+					if ($list[0] == "vtiger_contactdetails" && $list[1] == "lastname") {
+											$sqllist_column = "vtiger_contactdetails.lastname,vtiger_contactdetails.firstname";
+					}
 					$sqllist[] = $sqllist_column;
 					//Ends
 
@@ -940,13 +952,13 @@ 
 							$advorsql[] = $this->getRealValues($columns[0], $columns[1], $comparator, trim($valuearray[$n]), $datatype);
 						}
 						//If negative logic filter ('not equal to', 'does not contain') is used, 'and' condition should be applied instead of 'or'
-						if ($comparator == 'n' || $comparator == 'k')
-							$advorsqls = implode(" and ", $advorsql);
-						else
-							$advorsqls = implode(" or ", $advorsql);
+						if ($comparator == 'n' || $comparator == 'k') {
+													$advorsqls = implode(" and ", $advorsql);
+						} else {
+													$advorsqls = implode(" or ", $advorsql);
+						}
 						$advfiltersql = " (" . $advorsqls . ") ";
-					}
-					elseif ($comparator == 'bw' && count($valuearray) == 2) {
+					} elseif ($comparator == 'bw' && count($valuearray) == 2) {
 						$advfiltersql = "(" . $columns[0] . "." . $columns[1] . " between '" . getValidDBInsertDateTimeValue(trim($valuearray[0]), $datatype) . "' and '" . getValidDBInsertDateTimeValue(trim($valuearray[1]), $datatype) . "')";
 					} elseif ($comparator == 'y') {
 						$advfiltersql = sprintf("(%s.%s IS NULL || %s.%s = '')", $columns[0], $columns[1], $columns[0], $columns[1]);
@@ -982,8 +994,9 @@ 
 				$advcvsql .= $advfiltergroupsql;
 			}
 		}
-		if (trim($advcvsql) != "")
-			$advcvsql = '(' . $advcvsql . ')';
+		if (trim($advcvsql) != "") {
+					$advcvsql = '(' . $advcvsql . ')';
+		}
 		return $advcvsql;
 	}
 
@@ -1003,8 +1016,9 @@ 
 		$currentModule = vglobal('currentModule');
 		$mod_strings = vglobal('mod_strings');
 		//Added for proper check of contact name in advance filter
-		if ($tablename == "vtiger_contactdetails" && $fieldname == "lastname")
-			$fieldname = "contactid";
+		if ($tablename == "vtiger_contactdetails" && $fieldname == "lastname") {
+					$fieldname = "contactid";
+		}
 
 		$contactid = "vtiger_contactdetails.lastname";
 		if ($currentModule != "Contacts" && $currentModule != "Leads" && $currentModule != 'Campaigns') {
@@ -1052,10 +1066,11 @@ 
 			//For checkbox type values, we have to convert yes/no as 1/0 to get the values
 			$field_uitype = getUItype($this->customviewmodule, $fieldname);
 			if ($field_uitype == 56) {
-				if (strtolower($value) == 'yes')
-					$value = 1;
-				elseif (strtolower($value) == 'no')
-					$value = 0;
+				if (strtolower($value) == 'yes') {
+									$value = 1;
+				} elseif (strtolower($value) == 'no') {
+									$value = 0;
+				}
 			} else if (is_uitype($field_uitype, '_picklist_')) { /* Fix for tickets 4465 and 4629 */
 				// Get all the keys for the for the Picklist value
 				$mod_keys = array_keys($mod_strings, $value);
@@ -1104,8 +1119,9 @@ 
 			if ($modulename == 'Vendors') {
 				continue;
 			}
-			if ($s != 0)
-				$value .= ' or ';
+			if ($s != 0) {
+							$value .= ' or ';
+			}
 			if ($modulename == 'Accounts') {
 				//By Pavani : Related to problem in calender, Ticket: 4284 and 4675
 				if (($comparator == 'e' || $comparator == 's' || $comparator == 'c') && trim($adv_chk_value) == '') {
@@ -1368,16 +1384,18 @@ 
 					INNER JOIN vtiger_blocks ON vtiger_blocks.blockid = vtiger_field.block INNER JOIN vtiger_tab ON vtiger_tab.tabid = vtiger_field.tabid 
 				  WHERE vtiger_tab.name IN (%s) && vtiger_field.presence IN (0, 2)', generateQuestionMarks($modulesList));
 		$result = $adb->pquery($sql, [$modulesList]);
-		if ($module == "Calendar','Events")
-			$module = 'Calendar';
+		if ($module == "Calendar','Events") {
+					$module = 'Calendar';
+		}
 
 		$preBlockLabel = '';
 		while ($block = $adb->getRow($result)) {
 			$blockLabel = $block['blocklabel'];
 			$tabid = $block['tabid'];
 			// Skip certain blocks of certain modules
-			if (array_key_exists($tabid, $skipBlocksList) && in_array($blockLabel, $skipBlocksList[$tabid]))
-				continue;
+			if (array_key_exists($tabid, $skipBlocksList) && in_array($blockLabel, $skipBlocksList[$tabid])) {
+							continue;
+			}
 
 			if (trim($blockLabel) == '') {
 				$blockInfo[$preBlockLabel] = $blockInfo[$preBlockLabel] . ',' . $block['block'];
@@ -1450,9 +1468,9 @@ 
 						$permission = 'yes';
 					} elseif ($status == CV_STATUS_PRIVATE || $status == CV_STATUS_PENDING) {
 						$log->debug('Entering when status=1 or 2');
-						if ($userid == $current_user->id)
-							$permission = "yes";
-						else {
+						if ($userid == $current_user->id) {
+													$permission = "yes";
+						} else {
 							$log->debug("Entering when status=1 or status=2 & action = ListView or $module.Ajax or index");
 							$sql = sprintf('SELECT 
 										vtiger_users.id 
@@ -1477,17 +1495,19 @@ 
 							}
 							$user_array = $temp_result;
 							if (sizeof($user_array) > 0) {
-								if (!in_array($current_user->id, $user_array))
-									$permission = 'no';
-								else
-									$permission = 'yes';
-							} else
-								$permission = 'no';
+								if (!in_array($current_user->id, $user_array)) {
+																	$permission = 'no';
+								} else {
+																	$permission = 'yes';
+								}
+							} else {
+															$permission = 'no';
+							}
 						}
-					} else
-						$permission = 'yes';
-				}
-				else {
+					} else {
+											$permission = 'yes';
+					}
+				} else {
 					$log->debug('Entering else condition............');
 					$permission = 'no';
 				}

modules/CustomView/models/Record.php

Doc Comments +2 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 	/**
 	 * Function to set the Module to which the record belongs
 	 * @param <String> $moduleName
-	 * @return Vtiger_Record_Model or Module Specific Record Model instance
+	 * @return CustomView_Record_Model or Module Specific Record Model instance
 	 */
 	public function setModule($moduleName)
 	{
@@ -78,7 +78,7 @@ 
 	/**
 	 * Function to set the Module to which the record belongs from the Module model instance
 	 * @param <Vtiger_Module_Model> $module
-	 * @return Vtiger_Record_Model or Module Specific Record Model instance
+	 * @return CustomView_Record_Model or Module Specific Record Model instance
 	 */
 	public function setModuleFromInstance($module)
 	{
@@ -1057,7 +1057,6 @@ 
 
 	/**
 	 * function to check duplicates from database
-	 * @param <type> $viewName
 	 * @param <type> module name entity type in database
 	 * @return <boolean> true/false
 	 */

Spacing +3 added lines, -3 removed lines

@@ -297,7 +297,7 @@ 
 			$lockFields = $crmEntityModel->getLockFields();
 			if (is_array($lockFields)) {
 				foreach ($lockFields as $fieldName => $fieldValues) {
-					$listQuery .=' && ' . $baseTableName . '.' . $fieldName . ' NOT IN (' . generateQuestionMarks($fieldValues) . ')';
+					$listQuery .= ' && ' . $baseTableName . '.' . $fieldName . ' NOT IN (' . generateQuestionMarks($fieldValues) . ')';
 					$params = array_merge($params, $fieldValues);
 				}
 			}
@@ -451,7 +451,7 @@ 
 					}
 
 					$temp_val = explode(",", $advFitlerValue);
-					if (($fieldType == 'date' || ($fieldType == 'time' && $fieldName != 'time_start' && $fieldName != 'time_end') || ($fieldType == 'datetime')) && ($fieldType != '' && $advFitlerValue != '' )) {
+					if (($fieldType == 'date' || ($fieldType == 'time' && $fieldName != 'time_start' && $fieldName != 'time_end') || ($fieldType == 'datetime')) && ($fieldType != '' && $advFitlerValue != '')) {
 						$val = Array();
 						for ($x = 0; $x < count($temp_val); $x++) {
 							//if date and time given then we have to convert the date and
@@ -672,7 +672,7 @@ 
 						inner join vtiger_cvadvfilter on vtiger_cvadvfilter.cvid = vtiger_customview.cvid
 						left join vtiger_cvadvfilter_grouping on vtiger_cvadvfilter.cvid = vtiger_cvadvfilter_grouping.cvid
 								and vtiger_cvadvfilter.groupid = vtiger_cvadvfilter_grouping.groupid';
-			$ssql.= " where vtiger_customview.cvid = ? && vtiger_cvadvfilter.groupid = ? order by vtiger_cvadvfilter.columnindex";
+			$ssql .= " where vtiger_customview.cvid = ? && vtiger_cvadvfilter.groupid = ? order by vtiger_cvadvfilter.columnindex";
 
 			$result = $db->pquery($ssql, array($this->getId(), $groupId));
 			$noOfColumns = $db->num_rows($result);

Braces +16 added lines, -10 removed lines

@@ -413,15 +413,17 @@ 
 		$advFilterList = $this->get('advfilterlist');
 		if (!empty($advFilterList)) {
 			foreach ($advFilterList as $groupIndex => $groupInfo) {
-				if (empty($groupInfo))
-					continue;
+				if (empty($groupInfo)) {
+									continue;
+				}
 
 				$groupColumns = $groupInfo['columns'];
 				$groupCondition = $groupInfo['condition'];
 
 				foreach ($groupColumns as $columnIndex => $columnCondition) {
-					if (empty($columnCondition))
-						continue;
+					if (empty($columnCondition)) {
+											continue;
+					}
 
 					$advFilterColumn = $columnCondition['columnname'];
 					$advFilterComparator = $columnCondition['comparator'];
@@ -494,8 +496,10 @@ 
 				}
 
 				$groupConditionExpression = $advFilterList[$groupIndex]["conditionexpression"];
-				if (empty($groupConditionExpression))
-					continue; // Case when the group doesn't have any column criteria
+				if (empty($groupConditionExpression)) {
+									continue;
+				}
+				// Case when the group doesn't have any column criteria
 
 				$db->insert('vtiger_cvadvfilter_grouping', [
 					'groupid' => $groupIndex,
@@ -676,8 +680,9 @@ 
 
 			$result = $db->pquery($ssql, array($this->getId(), $groupId));
 			$noOfColumns = $db->num_rows($result);
-			if ($noOfColumns <= 0)
-				continue;
+			if ($noOfColumns <= 0) {
+							continue;
+			}
 
 			while ($relcriteriarow = $db->fetch_array($result)) {
 				$criteria = [];
@@ -730,8 +735,9 @@ 
 			$i++;
 		}
 		// Clear the condition (and/or) for last group, if any.
-		if (!empty($advft_criteria[$i - 1]['condition']))
-			$advft_criteria[$i - 1]['condition'] = '';
+		if (!empty($advft_criteria[$i - 1]['condition'])) {
+					$advft_criteria[$i - 1]['condition'] = '';
+		}
 		return $advft_criteria;
 	}
 

modules/Emails/class.phpmailer.php

Doc Comments +1 added lines, -1 removed lines

@@ -2758,7 +2758,7 @@
 	 * @link http://www.php.net/manual/en/function.pathinfo.php#107461
 	 * @param string $path A filename or path, does not need to exist as a file
 	 * @param integer|string $options Either a PATHINFO_* constant, or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
-	 * @return string|array
+	 * @return string
 	 * @static
 	 */
 	public static function mb_pathinfo($path, $options = null)

Indentation +1 added lines, -1 removed lines

@@ -1927,7 +1927,7 @@
 				//If a filename contains any of these chars, it should be quoted, but not otherwise: RFC2183 & RFC2045 5.1
 				//Fixes a warning in IETF's msglint MIME checker
 				//
-        // Allow for bypassing the Content-Disposition header totally
+		// Allow for bypassing the Content-Disposition header totally
 				if (!(empty($disposition))) {
 					if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $name)) {
 						$mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE . $this->LE);

Spacing +3 added lines, -4 removed lines

@@ -530,7 +530,7 @@ 
 	const STOP_MESSAGE = 0; // message only, continue processing
 	const STOP_CONTINUE = 1; // message?, likely ok to continue processing
 	const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
-	const CRLF = "\r\n";  // SMTP RFC specified EOL
+	const CRLF = "\r\n"; // SMTP RFC specified EOL
 
 	/////////////////////////////////////////////////
 	// METHODS, VARIABLES
@@ -1301,7 +1301,7 @@ 
 			$message = substr($message, 0, -$lelen);
 		}
 
-		$line = explode($this->LE, $message);   // Magic. We know FixEOL uses $LE
+		$line = explode($this->LE, $message); // Magic. We know FixEOL uses $LE
 		$message = '';
 		for ($i = 0; $i < count($line); $i++) {
 			$line_part = explode(' ', $line[$i]);
@@ -1390,8 +1390,7 @@ 
 				if ($dec < 128) { // Single byte character.
 					// If the encoded char was found at pos 0, it will fit
 					// otherwise reduce maxLength to start of the encoded char
-					$maxLength = ($encodedCharPos == 0) ? $maxLength :
-						$maxLength - ($lookBack - $encodedCharPos);
+					$maxLength = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos);
 					$foundSplitPos = true;
 				} elseif ($dec >= 192) { // First byte of a multi byte character
 					// Reduce maxLength to split at start of character

Braces +21 added lines, -14 removed lines

@@ -828,8 +828,9 @@ 
 	public function Send()
 	{
 		try {
-			if (!$this->PreSend())
-				return false;
+			if (!$this->PreSend()) {
+							return false;
+			}
 			return $this->PostSend();
 		} catch (phpmailerException $e) {
 			$this->mailHeader = '';
@@ -1773,15 +1774,19 @@ 
 	protected function SetMessageType()
 	{
 		$this->message_type = array();
-		if ($this->AlternativeExists())
-			$this->message_type[] = "alt";
-		if ($this->InlineImageExists())
-			$this->message_type[] = "inline";
-		if ($this->AttachmentExists())
-			$this->message_type[] = "attach";
+		if ($this->AlternativeExists()) {
+					$this->message_type[] = "alt";
+		}
+		if ($this->InlineImageExists()) {
+					$this->message_type[] = "inline";
+		}
+		if ($this->AttachmentExists()) {
+					$this->message_type[] = "attach";
+		}
 		$this->message_type = implode("_", $this->message_type);
-		if ($this->message_type == "")
-			$this->message_type = "plain";
+		if ($this->message_type == "") {
+					$this->message_type = "plain";
+		}
 	}
 
 	/**
@@ -2019,8 +2024,9 @@ 
 			case '8bit':
 				$encoded = $this->FixEOL($str);
 				//Make sure it ends with a line break
-				if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-					$encoded .= $this->LE;
+				if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+									$encoded .= $this->LE;
+				}
 				break;
 			case 'binary':
 				$encoded = $str;
@@ -2950,8 +2956,9 @@ 
 	 */
 	public function DKIM_BodyC($body)
 	{
-		if ($body == '')
-			return "\r\n";
+		if ($body == '') {
+					return "\r\n";
+		}
 		// stabilize line endings
 		$body = str_replace("\r\n", "\n", $body);
 		$body = str_replace("\n", "\r\n", $body);