YetiForceCompany / YetiForceCRM

modules/Services/Services.php

Braces +53 added lines, -38 removed lines

@@ -233,8 +233,9 @@ 
 		$query = "SELECT vtiger_crmentity.*, $this->table_name.*";
 
 		// Select Custom Field Table Columns if present
-		if (!empty($this->customFieldTable))
-			$query .= ", " . $this->customFieldTable[0] . ".* ";
+		if (!empty($this->customFieldTable)) {
+					$query .= ", " . $this->customFieldTable[0] . ".* ";
+		}
 
 		$query .= " FROM $this->table_name";
 
@@ -327,10 +328,11 @@ 
 		$query .= $this->getNonAdminAccessControlQuery('Services', $current_user);
 		$where_auto = " vtiger_crmentity.deleted=0";
 
-		if ($where != '')
-			$query .= " WHERE ($where) && $where_auto";
-		else
-			$query .= " WHERE $where_auto";
+		if ($where != '') {
+					$query .= " WHERE ($where) && $where_auto";
+		} else {
+					$query .= " WHERE $where_auto";
+		}
 
 		return $query;
 	}
@@ -351,8 +353,9 @@ 
 		$select_clause = sprintf("SELECT %s.%s AS recordid, vtiger_users_last_import.deleted,%s", $this->table_name, $this->table_index, $table_cols);
 
 		// Select Custom Field Table Columns if present
-		if (isset($this->customFieldTable))
-			$query .= ", " . $this->customFieldTable[0] . ".* ";
+		if (isset($this->customFieldTable)) {
+					$query .= ", " . $this->customFieldTable[0] . ".* ";
+		}
 
 		$from_clause = " FROM $this->table_name";
 
@@ -426,15 +429,17 @@ 
 		$focus = new $related_module();
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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";
+		}
 
 		$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, 1, '') == 'yes' && isPermitted($currentModule, 'EditView', $id) == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_ADD_TO') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small create'" .
 					" onclick='this.form.action.value=\"AddServiceToPriceBooks\";this.form.module.value=\"$currentModule\"' type='submit' name='button'" .
