YetiForceCompany / YetiForceCRM

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

modules/Emails/class.smtp.php

Doc Comments +7 added lines

@@ -111,6 +111,7 @@ 
 	 * SMTP CODE SUCCESS: 220
 	 * SMTP CODE FAILURE: 421
 	 * @access public
+	 * @param string $host
 	 * @return bool
 	 */
 	public function Connect($host, $port = 0, $tval = 30)
@@ -210,6 +211,8 @@ 
 	 * Performs SMTP authentication.  Must be run after running the
 	 * Hello() method.  Returns true if successfully authenticated.
 	 * @access public
+	 * @param string $username
+	 * @param string $password
 	 * @return bool
 	 */
 	public function Authenticate($username, $password)
@@ -325,6 +328,7 @@ 
 	 * SMTP CODE FAILURE: 451,554
 	 * SMTP CODE ERROR  : 500,501,503,421
 	 * @access public
+	 * @param string $msg_data
 	 * @return bool
 	 */
 	public function Data($msg_data)
@@ -491,6 +495,8 @@ 
 	/**
 	 * Sends a HELO/EHLO command.
 	 * @access private
+	 * @param string $hello
+	 * @param string $host
 	 * @return bool
 	 */
 	private function SendHello($hello, $host)
@@ -531,6 +537,7 @@ 
 	 * SMTP CODE SUCCESS: 552,451,452
 	 * SMTP CODE SUCCESS: 500,501,421
 	 * @access public
+	 * @param string $from
 	 * @return bool
 	 */
 	public function Mail($from)

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 	/////////////////////////////////////////////////
 
 	private $smtp_conn; // the socket to the server
-	private $error;  // error if any on the last call
+	private $error; // error if any on the last call
 	private $helo_rply; // the reply the server sent to us for HELO
 
 	/**
@@ -134,7 +134,7 @@ 
 				$port, // the port to use
 				$errno, // error number if any
 				$errstr, // error message if any
-				$tval);   // give up after ? secs
+				$tval); // give up after ? secs
 		// verify we connected properly
 		if (empty($this->smtp_conn)) {
 			$this->error = array("error" => "Failed to connect to server",

Braces +3 added lines, -2 removed lines

@@ -148,8 +148,9 @@
 
 		// SMTP server can take longer to respond, give longer timeout for first read
 		// Windows does not have support for this timeout function
-		if (substr(PHP_OS, 0, 3) != "WIN")
-			socket_set_timeout($this->smtp_conn, $tval, 0);
+		if (substr(PHP_OS, 0, 3) != "WIN") {
+					socket_set_timeout($this->smtp_conn, $tval, 0);
+		}
 
 		// get any announcement
 		$announce = $this->get_lines();

modules/Emails/Emails.php

Doc Comments +6 added lines

@@ -519,6 +519,9 @@ 
 		return $query;
 	}
 
+	/**
+	 * @param string $tableName
+	 */
 	protected function setupTemporaryTable($tableName, $tabId, $user, $parentRole, $userGroups)
 	{
 		$module = null;
@@ -619,6 +622,9 @@ 
 }
 
 //added for attach the generated pdf with email
