YetiForceCompany / YetiForceCRM

include/CRMEntity.php

Doc Comments +9 added lines, -3 removed lines

@@ -374,6 +374,11 @@ 
 	}
 
 	// Function which returns the value based on result type (array / ADODB ResultSet)
+
+	/**
+	 * @param integer $index
+	 * @param string $columnname
+	 */
 	private function resolve_query_result_value($result, $index, $columnname)
 	{
 		$adb = PearDatabase::getInstance();
@@ -633,7 +638,7 @@ 
 	}
 
 	/** Function to delete a record in the specifed table
-	 * @param $table_name -- table name:: Type varchar
+	 * @param string $table_name -- table name:: Type varchar
 	 * The function will delete a record .The id is obtained from the class variable $this->id and the columnname got from $this->tab_name_index[$table_name]
 	 */
 	public function deleteRelation($table_name)
@@ -817,6 +822,7 @@ 
 
 	/** Function to saves the values in all the tables mentioned in the class variable $tab_name for the specified module
 	 * @param $module -- module:: Type varchar
+	 * @param string $module_name
 	 */
 	public function save($module_name, $fileid = '')
 	{
@@ -2562,10 +2568,10 @@ 
 
 	/**
 	 *
-	 * @param <type> $module
-	 * @param <type> $user
+	 * @param Users $user
 	 * @param <type> $parentRole
 	 * @param <type> $userGroups
+	 * @param string $tableName
 	 */
 	protected function setupTemporaryTable($tableName, $tabId, $user, $parentRole, $userGroups)
 	{

Spacing +4 added lines, -4 removed lines

@@ -1970,7 +1970,7 @@ 
 					$matrix->addDependency($tab_name, $crmentityRelModuleFieldTable);
 
 					if ($queryPlanner->requireTable($crmentityRelModuleFieldTable, $matrix)) {
-						$relquery.= " left join vtiger_crmentity as $crmentityRelModuleFieldTable on $crmentityRelModuleFieldTable.crmid = $tab_name.$field_name and vtiger_crmentityRel$module$field_id.deleted=0";
+						$relquery .= " left join vtiger_crmentity as $crmentityRelModuleFieldTable on $crmentityRelModuleFieldTable.crmid = $tab_name.$field_name and vtiger_crmentityRel$module$field_id.deleted=0";
 					}
 
 					for ($j = 0; $j < $adb->num_rows($ui10_modules_query); $j++) {
@@ -1984,7 +1984,7 @@ 
 						$rel_tab_name_rel_module_table_alias = $rel_tab_name . "Rel$module$field_id";
 
 						if ($queryPlanner->requireTable($rel_tab_name_rel_module_table_alias)) {
-							$relquery.= " left join $rel_tab_name as $rel_tab_name_rel_module_table_alias  on $rel_tab_name_rel_module_table_alias.$rel_tab_index = $crmentityRelModuleFieldTable.crmid";
+							$relquery .= " left join $rel_tab_name as $rel_tab_name_rel_module_table_alias  on $rel_tab_name_rel_module_table_alias.$rel_tab_index = $crmentityRelModuleFieldTable.crmid";
 						}
 					}
 				}
@@ -2376,7 +2376,7 @@ 
 		$entitycolumnnames = $entityfields['fieldname'];
 		$query = "select crmid as id, $querycolumnnames, $entitycolumnnames as name ";
 		$query .= " FROM $this->table_name ";
-		$query .=" INNER JOIN vtiger_crmentity ON $this->table_name.$this->table_index = vtiger_crmentity.crmid && deleted = 0 ";
+		$query .= " INNER JOIN vtiger_crmentity ON $this->table_name.$this->table_index = vtiger_crmentity.crmid && deleted = 0 ";
 
 		//remove the base table
 		$LookupTable = array_unique($lookuptables);
@@ -2391,7 +2391,7 @@ 
 						on $this->table_name.$this->table_index = $tablename." . $this->tab_name_index[$tablename];
 		}
 		if (!empty($lookupcolumns) && $value !== false) {
-			$query .=" WHERE ";
+			$query .= " WHERE ";
 			$i = 0;
 			$columnCount = count($lookupcolumns);
 			foreach ($lookupcolumns as $columnname) {

Braces +157 added lines, -114 removed lines

@@ -169,8 +169,9 @@ 
 
 		//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;
+		}
 
 		if (isset($file_details['original_name']) && $file_details['original_name'] != null) {
 			$file_name = $file_details['original_name'];
@@ -338,16 +339,18 @@ 
 			} else {
 				$this->id = $this->newRecord;
 			}
-			if (empty($current_user->id))
-				$current_user->id = 0;
+			if (empty($current_user->id)) {
+							$current_user->id = 0;
+			}
 
 			// Customization
 			$created_date_var = $adb->formatDate($date_var, true);
 			$modified_date_var = $adb->formatDate($date_var, true);
 			// Preserve the timestamp
 			if (self::isBulkSaveMode()) {
-				if (!empty($this->column_fields['createdtime']))
-					$created_date_var = $adb->formatDate($this->column_fields['createdtime'], true);
+				if (!empty($this->column_fields['createdtime'])) {
+									$created_date_var = $adb->formatDate($this->column_fields['createdtime'], true);
+				}
 				//NOTE : modifiedtime ignored to support vtws_sync API track changes.
 			}
 			// END
@@ -377,10 +380,11 @@ 
 	private function resolve_query_result_value($result, $index, $columnname)
 	{
 		$adb = PearDatabase::getInstance();
-		if (is_array($result))
-			return $result[$index][$columnname];
-		else
-			return $adb->query_result($result, $index, $columnname);
+		if (is_array($result)) {
+					return $result[$index][$columnname];
+		} else {
+					return $adb->query_result($result, $index, $columnname);
+		}
 	}
 
 	/** Function to insert values in the specifed table for the specified module
@@ -600,10 +604,10 @@ 
 				} else {
 					$fldvalue = $this->column_fields[$fieldname];
 				}
-				if ($uitype != 33 && $uitype != 8)
-					$fldvalue = \vtlib\Functions::fromHTML($fldvalue, ($insertion_mode == 'edit') ? true : false);
-			}
-			else {
+				if ($uitype != 33 && $uitype != 8) {
+									$fldvalue = \vtlib\Functions::fromHTML($fldvalue, ($insertion_mode == 'edit') ? true : false);
+				}
+			} else {
 				$fldvalue = '';
 			}
 
@@ -661,8 +665,9 @@ 
 		$query1 = "select * from vtiger_seattachmentsrel where crmid=?";
 		$result = $adb->pquery($query1, array($notesid));
 		$noofrows = $adb->num_rows($result);
-		if ($noofrows != 0)
-			$attachmentid = $adb->query_result($result, 0, 'attachmentsid');
+		if ($noofrows != 0) {
+					$attachmentid = $adb->query_result($result, 0, 'attachmentsid');
+		}
 		if ($attachmentid != '') {
 			$query2 = "select * from vtiger_attachments where attachmentsid=?";
 			$filename = $adb->query_result($adb->pquery($query2, array($attachmentid)), 0, 'name');
@@ -713,10 +718,11 @@ 
 		// Lookup module field cache
 		if ($module == 'Calendar' || $module == 'Events') {
 			getColumnFields('Calendar');
-			if (VTCacheUtils::lookupFieldInfo_Module('Events'))
-				$cachedEventsFields = VTCacheUtils::lookupFieldInfo_Module('Events');
-			else
-				$cachedEventsFields = [];
+			if (VTCacheUtils::lookupFieldInfo_Module('Events')) {
+							$cachedEventsFields = VTCacheUtils::lookupFieldInfo_Module('Events');
+			} else {
+							$cachedEventsFields = [];
+			}
 			$cachedCalendarFields = VTCacheUtils::lookupFieldInfo_Module('Calendar');
 			$cachedModuleFields = array_merge($cachedEventsFields, $cachedCalendarFields);
 			$module = 'Calendar';
@@ -861,10 +867,11 @@ 
 			while ($row = $this->db->fetchByAssoc($result)) {
 				$rowid = $row[$this->table_index];
 
-				if (isset($rowid))
-					$this->retrieve_entity_info($rowid, $this->module_name);
-				else
-					$this->db->println("rowid not set unable to retrieve");
+				if (isset($rowid)) {
+									$this->retrieve_entity_info($rowid, $this->module_name);
+				} else {
+									$this->db->println("rowid not set unable to retrieve");
+				}
 
 
 
@@ -877,10 +884,11 @@ 
 			}
 		}
 
-		if (isset($list))
-			return $list;
-		else
-			return null;
+		if (isset($list)) {
+					return $list;
+		} else {
+					return null;
+		}
 	}
 
 	/** This function should be overridden in each module.  It marks an item as deleted.
@@ -1050,19 +1058,22 @@ 
 		require_once('include/utils/UserInfoUtil.php');
 		foreach ($this->column_fields as $fieldname => $fieldvalue) {
 			$reset_value = false;
-			if (getFieldVisibilityPermission($moduleName, $current_user->id, $fieldname) != '0')
-				$reset_value = true;
+			if (getFieldVisibilityPermission($moduleName, $current_user->id, $fieldname) != '0') {
+							$reset_value = true;
+			}
 
-			if ($fieldname == "record_id" || $fieldname == "record_module")
-				$reset_value = false;
+			if ($fieldname == "record_id" || $fieldname == "record_module") {
+							$reset_value = false;
+			}
 
 			/*
 			  if (isset($this->additional_column_fields) && in_array($fieldname, $this->additional_column_fields) == true)
 			  $reset_value = false;
 			 */
 
-			if ($reset_value == true)
-				$this->column_fields[$fieldname] = "";
+			if ($reset_value == true) {
+							$this->column_fields[$fieldname] = "";
+			}
 		}
 	}
 
