YetiForceCompany / YetiForceCRM

include/database/Postgres8.php

Doc Comments +6 added lines

@@ -14,6 +14,9 @@ 
  * ****************************************************************************** */
 
 //Fix postgres queries
+/**
+ * @param integer $debug
+ */
 function fixPostgresQuery($query, $log, $debug)
 {
 	// First select the query fields from the remaining query
@@ -115,6 +118,9 @@ 
 }
 
 //return an expanded table field list
+/**
+ * @param string $table
+ */
 function expandRecord($table, $log)
 {
 	$result = "";

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 	if ($debug)
 		$log->info("fixPostgresQuery result: " . $query);
 
-	return( $query);
+	return($query);
 }
 
 // Postgres8 will not accept a "tablename.*" entry in the GROUP BY clause
@@ -111,7 +111,7 @@ 
 	if ($expanded != '')
 		$expanded = " GROUP BY " . trim($expanded, ",");
 	//return the expanded fieldlist
-	return( $expanded);
+	return($expanded);
 }
 
 //return an expanded table field list
@@ -195,5 +195,5 @@ 
 		$result = substr($result, 0, strlen($result) - 1);
 
 	//return out new string
-	return( $result);
+	return($result);
 }

Braces +81 added lines, -56 removed lines

@@ -22,8 +22,9 @@ 
 	$groupClause = "";
 	$orderClause = "";
 
-	if ($debug)
-		$log->info("fixPostgresQuery: " . $query);
+	if ($debug) {
+			$log->info("fixPostgresQuery: " . $query);
+	}
 
 	// If we already have an order or group cluase separate ist for later use
 	if (stripos($queryRecord, 'GROUP BY') > 0) {
@@ -45,32 +46,36 @@ 
 	$privateGroupList = [];
 	$token = strtok($queryFields, ", ()	");
 	while ($token !== false) {
-		if (strpos($token, ".") !== false)
-			array_push($privateGroupList, $token);
+		if (strpos($token, ".") !== false) {
+					array_push($privateGroupList, $token);
+		}
 		$token = strtok(", ()	");
 	}
 	sort($privateGroupList);
 	$groupFields = "";
 	$last = "";
 	for ($i = 0; $i < count($privateGroupList); $i++) {
-		if ($last != $privateGroupList[$i])
-			if ($groupFields == "")
+		if ($last != $privateGroupList[$i]) {
+					if ($groupFields == "")
 				$groupFields = $privateGroupList[$i];
-			else
-				$groupFields .= "," . $privateGroupList[$i];
+		} else {
+							$groupFields .= "," . $privateGroupList[$i];
+			}
 		$last = $privateGroupList[$i];
 	}
 
 	// Rebuild the query
 	$query = sprintf("SELECT %s%s", $queryFields, $queryRecord);
-	if ($groupClause != "")
-		$groupClause = $groupClause . "," . $groupFields;
-	else
-		$groupClause = $groupFields;
+	if ($groupClause != "") {
+			$groupClause = $groupClause . "," . $groupFields;
+	} else {
+			$groupClause = $groupFields;
+	}
 	$query .= expandStar($groupClause, $log) . " " . $orderClause;
 
-	if ($debug)
-		$log->info("fixPostgresQuery result: " . $query);
+	if ($debug) {
+			$log->info("fixPostgresQuery result: " . $query);
+	}
 
 	return( $query);
 }
@@ -94,22 +99,25 @@ 
 				$subfield = substr($field, $pos + 1, strlen($field) - $pos);
 
 				//do we need to expand?
-				if ($subfield == "*")
-					$field = expandRecord($table, $log);
+				if ($subfield == "*") {
+									$field = expandRecord($table, $log);
+				}
 			}
 
 			//add the propably expanded field to the querylist
-			if ($expanded == "")
-				$expanded = $field;
-			else
-				$expanded .= "," . $field;
+			if ($expanded == "") {
+							$expanded = $field;
+			} else {
+							$expanded .= "," . $field;
+			}
 		}
 
 		//next field
 		$field = strtok(",");
 	}
-	if ($expanded != '')
-		$expanded = " GROUP BY " . trim($expanded, ",");
+	if ($expanded != '') {
+			$expanded = " GROUP BY " . trim($expanded, ",");
+	}
 	//return the expanded fieldlist
 	return( $expanded);
 }
@@ -122,68 +130,84 @@ 
 	$subfields = [];
 
 	//vtiger_products table
-	if ($table == "vtiger_products")
-		$subfields = array("productid", "productname", "productcode", "productcategory", "manufacturer", "qty_per_unit", "unit_price", "weight", "pack_size", "sales_start_date", "sales_end_date", "start_date", "expiry_date", "cost_factor", "commissionrate", "commissionmethod", "discontinued", "usageunit", "currency", "reorderlevel", "website", "taxclass", "mfr_part_no", "vendor_part_no", "serialno", "qtyinstock", "productsheet", "qtyindemand", "glacct", "vendor_id", "imagename");
+	if ($table == "vtiger_products") {
+			$subfields = array("productid", "productname", "productcode", "productcategory", "manufacturer", "qty_per_unit", "unit_price", "weight", "pack_size", "sales_start_date", "sales_end_date", "start_date", "expiry_date", "cost_factor", "commissionrate", "commissionmethod", "discontinued", "usageunit", "currency", "reorderlevel", "website", "taxclass", "mfr_part_no", "vendor_part_no", "serialno", "qtyinstock", "productsheet", "qtyindemand", "glacct", "vendor_id", "imagename");
+	}
 	
 	//vtiger_activity table
-	elseif ($table == "vtiger_activity")
-		$subfields = array("activityid", "subject", "semodule", "activitytype", "date_start", "due_date", "time_start", "time_end", "sendnotification", "duration_hours", "duration_minutes", "status", "eventstatus", "priority", "location", "notime", "visibility", "recurringtype");
+	elseif ($table == "vtiger_activity") {
+			$subfields = array("activityid", "subject", "semodule", "activitytype", "date_start", "due_date", "time_start", "time_end", "sendnotification", "duration_hours", "duration_minutes", "status", "eventstatus", "priority", "location", "notime", "visibility", "recurringtype");
+	}
 
 	//vtiger_notes table
-	elseif ($table == "vtiger_notes")
-		$subfields = array("notesid", "contact_id", "title", "filename", "notecontent");
+	elseif ($table == "vtiger_notes") {
+			$subfields = array("notesid", "contact_id", "title", "filename", "notecontent");
+	}
 
 	//vtiger_faq table
-	elseif ($table == "vtiger_faq")
-		$subfields = array("id", "product_id", "question", "answer", "category", "status");
+	elseif ($table == "vtiger_faq") {
+			$subfields = array("id", "product_id", "question", "answer", "category", "status");
+	}
 
 	//vtiger_profile2field
-	elseif ($table == "vtiger_profile2field")
-		$subfields = array("profileid", "tabid", "fieldid", "visible", "readonly");
+	elseif ($table == "vtiger_profile2field") {
+			$subfields = array("profileid", "tabid", "fieldid", "visible", "readonly");
+	}
 
 	//vtiger_field
