YetiForceCompany / YetiForceCRM

include/utils/Icon.php

Braces +9 added lines, -6 removed lines

@@ -46,12 +46,15 @@
 	public static function getIconByFileType($exntension)
 	{
 		$explodeExtension = reset(explode("/", $exntension));
-		if (isset(self::$extensionIcon[$explodeExtension]))
-			$fileIcon = self::$extensionIcon[$explodeExtension];
-		if (isset(self::$extensionIcon[$exntension]))
-			$fileIcon = self::$extensionIcon[$exntension];
-		if (!$fileIcon)
-			$fileIcon = 'userIcon-Documents';
+		if (isset(self::$extensionIcon[$explodeExtension])) {
+					$fileIcon = self::$extensionIcon[$explodeExtension];
+		}
+		if (isset(self::$extensionIcon[$exntension])) {
+					$fileIcon = self::$extensionIcon[$exntension];
+		}
+		if (!$fileIcon) {
+					$fileIcon = 'userIcon-Documents';
+		}
 		return $fileIcon;
 	}
 }

include/utils/utils.php

Spacing +1 added lines, -1 removed lines

@@ -1401,7 +1401,7 @@
 function isRecordExists($recordId, $cache = true)
 {
 	$recordMetaData = vtlib\Functions::getCRMRecordMetadata($recordId);
-	return (isset($recordMetaData) && $recordMetaData['deleted'] == 0 ) ? true : false;
+	return (isset($recordMetaData) && $recordMetaData['deleted'] == 0) ? true : false;
 }
 
 /** Function to set date values compatible to database (YY_MM_DD)

Braces +81 added lines, -59 removed lines

@@ -201,8 +201,9 @@ 
 		$inUTF8 = (strtoupper($default_charset) == 'UTF-8');
 	}
 
-	if (AppRequest::has('module') && AppRequest::has('file') && AppRequest::get('module') != 'Settings' && AppRequest::get('file') != 'ListView' && AppRequest::get('module') != 'Portal' && AppRequest::get('module') != 'Reports')
-		$ajaxAction = AppRequest::get('module') . 'Ajax';
+	if (AppRequest::has('module') && AppRequest::has('file') && AppRequest::get('module') != 'Settings' && AppRequest::get('file') != 'ListView' && AppRequest::get('module') != 'Portal' && AppRequest::get('module') != 'Reports') {
+			$ajaxAction = AppRequest::get('module') . 'Ajax';
+	}
 
 	if (is_string($string)) {
 		if ($action != 'CustomView' && $action != 'Export' && $action != $ajaxAction && $action != 'LeadConvertToEntities' && $action != 'CreatePDF' && $action != 'ConvertAsFAQ' && AppRequest::get('module') != 'Dashboard' && $action != 'CreateSOPDF' && $action != 'SendPDFMail' && (!AppRequest::has('submode'))) {
@@ -214,10 +215,11 @@ 
 
 		// In vtiger5 ajax request are treated specially and the data is encoded
 		if ($doconvert == true) {
-			if ($inUTF8)
-				$string = htmlentities($string, ENT_QUOTES, $default_charset);
-			else
-				$string = preg_replace(['/</', '/>/', '/"/'], ['&lt;', '&gt;', '&quot;'], $string);
+			if ($inUTF8) {
+							$string = htmlentities($string, ENT_QUOTES, $default_charset);
+			} else {
+							$string = preg_replace(['/</', '/>/', '/"/'], ['&lt;', '&gt;', '&quot;'], $string);
+			}
 		}
 	}
 	Vtiger_Cache::set('to_html', $oginalString, $string);
@@ -273,10 +275,11 @@ 
 	if ($module == 'Calendar') {
 		$cachedEventsFields = VTCacheUtils::lookupFieldInfo_Module('Events');
 		if ($cachedEventsFields) {
-			if (empty($cachedModuleFields))
-				$cachedModuleFields = $cachedEventsFields;
-			else
-				$cachedModuleFields = array_merge($cachedModuleFields, $cachedEventsFields);
+			if (empty($cachedModuleFields)) {
+							$cachedModuleFields = $cachedEventsFields;
+			} else {
+							$cachedModuleFields = array_merge($cachedModuleFields, $cachedEventsFields);
+			}
 		}
 	}
 
@@ -704,10 +707,11 @@ 
 			$pos++;
 		}
 	}
-	if (strtolower($default_charset) == 'utf-8')
-		return html_to_utf8($decodedStr);
-	else
-		return $decodedStr;
+	if (strtolower($default_charset) == 'utf-8') {
+			return html_to_utf8($decodedStr);
+	} else {
+			return $decodedStr;
+	}
 	//return html_to_utf8($decodedStr);
 }
 
@@ -726,13 +730,15 @@ 
 		while (($i--) > 0) {
 			if ($data != ($a = $data % ($p = pow(64, $i)))) {
 				$ret = chr(base_convert(str_pad(str_repeat(1, $i + 1), 8, "0"), 2, 10) + (($data - $a) / $p));
-				for ($i; $i > 0; $i--)
-					$ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p));
+				for ($i; $i > 0; $i--) {
+									$ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p));
+				}
 				break;
 			}
 		}
-	} else
-		$ret = "&#$data;";
+	} else {
+			$ret = "&#$data;";
+	}
 	return $ret;
 }
 
@@ -781,8 +787,9 @@ 
  */
 function escape_single_quotes($value)
 {
-	if (isset($value))
-		$value = str_replace("'", "\'", $value);
+	if (isset($value)) {
+			$value = str_replace("'", "\'", $value);
+	}
 	return $value;
 }
 