@@ -1108,8 +1119,9 @@ 
 		}
 
 		foreach ($colf as $key => $value) {
-			if (getFieldVisibilityPermission($module, $current_user->id, $key, 'readwrite') == '0')
-				$this->importable_fields[$key] = $value;
+			if (getFieldVisibilityPermission($module, $current_user->id, $key, 'readwrite') == '0') {
+							$this->importable_fields[$key] = $value;
+			}
 		}
 	}
 
@@ -1359,13 +1371,15 @@ 
 		$num_rows = $adb->num_rows($result);
 		for ($i = 0; $i < $num_rows; $i++) {
 			$columnname = $adb->query_result($result, $i, 'columnname');
-			if (in_array($columnname, $this->sortby_fields))
-				continue;
-			else
-				$this->sortby_fields[] = $columnname;
+			if (in_array($columnname, $this->sortby_fields)) {
+							continue;
+			} else {
+							$this->sortby_fields[] = $columnname;
+			}
+		}
+		if ($tabid == 21 || $tabid == 22) {
+					$this->sortby_fields[] = 'crmid';
 		}
-		if ($tabid == 21 || $tabid == 22)
-			$this->sortby_fields[] = 'crmid';
 		$log->debug("Exiting initSortByField");
 	}
 	/* Function to check if the mod number already exits */