-	elseif ($table == "vtiger_field")
-		$subfields = array("tabid", "fieldid", "columnname", "tablename", "generatedtype", "uitype", "fieldname", "fieldlabel", "readonly", "presence", "selected", "maximumlength", "sequence", "block", "displaytype", "typeofdata", "quickcreate", "quickcreatesequence", "info_type");
+	elseif ($table == "vtiger_field") {
+			$subfields = array("tabid", "fieldid", "columnname", "tablename", "generatedtype", "uitype", "fieldname", "fieldlabel", "readonly", "presence", "selected", "maximumlength", "sequence", "block", "displaytype", "typeofdata", "quickcreate", "quickcreatesequence", "info_type");
+	}
 
 	//vtiger_producttaxrel
-	elseif ($table == "vtiger_producttaxrel")
-		$subfields = array("productid", "taxid", "taxpercentage");
+	elseif ($table == "vtiger_producttaxrel") {
+			$subfields = array("productid", "taxid", "taxpercentage");
+	}
 
 	//vtiger_inventorytaxinfo
-	elseif ($table == "vtiger_inventorytaxinfo")
-		$subfields = array("taxid", "taxname", "taxlabel", "percentage", "deleted");
+	elseif ($table == "vtiger_inventorytaxinfo") {
+			$subfields = array("taxid", "taxname", "taxlabel", "percentage", "deleted");
+	}
 
 	//vtiger_role2picklist
-	elseif ($table == "vtiger_role2picklist")
-		$subfields = array("roleid", "picklistid", "sortid");
+	elseif ($table == "vtiger_role2picklist") {
+			$subfields = array("roleid", "picklistid", "sortid");
+	}
 
 	//vtiger_contactdetails
-	elseif ($table == "vtiger_contactdetails")
-		$subfields = array("lastname", "contactid", "accountid", "salutation", "firstname", "email", "phone", "mobile", "title", "department", "fax", "reportsto", "training", "usertype", "contacttype", "otheremail", "yahooid", "donotcall", "emailoptout", "imagename", "reference", "notify_owner");
+	elseif ($table == "vtiger_contactdetails") {
+			$subfields = array("lastname", "contactid", "accountid", "salutation", "firstname", "email", "phone", "mobile", "title", "department", "fax", "reportsto", "training", "usertype", "contacttype", "otheremail", "yahooid", "donotcall", "emailoptout", "imagename", "reference", "notify_owner");
+	}
 
 	//vtiger_crmentity
-	elseif ($table == "vtiger_crmentity")
-		$subfields = array("crmid", "smcreatorid", "smownerid", "modifiedby", "setype", "description", "createdtime", "modifiedtime", "viewedtime", "status", "version", "presence", "deleted");
+	elseif ($table == "vtiger_crmentity") {
+			$subfields = array("crmid", "smcreatorid", "smownerid", "modifiedby", "setype", "description", "createdtime", "modifiedtime", "viewedtime", "status", "version", "presence", "deleted");
+	}
 
 	//vtiger_seactivityrel
-	elseif ($table == "vtiger_seactivityrel")
-		$subfields = array("crmid", "activityid");
+	elseif ($table == "vtiger_seactivityrel") {
+			$subfields = array("crmid", "activityid");
+	}
 
 	//vtiger_cntactivityrel
-	elseif ($table == "vtiger_cntactivityrel")
-		$subfields = array("contactid", "activityid");
+	elseif ($table == "vtiger_cntactivityrel") {
+			$subfields = array("contactid", "activityid");
+	}
 
 	//vtiger_leaddetails
-	elseif ($table == "vtiger_leaddetails")
-		$subfields = array("leadid", "email", "interest", "firstname", "salutation", "lastname", "company", "annualrevenue", "industry", "campaign", "rating", "leadstatus", "leadsource", "converted", "designation", "space", "comments", "priority", "demorequest", "partnercontact", "productversion", "product", "maildate", "nextstepdate", "fundingsituation", "purpose", "evaluationstatus", "transferdate", "revenuetype", "noofemployees", "yahooid", "assignleadchk");
+	elseif ($table == "vtiger_leaddetails") {
+			$subfields = array("leadid", "email", "interest", "firstname", "salutation", "lastname", "company", "annualrevenue", "industry", "campaign", "rating", "leadstatus", "leadsource", "converted", "designation", "space", "comments", "priority", "demorequest", "partnercontact", "productversion", "product", "maildate", "nextstepdate", "fundingsituation", "purpose", "evaluationstatus", "transferdate", "revenuetype", "noofemployees", "yahooid", "assignleadchk");
+	}
 
 	//vtiger_pricebook
-	elseif ($table == "vtiger_pricebook")
-		$subfields = array("pricebookid", "bookname", "active", "description");
+	elseif ($table == "vtiger_pricebook") {
+			$subfields = array("pricebookid", "bookname", "active", "description");
+	}
 
 	//fields of the requested array still undefined
-	else
-		$log->info("function expandRecord: please add structural information for table '" . $table . "'");
+	else {
+			$log->info("function expandRecord: please add structural information for table '" . $table . "'");
+	}
 
 	//construct an entity string
 	for ($i = 0; $i < count($subfields); $i++) {
@@ -191,8 +215,9 @@ 
 	}
 
 	//remove the trailiung ,
-	if (strlen($result) > 0)
-		$result = substr($result, 0, strlen($result) - 1);
+	if (strlen($result) > 0) {
+			$result = substr($result, 0, strlen($result) - 1);
+	}
 
 	//return out new string
 	return( $result);

include/InventoryPDFController.php

Doc Comments +9 added lines

