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
@@ -597,10 +601,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 = '';
 			}
 
@@ -658,8 +662,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');
@@ -710,10 +715,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';
@@ -858,10 +864,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");
+				}
 
 
 
@@ -874,10 +881,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.
@@ -1047,19 +1055,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] = "";
+			}
 		}
 	}
 
@@ -1105,8 +1116,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;
+			}
 		}
 	}
 
@@ -1356,13 +1368,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 */
@@ -1372,10 +1386,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
@@ -1388,8 +1403,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 = [];
@@ -1443,8 +1459,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;";
 			}
@@ -1457,10 +1474,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');
@@ -1482,8 +1500,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;
 	}
@@ -1515,8 +1534,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;
@@ -1536,8 +1556,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;
 	}
 
@@ -1557,8 +1578,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);
@@ -1579,8 +1601,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
@@ -1596,8 +1619,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,
@@ -1607,8 +1631,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,
@@ -1632,8 +1657,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') {
@@ -1667,8 +1693,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');\"" .
@@ -1683,10 +1710,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.*";
 
@@ -1700,10 +1728,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]";
 			}
 		}
@@ -1717,8 +1747,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;
@@ -1751,10 +1782,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;
 
@@ -1785,8 +1817,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'" .
@@ -1796,8 +1829,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;
@@ -1825,10 +1859,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]";
 			}
 		}
@@ -2353,8 +2389,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);
@@ -2398,10 +2435,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++;
 				}
 			}
@@ -2458,8 +2496,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);
@@ -2685,10 +2724,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;
 	}
@@ -2708,10 +2748,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;
 	}
@@ -2751,8 +2792,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";
 
@@ -2796,8 +2838,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/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);

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;