@@ -1375,10 +1389,11 @@ 
 		$adb = PearDatabase::getInstance();
 		$result = $adb->pquery(sprintf("SELECT %s FROM *s WHERE %s = ?", $adb->sql_escape_string($column), $adb->sql_escape_string($table), $adb->sql_escape_string($column)), [$no]);
 		$num_rows = $adb->num_rows($result);
-		if ($num_rows > 0)
-			return true;
-		else
-			return false;
+		if ($num_rows > 0) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	// END
@@ -1391,8 +1406,9 @@ 
 
 		vtlib_setup_modulevars($module, $this);
 		$tabid = \includes\Modules::getModuleId($module);
-		if (!\includes\fields\RecordNumber::isModuleSequenceConfigured($tabid))
-			return;
+		if (!\includes\fields\RecordNumber::isModuleSequenceConfigured($tabid)) {
+					return;
+		}
 		$fieldinfo = $adb->pquery("SELECT * FROM vtiger_field WHERE tabid = ? && uitype = 4", Array($tabid));
 
 		$returninfo = [];
@@ -1449,8 +1465,9 @@ 
 		$singular_modname = vtlib_toSingular($related_module);
 		$button = '';
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \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;";
 			}
@@ -1463,10 +1480,11 @@ 
 		}
 
 		// To make the edit or del link actions to return back to same view.
-		if ($singlepane_view == 'true')
-			$returnset = "&return_module=$this_module&return_action=DetailView&return_id=$id";
-		else
-			$returnset = "&return_module=$this_module&return_action=CallRelatedList&return_id=$id";
+		if ($singlepane_view == 'true') {
+					$returnset = "&return_module=$this_module&return_action=DetailView&return_id=$id";
+		} else {
+					$returnset = "&return_module=$this_module&return_action=CallRelatedList&return_id=$id";
+		}
 
 		$userNameSql = \vtlib\Deprecated::getSqlForNameInDisplayFormat(array('first_name' => 'vtiger_users.first_name',
 				'last_name' => 'vtiger_users.last_name'), 'Users');
@@ -1488,8 +1506,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 		return $return_value;
 	}
@@ -1521,8 +1540,9 @@ 
 				return true;
 			} else if ($lastviewed && $modifiedon) {
 				/** Lastviewed and Modified time is available. */
-				if ($this->__timediff($modifiedon, $lastviewed) > 0)
-					return true;
+				if ($this->__timediff($modifiedon, $lastviewed) > 0) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -1542,8 +1562,9 @@ 
 
 		$t2 = mktime($t2_h, $t2_i, $t2_s, $t2_m, $t2_d, $t2_y);
 
-		if ($t1 == $t2)
-			return 0;
+		if ($t1 == $t2) {
+					return 0;
+		}
 		return $t2 - $t1;
 	}
 