@@ -390,6 +390,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string[] $names
+	 */
 	public function focusColumnValues($names, $delimeter = "\n")
 	{
 		if (!is_array($names)) {
@@ -414,6 +417,9 @@ 
 		return $defvalue;
 	}
 
+	/**
+	 * @param string $id
+	 */
 	public function resolveReferenceLabel($id, $module = false)
 	{
 		if (empty($id)) {
@@ -448,6 +454,9 @@ 
 		return $currencyField->getDisplayValue(null, true);
 	}
 
+	/**
+	 * @param string $value
+	 */
 	public function formatDate($value)
 	{
 		return DateTimeField::convertToUserFormat($value);

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 			$subProducts = $productLineItem["subProductArray{$productLineItemIndex}"];
 			if ($subProducts != '') {
 				foreach ($subProducts as $subProduct) {
-					$productName .="\n" . " - " . decode_html($subProduct);
+					$productName .= "\n" . " - " . decode_html($subProduct);
 				}
 			}
 			$contentModel->set('Name', $productName);

Braces +30 added lines, -20 removed lines

@@ -83,8 +83,9 @@ 
 
 	public function Output($filename, $type)
 	{
-		if (is_null($this->focus))
-			return;
+		if (is_null($this->focus)) {
+					return;
+		}
 
 		$pdfgenerator = $this->getPDFGenerator();
 
@@ -256,24 +257,32 @@ 
 
 			$addressValues = [];
 			$addressValues[] = $resultrow['address'];
-			if (!empty($resultrow['city']))
-				$addressValues[] = "\n" . $resultrow['city'];
-			if (!empty($resultrow['state']))
-				$addressValues[] = "," . $resultrow['state'];
-			if (!empty($resultrow['code']))
-				$addressValues[] = $resultrow['code'];
-			if (!empty($resultrow['country']))
-				$addressValues[] = "\n" . $resultrow['country'];
+			if (!empty($resultrow['city'])) {
+							$addressValues[] = "\n" . $resultrow['city'];
+			}
+			if (!empty($resultrow['state'])) {
+							$addressValues[] = "," . $resultrow['state'];
+			}
+			if (!empty($resultrow['code'])) {
+							$addressValues[] = $resultrow['code'];
+			}
+			if (!empty($resultrow['country'])) {
+							$addressValues[] = "\n" . $resultrow['country'];
+			}
 
 			$additionalCompanyInfo = [];
-			if (!empty($resultrow['phone']))
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Phone: ", $this->moduleName) . $resultrow['phone'];
-			if (!empty($resultrow['fax']))
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Fax: ", $this->moduleName) . $resultrow['fax'];
-			if (!empty($resultrow['website']))
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Website: ", $this->moduleName) . $resultrow['website'];
-			if (!empty($resultrow['vatid']))
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("VAT ID: ", $this->moduleName) . $resultrow['vatid'];
+			if (!empty($resultrow['phone'])) {
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Phone: ", $this->moduleName) . $resultrow['phone'];
+			}
+			if (!empty($resultrow['fax'])) {
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Fax: ", $this->moduleName) . $resultrow['fax'];
+			}
+			if (!empty($resultrow['website'])) {
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Website: ", $this->moduleName) . $resultrow['website'];
+			}
+			if (!empty($resultrow['vatid'])) {
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("VAT ID: ", $this->moduleName) . $resultrow['vatid'];
+			}
 
 			$modelColumnLeft = array(
 				'logo' => "storage/Logo/" . $resultrow['logoname'],
@@ -430,8 +439,9 @@ 
 	{
 		$valueString = '';
 		foreach ($values as $value) {
-			if (empty($value))
-				continue;
+			if (empty($value)) {
+							continue;
+			}
 			$valueString .= $value . $delimeter;
 		}
 		return rtrim($valueString, $delimeter);

include/Loader.php

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 
 	/**
 	 * Function to get the class name of a given Component, of given Type, for a given Module
-	 * @param <String> $componentType
+	 * @param string $componentType
 	 * @param <String> $componentName
 	 * @param <String> $moduleName
 	 * @return <String> Required Class Name

Braces +3 added lines, -2 removed lines

@@ -124,8 +124,9 @@
 			$secondFallBackModuleDir = $secondFallBackModuleClassPath = $actualModule;
 			if ($actualModule != 'Users') {
 				$baseModule = $moduleHierarchyParts[0];
-				if ($baseModule == 'Settings')
-					$baseModule = 'Settings:Vtiger';
+				if ($baseModule == 'Settings') {
+									$baseModule = 'Settings:Vtiger';
+				}
 				$firstFallBackDir = str_replace(':', '.', $baseModule);
 				$firstFallBackClassPath = str_replace(':', '_', $baseModule);
 			}

include/PrivilegeFile.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
 		file_put_contents(self::$usersFile, '<?php return ' . \vtlib\Functions::varExportMin($users) . ';');
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public static function getUser($type)
 	{
 		if (self::$usersFileCache === false) {

include/QueryGenerator/QueryGenerator.php

Doc Comments +18 added lines

@@ -153,6 +153,9 @@ 
 		return $this->whereFields;
 	}
 
+	/**
+	 * @param string $columns
+	 */
 	public function setCustomColumn($columns)
 	{
 		$this->columnsCustom[] = $columns;
@@ -193,6 +196,9 @@ 
 		return $this->ownerFields;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getModuleNameFields($module)
 	{
 		return $this->moduleNameFields[$module];
@@ -1249,6 +1255,9 @@ 
 		return $sql;
 	}
 
+	/**
+	 * @param string $groupSql
+	 */
 	private function makeGroupSqlReplacements($fieldSqlList, $groupSql)
 	{
 		$pos = 0;
@@ -1286,6 +1295,9 @@ 
 		return ($type == 'date' || $type == 'datetime');
 	}
 
+	/**
+	 * @return string
+	 */
 	public function fixDateTimeValue($name, $value, $first = true)
 	{
 		$moduleFields = $this->getModuleFields();
@@ -1303,6 +1315,9 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param string $glue
+	 */
 	public function addCondition($fieldname, $value, $operator, $glue = null, $custom = false, $newGroupType = null, $ignoreComma = false)
 	{
 		$conditionNumber = $this->conditionInstanceCount++;
@@ -1346,6 +1361,9 @@ 
 		return array('name' => $fieldname, 'value' => $value, 'operator' => $operator, 'custom' => $custom);
 	}
 
+	/**
+	 * @param string $groupType
+	 */
 	public function startGroup($groupType)
 	{
 		$this->groupInfo .= " $groupType (";

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

include/simplehtmldom/simple_html_dom.php

Doc Comments +35 added lines

@@ -120,6 +120,9 @@ 
 	public $tag_start = 0;
 	private $dom = null;
 
+	/**
+	 * @param simple_html_dom $dom
+	 */
 	public function __construct($dom)
 	{
 		$this->dom = $dom;
@@ -1553,6 +1556,10 @@ 
 }
 
 // parse attributes
+/**
+ * @param simple_html_dom_node $node
+ * @param string[] $space
+ */
 protected function parse_attr($node, $name, &$space)
 {
 // Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
@@ -1589,6 +1596,10 @@ 
 }
 
 // link node's parent
+/**
+ * @param simple_html_dom_node $node
+ * @param boolean $is_child
+ */
 protected function link_nodes(&$node, $is_child)
 {
 $node->parent = $this->parent;
@@ -1599,6 +1610,9 @@ 
 }
 
 // as a text node
+/**
+ * @param string $tag
+ */
 protected function as_text_node($tag)
 {
 $node = new simple_html_dom_node($this);
@@ -1609,12 +1623,18 @@ 
 return true;
 }
 
+/**
+ * @param string $chars
+ */
 protected function skip($chars)
 {
 $this->pos += strspn($this->doc, $chars, $this->pos);
 $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 }
 
+/**
+ * @param string $chars
+ */
 protected function copy_skip($chars)
 {
 $pos = $this->pos;
@@ -1626,6 +1646,9 @@ 
 return substr($this->doc, $pos, $len);
 }
 
+/**
+ * @param string $chars
+ */
 protected function copy_until($chars)
 {
 $pos = $this->pos;
@@ -1635,6 +1658,9 @@ 
 return substr($this->doc, $pos, $len);
 }
 
+/**
+ * @param string $char
+ */
 protected function copy_until_char($char)
 {
 if ($this->char === null)
@@ -1655,6 +1681,9 @@ 
 return substr($this->doc, $pos_old, $pos - $pos_old);
 }
 
+/**
+ * @param string $char
+ */
 protected function copy_until_char_escape($char)
 {
 if ($this->char === null)
@@ -1686,6 +1715,9 @@ 
 
 // remove noise from html content
 // save the noise in the $this->noise array.
+/**
+ * @param string $pattern
+ */
 protected function remove_noise($pattern, $remove_tag = false)
 {
 global $debugObject;
@@ -1713,6 +1745,9 @@ 
 }
 
 // restore noise to html content
+/**
+ * @param string|null $text
+ */
 function restore_noise($text)
 {
 global $debugObject;

Switch Indentation +21 added lines, -21 removed lines

@@ -399,9 +399,9 @@ 
 if (isset($this->_[HDOM_INFO_INNER]))
 	return $this->_[HDOM_INFO_INNER];
 switch ($this->nodetype) {
-	case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-	case HDOM_TYPE_COMMENT: return '';
-	case HDOM_TYPE_UNKNOWN: return '';
+		case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		case HDOM_TYPE_COMMENT: return '';
+		case HDOM_TYPE_UNKNOWN: return '';
 }
 if (strcasecmp($this->tag, 'script') === 0)
 	return '';
@@ -640,19 +640,19 @@ 
 }
 
 switch ($exp) {
-	case '=':
-		return ($value === $pattern);
-	case '!=':
-		return ($value !== $pattern);
-	case '^=':
-		return preg_match("/^" . preg_quote($pattern, '/') . "/", $value);
-	case '$=':
-		return preg_match("/" . preg_quote($pattern, '/') . "$/", $value);
-	case '*=':
-		if ($pattern[0] == '/') {
-			return preg_match($pattern, $value);
-		}
-		return preg_match("/" . $pattern . "/i", $value);
+		case '=':
+			return ($value === $pattern);
+		case '!=':
+			return ($value !== $pattern);
+		case '^=':
+			return preg_match("/^" . preg_quote($pattern, '/') . "/", $value);
+		case '$=':
+			return preg_match("/" . preg_quote($pattern, '/') . "$/", $value);
+		case '*=':
+			if ($pattern[0] == '/') {
+				return preg_match($pattern, $value);
+			}
+			return preg_match("/" . $pattern . "/i", $value);
 }
 return false;
 }
@@ -736,11 +736,11 @@ 
 	return $this->convert_text($this->attr[$name]);
 }
 switch ($name) {
-	case 'outertext': return $this->outertext();
-	case 'innertext': return $this->innertext();
-	case 'plaintext': return $this->text();
-	case 'xmltext': return $this->xmltext();
-	default: return array_key_exists($name, $this->attr);
+		case 'outertext': return $this->outertext();
+		case 'innertext': return $this->innertext();
+		case 'plaintext': return $this->text();
+		case 'xmltext': return $this->xmltext();
+		default: return array_key_exists($name, $this->attr);
 }
 }
 

Spacing +3 added lines, -3 removed lines

@@ -224,7 +224,7 @@ 
 	{
 	// I am SURE that this doesn't work properly.
 	// It fails to unset the current node from it's current parents nodes or children list first.
-	if($parent !== null)
+	if ($parent !== null)
 	{
 	$this->parent = $parent;
 	$this->parent->nodes[] = $this;
@@ -1427,7 +1427,7 @@ 
 		$node->tag = 'unknown';
 	}
 	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+		$node->_[HDOM_INFO_TEXT] .= '>';
 	$this->link_nodes($node, true);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1450,7 +1450,7 @@ 
 	}
 
 	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+		$node->_[HDOM_INFO_TEXT] .= '>';
 	$this->link_nodes($node, false);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;

Braces +164 added lines, -107 removed lines

@@ -153,8 +153,9 @@ 
 		echo $lead . $this->tag;
 		if ($show_attr && count($this->attr) > 0) {
 			echo '(';
-			foreach ($this->attr as $k => $v)
-				echo "[$k]=>\"" . $this->$k . '", ';
+			foreach ($this->attr as $k => $v) {
+							echo "[$k]=>\"" . $this->$k . '", ';
+			}
 			echo ')';
 		}
 		echo "\n";
@@ -246,8 +247,9 @@ 
 if ($idx === -1) {
 	return $this->children;
 }
-if (isset($this->children[$idx]))
+if (isset($this->children[$idx])) {
 	return $this->children[$idx];
+}
 return null;
 }
 
@@ -290,14 +292,17 @@ 
 // returns the previous sibling of node
 function prev_sibling()
 {
-if ($this->parent === null)
+if ($this->parent === null) {
 	return null;
+}
 $idx = 0;
 $count = count($this->parent->children);
-while ($idx < $count && $this !== $this->parent->children[$idx])
+while ($idx < $count && $this !== $this->parent->children[$idx]) {
 	++$idx;
-if (--$idx < 0)
+}
+if (--$idx < 0) {
 	return null;
+}
 return $this->parent->children[$idx];
 }
 
@@ -328,14 +333,17 @@ 
 // get dom node's inner html
 function innertext()
 {
-if (isset($this->_[HDOM_INFO_INNER]))
+if (isset($this->_[HDOM_INFO_INNER])) {
 	return $this->_[HDOM_INFO_INNER];
-if (isset($this->_[HDOM_INFO_TEXT]))
+}
+if (isset($this->_[HDOM_INFO_TEXT])) {
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+}
 
 $ret = '';
-foreach ($this->nodes as $n)
+foreach ($this->nodes as $n) {
 	$ret .= $n->outertext();
+}
 return $ret;
 }
 
@@ -353,18 +361,21 @@ 
 	$debugObject->debugLog(1, 'Innertext of tag: ' . $this->tag . $text);
 }
 
-if ($this->tag === 'root')
+if ($this->tag === 'root') {
 	return $this->innertext();
+}
 
 // trigger callback
 if ($this->dom && $this->dom->callback !== null) {
 	call_user_func_array($this->dom->callback, array($this));
 }
 
-if (isset($this->_[HDOM_INFO_OUTER]))
+if (isset($this->_[HDOM_INFO_OUTER])) {
 	return $this->_[HDOM_INFO_OUTER];
-if (isset($this->_[HDOM_INFO_TEXT]))
+}
+if (isset($this->_[HDOM_INFO_TEXT])) {
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+}
 
 // render begin tag
 if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) {
@@ -388,25 +399,29 @@ 
 }
 
 // render end tag
-if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
+if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) {
 	$ret .= '</' . $this->tag . '>';
+}
 return $ret;
 }
 
 // get dom node's plain text
 function text()
 {
-if (isset($this->_[HDOM_INFO_INNER]))
+if (isset($this->_[HDOM_INFO_INNER])) {
 	return $this->_[HDOM_INFO_INNER];
+}
 switch ($this->nodetype) {
 	case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
 	case HDOM_TYPE_COMMENT: return '';
 	case HDOM_TYPE_UNKNOWN: return '';
 }
-if (strcasecmp($this->tag, 'script') === 0)
+if (strcasecmp($this->tag, 'script') === 0) {
 	return '';
-if (strcasecmp($this->tag, 'style') === 0)
+}
+if (strcasecmp($this->tag, 'style') === 0) {
 	return '';
+}
 
 $ret = '';
 // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -437,8 +452,9 @@ 
 function makeup()
 {
 // text, comment, unknown
-if (isset($this->_[HDOM_INFO_TEXT]))
+if (isset($this->_[HDOM_INFO_TEXT])) {
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+}
 
 $ret = '<' . $this->tag;
 $i = -1;
@@ -447,14 +463,15 @@ 
 	++$i;
 
 	// skip removed attribute
-	if ($val === null || $val === false)
-		continue;
+	if ($val === null || $val === false) {
+			continue;
+	}
 
 	$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 	//no value attr: nowrap, checked selected...
-	if ($val === true)
-		$ret .= $key;
-	else {
+	if ($val === true) {
+			$ret .= $key;
+	} else {
 		switch ($this->_[HDOM_INFO_QUOTE][$i]) {
 			case HDOM_QUOTE_DOUBLE: $quote = '"';
 				break;
@@ -474,18 +491,21 @@ 
 function find($selector, $idx = null, $lowercase = false)
 {
 $selectors = $this->parse_selector($selector);
-if (($count = count($selectors)) === 0)
+if (($count = count($selectors)) === 0) {
 	return [];
+}
 $found_keys = [];
 
 // find each selector
 for ($c = 0; $c < $count; ++$c) {
 	// The change on the below line was documented on the sourceforge code tracker id 2788009
 	// used to be: if (($levle=count($selectors[0]))===0) return [];
-	if (($levle = count($selectors[$c])) === 0)
-		return [];
-	if (!isset($this->_[HDOM_INFO_BEGIN]))
-		return [];
+	if (($levle = count($selectors[$c])) === 0) {
+			return [];
+	}
+	if (!isset($this->_[HDOM_INFO_BEGIN])) {
+			return [];
+	}
 
 	$head = array($this->_[HDOM_INFO_BEGIN] => 1);
 
@@ -501,8 +521,9 @@ 
 	}
 
 	foreach ($head as $k => $v) {
-		if (!isset($found_keys[$k]))
-			$found_keys[$k] = 1;
+		if (!isset($found_keys[$k])) {
+					$found_keys[$k] = 1;
+		}
 	}
 }
 
@@ -510,14 +531,16 @@ 
 ksort($found_keys);
 
 $found = [];
-foreach ($found_keys as $k => $v)
+foreach ($found_keys as $k => $v) {
 	$found[] = $this->dom->nodes[$k];
+}
 
 // return nth-element or array
-if (is_null($idx))
+if (is_null($idx)) {
 	return $found;
-else if ($idx < 0)
+} else if ($idx < 0) {
 	$idx = count($found) + $idx;
+}
 return (isset($found[$idx])) ? $found[$idx] : null;
 }
 
@@ -562,8 +585,9 @@ 
 	$pass = true;
 
 	if ($tag === '*' && !$key) {
-		if (in_array($node, $this->children, true))
-			$ret[$i] = 1;
+		if (in_array($node, $this->children, true)) {
+					$ret[$i] = 1;
+		}
 		continue;
 	}
 
@@ -574,11 +598,13 @@ 
 	// compare key
 	if ($pass && $key) {
 		if ($no_key) {
-			if (isset($node->attr[$key]))
-				$pass = false;
+			if (isset($node->attr[$key])) {
+							$pass = false;
+			}
 		} else {
-			if (($key != "plaintext") && !isset($node->attr[$key]))
-				$pass = false;
+			if (($key != "plaintext") && !isset($node->attr[$key])) {
+							$pass = false;
+			}
 		}
 	}
 	// compare value
@@ -614,16 +640,19 @@ 
 					} else {
 						$check = $this->match($exp, $val, $k);
 					}
-					if ($check)
-						break;
+					if ($check) {
+											break;
+					}
 				}
 			}
 		}
-		if (!$check)
-			$pass = false;
+		if (!$check) {
+					$pass = false;
+		}
+	}
+	if ($pass) {
+			$ret[$i] = 1;
 	}
-	if ($pass)
-		$ret[$i] = 1;
 	unset($node);
 }
 // It's passed by reference so this is actually what this function returns.