@@ -458,8 +463,9 @@ 
 
 		$return_value = GetRelatedList($currentModule, $related_module, $focus, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_service_pricebooks method ...");
@@ -517,20 +523,23 @@ 
 
 		$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", array());
-		else
-			$list_result = $adb->pquery($query .
+		} else {
+					$list_result = $adb->pquery($query .
 				" LIMIT $limit_start_rec, $listMaxEntriesPerPage", array());
+		}
 
 		$header = array();
 		$header[] = $current_module_strings['LBL_LIST_SERVICE_NAME'];
-		if (getFieldVisibilityPermission('Services', $current_user->id, 'unit_price') == '0')
-			$header[] = $current_module_strings['LBL_SERVICE_UNIT_PRICE'];
+		if (getFieldVisibilityPermission('Services', $current_user->id, 'unit_price') == '0') {
+					$header[] = $current_module_strings['LBL_SERVICE_UNIT_PRICE'];
+		}
 		$header[] = $current_module_strings['LBL_PB_LIST_PRICE'];
-		if (isPermitted("PriceBooks", "EditView", "") == 'yes' || isPermitted("PriceBooks", "Delete", "") == 'yes')
-			$header[] = \includes\Language::translate('LBL_ACTION');
+		if (isPermitted("PriceBooks", "EditView", "") == 'yes' || isPermitted("PriceBooks", "Delete", "") == 'yes') {
+					$header[] = \includes\Language::translate('LBL_ACTION');
+		}
 
 		$currency_id = $focus->column_fields['currency_id'];
 		$numRows = $adb->num_rows($list_result);
@@ -546,8 +555,9 @@ 
 
 			$entries = Array();
 			$entries[] = textlength_check($adb->query_result($list_result, $i, "servicename"));
-			if (getFieldVisibilityPermission('Services', $current_user->id, 'unit_price') == '0')
-				$entries[] = CurrencyField::convertToUserFormat($unit_price, null, true);
+			if (getFieldVisibilityPermission('Services', $current_user->id, 'unit_price') == '0') {
+							$entries[] = CurrencyField::convertToUserFormat($unit_price, null, true);
+			}
 
 			$entries[] = CurrencyField::convertToUserFormat($listprice, null, true);
 			$action = "";
@@ -557,12 +567,14 @@ 
 				$action .= '<img src="' . vtiger_imageurl('blank.gif', $theme) . '" border="0" />';
 			}
 			if (isPermitted("PriceBooks", "Delete", "") == 'yes' && isPermitted('Services', 'Delete', $entity_id) == 'yes') {
-				if ($action != "")
-					$action .= '&nbsp;|&nbsp;';
+				if ($action != "") {
+									$action .= '&nbsp;|&nbsp;';
+				}
 				$action .= '<img src="themes/images/delete.gif" 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);
@@ -834,16 +846,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$button = '';
 
 		if ($actions && $this->ismember_check() === 0) {
-			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;";
 			}
@@ -872,8 +886,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_products method ...");

modules/Documents/Documents.php

Braces +38 added lines, -28 removed lines

@@ -67,8 +67,9 @@ 
 		$log = LoggerManager::getInstance();
 		$adb = PearDatabase::getInstance();
 		$insertion_mode = $this->mode;
-		if (isset($this->parentid) && $this->parentid != '')
-			$relid = $this->parentid;
+		if (isset($this->parentid) && $this->parentid != '') {
+					$relid = $this->parentid;
+		}
 		//inserting into vtiger_senotesrel
 		if (isset($relid) && $relid != '') {
 			$this->insertintonotesrel($relid, $this->id);
@@ -172,10 +173,11 @@ 
 	{
 		$log = LoggerManager::getInstance();
 		$log->debug('Entering getSortOrder() method ...');
-		if (AppRequest::has('sorder'))
-			$sorder = $this->db->sql_escape_string(AppRequest::get('sorder'));
-		else
-			$sorder = (($_SESSION['NOTES_SORT_ORDER'] != '') ? ($_SESSION['NOTES_SORT_ORDER']) : ($this->default_sort_order));
+		if (AppRequest::has('sorder')) {
+					$sorder = $this->db->sql_escape_string(AppRequest::get('sorder'));
+		} else {
+					$sorder = (($_SESSION['NOTES_SORT_ORDER'] != '') ? ($_SESSION['NOTES_SORT_ORDER']) : ($this->default_sort_order));
+		}
 		$log->debug('Exiting getSortOrder() method ...');
 		return $sorder;
 	}
@@ -193,10 +195,11 @@ 
 			$use_default_order_by = $this->default_order_by;
 		}
 
-		if (AppRequest::has('order_by'))
-			$order_by = $this->db->sql_escape_string(AppRequest::get('order_by'));
-		else
-			$order_by = (($_SESSION['NOTES_ORDER_BY'] != '') ? ($_SESSION['NOTES_ORDER_BY']) : ($use_default_order_by));
+		if (AppRequest::has('order_by')) {
+					$order_by = $this->db->sql_escape_string(AppRequest::get('order_by'));
+		} else {
+					$order_by = (($_SESSION['NOTES_ORDER_BY'] != '') ? ($_SESSION['NOTES_ORDER_BY']) : ($use_default_order_by));
+		}
 		$log->debug('Exiting getOrderBy method ...');
 		return $order_by;
 	}
@@ -266,10 +269,11 @@ 
 		;
 		$query .= getNonAdminAccessControlQuery('Documents', $current_user);
 		$where_auto = " vtiger_crmentity.deleted=0";
-		if ($where != "")
-			$query .= "  WHERE ($where) && " . $where_auto;
-		else
-			$query .= '  WHERE %s';
+		if ($where != "") {
+					$query .= "  WHERE ($where) && " . $where_auto;
+		} else {
+					$query .= '  WHERE %s';
+		}
 
 		$query = sprintf($query, $where_auto);
 		$log->debug("Exiting create_export_query method ...");
@@ -395,8 +399,9 @@ 
 	public function unlinkRelationship($id, $returnModule, $returnId, $relatedName = false)
 	{
 		$log = LoggerManager::getInstance();
-		if (empty($returnModule) || empty($returnId))
-			return;
+		if (empty($returnModule) || empty($returnId)) {
+					return;
+		}
 
 		if ($returnModule == 'Accounts') {
 			$sql = 'DELETE FROM vtiger_senotesrel WHERE notesid = ? && (crmid = ? || crmid IN (SELECT contactid FROM vtiger_contactdetails WHERE parentid=?))';
@@ -458,8 +463,9 @@ 
 	{
 		$adb = PearDatabase::getInstance();
 		$result = $adb->pquery("SELECT tree FROM `vtiger_trees_templates_data` WHERE tree = ?", array($folderid));
-		if (!empty($result) && $adb->num_rows($result) > 0)
-			return true;
+		if (!empty($result) && $adb->num_rows($result) > 0) {
+					return true;
+		}
 		return false;
 	}
 
@@ -510,10 +516,11 @@ 
 		vtlib_setup_modulevars($relatedModule, $other);
 
 		// To make the edit or del link actions to return back to same view.
-		if ($singlepane_view == 'true')
-			$returnset = "&return_module=$thisModule&return_action=DetailView&return_id=$id";
-		else
-			$returnset = "&return_module=$thisModule&return_action=CallRelatedList&return_id=$id";
+		if ($singlepane_view == 'true') {
+					$returnset = "&return_module=$thisModule&return_action=DetailView&return_id=$id";
+		} else {
+					$returnset = "&return_module=$thisModule&return_action=CallRelatedList&return_id=$id";
+		}
 
 		$joinTables = [];
 		$join = '';
@@ -533,10 +540,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]";
 			}
 		}