+/**
+ * @param Emails $obj
+ */
 function pdfAttach($obj, $module, $file_name, $id)
 {
 	$log = vglobal('log');

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 				$mysql = 'insert into vtiger_seactivityrel values(?,?)';
 				$adb->pquery($mysql, array($parentid, $actid));
 			} else {
-				$myids = explode("|", $parentid);  //2@71|
+				$myids = explode("|", $parentid); //2@71|
 				for ($i = 0; $i < (count($myids) - 1); $i++) {
 					$realid = explode("@", $myids[$i]);
 					$mycrmid = $realid[0];

Braces +45 added lines, -32 removed lines

@@ -179,16 +179,18 @@ 
 		$filepart = $file_details['part'];
 		$transfer = $file_details['transfer'];
 		$file = imap_fetchbody($mail, $_REQUEST['mailid'], $filepart);
-		if ($transfer == 'BASE64')
-			$file = imap_base64($file);
-		elseif ($transfer == 'QUOTED-PRINTABLE')
-			$file = imap_qprint($file);
+		if ($transfer == 'BASE64') {
+					$file = imap_base64($file);
+		} elseif ($transfer == 'QUOTED-PRINTABLE') {
+					$file = imap_qprint($file);
+		}
 		$current_id = $adb->getUniqueID("vtiger_crmentity");
 		$date_var = date('Y-m-d H:i:s');
 		//to get the owner id
 		$ownerid = $this->column_fields['assigned_user_id'];
-		if (!isset($ownerid) || $ownerid == '')
-			$ownerid = $current_user->id;
+		if (!isset($ownerid) || $ownerid == '') {
+					$ownerid = $current_user->id;
+		}
 		$upload_file_path = \vtlib\Functions::initStorageFileDirectory();
 		file_put_contents($upload_file_path . $current_id . "_" . $filename, $file);
 
@@ -238,8 +240,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;";
 			}
@@ -276,8 +279,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_contacts method ...");
@@ -293,10 +297,11 @@ 
 	{
 		$log = vglobal('log');
 		$log->debug("Entering getSortOrder() method ...");
-		if (isset($_REQUEST['sorder']))
-			$sorder = $this->db->sql_escape_string($_REQUEST['sorder']);
-		else
-			$sorder = (($_SESSION['EMAILS_SORT_ORDER'] != '') ? ($_SESSION['EMAILS_SORT_ORDER']) : ($this->default_sort_order));
+		if (isset($_REQUEST['sorder'])) {
+					$sorder = $this->db->sql_escape_string($_REQUEST['sorder']);
+		} else {
+					$sorder = (($_SESSION['EMAILS_SORT_ORDER'] != '') ? ($_SESSION['EMAILS_SORT_ORDER']) : ($this->default_sort_order));
+		}
 
 		$log->debug("Exiting getSortOrder method ...");
 		return $sorder;
@@ -317,10 +322,11 @@ 
 			$use_default_order_by = $this->default_order_by;
 		}
 
-		if (isset($_REQUEST['order_by']))
-			$order_by = $this->db->sql_escape_string($_REQUEST['order_by']);
-		else
-			$order_by = (($_SESSION['EMAILS_ORDER_BY'] != '') ? ($_SESSION['EMAILS_ORDER_BY']) : ($use_default_order_by));
+		if (isset($_REQUEST['order_by'])) {
+					$order_by = $this->db->sql_escape_string($_REQUEST['order_by']);
+		} else {
+					$order_by = (($_SESSION['EMAILS_ORDER_BY'] != '') ? ($_SESSION['EMAILS_ORDER_BY']) : ($use_default_order_by));
+		}
 
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
@@ -375,25 +381,31 @@ 
 			$entries[] = $row['user_name'];
 			$entries[] = $row['email1'];
 			$entries[] = $row['phone_home'];
-			if ($phone == '')
-				$phone = $row['phone_work'];
-			if ($phone == '')
-				$phone = $row['phone_mobile'];
-			if ($phone == '')
-				$phone = $row['phone_other'];
-			if ($phone == '')
-				$phone = $row['phone_fax'];
+			if ($phone == '') {
+							$phone = $row['phone_work'];
+			}
+			if ($phone == '') {
+							$phone = $row['phone_mobile'];
+			}
+			if ($phone == '') {
+							$phone = $row['phone_other'];
+			}
+			if ($phone == '') {
+							$phone = $row['phone_fax'];
+			}
 
 			//Adding Security Check for User
 
 			$entries_list[] = $entries;
 		}
 
-		if ($entries_list != '')
-			$return_data = array("header" => $header, "entries" => $entries);
+		if ($entries_list != '') {
+					$return_data = array("header" => $header, "entries" => $entries);
+		}
 