@@ -683,11 +712,13 @@ 
 
 foreach ($matches as $m) {
 	$m[0] = trim($m[0]);
-	if ($m[0] === '' || $m[0] === '/' || $m[0] === '//')
-		continue;
+	if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') {
+			continue;
+	}
 	// for browser generated xpath
-	if ($m[1] === 'tbody')
-		continue;
+	if ($m[1] === 'tbody') {
+			continue;
+	}
 
 	list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
 	if (!empty($m[2])) {
@@ -725,8 +756,9 @@ 
 		$result = [];
 	}
 }
-if (count($result) > 0)
+if (count($result) > 0) {
 	$selectors[] = $result;
+}
 return $selectors;
 }
 
@@ -749,8 +781,9 @@ 
 switch ($name) {
 	case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
 	case 'innertext':
-		if (isset($this->_[HDOM_INFO_TEXT]))
-			return $this->_[HDOM_INFO_TEXT] = $value;
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+					return $this->_[HDOM_INFO_TEXT] = $value;
+		}
 		return $this->_[HDOM_INFO_INNER] = $value;
 }
 if (!isset($this->attr[$name])) {
@@ -773,9 +806,10 @@ 
 
 function __unset($name)
 {
-if (isset($this->attr[$name]))
+if (isset($this->attr[$name])) {
 	unset($this->attr[$name]);
 }
+}
 
 // PaperG - Function to convert the text from one character set to another if the two sets are not the same.
 function convert_text($text)
@@ -835,27 +869,30 @@ 
 for ($i = 0; $i < $len; $i++) {
 	$c = ord($str[$i]);
 	if ($c > 128) {
-		if (($c >= 254))
-			return false;
-		elseif ($c >= 252)
-			$bits = 6;
-		elseif ($c >= 248)
-			$bits = 5;
-		elseif ($c >= 240)
-			$bits = 4;
-		elseif ($c >= 224)
-			$bits = 3;
-		elseif ($c >= 192)
-			$bits = 2;
-		else
-			return false;
-		if (($i + $bits) > $len)
-			return false;
+		if (($c >= 254)) {
+					return false;
+		} elseif ($c >= 252) {
+					$bits = 6;
+		} elseif ($c >= 248) {
+					$bits = 5;
+		} elseif ($c >= 240) {
+					$bits = 4;
+		} elseif ($c >= 224) {
+					$bits = 3;
+		} elseif ($c >= 192) {
+					$bits = 2;
+		} else {
+					return false;
+		}
+		if (($i + $bits) > $len) {
+					return false;
+		}
 		while ($bits > 1) {
 			$i++;
 			$b = ord($str[$i]);
-			if ($b < 128 || $b > 191)
-				return false;
+			if ($b < 128 || $b > 191) {
+							return false;
+			}
 			$bits--;
 		}
 	}
@@ -1175,8 +1212,9 @@ 
 function save($filepath = '')
 {
 $ret = $this->root->innertext();
-if ($filepath !== '')
+if ($filepath !== '') {
 	file_put_contents($filepath, $ret, LOCK_EX);
+}
 return $ret;
 }
 
@@ -1195,9 +1233,10 @@ 
 	$n = null;
 }
 // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-if (isset($this->children))
+if (isset($this->children)) {
 	foreach ($this->children as $n) {
 		$n->clear();
+}
 		$n = null;
 	}
 if (isset($this->parent)) {
@@ -1249,9 +1288,10 @@ 
 $this->root->_[HDOM_INFO_BEGIN] = -1;
 $this->root->nodetype = HDOM_TYPE_ROOT;
 $this->parent = $this->root;
-if ($this->size > 0)
+if ($this->size > 0) {
 	$this->char = $this->doc[0];
 }
+}
 
 // parse html content
 protected function parse()
@@ -1360,8 +1400,9 @@ 
 	$tag = $this->copy_until_char('>');
 
 	// skip attributes in end tag
-	if (($pos = strpos($tag, ' ')) !== false)
-		$tag = substr($tag, 0, $pos);
+	if (($pos = strpos($tag, ' ')) !== false) {
+			$tag = substr($tag, 0, $pos);
+	}
 
 	$parent_lower = strtolower($this->parent->tag);
 	$tag_lower = strtolower($tag);
@@ -1371,23 +1412,25 @@ 
 			$this->parent->_[HDOM_INFO_END] = 0;
 			$org_parent = $this->parent;
 
-			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
-				$this->parent = $this->parent->parent;
+			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) {
+							$this->parent = $this->parent->parent;
+			}
 
 			if (strtolower($this->parent->tag) !== $tag_lower) {
 				$this->parent = $org_parent; // restore origonal parent
-				if ($this->parent->parent)
-					$this->parent = $this->parent->parent;
+				if ($this->parent->parent) {
+									$this->parent = $this->parent->parent;
+				}
 				$this->parent->_[HDOM_INFO_END] = $this->cursor;
 				return $this->as_text_node($tag);
 			}