@@ -554,8 +563,9 @@ 
 
 		$query = sprintf($query, $other->table_name);
 		$returnValue = GetRelatedList($thisModule, $relatedModule, $other, $query, $button, $returnset);
-		if ($returnValue === null)
-			$returnValue = [];
+		if ($returnValue === null) {
+					$returnValue = [];
+		}
 		$returnValue['CUSTOM_BUTTON'] = $button;
 		return $returnValue;
 	}

modules/Products/Products.php

Braces +87 added lines, -64 removed lines

@@ -202,10 +202,11 @@ 
 		foreach ($_FILES as $fileindex => $files) {
 			$fileInstance = \includes\fields\File::loadFromRequest($files);
 			if ($fileInstance->validate('image')) {
-				if (AppRequest::get($fileindex . '_hidden') != '')
-					$files['original_name'] = AppRequest::get($fileindex . '_hidden');
-				else
-					$files['original_name'] = stripslashes($files['name']);
+				if (AppRequest::get($fileindex . '_hidden') != '') {
+									$files['original_name'] = AppRequest::get($fileindex . '_hidden');
+				} else {
+									$files['original_name'] = stripslashes($files['name']);
+				}
 				$files['original_name'] = str_replace('"', '', $files['original_name']);
 				$file_saved = $this->uploadAndSaveFile($id, $module, $files);
 			}
@@ -261,16 +262,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$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;";
 			}
@@ -295,8 +298,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_leads method ...");
@@ -322,16 +326,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$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;";
 			}
@@ -355,8 +361,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_accounts method ...");
@@ -382,16 +389,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$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;";
 			}
@@ -418,8 +427,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_contacts method ...");
@@ -445,16 +455,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$button = '';
 
 		if ($actions && getFieldVisibilityPermission($related_module, $current_user->id, 'product_id', 'readwrite') == '0') {
-			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;";
 			}
@@ -491,8 +503,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_tickets method ...");
@@ -517,8 +530,9 @@ 
 
 		$button = '';
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('ADD', $actions) && isPermitted($related_module, 1, '') == 'yes' && isPermitted($currentModule, 'EditView', $id) == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_ADD_TO') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small create'" .
 					" onclick='this.form.action.value=\"AddProductToPriceBooks\";this.form.module.value=\"$currentModule\"' type='submit' name='button'" .
@@ -526,10 +540,11 @@ 
 			}
 		}
 