@@ -803,10 +810,11 @@ 
 			$str = str_replace('_', '\_', $str);
 			if ($flag == 0) {
 				// If value what to search is null then we should not add % which will fail
-				if (empty($str))
-					$str = '' . $str . '';
-				else
-					$str = '%' . $str . '%';
+				if (empty($str)) {
+									$str = '' . $str . '';
+				} else {
+									$str = '%' . $str . '%';
+				}
 			} elseif ($flag == 1) {
 				$str = '%' . $str;
 			} elseif ($flag == 2) {
@@ -865,8 +873,9 @@ 
 		} else {
 			$mulsel = "select distinct $fieldname from vtiger_$fieldname inner join vtiger_role2picklist on vtiger_role2picklist.picklistvalueid = vtiger_$fieldname.picklist_valueid where roleid ='" . $roleid . "' and picklistid in (select picklistid from vtiger_$fieldname) order by sortid asc";
 		}
-		if ($fieldname != 'firstname')
-			$mulselresult = $adb->query($mulsel);
+		if ($fieldname != 'firstname') {
+					$mulselresult = $adb->query($mulsel);
+		}
 		for ($j = 0; $j < $adb->num_rows($mulselresult); $j++) {
 			$fieldvalues[] = $adb->query_result($mulselresult, $j, $fieldname);
 		}
@@ -878,15 +887,17 @@ 
 					$temp_status[$keyvalue][($temp_count + $t)] = $fieldvalues[$t];
 				}
 				$fieldvalues = $temp_status[$keyvalue];
-			} else
-				$temp_status[$keyvalue] = $fieldvalues;
+			} else {
+							$temp_status[$keyvalue] = $fieldvalues;
+			}
+		}
+		if ($uitype == 33) {
+					$fieldlists[1][$keyvalue] = $fieldvalues;
+		} else if ($uitype == 55 && $fieldname == 'salutationtype') {
+					$fieldlists[$keyvalue] = $fieldvalues;
+		} else if ($uitype == 15) {
+					$fieldlists[$keyvalue] = $fieldvalues;
 		}
-		if ($uitype == 33)
-			$fieldlists[1][$keyvalue] = $fieldvalues;
-		else if ($uitype == 55 && $fieldname == 'salutationtype')
-			$fieldlists[$keyvalue] = $fieldvalues;
-		else if ($uitype == 15)
-			$fieldlists[$keyvalue] = $fieldvalues;
 	}
 	$log->debug("Exit from function getAccessPickListValues($module)");
 
@@ -907,8 +918,9 @@ 
 
 		$ret_str .= " ifnull($tbl_name.$col_name,'null') = ifnull(temp.$col_name,'null')";
 
-		if (count($field_array) != $i)
-			$ret_str .= " and ";
+		if (count($field_array) != $i) {
+					$ret_str .= " and ";
+		}
 		$i++;
 	}
 	return $ret_str;