-		}
-		else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
+		} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
 			$this->parent->_[HDOM_INFO_END] = 0;
 			$org_parent = $this->parent;
 
-			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
-				$this->parent = $this->parent->parent;
+			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) {
+							$this->parent = $this->parent->parent;
+			}
 
 			if (strtolower($this->parent->tag) !== $tag_lower) {
 				$this->parent = $org_parent; // restore origonal parent
@@ -1397,13 +1440,15 @@ 
 		} else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower) {
 			$this->parent->_[HDOM_INFO_END] = 0;
 			$this->parent = $this->parent->parent;
-		} else
-			return $this->as_text_node($tag);
+		} else {
+					return $this->as_text_node($tag);
+		}
 	}
 
 	$this->parent->_[HDOM_INFO_END] = $this->cursor;
-	if ($this->parent->parent)
-		$this->parent = $this->parent->parent;
+	if ($this->parent->parent) {
+			$this->parent = $this->parent->parent;
+	}
 
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1426,8 +1471,9 @@ 
 		$node->nodetype = HDOM_TYPE_UNKNOWN;
 		$node->tag = 'unknown';
 	}
-	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+	if ($this->char === '>') {
+			$node->_[HDOM_INFO_TEXT].='>';
+	}
 	$this->link_nodes($node, true);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1449,8 +1495,9 @@ 
 		return true;
 	}
 