-		if ($singlepane_view == 'true')
-			$returnset = '&return_module=Products&return_action=DetailView&return_id=' . $id;
-		else
-			$returnset = '&return_module=Products&return_action=CallRelatedList&return_id=' . $id;
+		if ($singlepane_view == 'true') {
+					$returnset = '&return_module=Products&return_action=DetailView&return_id=' . $id;
+		} else {
+					$returnset = '&return_module=Products&return_action=CallRelatedList&return_id=' . $id;
+		}
 
 
 		$query = sprintf('SELECT vtiger_crmentity.crmid,
@@ -548,8 +563,9 @@ 
 
 		$return_value = GetRelatedList($currentModule, $related_module, $focus, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		return $return_value;
@@ -594,16 +610,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$button = '';
 
 		if ($actions && $this->ismember_check() === 0) {
-			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;";
 			}
@@ -632,8 +650,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_products method ...");
@@ -658,10 +677,11 @@ 
 		if (isPermitted("Products", 1, "") == 'yes') {
 			$button .= '<input title="' . \includes\Language::translate('LBL_NEW_PRODUCT') . '" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Products\';this.form.return_module.value=\'Products\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="' . \includes\Language::translate('LBL_NEW_PRODUCT') . '">&nbsp;';
 		}
-		if ($singlepane_view == 'true')
-			$returnset = '&return_module=Products&return_action=DetailView&is_parent=1&return_id=' . $id;
-		else
-			$returnset = '&return_module=Products&return_action=CallRelatedList&is_parent=1&return_id=' . $id;
+		if ($singlepane_view == 'true') {
+					$returnset = '&return_module=Products&return_action=DetailView&is_parent=1&return_id=' . $id;
+		} else {
+					$returnset = '&return_module=Products&return_action=CallRelatedList&is_parent=1&return_id=' . $id;
+		}
 
 		$query = "SELECT vtiger_products.productid, vtiger_products.productname,
 			vtiger_products.productcode, vtiger_products.commissionrate,
@@ -707,10 +727,11 @@ 
 		$query .= $this->getNonAdminAccessControlQuery('Products', $current_user);
 		$where_auto = " vtiger_crmentity.deleted=0";
 
-		if ($where != '')
-			$query .= " WHERE ($where) && $where_auto";
-		else
-			$query .= " WHERE $where_auto";
+		if ($where != '') {
+					$query .= " WHERE ($where) && $where_auto";
+		} else {
+					$query .= " WHERE $where_auto";
+		}
 
 		$log->debug("Exiting create_export_query method ...");
 		return $query;
@@ -895,8 +916,9 @@ 
 	public function unlinkRelationship($id, $return_module, $return_id, $relatedName = false)
 	{
 		$log = vglobal('log');
-		if (empty($return_module) || empty($return_id))
-			return;
+		if (empty($return_module) || empty($return_id)) {
+					return;
+		}
 
 		if ($return_module == 'Leads' || $return_module == 'Contacts') {
 			$sql = 'DELETE FROM vtiger_seproductsrel WHERE productid = ? && crmid = ?';
@@ -918,8 +940,9 @@ 
 		$db = PearDatabase::getInstance();
 		$currentUser = Users_Record_Model::getCurrentUserModel();
 
-		if (!is_array($with_crmids))
-			$with_crmids = Array($with_crmids);
+		if (!is_array($with_crmids)) {
+					$with_crmids = Array($with_crmids);
+		}
 		foreach ($with_crmids as $with_crmid) {
 			if ($with_module == 'Leads' || $with_module == 'Accounts' ||
 				$with_module == 'Contacts' || $with_module == 'Products') {

modules/Vendors/Vendors.php

Braces +44 added lines, -32 removed lines

@@ -89,16 +89,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$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;";
 			}
@@ -124,8 +126,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_products method ...");
@@ -163,10 +166,11 @@ 
                                 ";
 		$where_auto = " vtiger_crmentity.deleted = 0 ";
 
-		if ($where != "")
-			$query .= sprintf("  WHERE (%s) && %s", $where, $where_auto);
-		else
-			$query .= sprintf("  WHERE %s", $where_auto);
+		if ($where != "") {
+					$query .= sprintf("  WHERE (%s) && %s", $where, $where_auto);
+		} else {
+					$query .= sprintf("  WHERE %s", $where_auto);
+		}
 
 		$log->debug("Exiting create_export_query method ...");
 		return $query;
@@ -192,16 +196,18 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$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;";
 			}
@@ -228,8 +234,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_contacts method ...");
@@ -255,18 +262,20 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$button = '';
 
 		$button .= '<input type="hidden" name="email_directing_module"><input type="hidden" name="record">';
 
 		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;";
 			}
@@ -287,8 +296,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_campaigns method ...");
@@ -451,8 +461,9 @@ 
 	public function save_related_module($module, $crmid, $with_module, $with_crmids, $relatedName = false)
 	{
 		$adb = PearDatabase::getInstance();
-		if (!is_array($with_crmids))
-			$with_crmids = [$with_crmids];
+		if (!is_array($with_crmids)) {
+					$with_crmids = [$with_crmids];
+		}
 		if (!in_array($with_module, ['Contacts', 'Products', 'Campaigns'])) {
 			parent::save_related_module($module, $crmid, $with_module, $with_crmids, $relatedName);
 		} else {
@@ -476,8 +487,9 @@ 
 	public function unlinkRelationship($id, $return_module, $return_id, $relatedName = false)
 	{
 		$log = vglobal('log');
-		if (empty($return_module) || empty($return_id))
-			return;
+		if (empty($return_module) || empty($return_id)) {
+					return;
+		}
 		if ($return_module == 'Campaigns') {
 			$this->db->delete('vtiger_campaign_records', 'crmid=? && campaignid=?', [$id, $return_id]);
 		} elseif ($return_module == 'Contacts') {

modules/Campaigns/Campaigns.php

Braces +23 added lines, -17 removed lines

@@ -99,10 +99,11 @@ 
 		vtlib_setup_modulevars($related_module, $other);
 		$singular_modname = vtlib_toSingular($related_module);
 
-		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;
+		}
 
 		$button = '';
 
@@ -124,8 +125,9 @@ 
 		$button .= '   &nbsp';
 
 		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;";
 			}
@@ -148,10 +150,12 @@ 
 			foreach ($other->related_tables as $tname => $relmap) {
 				$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];
+				}
 				$moreRelation .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -168,9 +172,9 @@ 
 		$query = sprintf($query, $id);
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
-		else if ($is_CampaignStatusAllowed) {
+		if ($return_value === null) {
+					$return_value = Array();
+		} else if ($is_CampaignStatusAllowed) {
 			$statusPos = count($return_value['header']) - 2; // Last column is for Actions, exclude that. Also the index starts from 0, so reduce one more count.
 			$return_value = $this->add_status_popup($return_value, $statusPos, $related_module);
 		}
@@ -279,8 +283,9 @@ 
 	public function unlinkRelationship($id, $returnModule, $returnId, $relatedName = false)
 	{
 		$log = vglobal('log');
-		if (empty($returnModule) || empty($returnId))
-			return;
+		if (empty($returnModule) || empty($returnId)) {
+					return;
+		}
 
 		if (in_array($returnModule, ['Leads', 'Vendors', 'Contacts', 'Partners', 'Competition'])) {
 			$this->db->delete('vtiger_campaign_records', 'campaignid=? && crmid=?', [$id, $returnId]);
@@ -297,8 +302,9 @@ 
 	{
 		$adb = PearDatabase::getInstance();
 
-		if (!is_array($withCrmids))
-			$withCrmids = [$withCrmids];
+		if (!is_array($withCrmids)) {
+					$withCrmids = [$withCrmids];
+		}
 		if (!in_array($withModule, ['Accounts', 'Leads', 'Vendors', 'Contacts', 'Partners', 'Competition'])) {
 			parent::save_related_module($module, $crmid, $withModule, $withCrmids, $relatedName);
 		} else {

modules/Emails/Emails.php

Braces +45 added lines, -32 removed lines

@@ -179,16 +179,18 @@ 
 		$filepart = $file_details['part'];
 		$transfer = $file_details['transfer'];
 		$file = imap_fetchbody($mail, $_REQUEST['mailid'], $filepart);
-		if ($transfer == 'BASE64')
-			$file = imap_base64($file);
-		elseif ($transfer == 'QUOTED-PRINTABLE')
-			$file = imap_qprint($file);
+		if ($transfer == 'BASE64') {
+					$file = imap_base64($file);
+		} elseif ($transfer == 'QUOTED-PRINTABLE') {
+					$file = imap_qprint($file);
+		}
 		$current_id = $adb->getUniqueID("vtiger_crmentity");
 		$date_var = date('Y-m-d H:i:s');
 		//to get the owner id
 		$ownerid = $this->column_fields['assigned_user_id'];
-		if (!isset($ownerid) || $ownerid == '')
-			$ownerid = $current_user->id;
+		if (!isset($ownerid) || $ownerid == '') {
+					$ownerid = $current_user->id;
+		}
 		$upload_file_path = \vtlib\Functions::initStorageFileDirectory();
 		file_put_contents($upload_file_path . $current_id . "_" . $filename, $file);
 
@@ -238,8 +240,9 @@ 
 		$button = '';
 
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -276,8 +279,9 @@ 
 
 		$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_contacts method ...");
@@ -293,10 +297,11 @@ 
 	{
 		$log = vglobal('log');
 		$log->debug("Entering getSortOrder() method ...");
-		if (isset($_REQUEST['sorder']))
-			$sorder = $this->db->sql_escape_string($_REQUEST['sorder']);
-		else
-			$sorder = (($_SESSION['EMAILS_SORT_ORDER'] != '') ? ($_SESSION['EMAILS_SORT_ORDER']) : ($this->default_sort_order));
+		if (isset($_REQUEST['sorder'])) {
+					$sorder = $this->db->sql_escape_string($_REQUEST['sorder']);
+		} else {
+					$sorder = (($_SESSION['EMAILS_SORT_ORDER'] != '') ? ($_SESSION['EMAILS_SORT_ORDER']) : ($this->default_sort_order));
+		}
 
 		$log->debug("Exiting getSortOrder method ...");
 		return $sorder;
@@ -317,10 +322,11 @@ 
 			$use_default_order_by = $this->default_order_by;
 		}
 
-		if (isset($_REQUEST['order_by']))
-			$order_by = $this->db->sql_escape_string($_REQUEST['order_by']);
-		else
-			$order_by = (($_SESSION['EMAILS_ORDER_BY'] != '') ? ($_SESSION['EMAILS_ORDER_BY']) : ($use_default_order_by));
+		if (isset($_REQUEST['order_by'])) {
+					$order_by = $this->db->sql_escape_string($_REQUEST['order_by']);
+		} else {
+					$order_by = (($_SESSION['EMAILS_ORDER_BY'] != '') ? ($_SESSION['EMAILS_ORDER_BY']) : ($use_default_order_by));
+		}
 
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
@@ -375,25 +381,31 @@ 
 			$entries[] = $row['user_name'];
 			$entries[] = $row['email1'];
 			$entries[] = $row['phone_home'];
-			if ($phone == '')
-				$phone = $row['phone_work'];
-			if ($phone == '')
-				$phone = $row['phone_mobile'];
-			if ($phone == '')
-				$phone = $row['phone_other'];
-			if ($phone == '')
-				$phone = $row['phone_fax'];
+			if ($phone == '') {
+							$phone = $row['phone_work'];
+			}
+			if ($phone == '') {
+							$phone = $row['phone_mobile'];
+			}
+			if ($phone == '') {
+							$phone = $row['phone_other'];
+			}
+			if ($phone == '') {
+							$phone = $row['phone_fax'];
+			}
 
 			//Adding Security Check for User
 
 			$entries_list[] = $entries;
 		}
 
-		if ($entries_list != '')
-			$return_data = array("header" => $header, "entries" => $entries);
+		if ($entries_list != '') {
+					$return_data = array("header" => $header, "entries" => $entries);
+		}
 
-		if ($return_data === null)
-			$return_data = Array();
+		if ($return_data === null) {
+					$return_data = Array();
+		}
 		$return_data['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_users method ...");
@@ -629,8 +641,9 @@ 
 	$date_var = date('Y-m-d H:i:s');
 
 	$ownerid = $obj->column_fields['assigned_user_id'];
-	if (!isset($ownerid) || $ownerid == '')
-		$ownerid = $current_user->id;
+	if (!isset($ownerid) || $ownerid == '') {
+			$ownerid = $current_user->id;
+	}
 
 	$current_id = $adb->getUniqueID("vtiger_crmentity");
 

modules/Calendar/Activity.php

Braces +29 added lines, -22 removed lines

@@ -111,8 +111,9 @@ 
 		if (isset($this->column_fields['recurringtype']) && $this->column_fields['recurringtype'] != '' && $this->column_fields['recurringtype'] != '--None--') {
 			$recur_type = trim($this->column_fields['recurringtype']);
 			$recur_data = \vtlib\Functions::getRecurringObjValue();
-			if (is_object($recur_data))
-				$this->insertIntoRecurringTable($recur_data);
+			if (is_object($recur_data)) {
+							$this->insertIntoRecurringTable($recur_data);
+			}
 		}
 
 		//Insert into vtiger_activity_remainder table
@@ -248,10 +249,10 @@ 
 					$sql = 'delete  from vtiger_activity_reminder where activity_id=?';
 					$adb->pquery($sql, array($activity_id));
 					$flag = "false";
-				} else
-					$flag = "false";
-			}
-			else {
+				} else {
+									$flag = "false";
+				}
+			} else {
 				$sql = 'delete from vtiger_activity_reminder where activity_id=?';
 				$adb->pquery($sql, array($activity_id));
 				$sql = 'delete  from vtiger_recurringevents where activityid=?';
@@ -360,8 +361,9 @@ 
 	 */
 	public function getJoinClause($tableName)
 	{
-		if ($tableName == "vtiger_activity_reminder")
-			return 'LEFT JOIN';
+		if ($tableName == "vtiger_activity_reminder") {
+					return 'LEFT JOIN';
+		}
 		return parent::getJoinClause($tableName);
 	}
 
@@ -374,10 +376,11 @@ 
 	{
 		$log = LoggerManager::getInstance();
 		$log->debug('Entering getSortOrder() method ...');
-		if (AppRequest::has('sorder'))
-			$sorder = $this->db->sql_escape_string(AppRequest::get('sorder'));
-		else
-			$sorder = (($_SESSION['ACTIVITIES_SORT_ORDER'] != '') ? ($_SESSION['ACTIVITIES_SORT_ORDER']) : ($this->default_sort_order));
+		if (AppRequest::has('sorder')) {
+					$sorder = $this->db->sql_escape_string(AppRequest::get('sorder'));
+		} else {
+					$sorder = (($_SESSION['ACTIVITIES_SORT_ORDER'] != '') ? ($_SESSION['ACTIVITIES_SORT_ORDER']) : ($this->default_sort_order));
+		}
 		$log->debug('Exiting getSortOrder method ...');
 		return $sorder;
 	}
@@ -396,10 +399,11 @@ 
 			$use_default_order_by = $this->default_order_by;
 		}
 
-		if (AppRequest::has('order_by'))
-			$order_by = $this->db->sql_escape_string(AppRequest::get('order_by'));
-		else
-			$order_by = (($_SESSION['ACTIVITIES_ORDER_BY'] != '') ? ($_SESSION['ACTIVITIES_ORDER_BY']) : ($use_default_order_by));
+		if (AppRequest::has('order_by')) {
+					$order_by = $this->db->sql_escape_string(AppRequest::get('order_by'));
+		} else {
+					$order_by = (($_SESSION['ACTIVITIES_ORDER_BY'] != '') ? ($_SESSION['ACTIVITIES_ORDER_BY']) : ($use_default_order_by));
+		}
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}
@@ -430,8 +434,9 @@ 
 		$button = '';
 
 		if ($actions) {
-			if (is_string($actions))
-				$actions = explode(',', strtoupper($actions));
+			if (is_string($actions)) {
+							$actions = explode(',', strtoupper($actions));
+			}
 			if (in_array('SELECT', $actions) && isPermitted($related_module, 4, '') == 'yes') {
 				$button .= "<input title='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "' class='crmbutton small edit' type='button' onclick=\"return window.open('index.php?module=$related_module&return_module=$currentModule&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid=$id','test','width=640,height=602,resizable=0,scrollbars=0');\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -447,8 +452,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;
 
 		$log->debug("Exiting get_contacts method ...");
@@ -477,8 +483,9 @@ 
 		$query = sprintf($query, $id);
 		$return_data = GetRelatedList('Calendar', 'Users', $focus, $query, $button, $returnset);
 
-		if ($return_data === null)
-			$return_data = [];
+		if ($return_data === null) {
+					$return_data = [];
+		}
 		$return_data['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_users method ...");

modules/Reports/models/Record.php

Braces +31 added lines, -20 removed lines

@@ -573,15 +573,17 @@ 
 			$db->pquery('DELETE FROM vtiger_relcriteria_grouping WHERE queryid = ?', array($reportId));
 
 			foreach ($advancedFilter as $groupIndex => $groupInfo) {
-				if (empty($groupInfo))
-					continue;
+				if (empty($groupInfo)) {
+									continue;
+				}
 
 				$groupColumns = $groupInfo['columns'];
 				$groupCondition = $groupInfo['condition'];
 
 				foreach ($groupColumns as $columnIndex => $columnCondition) {
-					if (empty($columnCondition))
-						continue;
+					if (empty($columnCondition)) {
+											continue;
+					}
 
 					$advFilterColumn = $columnCondition["columnname"];
 					$advFilterComparator = $columnCondition["comparator"];
@@ -649,8 +651,10 @@ 
 				}
 
 				$groupConditionExpression = $advancedFilter[$groupIndex]["conditionexpression"];
-				if (empty($groupConditionExpression))
-					continue; // Case when the group doesn't have any column criteria
+				if (empty($groupConditionExpression)) {
+									continue;
+				}
+				// Case when the group doesn't have any column criteria
 
 				$db->pquery("INSERT INTO vtiger_relcriteria_grouping(groupid, queryid, group_condition, condition_expression) VALUES (?,?,?,?)", array($groupIndex, $reportId, $groupCondition, $groupConditionExpression));
 			}
@@ -723,8 +727,9 @@ 
 
 	public function getReportsCount($query = null)
 	{
-		if ($query === null)
-			$query = $this->get('recordCountQuery');
+		if ($query === null) {
+					$query = $this->get('recordCountQuery');
+		}
 		$adb = PearDatabase::getInstance();
 		$count = 0;
 		$result = $adb->query($query, array());
@@ -844,8 +849,9 @@ 
 			if (!empty($blocks)) {
 				foreach ($blocks as $fieldType => $fieldName) {
 					$fieldDetails = explode(':', $fieldType);
-					if ($fieldName == 'Send Reminder' && $primaryModule == 'Calendar')
-						continue;
+					if ($fieldName == 'Send Reminder' && $primaryModule == 'Calendar') {
+											continue;
+					}
 					if ($fieldDetails[4] === "I" || $fieldDetails[4] === "N" || $fieldDetails[4] === "NN") {
 						$calculationFields[$fieldType] = $fieldName;
 					}
@@ -877,8 +883,9 @@ 
 					if (!empty($blocks)) {
 						foreach ($blocks as $fieldType => $fieldName) {
 							$fieldDetails = explode(':', $fieldType);
-							if ($fieldName == 'Send Reminder' && $secondaryModule == 'Calendar')
-								continue;
+							if ($fieldName == 'Send Reminder' && $secondaryModule == 'Calendar') {
+															continue;
+							}
 							if ($fieldDetails[4] === "I" || $fieldDetails[4] === "N" || $fieldDetails[4] === "NN") {
 								$calculationFields[$fieldType] = $fieldName;
 							}
@@ -1065,13 +1072,15 @@ 
 	 */
 	public function showLineItemFieldsInFilter($calculationFields = false)
 	{
-		if ($calculationFields === false)
-			$calculationFields = $this->getSelectedCalculationFields();
+		if ($calculationFields === false) {
+					$calculationFields = $this->getSelectedCalculationFields();
+		}
 
 		$primaryModule = $this->getPrimaryModule();
 		$inventoryModules = [];
-		if (!in_array($primaryModule, $inventoryModules))
-			return false;
+		if (!in_array($primaryModule, $inventoryModules)) {
+					return false;
+		}
 		if (!empty($calculationFields)) {
 			foreach ($calculationFields as $field) {
 				if (stripos($field, 'cb:vtiger_inventoryproductrel') !== false) {
@@ -1175,13 +1184,14 @@ 
 		$primaryModuleModel = Vtiger_Module_Model::getInstance($primaryModule);
 		$primaryModuleFieldInstances = $primaryModuleModel->getFields();
 
-		if (is_array($fields))
-			foreach ($fields as $module => $blocks) {
+		if (is_array($fields)) {
+					foreach ($fields as $module => $blocks) {
 				if (is_array($blocks))
 					foreach ($blocks as $blockLabel => $blockFields) {
 						if (is_array($blockFields))
 							foreach ($blockFields as $reportFieldInfo => $fieldLabel) {
 								$fieldInfo = explode(':', $reportFieldInfo);
+		}
 
 								$fieldInstance = $primaryModuleFieldInstances[$fieldInfo[3]];
 								if (empty($fieldInstance) || $fieldInfo[0] == 'vtiger_inventoryproductrel' || $fieldInstance->getFieldDataType() == 'email' || $fieldInstance->getFieldDataType() == 'phone' || $fieldInstance->getFieldDataType() == 'image' || $fieldInstance->get('uitype') == '4') {
@@ -1213,13 +1223,14 @@ 
 				}
 			}
 		}
-		if (is_array($fields))
-			foreach ($fields as $module => $blocks) {
+		if (is_array($fields)) {
+					foreach ($fields as $module => $blocks) {
 				if (is_array($blocks))
 					foreach ($blocks as $blockLabel => $blockFields) {
 						if (is_array($blockFields))
 							foreach ($blockFields as $reportFieldInfo => $fieldLabel) {
 								$fieldInfo = explode(':', $reportFieldInfo);
+		}
 								$fieldInstance = $secondaryModuleFieldInstances[$module][$fieldInfo[3]];
 								if (empty($fieldInstance) || $fieldInfo[0] == 'vtiger_inventoryproductrel' || $fieldInstance->getFieldDataType() == 'email' || $fieldInstance->getFieldDataType() == 'phone' || $fieldInstance->getFieldDataType() == 'image' || $fieldInstance->get('uitype') == '4') {
 									unset($fields[$module][$blockLabel][$reportFieldInfo]);

modules/Vtiger/uitypes/Multiowner.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	 */
 	public function getDisplayValue($values, $record = false, $recordInstance = false, $rawText = false)
 	{
-		if ($values === null && !is_array($values))
-			return;
+		if ($values === null && !is_array($values)) {
+					return;
+		}
 		foreach ($values as $value) {
 			if (self::getOwnerType($value) === 'User') {
 				$userModel = Users_Record_Model::getCleanInstance('Users');