@@ -1021,8 +1033,9 @@ 
 	foreach ($name as $module) {
 		$focus = CRMEntity::getInstance($module);
 		$query = $focus->buildSearchQueryForFieldTypes(11, $number);
-		if (empty($query))
-			return;
+		if (empty($query)) {
+					return;
+		}
 
 		$result = $adb->pquery($query, []);
 		if ($adb->num_rows($result) > 0) {
@@ -1229,8 +1242,9 @@ 
 	//require_once('modules/com_vtiger_workflow/VTEntityCache.inc');
 	$em = new VTEventsManager($adb);
 	$em->initTriggerCache();
-	if (!is_array($destinationRecordIds))
-		$destinationRecordIds = [$destinationRecordIds];
+	if (!is_array($destinationRecordIds)) {
+			$destinationRecordIds = [$destinationRecordIds];
+	}
 
 	$data = [];
 	$data['CRMEntity'] = $focus;
@@ -1277,11 +1291,13 @@ 
 {
 	global $Vtiger_Utils_Log, $_installOrUpdateVtlibModule;
 	$log = LoggerManager::getInstance();
-	if (!file_exists($packagepath))
-		return;
+	if (!file_exists($packagepath)) {
+			return;
+	}
 
-	if (isset($_installOrUpdateVtlibModule[$packagename . $packagepath]))
-		return;
+	if (isset($_installOrUpdateVtlibModule[$packagename . $packagepath])) {
+			return;
+	}
 	$_installOrUpdateVtlibModule[$packagename . $packagepath] = 'install';
 
 	$Vtiger_Utils_Log = defined('INSTALLATION_MODE_DEBUG') ? INSTALLATION_MODE_DEBUG : true;
@@ -1328,11 +1344,13 @@ 
 {
 	global $_installOrUpdateVtlibModule;
 	$log = LoggerManager::getInstance();
-	if (!file_exists($packagepath))
-		return;
+	if (!file_exists($packagepath)) {
+			return;
+	}
 
-	if (isset($_installOrUpdateVtlibModule[$module . $packagepath]))
-		return;
+	if (isset($_installOrUpdateVtlibModule[$module . $packagepath])) {
+			return;
+	}
 	$_installOrUpdateVtlibModule[$module . $packagepath] = 'update';
 
 	$Vtiger_Utils_Log = defined('INSTALLATION_MODE_DEBUG') ? INSTALLATION_MODE_DEBUG : true;
@@ -1416,20 +1434,23 @@ 
 	$delim = array('/', '.');
 	foreach ($delim as $delimiter) {
 		$x = strpos($value, $delimiter);
-		if ($x === false)
-			continue;
-		else {
+		if ($x === false) {
+					continue;
+		} else {
 			$value = str_replace($delimiter, '-', $value);
 			break;
 		}
 	}
 	list($y, $m, $d) = explode('-', $value);
-	if (strlen($y) == 1)
-		$y = '0' . $y;
-	if (strlen($m) == 1)
-		$m = '0' . $m;
-	if (strlen($d) == 1)
-		$d = '0' . $d;
+	if (strlen($y) == 1) {
+			$y = '0' . $y;
+	}
+	if (strlen($m) == 1) {
+			$m = '0' . $m;
+	}
+	if (strlen($d) == 1) {
+			$d = '0' . $d;
+	}
 	$value = implode('-', array($y, $m, $d));
 
 	if (strlen($y) < 4) {
@@ -1821,8 +1842,9 @@ 
 		$query = $queryGenerator->getQuery();
 		$current_page = ListViewSession::getCurrentPage($moduleName, $viewid);
 		$limit_start_rec = ($current_page - 1) * $list_max_entries_per_page;
-		if ($limit_start_rec < 0)
-			$limit_start_rec = 0;
+		if ($limit_start_rec < 0) {
+					$limit_start_rec = 0;
+		}
 		$query .= sprintf(' LIMIT %s,%s', $limit_start_rec, $list_max_entries_per_page);
 
 		$result = $adb->pquery($query, []);

Doc Comments +6 added lines, -2 removed lines

@@ -56,8 +56,8 @@ 
 
 /** Function to return a full name
  * @param $row -- row:: Type integer
- * @param $first_column -- first column:: Type string
- * @param $last_column -- last column:: Type string
+ * @param string $first_column -- first column:: Type string
+ * @param string $last_column -- last column:: Type string
  * @returns $fullname -- fullname:: Type string
  *
  */
@@ -713,6 +713,7 @@ 
 
 /**
  * simple HTML to UTF-8 conversion:
+ * @param string $data
  */
 function html_to_utf8($data)
 {
@@ -757,6 +758,7 @@ 
 
 /**
  * Function to find the UI type of a field based on the uitype id
+ * @param string $reqtype
  */
 function is_uitype($uitype, $reqtype)
 {
@@ -1539,6 +1541,8 @@ 
 
 /**
  * Function to get the approximate difference between two date time values as string
+ * @param integer $d1
+ * @param integer $d2
  */
 function dateDiffAsString($d1, $d2)
 {

include/ConfigUtils.php

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
 		self::$modules[$module] = $CONFIG;
 		switch ($argsLength) {
 			case 2:
-				if (!isset($CONFIG[$key]))
-					return false;
+				if (!isset($CONFIG[$key])) {
+									return false;
+				}
 				return $CONFIG[$key];
 				break;
 			default:

Doc Comments +36 added lines

@@ -16,11 +16,17 @@ 
 	protected static $sounds = [];
 	protected static $search = [];
 
+	/**
+	 * @param string $key
+	 */
 	public static function load($key, $config)
 	{
 		self::$$key = $config;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function main($key, $value = false)
 	{
 		if (isset(self::$main[$key])) {
@@ -71,11 +77,17 @@ 
 		}
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function api($key, $defvalue = false)
 	{
 		return self::$api[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function debug($key, $defvalue = false)
 	{
 		if (empty(self::$debug)) {
@@ -85,6 +97,9 @@ 
 		return self::$debug[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function developer($key, $defvalue = false)
 	{
 		if (empty(self::$developer)) {
@@ -94,6 +109,9 @@ 
 		return self::$developer[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function security($key, $defvalue = false)
 	{
 		if (empty(self::$security)) {
@@ -103,6 +121,9 @@ 
 		return self::$security[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function securityKeys($key, $defvalue = false)
 	{
 		if (empty(self::$securityKeys)) {
@@ -112,6 +133,9 @@ 
 		return self::$securityKeys[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function performance($key, $defvalue = false)
 	{
 		if (empty(self::$performance)) {
@@ -121,6 +145,11 @@ 
 		return self::$performance[$key];
 	}
 
+	/**
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
 	public static function relation($key, $defvalue = false)
 	{
 		if (empty(self::$relation)) {
@@ -143,6 +172,9 @@ 
 		return self::$sounds[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function search($key, $defvalue = false)
 	{
 		if (empty(self::$search)) {
@@ -152,6 +184,10 @@ 
 		return self::$search[$key];
 	}
 
+	/**
+	 * @param string $key
+	 * @param integer $value
+	 */
 	public static function iniSet($key, $value)
 	{
 		@ini_set($key, $value);

include/QueryGenerator/QueryGenerator.php

Braces +44 added lines, -30 removed lines

@@ -306,8 +306,9 @@ 
 
 	public function parseAdvFilterList($advFilterList, $glue = '')
 	{
-		if (!empty($glue))
-			$this->addConditionGlue($glue);
+		if (!empty($glue)) {
+					$this->addConditionGlue($glue);
+		}
 
 		$customView = new CustomView($this->module);
 		$dateSpecificConditions = $customView->getStdFilterConditions();
@@ -318,8 +319,9 @@ 
 				foreach ($filtercolumns as $index => $filter) {
 					$nameComponents = explode(':', $filter['columnname']);
 					// For Events "End Date & Time" field datatype should be DT. But, db will give D for due_date field
-					if ($nameComponents[2] == 'due_date' && $nameComponents[3] == 'Events_End_Date_&_Time')
-						$nameComponents[4] = 'DT';
+					if ($nameComponents[2] == 'due_date' && $nameComponents[3] == 'Events_End_Date_&_Time') {
+											$nameComponents[4] = 'DT';
+					}
 					if (empty($nameComponents[2]) && $nameComponents[1] == 'crmid' && $nameComponents[0] == 'vtiger_crmentity') {
 						$name = $this->getSQLColumn('id');
 					} else {
@@ -343,13 +345,15 @@ 
 						// If datatype is DT then we should append time also
 						if ($nameComponents[4] == 'DT') {
 							$startdate = explode(' ', $dateFilterResolvedList['startdate']);
-							if ($startdate[1] == '')
-								$startdate[1] = '00:00:00';
+							if ($startdate[1] == '') {
+															$startdate[1] = '00:00:00';
+							}
 							$dateFilterResolvedList['startdate'] = $startdate[0] . ' ' . $startdate[1];
 
 							$enddate = explode(' ', $dateFilterResolvedList['enddate']);
-							if ($enddate[1] == '')
-								$enddate[1] = '23:59:59';
+							if ($enddate[1] == '') {
+															$enddate[1] = '23:59:59';
+							}
 							$dateFilterResolvedList['enddate'] = $enddate[0] . ' ' . $enddate[1];
 						}
 						$value = [];
@@ -367,12 +371,14 @@ 
 
 						$value = [];
 						$start = explode(' ', $startDate);
-						if ($start[1] == "")
-							$startDate = $start[0] . ' ' . '00:00:00';
+						if ($start[1] == "") {
+													$startDate = $start[0] . ' ' . '00:00:00';
+						}
 
 						$end = explode(' ', $endDate);
-						if ($end[1] == "")
-							$endDate = $end[0] . ' ' . '23:59:59';
+						if ($end[1] == "") {
+													$endDate = $end[0] . ' ' . '23:59:59';
+						}
 
 						$value[] = $startDate;
 						$value[] = $endDate;
@@ -405,8 +411,9 @@ 
 				}
 				$this->endGroup();
 				$groupConditionGlue = $groupcolumns['condition'];
-				if (!empty($groupConditionGlue))
-					$this->addConditionGlue($groupConditionGlue);
+				if (!empty($groupConditionGlue)) {
+									$this->addConditionGlue($groupConditionGlue);
+				}
 			}
 		}
 	}
@@ -698,8 +705,9 @@ 
 				$fields = $meta->getModuleFields();
 				$fieldObject = $fields[$fieldName];
 
-				if (empty($fieldObject))
-					continue;
+				if (empty($fieldObject)) {
+									continue;
+				}
 
 				$tableName = $fieldObject->getTableName();
 				if (!in_array($tableName, $referenceFieldTableList)) {
@@ -758,8 +766,9 @@ 
 			$operator = strtolower($conditionInfo['operator']);
 			if ($operator == 'between' && $this->isDateType($field->getFieldDataType())) {
 				$start = explode(' ', $conditionInfo['value'][0]);
-				if (count($start) == 2)
-					$conditionInfo['value'][0] = getValidDBInsertDateTimeValue($start[0] . ' ' . $start[1]);
+				if (count($start) == 2) {
+									$conditionInfo['value'][0] = getValidDBInsertDateTimeValue($start[0] . ' ' . $start[1]);
+				}
 
 				$end = explode(' ', $conditionInfo['values'][1]);
 				// Dates will be equal for Today, Tomorrow, Yesterday.
@@ -920,8 +929,9 @@ 
 						$conditionGlue = ' && ';
 						if ($conditionInfo['operator'] == 'n') {
 							$specialCondition = ' || ' . $field->getTableName() . '.' . $field->getColumnName() . ' IS NULL ';
-							if (!empty($otherField))
-								$specialConditionForOtherField = ' || ' . $otherField->getTableName() . '.' . $otherField->getColumnName() . ' IS NULL ';
+							if (!empty($otherField)) {
+															$specialConditionForOtherField = ' || ' . $otherField->getTableName() . '.' . $otherField->getColumnName() . ' IS NULL ';
+							}
 						}
 					}
 
@@ -931,10 +941,11 @@ 
 					}
 
 					$fieldSql .= "$fieldGlue ((" . $field->getTableName() . '.' . $field->getColumnName() . ' ' . $valueSql . " $specialCondition) ";
-					if (!empty($otherField))
-						$fieldSql .= $conditionGlue . '(' . $otherField->getTableName() . '.' . $otherField->getColumnName() . ' ' . $otherFieldValueSql . ' ' . $specialConditionForOtherField . '))';
-					else
-						$fieldSql .= ')';
+					if (!empty($otherField)) {
+											$fieldSql .= $conditionGlue . '(' . $otherField->getTableName() . '.' . $otherField->getColumnName() . ' ' . $otherFieldValueSql . ' ' . $specialConditionForOtherField . '))';
+					} else {
+											$fieldSql .= ')';
+					}
 				} elseif ($conditionInfo['custom']) {
 					$fieldSql .= $fieldGlue . 'vtiger_crmentity.crmid ' . $valueSql;
 				} else {
@@ -1306,8 +1317,9 @@ 
 	public function addCondition($fieldname, $value, $operator, $glue = null, $custom = false, $newGroupType = null, $ignoreComma = false)
 	{
 		$conditionNumber = $this->conditionInstanceCount++;
-		if ($glue != null && $conditionNumber > 0)
-			$this->addConditionGlue($glue);
+		if ($glue != null && $conditionNumber > 0) {
+					$this->addConditionGlue($glue);
+		}
 
 		$this->groupInfo .= "$conditionNumber ";
 		$this->whereFields[] = $fieldname;
@@ -1328,8 +1340,9 @@ 
 	public function addReferenceModuleFieldCondition($relatedModule, $referenceField, $fieldName, $value, $SQLOperator, $glue = null)
 	{
 		$conditionNumber = $this->conditionInstanceCount++;
-		if ($glue != null && $conditionNumber > 0)
-			$this->addConditionGlue($glue);
+		if ($glue != null && $conditionNumber > 0) {
+					$this->addConditionGlue($glue);
+		}
 
 		$this->groupInfo .= "$conditionNumber ";
 		$this->referenceModuleField[$conditionNumber] = array('relatedModule' => $relatedModule, 'referenceField' => $referenceField, 'fieldName' => $fieldName, 'value' => $value,
@@ -1403,8 +1416,9 @@ 
 					}
 					$this->endGroup();
 					$groupConditionGlue = $groupcolumns['condition'];
-					if (!empty($groupConditionGlue))
-						$this->addConditionGlue($groupConditionGlue);
+					if (!empty($groupConditionGlue)) {
+											$this->addConditionGlue($groupConditionGlue);
+					}
 				}
 			}
 			$this->endGroup();

Doc Comments +22 added lines

@@ -153,6 +153,9 @@ 
 		return $this->whereFields;
 	}
 
+	/**
+	 * @param string $columns
+	 */
 	public function setCustomColumn($columns)
 	{
 		$this->columnsCustom[] = $columns;
@@ -183,6 +186,9 @@ 
 		$this->sourceRecord = $sourceRecord;
 	}
 
+	/**
+	 * @return boolean
+	 */
 	public function getSourceRecord()
 	{
 		return $this->sourceRecord;
@@ -193,6 +199,9 @@ 
 		return $this->ownerFields;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getModuleNameFields($module)
 	{
 		return $this->moduleNameFields[$module];
@@ -1250,6 +1259,9 @@ 
 		return $sql;
 	}
 
+	/**
+	 * @param string $groupSql
+	 */
 	private function makeGroupSqlReplacements($fieldSqlList, $groupSql)
 	{
 		$pos = 0;
@@ -1287,6 +1299,9 @@ 
 		return ($type == 'date' || $type == 'datetime');
 	}
 
+	/**
+	 * @return string
+	 */
 	public function fixDateTimeValue($name, $value, $first = true)
 	{
 		$moduleFields = $this->getModuleFields();
@@ -1304,6 +1319,10 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param string $glue
+	 * @param string $newGroupType
+	 */
 	public function addCondition($fieldname, $value, $operator, $glue = null, $custom = false, $newGroupType = null, $ignoreComma = false)
 	{
 		$conditionNumber = $this->conditionInstanceCount++;
@@ -1347,6 +1366,9 @@ 
 		return array('name' => $fieldname, 'value' => $value, 'operator' => $operator, 'custom' => $custom);
 	}
 
+	/**
+	 * @param string $groupType
+	 */
 	public function startGroup($groupType)
 	{
 		$this->groupInfo .= " $groupType (";

include/Webservices/VtigerActorOperation.php

Spacing +1 added lines, -2 removed lines

@@ -270,8 +270,7 @@
 			foreach ($moduleFields as $fieldName => $webserviceField) {
 				array_push($fields, $this->getDescribeFieldArray($webserviceField));
 			}
-			$label = ($app_strings[$this->meta->getObectIndexColumn()]) ? $app_strings[$this->meta->getObectIndexColumn()] :
-				$this->meta->getObectIndexColumn();
+			$label = ($app_strings[$this->meta->getObectIndexColumn()]) ? $app_strings[$this->meta->getObectIndexColumn()] : $this->meta->getObectIndexColumn();
 			$this->moduleFields = $fields;
 		}
 		return $this->moduleFields;

include/Webservices/GetUpdates.php

Spacing +5 added lines, -5 removed lines

@@ -117,7 +117,7 @@ 
 		$params = array_merge($params, $ownerIds);
 	}
 
-	$q .=" order by modifiedtime limit $numRecordsLimit";
+	$q .= " order by modifiedtime limit $numRecordsLimit";
 	$result = $adb->pquery($q, $params);
 
 	$modTime = [];
@@ -156,7 +156,7 @@ 
 		// since not all fields present in delete condition will be present in the fieldnames of the module
 		foreach ($deleteColumnNames as $table_fieldName => $columnName) {
 			if (!in_array($columnName, $moduleFieldNames)) {
-				$selectClause .=", " . $table_fieldName;
+				$selectClause .= ", " . $table_fieldName;
 			}
 		}
 		if ($elementType == "Emails")
@@ -166,10 +166,10 @@ 
 
 		$fromClause .= " INNER JOIN (select modifiedtime, crmid,deleted,setype FROM $baseCRMTable WHERE setype=? and modifiedtime >? and modifiedtime<=?";
 		if (!$applicationSync) {
-			$fromClause.= 'and smownerid IN(' . generateQuestionMarks($ownerIds) . ')';
+			$fromClause .= 'and smownerid IN(' . generateQuestionMarks($ownerIds) . ')';
 			$params = array_merge($params, $ownerIds);
 		}
-		$fromClause.= ' ) vtiger_ws_sync ON (vtiger_crmentity.crmid = vtiger_ws_sync.crmid)';
+		$fromClause .= ' ) vtiger_ws_sync ON (vtiger_crmentity.crmid = vtiger_ws_sync.crmid)';
 		$q = $selectClause . " " . $fromClause;
 		$result = $adb->pquery($q, $params);
 		$recordDetails = [];
@@ -206,7 +206,7 @@ 
 		$params[] = $entityModule;
 	}
 	if (!$applicationSync) {
-		$q.='and smownerid IN(' . generateQuestionMarks($ownerIds) . ')';
+		$q .= 'and smownerid IN(' . generateQuestionMarks($ownerIds) . ')';
 		$params = array_merge($params, $ownerIds);
 	}
 

Braces +25 added lines, -18 removed lines

@@ -73,14 +73,16 @@ 
 	$modulesInformation = $modulesDetails["information"];
 
 	foreach ($modulesInformation as $moduleName => $entityInformation) {
-		if ($entityInformation["isEntity"])
-			$entityModules[] = $moduleName;
+		if ($entityInformation["isEntity"]) {
+					$entityModules[] = $moduleName;
+		}
 	}
 	if (!$typed) {
 		$accessableModules = $entityModules;
 	} else {
-		if (!in_array($elementType, $entityModules))
-			throw new WebServiceException(WebServiceErrorCode::$ACCESSDENIED, "Permission to perform the operation is denied");
+		if (!in_array($elementType, $entityModules)) {
+					throw new WebServiceException(WebServiceErrorCode::$ACCESSDENIED, "Permission to perform the operation is denied");
+		}
 		$accessableModules[] = $elementType;
 	}
 
@@ -101,15 +103,17 @@ 
 		if ($elementType == "Calendar" || $elementType == "Events") {
 			$baseCRMTable = getSyncQueryBaseTable($elementType);
 		}
-	} else
-		$baseCRMTable = " vtiger_crmentity ";
+	} else {
+			$baseCRMTable = " vtiger_crmentity ";
+	}
 
 	//modifiedtime - next token
 	$q = "SELECT modifiedtime FROM $baseCRMTable WHERE  modifiedtime>? and setype IN(" . generateQuestionMarks($accessableModules) . ") ";
 	$params = array($datetime);
 	foreach ($accessableModules as $entityModule) {
-		if ($entityModule == "Events")
-			$entityModule = "Calendar";
+		if ($entityModule == "Events") {
+					$entityModule = "Calendar";
+		}
 		$params[] = $entityModule;
 	}
 	if (!$applicationSync) {
@@ -159,10 +163,11 @@ 
 				$selectClause .=", " . $table_fieldName;
 			}
 		}
-		if ($elementType == "Emails")
-			$fromClause = vtws_getEmailFromClause();
-		else
-			$fromClause = $queryGenerator->getFromClause();
+		if ($elementType == "Emails") {
+					$fromClause = vtws_getEmailFromClause();
+		} else {
+					$fromClause = $queryGenerator->getFromClause();
+		}
 
 		$fromClause .= " INNER JOIN (select modifiedtime, crmid,deleted,setype FROM $baseCRMTable WHERE setype=? and modifiedtime >? and modifiedtime<=?";
 		if (!$applicationSync) {
@@ -201,8 +206,9 @@ 
 	$params = array($maxModifiedTime);
 
 	foreach ($accessableModules as $entityModule) {
-		if ($entityModule == "Events")
-			$entityModule = "Calendar";
+		if ($entityModule == "Events") {
+					$entityModule = "Calendar";
+		}
 		$params[] = $entityModule;
 	}
 	if (!$applicationSync) {
@@ -285,10 +291,11 @@ 
 
 function getCalendarTypeCondition($elementType)
 {
-	if ($elementType == "Events")
-		$activityCondition = "vtiger_activity.activitytype !='Task' and vtiger_activity.activitytype !='Emails'";
-	else
-		$activityCondition = "vtiger_activity.activitytype ='Task'";
+	if ($elementType == "Events") {
+			$activityCondition = "vtiger_activity.activitytype !='Task' and vtiger_activity.activitytype !='Emails'";
+	} else {
+			$activityCondition = "vtiger_activity.activitytype ='Task'";
+	}
 	return $activityCondition;
 }
 

Doc Comments +6 added lines

@@ -13,6 +13,9 @@ 
 require_once 'include/utils/CommonUtils.php';
 require_once 'include/Webservices/DescribeObject.php';
 
+/**
+ * @param string $syncType
+ */
 function vtws_sync($mtime, $elementType, $syncType, $user)
 {
 	global $recordString, $modifiedTimeString;
@@ -244,6 +247,9 @@ 
 	return strtotime($mtimeString);
 }
 
+/**
+ * @param string[] $deletedValues
+ */
 function vtws_isRecordDeleted($recordDetails, $deleteColumnDetails, $deletedValues)
 {
 	$deletedRecord = false;

include/Webservices/VtigerCRMObjectMeta.php

Braces +6 added lines, -4 removed lines

@@ -212,8 +212,9 @@ 
 		$adb = PearDatabase::getInstance();
 
 		// administrator's have assign privilege
-		if (\vtlib\Functions::userIsAdministrator($this->user))
-			return true;
+		if (\vtlib\Functions::userIsAdministrator($this->user)) {
+					return true;
+		}
 
 		$idComponents = vtws_getIdComponents($webserviceId);
 		$userId = $idComponents[1];
@@ -353,8 +354,9 @@ 
 		$theme = vtws_preserveGlobal('theme', $this->user->theme);
 		$default_language = AppConfig::main('default_language');
 		$current_language = vglobal('current_language');
-		if (empty($current_language))
-			$current_language = $default_language;
+		if (empty($current_language)) {
+					$current_language = $default_language;
+		}
 		$current_language = vtws_preserveGlobal('current_language', $current_language);
 
 		$this->computeAccess();

include/Webservices/History.php

Braces +7 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
 	$page = empty($element['page']) ? 0 : intval($element['page']); // Page to start
 
 	$acrossAllModule = false;
-	if ($moduleName == 'Home')
-		$acrossAllModule = true;
+	if ($moduleName == 'Home') {
+			$acrossAllModule = true;
+	}
 
 	// Pre-condition check
 	if (empty($moduleName)) {
@@ -71,8 +72,10 @@ 
 
 	// Get most recently tracked changes with limit
 	$start = $page * $MAXLIMIT;
-	if ($start > 0)
-		$start = $start + 1; // Adjust the start range
+	if ($start > 0) {
+			$start = $start + 1;
+	}
+	// Adjust the start range
 	$sql .= sprintf(' ORDER BY vtiger_modtracker_basic.id DESC LIMIT %s,%s', $start, $MAXLIMIT);
 
 	$result = $adb->pquery($sql, $params);

include/Webservices/ModuleTypes.php

Braces +6 added lines, -4 removed lines

@@ -52,8 +52,9 @@ 
 				generateQuestionMarks($fieldTypeList) . ')';
 			$params = [];
 			$params[] = $user->id;
-			foreach ($fieldTypeList as $fieldType)
-				$params[] = $fieldType;
+			foreach ($fieldTypeList as $fieldType) {
+							$params[] = $fieldType;
+			}
 			$result = $db->pquery($sql, $params);
 			$it = new SqlResultIterator($db, $result);
 			$moduleList = [];
@@ -107,8 +108,9 @@ 
 
 	$default_language = VTWS_PreserveGlobal::getGlobal('default_language');
 	$current_language = vglobal('current_language');
-	if (empty($current_language))
-		$current_language = $default_language;
+	if (empty($current_language)) {
+			$current_language = $default_language;
+	}
 	$current_language = vtws_preserveGlobal('current_language', $current_language);
 
 	$appStrings = return_application_language($current_language);