-	if ($this->char === '>')
-		$node->_[HDOM_INFO_TEXT].='>';
+	if ($this->char === '>') {
+			$node->_[HDOM_INFO_TEXT].='>';
+	}
 	$this->link_nodes($node, false);
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	return true;
@@ -1511,8 +1558,9 @@ 
 	if ($name !== '/' && $name !== '') {
 		$space[1] = $this->copy_skip($this->token_blank);
 		$name = $this->restore_noise($name);
-		if ($this->lowercase)
-			$name = strtolower($name);
+		if ($this->lowercase) {
+					$name = strtolower($name);
+		}
 		if ($this->char === '=') {
 			$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			$this->parse_attr($node, $name, $space);
@@ -1520,14 +1568,17 @@ 
 			//no value attr: nowrap, checked selected...
 			$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 			$node->attr[$name] = true;
-			if ($this->char != '>')
-				$this->char = $this->doc[--$this->pos]; // prev
+			if ($this->char != '>') {
+							$this->char = $this->doc[--$this->pos];
+			}
+			// prev
 		}
 		$node->_[HDOM_INFO_SPACE][] = $space;
 		$space = array($this->copy_skip($this->token_blank), '', '');
-	} else
-		break;
-} while ($this->char !== '>' && $this->char !== '/');
+	} else {
+			break;
+	}
+	} while ($this->char !== '>' && $this->char !== '/');
 
 $this->link_nodes($node, true);
 $node->_[HDOM_INFO_ENDSPACE] = $space[0];
@@ -1538,9 +1589,10 @@ 
 	$node->_[HDOM_INFO_END] = 0;
 } else {
 	// reset parent
-	if (!isset($this->self_closing_tags[strtolower($node->tag)]))
-		$this->parent = $node;
-}
+	if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+			$this->parent = $node;
+	}
+	}
 $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 // If it's a BR tag, we need to set it's text to the default text.
 // This way when we see it in plaintext, we can generate formatting that the user wants.
@@ -1621,8 +1673,9 @@ 
 $len = strspn($this->doc, $chars, $pos);
 $this->pos += $len;
 $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-if ($len === 0)
+if ($len === 0) {
 	return '';
+}
 return substr($this->doc, $pos, $len);
 }
 
@@ -1637,8 +1690,9 @@ 
 
 protected function copy_until_char($char)
 {
-if ($this->char === null)
+if ($this->char === null) {
 	return '';
+}
 
 if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
 	$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
@@ -1647,8 +1701,9 @@ 
 	return $ret;
 }
 
-if ($pos === $this->pos)
+if ($pos === $this->pos) {
 	return '';
+}
 $pos_old = $this->pos;
 $this->char = $this->doc[$pos];
 $this->pos = $pos;