@@ -1563,8 +1584,9 @@ 
 	 */
 	public function save_related_module($module, $crmid, $withModule, $withCrmid, $relatedName = false)
 	{
-		if (!is_array($withCrmid))
-			$withCrmid = [$withCrmid];
+		if (!is_array($withCrmid)) {
+					$withCrmid = [$withCrmid];
+		}
 		switch ($relatedName) {
 			case 'get_many_to_many':
 				$this->saveRelatedM2M($module, $crmid, $withModule, $withCrmid);
@@ -1585,8 +1607,9 @@ 
 		foreach ($withCrmid as $relcrmid) {
 			$check = $db->pquery(sprintf('SELECT 1 FROM `%s` WHERE %s = ? && %s = ?', $referenceInfo['table'], $referenceInfo['base'], $referenceInfo['rel']), [$relcrmid, $crmid]);
 			// Relation already exists? No need to add again
-			if ($check && $db->getRowCount($check))
-				continue;
+			if ($check && $db->getRowCount($check)) {
+							continue;
+			}
 			$db->insert($referenceInfo['table'], [
 				$referenceInfo['base'] => $relcrmid,
 				$referenceInfo['rel'] => $crmid
@@ -1602,8 +1625,9 @@ 
 			if ($withModule == 'Documents') {
 				$checkpresence = $db->pquery('SELECT crmid FROM vtiger_senotesrel WHERE crmid = ? && notesid = ?', [$crmid, $relcrmid]);
 				// Relation already exists? No need to add again
-				if ($checkpresence && $db->getRowCount($checkpresence))
-					continue;
+				if ($checkpresence && $db->getRowCount($checkpresence)) {
+									continue;
+				}
 
 				$db->insert('vtiger_senotesrel', [
 					'crmid' => $crmid,
@@ -1613,8 +1637,9 @@ 
 				$checkpresence = $db->pquery('SELECT crmid FROM vtiger_crmentityrel WHERE crmid = ? && module = ? && relcrmid = ? && relmodule = ?', [$crmid, $module, $relcrmid, $withModule]
 				);
 				// Relation already exists? No need to add again
-				if ($checkpresence && $db->getRowCount($checkpresence))
-					continue;
+				if ($checkpresence && $db->getRowCount($checkpresence)) {
+									continue;
+				}
 
 				$db->insert('vtiger_crmentityrel', [
 					'crmid' => $crmid,
@@ -1638,8 +1663,9 @@ 
 	public function delete_related_module($module, $crmid, $withModule, $withCrmid)
 	{
 		$db = PearDatabase::getInstance();
-		if (!is_array($withCrmid))
-			$withCrmid = Array($withCrmid);
+		if (!is_array($withCrmid)) {
+					$withCrmid = Array($withCrmid);
+		}
 		foreach ($withCrmid as $relcrmid) {
 
 			if ($withModule == 'Documents') {
@@ -1673,8 +1699,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=$current_module&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\"" .
@@ -1689,10 +1716,11 @@ 
 		}
 
 		// To make the edit or del link actions to return back to same view.
-		if ($singlepane_view == 'true')
-			$returnset = "&return_module=$current_module&return_action=DetailView&return_id=$id";
-		else
-			$returnset = "&return_module=$current_module&return_action=CallRelatedList&return_id=$id";
+		if ($singlepane_view == 'true') {
+					$returnset = "&return_module=$current_module&return_action=DetailView&return_id=$id";
+		} else {
+					$returnset = "&return_module=$current_module&return_action=CallRelatedList&return_id=$id";
+		}
 
 		$query = "SELECT vtiger_crmentity.*, $other->table_name.*";
 
@@ -1706,10 +1734,12 @@ 
 				$query .= ", $tname.*";
 
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$more_relation .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -1723,8 +1753,9 @@ 
 		$query .= " WHERE vtiger_crmentity.deleted = 0 && (vtiger_crmentityrel.crmid = $id || vtiger_crmentityrel.relcrmid = $id)";
 		$return_value = GetRelatedList($current_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		return $return_value;
@@ -1757,10 +1788,11 @@ 
 		$row = [];
 
 		// To make the edit or del link actions to return back to same view.
-		if ($singlepane_view == 'true')
-			$returnset = "&return_module=$currentModule&return_action=DetailView&return_id=$id";
-		else
-			$returnset = "&return_module=$currentModule&return_action=CallRelatedList&return_id=$id";
+		if ($singlepane_view == 'true') {
+					$returnset = "&return_module=$currentModule&return_action=DetailView&return_id=$id";
+		} else {
+					$returnset = "&return_module=$currentModule&return_action=CallRelatedList&return_id=$id";
+		}
 
 		$return_value = null;
 
@@ -1791,8 +1823,9 @@ 
 			$button .= '<input type="hidden" name="' . $dependentColumn . '" id="' . $dependentColumn . '" value="' . $id . '">';
 			$button .= '<input type="hidden" name="' . $dependentColumn . '_type" id="' . $dependentColumn . '_type" value="' . $currentModule . '">';
 			if ($actions) {
-				if (is_string($actions))
-					$actions = explode(',', strtoupper($actions));
+				if (is_string($actions)) {
+									$actions = explode(',', strtoupper($actions));
+				}
 				if (in_array('ADD', $actions) && isPermitted($relatedModule, 1, '') == 'yes' && getFieldVisibilityPermission($relatedModule, $current_user->id, $dependentField, 'readwrite') == '0') {
 					$button .= "<input title='" . \includes\Language::translate('LBL_ADD_NEW') . " " . \includes\Language::translate($singular_modname, $relatedModule) . "' class='crmbutton small create'" .
 						" onclick='this.form.action.value=\"EditView\";this.form.module.value=\"$relatedModule\"' type='submit' name='button'" .
@@ -1802,8 +1835,9 @@ 
 			$query = $this->createDependentQuery($other, $row, $id);
 			$return_value = GetRelatedList($currentModule, $relatedModule, $other, $query, $button, $returnset);
 		}
-		if ($return_value == null)
-			$return_value = [];
+		if ($return_value == null) {
+					$return_value = [];
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		return $return_value;
@@ -1831,10 +1865,12 @@ 
 					continue;
 				}
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$join .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -2351,8 +2387,9 @@ 
 	{
 		$adb = PearDatabase::getInstance();
 
-		if (!is_array($uitypes))
-			$uitypes = array($uitypes);
+		if (!is_array($uitypes)) {
+					$uitypes = array($uitypes);
+		}
 		$module = get_class($this);
 
 		$cachedModuleFields = VTCacheUtils::lookupFieldInfo_Module($module);
@@ -2396,10 +2433,11 @@ 
 			$columnCount = count($lookupcolumns);
 			foreach ($lookupcolumns as $columnname) {
 				if (!empty($columnname)) {
-					if ($i == 0 || $i == ($columnCount))
-						$query .= sprintf("%s = '%s'", $columnname, $value);
-					else
-						$query .= sprintf(" || %s = '%s'", $columnname, $value);
+					if ($i == 0 || $i == ($columnCount)) {
+											$query .= sprintf("%s = '%s'", $columnname, $value);
+					} else {
+											$query .= sprintf(" || %s = '%s'", $columnname, $value);
+					}
 					$i++;
 				}
 			}
@@ -2456,8 +2494,9 @@ 
 
 	public function getUserAccessConditionsQuerySR($module, $currentUser = false, $relatedRecord = false)
 	{
-		if ($currentUser == false)
-			$currentUser = vglobal('current_user');
+		if ($currentUser == false) {
+					$currentUser = vglobal('current_user');
+		}
 
 		$userid = $currentUser->id;
 		$userPrivileges = \Vtiger_Util_Helper::getUserPrivilegesFile($userid);
@@ -2683,10 +2722,11 @@ 
 		$log = LoggerManager::getInstance();
 		$currentModule = vglobal('currentModule');
 		$log->debug("Entering getSortOrder() method ...");
-		if (AppRequest::has('sorder'))
-			$sorder = $this->db->sql_escape_string(AppRequest::getForSql('sorder'));
-		else
-			$sorder = (($_SESSION[$currentModule . '_Sort_Order'] != '') ? ($_SESSION[$currentModule . '_Sort_Order']) : ($this->default_sort_order));
+		if (AppRequest::has('sorder')) {
+					$sorder = $this->db->sql_escape_string(AppRequest::getForSql('sorder'));
+		} else {
+					$sorder = (($_SESSION[$currentModule . '_Sort_Order'] != '') ? ($_SESSION[$currentModule . '_Sort_Order']) : ($this->default_sort_order));
+		}
 		$log->debug("Exiting getSortOrder() method ...");
 		return $sorder;
 	}
@@ -2706,10 +2746,11 @@ 
 			$use_default_order_by = $this->default_order_by;
 		}
 
-		if (AppRequest::has('order_by'))
-			$order_by = $this->db->sql_escape_string(AppRequest::getForSql('order_by'));
-		else
-			$order_by = (($_SESSION[$currentModule . '_Order_By'] != '') ? ($_SESSION[$currentModule . '_Order_By']) : ($use_default_order_by));
+		if (AppRequest::has('order_by')) {
+					$order_by = $this->db->sql_escape_string(AppRequest::getForSql('order_by'));
+		} else {
+					$order_by = (($_SESSION[$currentModule . '_Order_By'] != '') ? ($_SESSION[$currentModule . '_Order_By']) : ($use_default_order_by));
+		}
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}
@@ -2749,8 +2790,9 @@ 
 		$selectClause = sprintf('SELECT %s.%s AS recordid,%s%s', $this->table_name, $this->table_index, $tableColumnsString, $additionalColumns);
 
 		// Select Custom Field Table Columns if present
-		if (isset($this->customFieldTable))
-			$query .= ", " . $this->customFieldTable[0] . ".* ";
+		if (isset($this->customFieldTable)) {
+					$query .= ", " . $this->customFieldTable[0] . ".* ";
+		}
 
 		$fromClause = " FROM $this->table_name";
 
@@ -2794,8 +2836,9 @@ 
 		foreach ($tableColumns as $tableColumn) {
 			$tableInfo = explode('.', $tableColumn);
 			$duplicateCheckClause .= " ifnull($tableColumn,'null') = ifnull(temp.$tableInfo[1],'null')";
-			if (count($tableColumns) != $i++)
-				$duplicateCheckClause .= ' && ';
+			if (count($tableColumns) != $i++) {
+							$duplicateCheckClause .= ' && ';
+			}
 		}
 
 		$query = $selectClause . $fromClause .

include/database/PearDatabase.php

Doc Comments +34 added lines

@@ -127,6 +127,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public static function getDBConfig($type)
 	{
 		if (!self::$dbConfig) {
@@ -139,6 +142,14 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $dbtype
+	 * @param string $host
+	 * @param string $dbname
+	 * @param string $username
+	 * @param string $passwd
+	 * @param integer $port
+	 */
 	protected function loadDBConfig($dbtype, $host, $dbname, $username, $passwd, $port)
 	{
 		if ($host == '_SERVER_') {
@@ -232,6 +243,9 @@ 
 		$this->dieOnError = $value;
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function setAttribute($attribute, $value)
 	{
 		$this->database->setAttribute($attribute, $value);
@@ -298,6 +312,10 @@ 
 	}
 
 	//TODO DEPRECATED recommended to use getRow
+
+	/**
+	 * @return string
+	 */
 	public function fetch_array(&$result)
 	{
 		return $result->fetch(PDO::FETCH_ASSOC);
@@ -498,6 +516,10 @@ 
 	}
 
 	//TODO DEPRECATED
+
+	/**
+	 * @param integer $row
+	 */
 	public function query_result(&$result, $row, $col = 0)
 	{
 		return to_html($this->query_result_raw($result, $row, $col));
@@ -674,6 +696,9 @@ 
 		return $id;
 	}
 
+	/**
+	 * @param string $tableName
+	 */
 	public function checkExistTable($tableName, $cache = true)
 	{
 		$tablePresent = Vtiger_Cache::get('checkExistTable', $tableName);
@@ -702,6 +727,9 @@ 
 		return $lastInsertID;
 	}
 
+	/**
+	 * @param string $datetime
+	 */
 	public function formatDate($datetime, $strip_quotes = false)
 	{
 		/* remove single quotes to use the date as parameter for Prepared statement */
@@ -792,6 +820,9 @@ 
 		return ' ( ' . $l . ' ) ';
 	}
 
+	/**
+	 * @param PDOStatement $result
+	 */
 	public function getAffectedRowCount(&$result)
 	{
 		$rows = $result->rowCount();
@@ -861,6 +892,9 @@ 
 	protected $logSqlTimeID = false;
 	protected $logSqlTimeGroup = 1;
 
+	/**
+	 * @param double $endat
+	 */
 	public function logSqlTime($startat, $endat, $sql, $params = false)
 	{
 		if (!AppConfig::performance('SQL_LOG_INCLUDE_CALLER')) {

Braces +33 added lines, -22 removed lines

@@ -464,8 +464,9 @@ 
 			$this->checkError('Missing table name');
 			return false;
 		}
-		if ($where != '')
-			$where = sprintf('WHERE %s', $where);
+		if ($where != '') {
+					$where = sprintf('WHERE %s', $where);
+		}
 		if (count($params) === 0) {
 			$this->query(sprintf('DELETE FROM %s %s', $table, $where));
 		} else {
@@ -558,10 +559,12 @@ 
 	//TODO DEPRECATED
 	public function flatten_array($input, $output = null)
 	{
-		if ($input == null)
-			return null;
-		if ($output == null)
-			$output = [];
+		if ($input == null) {
+					return null;
+		}
+		if ($output == null) {
+					$output = [];
+		}
 		foreach ($input as $value) {
 			if (is_array($value)) {
 				$output = $this->flatten_array($value, $output);
@@ -634,15 +637,17 @@ 
 	{
 		if (isset($result) && $rowNum < 0) {
 			$row = $this->getRow($result);
-			if ($encode && is_array($row))
-				return array_map('to_html', $row);
+			if ($encode && is_array($row)) {
+							return array_map('to_html', $row);
+			}
 			return $row;
 		}
 		if ($this->getRowCount($result) > $rowNum) {
 			$row = $this->raw_query_result_rowdata($result, $rowNum);
 		}
-		if ($encode && is_array($row))
-			return array_map('to_html', $row);
+		if ($encode && is_array($row)) {
+					return array_map('to_html', $row);
+		}
 		return $row;
 	}
 
@@ -787,8 +792,9 @@ 
 			$this->log('sqlExprDatalist: empty arrays not allowed', 'error');
 			$this->checkError('sqlExprDatalist: empty arrays not allowed');
 		}
-		foreach ($array as $key => $val)
-			$l .= ($l ? ',' : '') . $this->quote($val);
+		foreach ($array as $key => $val) {
+					$l .= ($l ? ',' : '') . $this->quote($val);
+		}
 		return ' ( ' . $l . ' ) ';
 	}
 
@@ -803,8 +809,9 @@ 
 	{
 		$result = $this->query($sql, $dieOnError, $msg);
 
-		if ($this->getRowCount($result) == 1)
-			return $result;
+		if ($this->getRowCount($result) == 1) {
+					return $result;
+		}
 		$this->log('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, 'error');
 		$this->checkError('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, $dieOnError);
 		return '';
@@ -816,8 +823,9 @@ 
 	{
 		$result = $this->pquery($sql, $params, $dieOnError, $msg);
 
-		if ($this->getRowCount($result) == 1)
-			return $result;
+		if ($this->getRowCount($result) == 1) {
+					return $result;
+		}
 		$this->log('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, 'error');
 		$this->checkError('Rows Returned:' . $this->getRowCount($result) . ' More than 1 row returned for ' . $sql, $dieOnError);
 		return '';
@@ -881,8 +889,9 @@ 
 			if (isset($_SERVER['REQUEST_METHOD'])) {
 				$uri = $_SERVER['REQUEST_URI'];
 				$qmarkIndex = strpos($_SERVER['REQUEST_URI'], '?');
-				if ($qmarkIndex !== false)
-					$uri = substr($uri, 0, $qmarkIndex);
+				if ($qmarkIndex !== false) {
+									$uri = substr($uri, 0, $qmarkIndex);
+				}
 				$data = $uri . '?' . http_build_query($_SERVER['REQUEST_METHOD'] == 'GET' ? $_GET : $_POST);
 			}
 			$stmt = $db->database->prepare($logQuery);
@@ -917,10 +926,12 @@ 
 					}
 					$args = rtrim($args, ',');
 				}
-				if (!empty($callerfunc))
-					$callerfunc = " ($callerfunc)";
-				if (!empty($args))
-					$callerfunc .= "[$args] ";
+				if (!empty($callerfunc)) {
+									$callerfunc = " ($callerfunc)";
+				}
+				if (!empty($args)) {
+									$callerfunc .= "[$args] ";
+				}
 			}
 			$data[] = 'CALLER: (' . $callers[$calleridx]['line'] . ') ' . $callers[$calleridx]['file'] . $callerfunc;
 		}

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/main/WebUI.php

Doc Comments +9 added lines

@@ -54,6 +54,9 @@ 
 		return $user;
 	}
 
+	/**
+	 * @param Vtiger_Request $request
+	 */
 	protected function triggerCheckPermission($handler, $request)
 	{
 		$moduleName = $request->getModule();
@@ -73,6 +76,9 @@ 
 		throw new \Exception\NoPermitted('LBL_NOT_ACCESSIBLE');
 	}
 
+	/**
+	 * @param Vtiger_Request $request
+	 */
 	protected function triggerPreProcess($handler, $request)
 	{
 		if ($request->isAjax()) {
@@ -82,6 +88,9 @@ 
 		$handler->preProcess($request);
 	}
 
+	/**
+	 * @param Vtiger_Request $request
+	 */
 	protected function triggerPostProcess($handler, $request)
 	{
 		if ($request->isAjax()) {

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/recaptcha/recaptchalib.php

Doc Comments +6 added lines

@@ -206,6 +206,9 @@ 
 }
 /* Mailhide related code */
 
+/**
+ * @param string $ky
+ */
 function _recaptcha_aes_encrypt($val, $ky)
 {
 	if (!function_exists("mcrypt_encrypt")) {
@@ -217,6 +220,9 @@ 
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
+/**
+ * @param null|string $x
+ */
 function _recaptcha_mailhide_urlbase64($x)
 {
 	return strtr(base64_encode($x), '+/', '-_');

Indentation -1 removed lines

@@ -98,7 +98,6 @@
  * @param string $pubkey A public key for reCAPTCHA
  * @param string $error The error given by reCAPTCHA (optional, default is null)
  * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
  * @return string - The HTML to be embedded in the user's form.
  */
 function recaptcha_get_html($pubkey, $error = null, $use_ssl = false)

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	$http_request .= $req;
 
 	$response = '';
-	if (false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) )) {
+	if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
 		die('Could not open socket');
 	}
 

Braces +7 added lines, -4 removed lines

@@ -47,8 +47,9 @@ 
 function _recaptcha_qsencode($data)
 {
 	$req = "";
-	foreach ($data as $key => $value)
-		$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+	foreach ($data as $key => $value) {
+			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+	}
 
 	// Cut the last '&'
 	$req = substr($req, 0, strlen($req) - 1);
@@ -83,8 +84,10 @@ 
 
 	fwrite($fs, $http_request);
 
-	while (!feof($fs))
-		$response .= fgets($fs, 1160); // One TCP-IP packet
+	while (!feof($fs)) {
+			$response .= fgets($fs, 1160);
+	}
+	// One TCP-IP packet
 	fclose($fs);
 	$response = explode("\r\n\r\n", $response, 2);
 

include/RelatedListView.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 
 /** 	Function to display the Products which are related to the PriceBook
  * 	@param string $query - query to get the list of products which are related to the current PriceBook
- * 	@param object $focus - PriceBook object which contains all the information of the current PriceBook
+ * 	@param PriceBooks $focus - PriceBook object which contains all the information of the current PriceBook
  * 	@param string $returnset - return_module, return_action and return_id which are sequenced with & to pass to the URL which is optional
  * 	return array $return_data which will be formed like array('header'=>$header,'entries'=>$entries_list) where as $header contains all the header columns and $entries_list will contain all the Product entries
  */

Braces +26 added lines, -18 removed lines

@@ -115,22 +115,26 @@ 
 
 	$limit_start_rec = ($start - 1) * $listMaxEntriesPerPage;
 
-	if ($adb->isPostgres())
-		$list_result = $adb->pquery($query .
+	if ($adb->isPostgres()) {
+			$list_result = $adb->pquery($query .
 			" OFFSET $limit_start_rec LIMIT $listMaxEntriesPerPage ", []);
-	else
-		$list_result = $adb->pquery($query .
+	} else {
+			$list_result = $adb->pquery($query .
 			" LIMIT $limit_start_rec, $listMaxEntriesPerPage ", []);
+	}
 
 	$header = [];
 	$header[] = $mod_strings['LBL_LIST_PRODUCT_NAME'];
-	if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0')
-		$header[] = $mod_strings['LBL_PRODUCT_CODE'];
-	if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0')
-		$header[] = $mod_strings['LBL_PRODUCT_UNIT_PRICE'];
+	if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0') {
+			$header[] = $mod_strings['LBL_PRODUCT_CODE'];
+	}
+	if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0') {
+			$header[] = $mod_strings['LBL_PRODUCT_UNIT_PRICE'];
+	}
 	$header[] = $mod_strings['LBL_PB_LIST_PRICE'];
-	if (isPermitted("PriceBooks", "EditView", "") == 'yes' || isPermitted("PriceBooks", "Delete", "") == 'yes')
-		$header[] = $mod_strings['LBL_ACTION'];
+	if (isPermitted("PriceBooks", "EditView", "") == 'yes' || isPermitted("PriceBooks", "Delete", "") == 'yes') {
+			$header[] = $mod_strings['LBL_ACTION'];
+	}
 
 	$currency_id = $focus->column_fields['currency_id'];
 	$numRows = $adb->num_rows($list_result);
@@ -146,10 +150,12 @@ 
 
 		$entries = [];
 		$entries[] = textlength_check($adb->query_result($list_result, $i, "productname"));
-		if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0')
-			$entries[] = $adb->query_result($list_result, $i, "productcode");
-		if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0')
-			$entries[] = CurrencyField::convertToUserFormat($unit_price, null, true);
+		if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0') {
+					$entries[] = $adb->query_result($list_result, $i, "productcode");
+		}
+		if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0') {
+					$entries[] = CurrencyField::convertToUserFormat($unit_price, null, true);
+		}
 
 		$entries[] = CurrencyField::convertToUserFormat($listprice, null, true);
 		$action = "";
@@ -159,12 +165,14 @@ 
 			$action .= '<img src="' . vtiger_imageurl('blank.gif', $theme) . '" border="0" />';
 		}
 		if (isPermitted("PriceBooks", "Delete", "") == 'yes' && isPermitted('Products', 'Delete', $entity_id) == 'yes') {
-			if ($action != "")
-				$action .= '&nbsp;|&nbsp;';
+			if ($action != "") {
+							$action .= '&nbsp;|&nbsp;';
+			}
 			$action .= '<img src="' . vtiger_imageurl('delete.gif', $theme) . '" onclick="if(confirm(\'' . \includes\Language::translate('ARE_YOU_SURE') . '\')) deletePriceBookProductRel(' . $entity_id . ',' . $pricebook_id . ');" alt="' . \includes\Language::translate('LBL_DELETE') . '" title="' . \includes\Language::translate('LBL_DELETE') . '" style="cursor:pointer;" border="0">';
 		}
-		if ($action != "")
-			$entries[] = $action;
+		if ($action != "") {
+					$entries[] = $action;
+		}
 		$entries_list[] = $entries;
 	}
 	$navigationOutput[] = getRecordRangeMessage($list_result, $limit_start_rec, $noofrows);