-		if ($return_data === null)
-			$return_data = Array();
+		if ($return_data === null) {
+					$return_data = Array();
+		}
 		$return_data['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_users method ...");
@@ -629,8 +641,9 @@ 
 	$date_var = date('Y-m-d H:i:s');
 
 	$ownerid = $obj->column_fields['assigned_user_id'];
-	if (!isset($ownerid) || $ownerid == '')
-		$ownerid = $current_user->id;
+	if (!isset($ownerid) || $ownerid == '') {
+			$ownerid = $current_user->id;
+	}
 
 	$current_id = $adb->getUniqueID("vtiger_crmentity");
 

modules/Emails/mail.php

Doc Comments +10 added lines

@@ -103,6 +103,7 @@ 
 /** 	Function to get the user Email id based on column name and column value
  * 	$name -- column name of the vtiger_users vtiger_table
  * 	$val  -- column value
+ * @param string $name
  */
 function getUserEmailId($name, $val)
 {
@@ -162,6 +163,8 @@ 
  * 	$attachment	-- whether we want to attach the currently selected file or all vtiger_files.
   [values = current,all] - optional
  * 	$emailid	-- id of the email object which will be used to get the vtiger_attachments - optional
+ * @param PHPMailer $mail
+ * @param string $to_email
  */
 function setMailerProperties($mail, $subject, $contents, $fromEmail, $fromName, $to_email, $attachment = '', $emailid = '', $module = '', $logo = '')
 {
@@ -297,6 +300,7 @@ 
  * 	$mail -- reference of the mail object
  * 	$filename -- filename which is going to added with the mail
  * 	$record -- id of the record - optional
+ * @param string $record
  */
 function addAttachment($mail, $filename, $record)
 {
@@ -313,6 +317,7 @@ 
 /**     Function to add all the vtiger_files as attachment with the mail object
  *     $mail -- reference of the mail object
  *     $record -- email id ie., record id which is used to get the all vtiger_attachments from database
+ * @param string $record
  */
 function addAllAttachments($mail, $record)
 {
@@ -347,6 +352,9 @@ 
  * 	$mail -- reference of the mail object
  * 	$cc_mod -- mode to set the address ie., cc or bcc
  * 	$cc_val -- addresss with comma seperated to set as CC or BCC in the mail
+ * @param PHPMailer $mail
+ * @param string $cc_mod
+ * @param string $cc_val
  */
 function setCCAddress($mail, $cc_mod, $cc_val)
 {
@@ -375,6 +383,7 @@ 
 
 /** 	Function to send the mail which will be called after set all the mail object values
  * 	$mail -- reference of the mail object
+ * @param PHPMailer $mail
  */
 function MailSend($mail)
 {
@@ -423,6 +432,7 @@ 
  * 	$mail_status -- status of the mail which is sent or not
  * 	$to -- the email address to whom we sent the mail and failes
  * 	return -- Mail error occured during the mail sending process
+ * @param PHPMailer $mail
  */
 function getMailError($mail, $mail_status, $to)
 {

Spacing +5 added lines, -5 removed lines

@@ -179,7 +179,7 @@ 
 	$mail->Body = decode_html($contents);
 	$mail->AltBody = strip_tags(preg_replace(array("/<p>/i", "/<br>/i", "/<br \/>/i"), array("\n", "\n", "\n"), $contents));
 
-	$mail->IsSMTP();  //set mailer to use SMTP
+	$mail->IsSMTP(); //set mailer to use SMTP
 
 	setMailServerProperties($mail);
 
@@ -230,7 +230,7 @@ 
 		addAllAttachments($mail, $emailid);
 	}
 
-	$mail->IsHTML(true);  // set email format to HTML
+	$mail->IsHTML(true); // set email format to HTML
 
 	return;
 }
@@ -278,7 +278,7 @@ 
 	if ($smtp_auth) {
 		$mail->SMTPAuth = true; // turn on SMTP authentication
 	}
-	$mail->Host = $server;  // specify main and backup server
+	$mail->Host = $server; // specify main and backup server
 	$mail->Username = $username; // SMTP username
 	$mail->Password = $password; // SMTP password
 	// To Support TLS
@@ -525,8 +525,8 @@ 
 
 function isUserInitiated()
 {
-	return ( AppRequest::get('module') == 'Emails' &&
-		( AppRequest::get('action') == 'mailsend' || AppRequest::get('action') == 'Save'));
+	return (AppRequest::get('module') == 'Emails' &&
+		(AppRequest::get('action') == 'mailsend' || AppRequest::get('action') == 'Save'));
 }
 
 /**

Braces +31 added lines, -24 removed lines

@@ -245,27 +245,30 @@ 
 	$log->debug('Inside the function setMailServerProperties');
 
 	$res = $adb->pquery('select * from vtiger_systems where server_type=?', array('email'));
-	if (AppRequest::has('server'))
-		$server = AppRequest::get('server');
-	else
-		$server = $adb->query_result_raw($res, 0, 'server');
-	if (AppRequest::has('server_username'))
-		$username = AppRequest::get('server_username');
-	else
-		$username = $adb->query_result_raw($res, 0, 'server_username');
-
-	if (AppRequest::has('server_password'))
-		$password = AppRequest::get('server_password');
-	else
-		$password = $adb->query_result_raw($res, 0, 'server_password');
+	if (AppRequest::has('server')) {
+			$server = AppRequest::get('server');
+	} else {
+			$server = $adb->query_result_raw($res, 0, 'server');
+	}
+	if (AppRequest::has('server_username')) {
+			$username = AppRequest::get('server_username');
+	} else {
+			$username = $adb->query_result_raw($res, 0, 'server_username');
+	}
+
+	if (AppRequest::has('server_password')) {
+			$password = AppRequest::get('server_password');
+	} else {
+			$password = $adb->query_result_raw($res, 0, 'server_password');
+	}
 
 	// Define default state
 	$smtp_auth = false;
 
 	// Prasad: First time read smtp_auth from the request
-	if (AppRequest::get('smtp_auth') == 'on')
-		$smtp_auth = true;
-	else if (AppRequest::get('module') == 'Settings' && (!AppRequest::has('smtp_auth'))) {
+	if (AppRequest::get('smtp_auth') == 'on') {
+			$smtp_auth = true;
+	} else if (AppRequest::get('module') == 'Settings' && (!AppRequest::has('smtp_auth'))) {
 		//added to avoid issue while editing the values in the outgoing mail server.
 		$smtp_auth = false;
 	} else {
@@ -353,10 +356,12 @@ 
 	$log = LoggerManager::getInstance();
 	$log->debug('Inside the functin setCCAddress');
 
-	if ($cc_mod == 'cc')
-		$method = 'AddCC';
-	if ($cc_mod == 'bcc')
-		$method = 'AddBCC';
+	if ($cc_mod == 'cc') {
+			$method = 'AddCC';
+	}
+	if ($cc_mod == 'bcc') {
+			$method = 'AddBCC';
+	}
 	if ($cc_val != '') {
 		$ccmail = explode(",", trim($cc_val, ","));
 		for ($i = 0; $i < count($ccmail); $i++) {
@@ -367,8 +372,9 @@ 
 				$cc_name = $name_addr_pair[0];
 				$addr = trim($name_addr_pair[1], ">");
 			}
-			if ($ccmail[$i] != '')
-				$mail->$method($addr, $cc_name);
+			if ($ccmail[$i] != '') {
+							$mail->$method($addr, $cc_name);
+			}
 		}
 	}
 }
@@ -541,8 +547,9 @@ 
 		$userGroups = new GetGroupUsers();
 		$userGroups->getAllUsersInGroup($groupId);
 
-		if (count($userGroups->group_users) == 0)
-			return [];
+		if (count($userGroups->group_users) == 0) {
+					return [];
+		}
 
 		$query = sprintf('SELECT 
 					email1 

modules/HelpDesk/dashboards/TicketsByStatus.php

Doc Comments -1 removed lines

@@ -27,7 +27,6 @@
 
 	/**
 	 * Function returns Tickets grouped by Status
-	 * @param type $data
 	 * @return <Array>
 	 */
 	public function getTicketsByStatus($owner)

Braces +14 added lines, -10 removed lines

@@ -19,8 +19,9 @@ 
 
 		$listSearchParams = [];
 		$conditions = array(array('ticketstatus', 'e', $value));
-		if (!empty($assignedto))
-			array_push($conditions, array('assigned_user_id', 'e', $assignedto));
+		if (!empty($assignedto)) {
+					array_push($conditions, array('assigned_user_id', 'e', $assignedto));
+		}
 		$listSearchParams[] = $conditions;
 		return '&viewname=All&search_params=' . json_encode($listSearchParams);
 	}
@@ -72,8 +73,9 @@ 
 				$priorities[$row['priority']] = $counter++;
 				$colors[$row['priority']] = $row['color'];
 			}
-			if (!in_array($row['statusvalue'], $status))
-				$status[] = $row['statusvalue'];
+			if (!in_array($row['statusvalue'], $status)) {
+							$status[] = $row['statusvalue'];
+			}
 		}
 		if (!empty($tickets)) {
 			$counter = 0;
@@ -117,13 +119,15 @@ 
 		$data = $request->get('data');
 		$createdTime = $request->get('createdtime');
 		$widget = Vtiger_Widget_Model::getInstance($linkId, $currentUser->getId());
-		if (!$request->has('owner'))
-			$owner = Settings_WidgetsManagement_Module_Model::getDefaultUserId($widget, $moduleName);
-		else
-			$owner = $request->get('owner');
+		if (!$request->has('owner')) {
+					$owner = Settings_WidgetsManagement_Module_Model::getDefaultUserId($widget, $moduleName);
+		} else {
+					$owner = $request->get('owner');
+		}
 		$ownerForwarded = $owner;
-		if ($owner == 'all')
-			$owner = '';
+		if ($owner == 'all') {
+					$owner = '';
+		}
 
 		//Date conversion from user to database format
 		if (!empty($createdTime)) {

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		$sql = 'SELECT Year(`saledate`) as y,  Month(`saledate`) as m,sum(`sum_gross`) as s FROM u_yf_finvoice
 					INNER JOIN vtiger_crmentity ON u_yf_finvoice.finvoiceid = vtiger_crmentity.crmid
 					WHERE vtiger_crmentity.deleted = ? && saledate > ?';
-		$sql.= \App\PrivilegeQuery::getAccessConditions($moduleName);
+		$sql .= \App\PrivilegeQuery::getAccessConditions($moduleName);
 		if ($owner != 'all') {
 			$sql .= ' && vtiger_crmentity.smownerid = ?';
 			$param[] = $owner;

modules/Import/views/Main.php

Doc Comments +9 added lines

@@ -27,6 +27,9 @@ 
 		$this->user = $user;
 	}
 
+	/**
+	 * @param Vtiger_Request $request
+	 */
 	public static function import($request, $user)
 	{
 		$importController = new Import_Main_View($request, $user);
@@ -100,6 +103,9 @@ 
 		}
 	}
 
+	/**
+	 * @param boolean $continueImport
+	 */
 	public static function showCurrentStatus($importInfo, $importStatusCount, $continueImport)
 	{
 		$moduleName = $importInfo['module'];
@@ -210,6 +216,9 @@ 
 		Import_Queue_Action::add($this->request, $this->user);
 	}
 
+	/**
+	 * @param Vtiger_Request $request
+	 */
 	public static function deleteMap($request)
 	{
 		$moduleName = $request->getModule();

modules/ModComments/ModComments.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 	/**
 	 * Add widget to other module.
-	 * @param unknown_type $moduleNames
+	 * @param string[] $moduleNames
 	 * @return unknown_type
 	 */
 	static function addWidgetTo($moduleNames, $widgetType = 'DETAILVIEWWIDGET', $widgetName = 'DetailViewBlockCommentWidget')

Braces +12 added lines, -8 removed lines

@@ -64,11 +64,13 @@ 
 	 */
 	static function addWidgetTo($moduleNames, $widgetType = 'DETAILVIEWWIDGET', $widgetName = 'DetailViewBlockCommentWidget')
 	{
-		if (empty($moduleNames))
-			return;
+		if (empty($moduleNames)) {
+					return;
+		}
 
-		if (is_string($moduleNames))
-			$moduleNames = array($moduleNames);
+		if (is_string($moduleNames)) {
+					$moduleNames = array($moduleNames);
+		}
 
 		$commentWidgetModules = array();
 		foreach ($moduleNames as $moduleName) {
@@ -95,11 +97,13 @@ 
 	 */
 	static function removeWidgetFrom($moduleNames, $widgetType = 'DETAILVIEWWIDGET', $widgetName = 'DetailViewBlockCommentWidget')
 	{
-		if (empty($moduleNames))
-			return;
+		if (empty($moduleNames)) {
+					return;
+		}
 
-		if (is_string($moduleNames))
-			$moduleNames = array($moduleNames);
+		if (is_string($moduleNames)) {
+					$moduleNames = array($moduleNames);
+		}
 
 		$commentWidgetModules = array();
 		foreach ($moduleNames as $moduleName) {