@@ -1657,8 +1712,9 @@ 
 
 protected function copy_until_char_escape($char)
 {
-if ($this->char === null)
+if ($this->char === null) {
 	return '';
+}
 
 $start = $this->pos;
 while (1) {
@@ -1669,8 +1725,9 @@ 
 		return $ret;
 	}
 
-	if ($pos === $this->pos)
-		return '';
+	if ($pos === $this->pos) {
+			return '';
+	}
 
 	if ($this->doc[$pos - 1] === '\\') {
 		$start = $pos + 1;

include/utils/ListViewUtils.php

Doc Comments +5 added lines

@@ -378,6 +378,11 @@
  * Returns an string value
  */
 
+/**
+ * @param string $url_qry
+ * @param string $module
+ * @param string $related_module
+ */
 function getRelatedTableHeaderNavigation($navigation_array, $url_qry, $module, $related_module, $recordid)
 {
 	$log = LoggerManager::getInstance();

Spacing +5 added lines, -5 removed lines

@@ -194,15 +194,15 @@ 
 
 			//added to fix #5135
 			if (AppRequest::get('from_homepage') == 'upcoming_activities' || AppRequest::get('from_homepage') == 'pending_activities') {
-				$query.=' LEFT OUTER JOIN vtiger_recurringevents ON vtiger_recurringevents.activityid=vtiger_activity.activityid';
+				$query .= ' LEFT OUTER JOIN vtiger_recurringevents ON vtiger_recurringevents.activityid=vtiger_activity.activityid';
 			}
 			//end
 			$instance = CRMEntity::getInstance($module);
-			$query.=" WHERE vtiger_crmentity.deleted = 0 && activitytype != 'Emails' ";
+			$query .= " WHERE vtiger_crmentity.deleted = 0 && activitytype != 'Emails' ";
 			$securityParameter = $instance->getUserAccessConditionsQuerySR($module, $current_user);
 			if ($securityParameter != '')
-				$query.= $securityParameter;
-			$query.= ' ' . $where;
+				$query .= $securityParameter;
+			$query .= ' ' . $where;
 			break;
 		Case "Emails":
 			$query = "SELECT DISTINCT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
@@ -616,7 +616,7 @@ 
 	$chars = preg_split('/(&[^;\s]+;)|/', $str, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE);
 	$html_length = count($chars);
 	// check if we can predict the return value and save some processing time
-	if (($html_length === 0) || ( $start >= $html_length) || ( isset($length) && ( $length <= -$html_length)))
+	if (($html_length === 0) || ($start >= $html_length) || (isset($length) && ($length <= -$html_length)))
 		return "";
 
 	//calculate start position

Braces +52 added lines, -39 removed lines

@@ -200,8 +200,9 @@ 
 			$instance = CRMEntity::getInstance($module);
 			$query.=" WHERE vtiger_crmentity.deleted = 0 && activitytype != 'Emails' ";
 			$securityParameter = $instance->getUserAccessConditionsQuerySR($module, $current_user);
-			if ($securityParameter != '')
-				$query.= $securityParameter;
+			if ($securityParameter != '') {
+							$query.= $securityParameter;
+			}
 			$query.= ' ' . $where;
 			break;
 		Case "Emails":
@@ -355,18 +356,21 @@ 
 			$start = $_SESSION['rlvs'][$module][$related]['start'];
 		}
 	}
-	if (AppRequest::has('viewname') && AppRequest::get('viewname') != '')
-		$lv_array['viewname'] = AppRequest::get('viewname');
+	if (AppRequest::has('viewname') && AppRequest::get('viewname') != '') {
+			$lv_array['viewname'] = AppRequest::get('viewname');
+	}
 
-	if ($related == '')
-		$_SESSION['lvs'][AppRequest::get('module')] = $lv_array;
-	else
-		$_SESSION['rlvs'][$module][$related] = $lv_array;
+	if ($related == '') {
+			$_SESSION['lvs'][AppRequest::get('module')] = $lv_array;
+	} else {
+			$_SESSION['rlvs'][$module][$related] = $lv_array;
+	}
 
 	if ($start < ceil($noofrows / $max_ent) && $start != '') {
 		$start = ceil($noofrows / $max_ent);
-		if ($related == '')
-			$_SESSION['lvs'][$currentModule]['start'] = $start;
+		if ($related == '') {
+					$_SESSION['lvs'][$currentModule]['start'] = $start;
+		}
 	}
 }
 /* * Function to get the table headers for related listview
@@ -389,8 +393,9 @@ 
 
 	$relatedListResult = $adb->pquery('SELECT * FROM vtiger_relatedlists WHERE tabid=? AND
 		related_tabid=?', array($tabid, $relatedTabId));
-	if (empty($relatedListResult))
-		return;
+	if (empty($relatedListResult)) {
+			return;
+	}
 	$relatedListRow = $adb->fetchByAssoc($relatedListResult);
 	$header = $relatedListRow['label'];
 	$actions = $relatedListRow['actions'];
@@ -439,11 +444,12 @@ 
 	}
 	$output .= '</td>';
 	$log->debug("Exiting getTableHeaderNavigation method ...");
-	if ($navigation_array['first'] == '')
-		return;
-	else
-		return $output;
-}
+	if ($navigation_array['first'] == '') {
+			return;
+	} else {
+			return $output;
+	}
+	}
 /* Function to get the Entity Id of a given Entity Name */
 
 function getEntityId($module, $entityName)
@@ -473,23 +479,26 @@ 
 			$entityId = $adb->query_result($result, 0, $entityidfield);
 		}
 	}
-	if (!empty($entityId))
-		return $entityId;
-	else
-		return 0;
-}
+	if (!empty($entityId)) {
+			return $entityId;
+	} else {
+			return 0;
+	}
+	}
 
 function decode_html($str)
 {
 	$defaultCharset = AppConfig::main('default_charset');
-	if (empty($default_charset))
-		$defaultCharset = 'UTF-8';
+	if (empty($default_charset)) {
+			$defaultCharset = 'UTF-8';
+	}
 	// Direct Popup action or Ajax Popup action should be treated the same.
-	if (AppRequest::get('action') == 'Popup' || (AppRequest::has('action') && AppRequest::get('file') == 'Popup'))
-		return html_entity_decode($str);
-	else
-		return html_entity_decode($str, ENT_QUOTES, $defaultCharset);
-}
+	if (AppRequest::get('action') == 'Popup' || (AppRequest::has('action') && AppRequest::get('file') == 'Popup')) {
+			return html_entity_decode($str);
+	} else {
+			return html_entity_decode($str, ENT_QUOTES, $defaultCharset);
+	}
+	}
 
 function popup_decode_html($str)
 {
@@ -602,22 +611,25 @@ 
 
 function html_substr($str, $start, $length = NULL)
 {
-	if ($length === 0)
-		return "";
+	if ($length === 0) {
+			return "";
+	}
 	//check if we can simply use the built-in functions
 	if (strpos($str, '&') === false) { //No entities. Use built-in functions
-		if ($length === NULL)
-			return substr($str, $start);
-		else
-			return substr($str, $start, $length);
+		if ($length === NULL) {
+					return substr($str, $start);
+		} else {
+					return substr($str, $start, $length);
+		}
 	}
 
 	// create our array of characters and html entities
 	$chars = preg_split('/(&[^;\s]+;)|/', $str, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE);
 	$html_length = count($chars);
 	// check if we can predict the return value and save some processing time
-	if (($html_length === 0) || ( $start >= $html_length) || ( isset($length) && ( $length <= -$html_length)))
-		return "";
+	if (($html_length === 0) || ( $start >= $html_length) || ( isset($length) && ( $length <= -$html_length))) {
+			return "";
+	}
 
 	//calculate start position
 	if ($start >= 0) {
@@ -626,9 +638,10 @@ 
 		$start = max($start, -$html_length);
 		$real_start = $chars[$html_length + $start][1];
 	}
-	if (!isset($length)) // no $length argument passed, return all remaining characters
+	if (!isset($length)) {
+		// no $length argument passed, return all remaining characters
 		return substr($str, $real_start);
-	else if ($length > 0) { // copy $length chars
+	} else if ($length > 0) { // copy $length chars
 		if ($start + $length >= $html_length) { // return all remaining characters
 			return substr($str, $real_start);
 		} else { //return $length characters

include/utils/VtlibUtils.php

Doc Comments +6 added lines, -1 removed lines

@@ -18,6 +18,9 @@ 
 	$__cache_vtiger_imagepath = [];
 }
 
+/**
+ * @param string $imagename
+ */
 function vtiger_imageurl($imagename, $themename)
 {
 	global $__cache_vtiger_imagepath;
@@ -200,6 +203,9 @@ 
 	}
 }
 
+/**
+ * @param string $varname
+ */
 function __vtlib_get_modulevar_value($module, $varname)
 {
 	$mod_var_mapping = Array(
@@ -497,7 +503,6 @@ 
 /**
  * Purify (Cleanup) malicious snippets of code from the input
  *
- * @param String $value
  * @param Boolean $ignore Skip cleaning of the input
  * @return String
  */

Braces +26 added lines, -18 removed lines

@@ -156,10 +156,11 @@ 
 	$old_dieOnError = $adb->dieOnError;
 	$adb->dieOnError = false;
 
-	if ($enable_disable === true)
-		$enable_disable = 1;
-	else if ($enable_disable === false)
-		$enable_disable = 0;
+	if ($enable_disable === true) {
+			$enable_disable = 1;
+	} else if ($enable_disable === false) {
+			$enable_disable = 0;
+	}
 
 	$adb->pquery('UPDATE vtiger_language set active = ? WHERE prefix = ?', Array($enable_disable, $langprefix));
 
@@ -195,8 +196,9 @@ 
 
 	$checkfor = Array('table_name', 'table_index', 'related_tables', 'popup_fields', 'IsCustomModule');
 	foreach ($checkfor as $check) {
-		if (!isset($focus->$check))
-			$focus->$check = __vtlib_get_modulevar_value($module, $check);
+		if (!isset($focus->$check)) {
+					$focus->$check = __vtlib_get_modulevar_value($module, $check);
+		}
 	}
 }
 
@@ -356,8 +358,9 @@ 
 function vtlib_tosingular($text)
 {
 	$lastpos = strripos($text, 's');
-	if ($lastpos == strlen($text) - 1)
-		return substr($text, 0, -1);
+	if ($lastpos == strlen($text) - 1) {
+			return substr($text, 0, -1);
+	}
 	return $text;
 }
 
@@ -377,8 +380,9 @@ 
 	$roleresCount = $adb->num_rows($roleres);
 	$allroles = [];
 	if ($roleresCount) {
-		for ($index = 0; $index < $roleresCount; ++$index)
-			$allroles[] = $adb->query_result($roleres, $index, 'roleid');
+		for ($index = 0; $index < $roleresCount; ++$index) {
+					$allroles[] = $adb->query_result($roleres, $index, 'roleid');
+		}
 	}
 	sort($allroles);
 
@@ -401,8 +405,9 @@ 
 	foreach ($picklistval_roles as $picklistval => $pickvalroles) {
 		sort($pickvalroles);
 		$diff = array_diff($pickvalroles, $allroles);
-		if (empty($diff))
-			$allrolevalues[] = $picklistval;
+		if (empty($diff)) {
+					$allrolevalues[] = $picklistval;
+		}
 	}
 
 	$log->debug('Exiting ' . __METHOD__ . ' method ...');
@@ -479,8 +484,9 @@ 
 			$tmpfile = 'vtiger' . time() . '-' . rand(1, 1000) . '.tmp';
 			// Continue the loop unless we find a name that does not exists already.
 			$usefilename = "$dirpath/$tmpfile";
-			if (!file_exists($usefilename))
-				break;
+			if (!file_exists($usefilename)) {
+							break;
+			}
 		} while (true);
 		$fh = @fopen($usefilename, 'a');
 		if ($fh) {
@@ -522,8 +528,9 @@ 
 	if (!$ignore) {
 		// Initialize the instance if it has not yet done
 		if ($__htmlpurifier_instance == false) {
-			if (empty($use_charset))
-				$use_charset = 'UTF-8';
+			if (empty($use_charset)) {
+							$use_charset = 'UTF-8';
+			}
 
 			include_once ('libraries/htmlpurifier/library/HTMLPurifier.auto.php');
 
@@ -590,8 +597,9 @@ 
 	if (!$ignore) {
 		// Initialize the instance if it has not yet done
 		if ($htmlPurifierForHtml == false) {
-			if (empty($use_charset))
-				$use_charset = 'UTF-8';
+			if (empty($use_charset)) {
+							$use_charset = 'UTF-8';
+			}
 
 			include_once ('libraries/htmlpurifier/library/HTMLPurifier.auto.php');
 

include/Webservices/DataTransform.php

Doc Comments +3 added lines

@@ -48,6 +48,9 @@
 		return $row;
 	}
 
+	/**
+	 * @param boolean $t
+	 */
 	public static function sanitizeData($newRow, $meta, $t = null)
 	{
 

Braces +6 added lines, -4 removed lines

@@ -24,8 +24,9 @@ 
 		$fieldColumnMapping = $meta->getFieldColumnMapping();
 		$columnFieldMapping = array_flip($fieldColumnMapping);
 		foreach ($row as $col => $val) {
-			if (array_key_exists($col, $columnFieldMapping))
-				$newRow[$columnFieldMapping[$col]] = $val;
+			if (array_key_exists($col, $columnFieldMapping)) {
+							$newRow[$columnFieldMapping[$col]] = $val;
+			}
 		}
 		$newRow = DataTransform::sanitizeData($newRow, $meta, true);
 		return $newRow;
@@ -149,8 +150,9 @@ 
 		$allFields = $meta->getFieldColumnMapping();
 		$newRow = [];
 		foreach ($allFields as $field => $col) {
-			if (isset($row[$field]))
-				$newRow[$field] = $row[$field];
+			if (isset($row[$field])) {
+							$newRow[$field] = $row[$field];
+			}
 		}
 		if (isset($row[$recordString])) {
 			$newRow[$recordString] = $row[$recordString];