YetiForceCompany / YetiForceCRM

modules/OSSEmployees/OSSEmployees.php

Doc Comments +7 added lines

@@ -149,6 +149,10 @@ 
 		return $hierarchy;
 	}
 
+	/**
+	 * @param integer $id
+	 * @param integer[] $encountered_accounts
+	 */
 	public function __getParentEmployees($id, &$parent_accounts, &$encountered_accounts)
 	{
 		$adb = PearDatabase::getInstance();
@@ -200,6 +204,9 @@ 
 		return $parent_accounts;
 	}
 
+	/**
+	 * @param integer $id
+	 */
 	public function __getChildEmployees($id, &$child_accounts, $depth)
 	{
 		$adb = PearDatabase::getInstance();

Braces +14 added lines, -10 removed lines

@@ -284,16 +284,18 @@ 
 
 
 
-		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, 'parent_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;";
 			}
@@ -316,8 +318,9 @@ 
 				WHERE  vtiger_crmentity.deleted = 0 && vtiger_crmentity.`smownerid`= " . $userId;
 
 		$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_osstimecontrol method ...");
 		return $return_value;
@@ -336,8 +339,9 @@ 
 			$modcommentsModuleInstance = vtlib\Module::getInstance('ModComments');
 			if ($modcommentsModuleInstance && file_exists('modules/ModComments/ModComments.php')) {
 				include_once 'modules/ModComments/ModComments.php';
-				if (class_exists('ModComments'))
-					ModComments::addWidgetTo(array('OSSEmployees'));
+				if (class_exists('ModComments')) {
+									ModComments::addWidgetTo(array('OSSEmployees'));
+				}
 			}
 		} else if ($event_type == 'module.disabled') {
 

modules/PaymentsIn/helpers/mt940.php

Doc Comments +15 added lines

@@ -50,6 +50,9 @@ 
 		return $xml;
 	}
 
+	/**
+	 * @param integer $level
+	 */
 	protected function createXML($key, $value, $level)
 	{
 		$indent = '';
@@ -69,6 +72,9 @@ 
 		return $xml;
 	}
 
+	/**
+	 * @param string $line
+	 */
 	protected function parseLine($line)
 	{
 		$tag = substr($line, 1, strpos($line, ':', 1) - 1);
@@ -114,6 +120,9 @@ 
 		$this->_lastTag = $tag;
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function parseOperation($value)
 	{
 		$this->operations[] = array(
@@ -124,6 +133,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function parseBalance($value)
 	{
 		return array(
@@ -134,6 +146,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function parseTransaction($value)
 	{
 		$transaction = array(

Braces +19 added lines, -14 removed lines

@@ -34,8 +34,9 @@ 
 	public function parse()
 	{
 		$tab = $this->prepareFile();
-		foreach ($tab as $line)
-			$this->parseLine($line);
+		foreach ($tab as $line) {
+					$this->parseLine($line);
+		}
 	}
 
 	public function getXML()
@@ -53,13 +54,15 @@ 
 	protected function createXML($key, $value, $level)
 	{
 		$indent = '';
-		for ($i = 0; $i <= $level; $i++)
-			$indent .= "\t";
+		for ($i = 0; $i <= $level; $i++) {
+					$indent .= "\t";
+		}
 		if (is_array($value)) {
 			$xml = "$indent<$key>\n";
 			foreach ($value as $subKey => $subVal) {
-				if (is_numeric($subKey))
-					$subKey = substr($key, 0, -1);
+				if (is_numeric($subKey)) {
+									$subKey = substr($key, 0, -1);
+				}
 				$xml .= $this->createXML($subKey, $subVal, $level + 1);
 			}
 			$xml .= "$indent</$key>\n";
@@ -85,10 +88,11 @@ 
 				break;
 			case 'NS':
 				$code = substr($value, 0, 2);
-				if ($code == '22')
-					$this->ownerName = substr($value, 2);
-				else if ($code == '23')
-					$this->accountName = substr($value, 2);
+				if ($code == '22') {
+									$this->ownerName = substr($value, 2);
+				} else if ($code == '23') {
+									$this->accountName = substr($value, 2);
+				}
 				break;
 			case '60F':
 				$this->openBalance = $this->parseBalance($value);
@@ -103,10 +107,11 @@ 
 				self::parseOperation($value);
 				break;
 			case '86':
-				if ($this->_lastTag == '61')
-					$this->parseTransaction($value);
-				else
-					$this->info .= $value;
+				if ($this->_lastTag == '61') {
+									$this->parseTransaction($value);
+				} else {
+									$this->info .= $value;
+				}
 				break;
 			default:
 				break;

modules/PaymentsIn/helpers/subclass/mt940_Milenium.php

Doc Comments +6 added lines

@@ -20,6 +20,9 @@ 
 			$this->parseLine($line);
 	}
 
+	/**
+	 * @param string $line
+	 */
 	protected function parseLine($line)
 	{
 		$tag = substr($line, 1, strpos($line, ':', 1) - 1);
@@ -65,6 +68,9 @@ 
 		$this->_lastTag = $tag;
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function parseOperation($value)
 	{
 		$this->operations[] = array(

Braces +13 added lines, -10 removed lines

@@ -16,8 +16,9 @@ 
 	public function parse()
 	{
 		$tab = $this->prepareFile();
-		foreach ($tab as $line)
-			$this->parseLine($line);
+		foreach ($tab as $line) {
+					$this->parseLine($line);
+		}
 	}
 
 	protected function parseLine($line)
@@ -36,10 +37,11 @@ 
 				break;
 			case 'NS':
 				$code = substr($value, 0, 2);
-				if ($code == '22')
-					$this->ownerName = substr($value, 2);
-				else if ($code == '23')
-					$this->accountName = substr($value, 2);
+				if ($code == '22') {
+									$this->ownerName = substr($value, 2);
+				} else if ($code == '23') {
+									$this->accountName = substr($value, 2);
+				}
 				break;
 			case '60F':
 				$this->openBalance = $this->parseBalance($value);
@@ -54,10 +56,11 @@ 
 				self::parseOperation($value);
 				break;
 			case '86':
-				if ($this->_lastTag == '61')
-					$this->parseTransaction($value);
-				else
-					$this->info .= $value;
+				if ($this->_lastTag == '61') {
+									$this->parseTransaction($value);
+				} else {
+									$this->info .= $value;
+				}
 				break;
 			default:
 				break;

modules/PaymentsIn/helpers/subclass/mt940_WBK.php

Doc Comments +9 added lines

@@ -20,6 +20,9 @@ 
 			$this->parseLine($line);
 	}
 
+	/**
+	 * @param string $line
+	 */
 	protected function parseLine($line)
 	{
 		$tag = substr($line, 1, strpos($line, ':', 1) - 1);
@@ -65,6 +68,9 @@ 
 		$this->_lastTag = $tag;
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function parseTransaction($value)
 	{
 		$transaction = array(
@@ -109,6 +115,9 @@ 
 		$this->operations[count($this->operations) - 1]['details'] = $transaction;
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function parseOperation($value)
 	{
 		$this->operations[] = array(

Braces +13 added lines, -10 removed lines

@@ -16,8 +16,9 @@ 
 	public function parse()
 	{
 		$tab = $this->prepareFile();
-		foreach ($tab as $line)
-			$this->parseLine($line);
+		foreach ($tab as $line) {
+					$this->parseLine($line);
+		}
 	}
 
 	protected function parseLine($line)
@@ -36,10 +37,11 @@ 
 				break;
 			case 'NS':
 				$code = substr($value, 0, 2);
-				if ($code == '22')
-					$this->ownerName = substr($value, 2);
-				else if ($code == '23')
-					$this->accountName = substr($value, 2);
+				if ($code == '22') {
+									$this->ownerName = substr($value, 2);
+				} else if ($code == '23') {
+									$this->accountName = substr($value, 2);
+				}
 				break;
 			case '60F':
 				$this->openBalance = $this->parseBalance($value);
@@ -54,10 +56,11 @@ 
 				self::parseOperation($value);
 				break;
 			case '86':
-				if ($this->_lastTag == '61')
-					$this->parseTransaction($value);
-				else
-					$this->info .= $value;
+				if ($this->_lastTag == '61') {
+									$this->parseTransaction($value);
+				} else {
+									$this->info .= $value;
+				}
 				break;
 			default:
 				break;

modules/PBXManager/connectors/PBXManager.php

Doc Comments +8 added lines, -2 removed lines

@@ -54,6 +54,9 @@ 
 		return $this->webappurl;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getOutboundContext()
 	{
 		return $this->outboundcontext;
@@ -82,6 +85,7 @@ 
 	/**
 	 * Function to set server parameters
 	 * @param <array>  authdetails
+	 * @param PBXManager_Server_Model $serverModel
 	 */
 	public function setServerParameters($serverModel)
 	{
@@ -100,6 +104,9 @@ 
 		return self::$SETTINGS_REQUIRED_PARAMETERS;
 	}
 
+	/**
+	 * @param string $type
+	 */
 	protected function prepareParameters($details, $type)
 	{
 		switch ($type) {
@@ -294,7 +301,6 @@ 
 
 	/**
 	 * Function to respond for outgoing calls
-	 * @param <Vtiger_Request> $details 
 	 */
 	public function respondToOutgoingCall($to)
 	{
@@ -324,7 +330,7 @@ 
 	/**
 	 * Function to make outbound call 
 	 * @param <string> $number (Customer)
-	 * @param <string> $recordid
+	 * @param <string> $record
 	 */
 	public function call($number, $record)
 	{

Braces +8 added lines, -6 removed lines

@@ -239,10 +239,11 @@ 
 		$recordModel = PBXManager_Record_Model::getCleanInstance();
 		$recordModel->saveRecordWithArrray($params);
 
-		if ($direction == self::INCOMING_TYPE)
-			$this->respondToIncomingCall($details);
-		else
-			$this->respondToOutgoingCall($params['CustomerNumber']);
+		if ($direction == self::INCOMING_TYPE) {
+					$this->respondToIncomingCall($details);
+		} else {
+					$this->respondToOutgoingCall($params['CustomerNumber']);
+		}
 	}
 
 	/**
@@ -312,8 +313,9 @@ 
 		} else {
 			$response .= '<Number>SIP/';
 			$response .= $to;
-			if ($numberLength > 5)
-				$response .= '@' . $this->getOutboundTrunk();
+			if ($numberLength > 5) {
+							$response .= '@' . $this->getOutboundTrunk();
+			}
 			$response .= '</Number>';
 		}
 

modules/PriceBooks/PriceBooks.php

Doc Comments +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 
 	/** 	function used to get whether the pricebook has related with a product or not
 	 * 	@param int $id - product id
-	 * 	@return true or false - if there are no pricebooks available or associated pricebooks for the product is equal to total number of pricebooks then return false, else return true
+	 * 	@return boolean|null or false - if there are no pricebooks available or associated pricebooks for the product is equal to total number of pricebooks then return false, else return true
 	 */
 	public function get_pricebook_noproduct($id)
 	{

Spacing +5 added lines, -5 removed lines

@@ -283,19 +283,19 @@
 		$query = $this->getRelationQuery($module, $secmodule, "vtiger_pricebook", "pricebookid", $queryplanner);
 		// TODO Support query planner
 		if ($queryplanner->requireTable("vtiger_crmentityPriceBooks", $matrix)) {
-			$query .=" left join vtiger_crmentity as vtiger_crmentityPriceBooks on vtiger_crmentityPriceBooks.crmid=vtiger_pricebook.pricebookid and vtiger_crmentityPriceBooks.deleted=0";
+			$query .= " left join vtiger_crmentity as vtiger_crmentityPriceBooks on vtiger_crmentityPriceBooks.crmid=vtiger_pricebook.pricebookid and vtiger_crmentityPriceBooks.deleted=0";
 		}
 		if ($queryplanner->requireTable("vtiger_currency_infoPriceBooks")) {
-			$query .=" left join vtiger_currency_info as vtiger_currency_infoPriceBooks on vtiger_currency_infoPriceBooks.id = vtiger_pricebook.currency_id";
+			$query .= " left join vtiger_currency_info as vtiger_currency_infoPriceBooks on vtiger_currency_infoPriceBooks.id = vtiger_pricebook.currency_id";
 		}
 		if ($queryplanner->requireTable("vtiger_usersPriceBooks")) {
-			$query .=" left join vtiger_users as vtiger_usersPriceBooks on vtiger_usersPriceBooks.id = vtiger_crmentityPriceBooks.smownerid";
+			$query .= " left join vtiger_users as vtiger_usersPriceBooks on vtiger_usersPriceBooks.id = vtiger_crmentityPriceBooks.smownerid";
 		}
 		if ($queryplanner->requireTable("vtiger_groupsPriceBooks")) {
-			$query .=" left join vtiger_groups as vtiger_groupsPriceBooks on vtiger_groupsPriceBooks.groupid = vtiger_crmentityPriceBooks.smownerid";
+			$query .= " left join vtiger_groups as vtiger_groupsPriceBooks on vtiger_groupsPriceBooks.groupid = vtiger_crmentityPriceBooks.smownerid";
 		}
 		if ($queryplanner->requireTable("vtiger_lastModifiedByPriceBooks")) {
-			$query .=" left join vtiger_users as vtiger_lastModifiedByPriceBooks on vtiger_lastModifiedByPriceBooks.id = vtiger_crmentityPriceBooks.smownerid";
+			$query .= " left join vtiger_users as vtiger_lastModifiedByPriceBooks on vtiger_lastModifiedByPriceBooks.id = vtiger_crmentityPriceBooks.smownerid";
 		}
 		if ($queryplanner->requireTable("vtiger_createdbyPriceBooks")) {
 			$query .= " left join vtiger_users as vtiger_createdbyPriceBooks on vtiger_createdbyPriceBooks.id = vtiger_crmentityPriceBooks.smcreatorid ";

Braces +22 added lines, -16 removed lines

@@ -102,16 +102,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='submit' name='button' onclick=\"this.form.action.value='AddProductsToPriceBook';this.form.module.value='$related_module';this.form.return_module.value='$currentModule';this.form.return_action.value='PriceBookDetailView'\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -131,8 +133,9 @@ 
 		$this->retrieve_entity_info($id, $this_module);
 		$return_value = getPriceBookRelatedProducts($query, $this, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_pricebook_products method ...");
@@ -158,16 +161,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='submit' name='button' onclick=\"this.form.action.value='AddServicesToPriceBook';this.form.module.value='$related_module';this.form.return_module.value='$currentModule';this.form.return_action.value='PriceBookDetailView'\" value='" . \includes\Language::translate('LBL_SELECT') . " " . \includes\Language::translate($related_module) . "'>&nbsp;";
 			}
@@ -187,8 +192,9 @@ 
 		$this->retrieve_entity_info($id, $this_module);
 		$return_value = $other->getPriceBookRelatedServices($query, $this, $returnset);
 
-		if ($return_value === null)
-			$return_value = Array();
+		if ($return_value === null) {
+					$return_value = Array();
+		}
 		$return_value['CUSTOM_BUTTON'] = $button;
 
 		$log->debug("Exiting get_pricebook_services method ...");

modules/Products/Products.php

Doc Comments +3 added lines, -2 removed lines

@@ -192,6 +192,9 @@ 
 		$this->db->pquery($query, $params);
 	}
 
+	/**
+	 * @param string $module
+	 */
 	public function insertIntoAttachment($id, $module)
 	{
 		$adb = PearDatabase::getInstance();
@@ -556,8 +559,6 @@ 
 	}
 
 	/** 	function used to get the number of vendors which are related to the product
-	 * 	@param int $id - product id
-	 * 	@return int number of rows - return the number of products which do not have relationship with vendor
 	 */
 	public function product_novendor()
 	{

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/Reports/ReportRun.php

Doc Comments +9 added lines

@@ -103,6 +103,9 @@ 
 		$this->customTables[] = $table;
 	}
 
+	/**
+	 * @param ReportRunQueryDependencyMatrix $dependencies
+	 */
 	public function requireTable($table, $dependencies = null)
 	{
 
@@ -782,6 +785,7 @@ 
 	/** Function to get field that is to be compared in query form for the given Comparator and field
 	 *  @ param $field : field
 	 *  returns the value for the comparator
+	 * @param string $field
 	 */
 	public function getFilterComparedField($field)
 	{
@@ -2308,6 +2312,11 @@ 
 	 * 		HTML strings for
 	 */
 	// Performance Optimization: Added parameter directOutput to avoid building big-string!
+
+	/**
+	 * @param string $outputformat
+	 * @param string $filtersql
+	 */
 	public function GenerateReport($outputformat, $filtersql, $directOutput = false, $startLimit = false, $endLimit = false)
 	{
 		$adb = PearDatabase::getInstance();

Spacing +20 added lines, -20 removed lines

@@ -863,7 +863,7 @@ 
 						inner join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_report.queryid
 						left join vtiger_relcriteria_grouping on vtiger_relcriteria.queryid = vtiger_relcriteria_grouping.queryid
 								and vtiger_relcriteria.groupid = vtiger_relcriteria_grouping.groupid';
-			$ssql.= " where vtiger_report.reportid = ? && vtiger_relcriteria.groupid = ? order by vtiger_relcriteria.columnindex";
+			$ssql .= " where vtiger_report.reportid = ? && vtiger_relcriteria.groupid = ? order by vtiger_relcriteria.columnindex";
 
 			$result = $adb->pquery($ssql, array($reportid, $groupId));
 			$noOfColumns = $adb->num_rows($result);
@@ -1007,7 +1007,7 @@ 
 										$advfiltergroupsql .= "$tableColumnSql BETWEEN $start AND $end";
 									else
 										$advfiltergroupsql .= "$tableColumnSql NOT BETWEEN $start AND $end";
-								}else if ($comparator == 'bw') {
+								} else if ($comparator == 'bw') {
 									$values = explode(',', $value);
 									$startDateTime = explode(' ', $values[0]);
 									$endDateTime = explode(' ', $values[1]);
@@ -1437,7 +1437,7 @@ 
 				}
 
 				$temp_val = explode(",", $adv_filter_value);
-				if (($column_info[4] == 'D' || ($column_info[4] == 'T' && $column_info[1] != 'time_start' && $column_info[1] != 'time_end') || ($column_info[4] == 'DT')) && ($column_info[4] != '' && $adv_filter_value != '' )) {
+				if (($column_info[4] == 'D' || ($column_info[4] == 'T' && $column_info[1] != 'time_start' && $column_info[1] != 'time_end') || ($column_info[4] == 'DT')) && ($column_info[4] != '' && $adv_filter_value != '')) {
 					$val = Array();
 					for ($x = 0; $x < count($temp_val); $x++) {
 						if ($column_info[4] == 'D') {
@@ -1800,7 +1800,7 @@ 
 		$current_user = vglobal('current_user');
 		$secondary_module = "'";
 		$secondary_module .= str_replace(":", "','", $this->secondarymodule);
-		$secondary_module .="'";
+		$secondary_module .= "'";
 
 		if ($module == "Leads") {
 			$query = "from vtiger_leaddetails
@@ -1864,7 +1864,7 @@ 
 				left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid";
 
 			if ($this->queryPlanner->requireTable('vtiger_lastModifiedByAccounts')) {
-				$query.= " left join vtiger_users as vtiger_lastModifiedByAccounts on vtiger_lastModifiedByAccounts.id = vtiger_crmentity.modifiedby";
+				$query .= " left join vtiger_users as vtiger_lastModifiedByAccounts on vtiger_lastModifiedByAccounts.id = vtiger_crmentity.modifiedby";
 			}
 			if ($this->queryPlanner->requireTable('vtiger_createdbyAccounts')) {
 				$query .= " left join vtiger_users as vtiger_createdbyAccounts on vtiger_createdbyAccounts.id = vtiger_crmentity.smcreatorid";
@@ -2658,7 +2658,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
@@ -2669,7 +2669,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
@@ -2680,7 +2680,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
@@ -2691,7 +2691,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 						$rowcount++;
@@ -2770,7 +2770,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
@@ -2781,7 +2781,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
@@ -2792,7 +2792,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
@@ -2803,7 +2803,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
@@ -2975,7 +2975,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
@@ -2986,7 +2986,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
@@ -2997,7 +2997,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
@@ -3008,7 +3008,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
@@ -3250,7 +3250,7 @@ 
 		if ($fieldInfo['uitype'] == '71') {
 			$curr_symb = " (" . \includes\Language::translate('LBL_IN') . " " . $current_user->currency_symbol . ")";
 		}
-		$rep_header .=$curr_symb;
+		$rep_header .= $curr_symb;
 
 		return $rep_header;
 	}
@@ -3367,7 +3367,7 @@ 
 			$rowcount = 1;
 			//copy the first value details
 			$arrayFirstRowValues = $arr_val[0];
-			array_pop($arrayFirstRowValues);   // removed action link in details
+			array_pop($arrayFirstRowValues); // removed action link in details
 			foreach ($arrayFirstRowValues as $key => $value) {
 				$worksheet->setCellValueExplicitByColumnAndRow($count, $rowcount, $key, true);
 				$worksheet->getStyleByColumnAndRow($count, $rowcount)->applyFromArray($header_styles);
@@ -3434,7 +3434,7 @@ 
 		if (isset($arr_val)) {
 			// Header
 			$csv_values = array_keys($arr_val[0]);
-			array_pop($csv_values);   //removed header in csv file
+			array_pop($csv_values); //removed header in csv file
 			fputcsv($fp, $csv_values);
 			foreach ($arr_val as $key => $array_value) {
 				array_pop($array_value); //removed action link

Braces +213 added lines, -161 removed lines

@@ -54,8 +54,9 @@ 
 
 	protected function computeDependencies()
 	{
-		if ($this->computedMatrix !== null)
-			return;
+		if ($this->computedMatrix !== null) {
+					return;
+		}
 
 		$this->computedMatrix = array();
 		foreach ($this->matrix as $key => $values) {
@@ -94,8 +95,9 @@ 
 
 	public function addTable($table)
 	{
-		if (!empty($table))
-			$this->tables[$table] = $table;
+		if (!empty($table)) {
+					$this->tables[$table] = $table;
+		}
 	}
 
 	public function addCustomTable($table)
@@ -599,8 +601,9 @@ 
 			$access_fields[] = $collistrow["fieldname"];
 		}
 		//added to include ticketid for Reports module in select columnlist for all users
-		if ($module == "HelpDesk")
-			$access_fields[] = "ticketid";
+		if ($module == "HelpDesk") {
+					$access_fields[] = "ticketid";
+		}
 		return $access_fields;
 	}
 
@@ -675,8 +678,9 @@ 
 				}
 				if ($ordercolumnsequal) {
 					$selectedfields = explode(":", $fieldcolname);
-					if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule)
-						$selectedfields[0] = "vtiger_crmentity";
+					if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule) {
+											$selectedfields[0] = "vtiger_crmentity";
+					}
 					$sSQLList[] = $selectedfields[0] . "." . $selectedfields[1] . " '" . $selectedfields[2] . "'";
 				}
 			}
@@ -728,11 +732,12 @@ 
 			if (trim($value) == "NULL") {
 				$rtvalue = " is NOT NULL";
 			} elseif (trim($value) != "") {
-				if ($columnName)
-					$rtvalue = " <> " . $adb->quote($value) . " || " . $columnName . " IS NULL ";
-				else
-					$rtvalue = " <> " . $adb->quote($value);
-			}elseif (trim($value) == "" && $datatype == "V") {
+				if ($columnName) {
+									$rtvalue = " <> " . $adb->quote($value) . " || " . $columnName . " IS NULL ";
+				} else {
+									$rtvalue = " <> " . $adb->quote($value);
+				}
+			} elseif (trim($value) == "" && $datatype == "V") {
 				$rtvalue = " <> " . $adb->quote($value);
 			} else {
 				$rtvalue = " is NOT NULL";
@@ -864,8 +869,9 @@ 
 
 			$result = $adb->pquery($ssql, array($reportid, $groupId));
 			$noOfColumns = $adb->num_rows($result);
-			if ($noOfColumns <= 0)
-				continue;
+			if ($noOfColumns <= 0) {
+							continue;
+			}
 
 			while ($relcriteriarow = $adb->fetch_array($result)) {
 				$columnIndex = $relcriteriarow["columnindex"];
@@ -889,8 +895,9 @@ 
 			$i++;
 		}
 		// Clear the condition (and/or) for last group, if any.
-		if (!empty($advft_criteria[$i - 1]['condition']))
-			$advft_criteria[$i - 1]['condition'] = '';
+		if (!empty($advft_criteria[$i - 1]['condition'])) {
+					$advft_criteria[$i - 1]['condition'] = '';
+		}
 		return $advft_criteria;
 	}
 
@@ -1000,11 +1007,12 @@ 
 									$end = getValidDBInsertDateTimeValue($date2);
 									$start = "'$start'";
 									$end = "'$end'";
-									if ($comparator == 'e')
-										$advfiltergroupsql .= "$tableColumnSql BETWEEN $start AND $end";
-									else
-										$advfiltergroupsql .= "$tableColumnSql NOT BETWEEN $start AND $end";
-								}else if ($comparator == 'bw') {
+									if ($comparator == 'e') {
+																			$advfiltergroupsql .= "$tableColumnSql BETWEEN $start AND $end";
+									} else {
+																			$advfiltergroupsql .= "$tableColumnSql NOT BETWEEN $start AND $end";
+									}
+								} else if ($comparator == 'bw') {
 									$values = explode(',', $value);
 									$startDateTime = explode(' ', $values[0]);
 									$endDateTime = explode(' ', $values[1]);
@@ -1056,10 +1064,12 @@ 
 						}
 						//Added to handle yes or no for checkbox  field in reports advance filters. -shahul
 						if ($selectedfields[4] == 'C') {
-							if (strcasecmp(trim($value), "yes") == 0)
-								$value = "1";
-							if (strcasecmp(trim($value), "no") == 0)
-								$value = "0";
+							if (strcasecmp(trim($value), "yes") == 0) {
+															$value = "1";
+							}
+							if (strcasecmp(trim($value), "no") == 0) {
+															$value = "0";
+							}
 						}
 						if (in_array($comparator, $dateSpecificConditions)) {
 							$customView = new CustomView($moduleName);
@@ -1100,13 +1110,15 @@ 
 										$advcolsql[] = "vtiger_troubletickets.status" . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
 									} else if ($selectedfields[2] == 'Faq_Status') {
 										$advcolsql[] = "vtiger_faq.status" . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
-									} else
-										$advcolsql[] = $selectedfields[0] . "." . $selectedfields[1] . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
+									} else {
+																			$advcolsql[] = $selectedfields[0] . "." . $selectedfields[1] . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
+									}
 								} elseif ($selectedfields[1] == 'description') {//when you use comma seperated values.
-									if ($selectedfields[0] == 'vtiger_crmentity' . $this->primarymodule)
-										$advcolsql[] = "vtiger_crmentity.description" . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
-									else
-										$advcolsql[] = $selectedfields[0] . "." . $selectedfields[1] . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
+									if ($selectedfields[0] == 'vtiger_crmentity' . $this->primarymodule) {
+																			$advcolsql[] = "vtiger_crmentity.description" . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
+									} else {
+																			$advcolsql[] = $selectedfields[0] . "." . $selectedfields[1] . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype);
+									}
 								} elseif ($selectedfields[2] == 'Quotes_Inventory_Manager') {
 									$advcolsql[] = ("trim($concatSql)" . $this->getAdvComparator($comparator, trim($valuearray[$n]), $datatype));
 								} elseif ($selectedfields[1] == 'modifiedby') {
@@ -1123,10 +1135,11 @@ 
 								}
 							}
 							//If negative logic filter ('not equal to', 'does not contain') is used, 'and' condition should be applied instead of 'or'
-							if ($comparator == 'n' || $comparator == 'k')
-								$advcolumnsql = implode(" and ", $advcolsql);
-							else
-								$advcolumnsql = implode(" or ", $advcolsql);
+							if ($comparator == 'n' || $comparator == 'k') {
+															$advcolumnsql = implode(" and ", $advcolsql);
+							} else {
+															$advcolumnsql = implode(" or ", $advcolsql);
+							}
 							$fieldvalue = " (" . $advcolumnsql . ") ";
 						} elseif ($selectedfields[1] == 'user_name') {
 							if ($selectedfields[0] == "vtiger_users" . $this->primarymodule) {
@@ -1186,18 +1199,20 @@ 
 								$fieldvalue = "vtiger_activity.status" . $this->getAdvComparator($comparator, trim($value), $datatype);
 							}
 						} else if ($comparator == 'ny') {
-							if ($fieldInfo['uitype'] == '10' || isReferenceUIType($fieldInfo['uitype']))
-								$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NOT NULL && " . $selectedfields[0] . "." . $selectedfields[1] . " != '' && " . $selectedfields[0] . "." . $selectedfields[1] . "  != '0')";
-							else
-								$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NOT NULL && " . $selectedfields[0] . "." . $selectedfields[1] . " != '')";
-						}elseif ($comparator == 'y' || ($comparator == 'e' && (trim($value) == "NULL" || trim($value) == ''))) {
+							if ($fieldInfo['uitype'] == '10' || isReferenceUIType($fieldInfo['uitype'])) {
+															$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NOT NULL && " . $selectedfields[0] . "." . $selectedfields[1] . " != '' && " . $selectedfields[0] . "." . $selectedfields[1] . "  != '0')";
+							} else {
+															$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NOT NULL && " . $selectedfields[0] . "." . $selectedfields[1] . " != '')";
+							}
+						} elseif ($comparator == 'y' || ($comparator == 'e' && (trim($value) == "NULL" || trim($value) == ''))) {
 							if ($selectedfields[0] == 'vtiger_inventoryproductrel') {
 								$selectedfields[0] = 'vtiger_inventoryproductrel' . $moduleName;
 							}
-							if ($fieldInfo['uitype'] == '10' || isReferenceUIType($fieldInfo['uitype']))
-								$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NULL || " . $selectedfields[0] . "." . $selectedfields[1] . " = '' || " . $selectedfields[0] . "." . $selectedfields[1] . " = '0')";
-							else
-								$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NULL || " . $selectedfields[0] . "." . $selectedfields[1] . " = '')";
+							if ($fieldInfo['uitype'] == '10' || isReferenceUIType($fieldInfo['uitype'])) {
+															$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NULL || " . $selectedfields[0] . "." . $selectedfields[1] . " = '' || " . $selectedfields[0] . "." . $selectedfields[1] . " = '0')";
+							} else {
+															$fieldvalue = "(" . $selectedfields[0] . "." . $selectedfields[1] . " IS NULL || " . $selectedfields[0] . "." . $selectedfields[1] . " = '')";
+							}
 						} elseif ($selectedfields[0] == 'vtiger_inventoryproductrel') {
 							if ($selectedfields[1] == 'productid') {
 								$fieldvalue = "vtiger_products$moduleName.productname " . $this->getAdvComparator($comparator, trim($value), $datatype);
@@ -1243,8 +1258,9 @@ 
 				}
 			}
 		}
-		if (trim($advfiltersql) != "")
-			$advfiltersql = '(' . $advfiltersql . ')';
+		if (trim($advfiltersql) != "") {
+					$advfiltersql = '(' . $advfiltersql . ')';
+		}
 
 		return $advfiltersql;
 	}
@@ -1299,8 +1315,9 @@ 
 
 			if ($fieldcolname != "none") {
 				$selectedfields = explode(":", $fieldcolname);
-				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule)
-					$selectedfields[0] = "vtiger_crmentity";
+				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule) {
+									$selectedfields[0] = "vtiger_crmentity";
+				}
 
 				$moduleFieldLabel = $selectedfields[3];
 				list($moduleName, $fieldLabel) = explode('__', $moduleFieldLabel, 2);
@@ -1369,8 +1386,9 @@ 
 	{
 		if ($filtercolumn != "none") {
 			$selectedfields = explode(":", $filtercolumn);
-			if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule)
-				$selectedfields[0] = "vtiger_crmentity";
+			if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule) {
+							$selectedfields[0] = "vtiger_crmentity";
+			}
 			if ($filter == "custom") {
 				if ($startdate != "0000-00-00" && $enddate != "0000-00-00" && $startdate != "" &&
 					$enddate != "" && $selectedfields[0] != "" && $selectedfields[1] != "") {
@@ -1403,8 +1421,9 @@ 
 		if (!empty($advft_criteria)) {
 			foreach ($advft_criteria as $column_index => $column_condition) {
 
-				if (empty($column_condition))
-					continue;
+				if (empty($column_condition)) {
+									continue;
+				}
 
 				$adv_filter_column = $column_condition["columnname"];
 				$adv_filter_comparator = $column_condition["comparator"];
@@ -1460,10 +1479,12 @@ 
 			}
 
 			foreach ($advft_criteria_groups as $group_index => $group_condition_info) {
-				if (empty($group_condition_info))
-					continue;
-				if (empty($advfilterlist[$group_index]))
-					continue;
+				if (empty($group_condition_info)) {
+									continue;
+				}
+				if (empty($advfilterlist[$group_index])) {
+									continue;
+				}
 				$advfilterlist[$group_index]['condition'] = $group_condition_info["groupcondition"];
 				$noOfGroupColumns = count($advfilterlist[$group_index]['columns']);
 				if (!empty($advfilterlist[$group_index]['columns'][$noOfGroupColumns - 1]['column_condition'])) {
@@ -1505,8 +1526,9 @@ 
 
 			if ($fieldcolname != "none") {
 				$selectedfields = explode(":", $fieldcolname);
-				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule)
-					$selectedfields[0] = "vtiger_crmentity";
+				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule) {
+									$selectedfields[0] = "vtiger_crmentity";
+				}
 				if ($datefilter == "custom") {
 
 					if ($startdate != "0000-00-00" && $enddate != "0000-00-00" && $selectedfields[0] != "" && $selectedfields[1] != "" && $startdate != '' && $enddate != '') {
@@ -1595,8 +1617,9 @@ 
 
 			if ($fieldcolname != "none") {
 				$selectedfields = explode(":", $fieldcolname);
-				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule)
-					$selectedfields[0] = "vtiger_crmentity";
+				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule) {
+									$selectedfields[0] = "vtiger_crmentity";
+				}
 				if (stripos($selectedfields[1], 'cf_') == 0 && stristr($selectedfields[1], 'cf_') === true) {
 					//In sql queries forward slash(/) is treated as query terminator,so to avoid this problem
 					//the column names are enclosed within ('[]'),which will treat this as part of column name
@@ -1689,8 +1712,9 @@ 
 					$sSQL .= ", ";
 					$this->orderbylistsql .= ", ";
 				}
-				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule)
-					$selectedfields[0] = "vtiger_crmentity";
+				if ($selectedfields[0] == "vtiger_crmentity" . $this->primarymodule) {
+									$selectedfields[0] = "vtiger_crmentity";
+				}
 				$sSQL .= $selectedfields[0] . "." . $selectedfields[1] . " " . $sortorder;
 				$this->orderbylistsql .= $selectedfields[0] . "." . $selectedfields[1] . " " . $selectedfields[2];
 			}
@@ -2275,8 +2299,9 @@ 
 		}
 		/* STRING TRANSLATION starts */
 		$moduleLabel = '';
-		if (in_array($module, $modules_selected))
-			$moduleLabel = \includes\Language::translate($module, $module);
+		if (in_array($module, $modules_selected)) {
+					$moduleLabel = \includes\Language::translate($module, $module);
+		}
 
 		if (empty($translatedLabel)) {
 			$translatedLabel = \includes\Language::translate(str_replace('__', " ", $fld->name), $module);
@@ -2355,8 +2380,9 @@ 
 			}
 			// END
 
-			if ($is_admin === false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1)
-				$picklistarray = $this->getAccessPickListValues();
+			if ($is_admin === false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) {
+							$picklistarray = $this->getAccessPickListValues();
+			}
 			if ($result) {
 				$y = $adb->getFieldsCount($result);
 				$arrayHeaders = Array();
@@ -2390,10 +2416,11 @@ 
 							$headerLabel_tmp = \includes\Language::translate($mod_name[0] . " " . $mod_name[1]);
 						}
 					}
-					if ($headerLabel == $headerLabel_tmp)
-						$headerLabel = \includes\Language::translate($headerLabel_tmp);
-					else
-						$headerLabel = $headerLabel_tmp;
+					if ($headerLabel == $headerLabel_tmp) {
+											$headerLabel = \includes\Language::translate($headerLabel_tmp);
+					} else {
+											$headerLabel = $headerLabel_tmp;
+					}
 					/* STRING TRANSLATION ends */
 					$header .= "<td class='rptCellLabel'>" . $headerLabel . "</td>";
 
@@ -2429,14 +2456,17 @@ 
 						$snewvalue = $custom_field_values[1];
 						$tnewvalue = $custom_field_values[2];
 					}
-					if ($newvalue == "")
-						$newvalue = "-";
+					if ($newvalue == "") {
+											$newvalue = "-";
+					}
 
-					if ($snewvalue == "")
-						$snewvalue = "-";
+					if ($snewvalue == "") {
+											$snewvalue = "-";
+					}
 
-					if ($tnewvalue == "")
-						$tnewvalue = "-";
+					if ($tnewvalue == "") {
+											$tnewvalue = "-";
+					}
 
 					$valtemplate .= "<tr>";
 
@@ -2562,8 +2592,9 @@ 
 		} elseif ($outputformat == "PDF") {
 			$sSQL = $this->sGetSQLforReport($this->reportid, $filtersql, $outputformat, false, $startLimit, $endLimit);
 			$result = $adb->pquery($sSQL, array());
-			if ($is_admin === false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1)
-				$picklistarray = $this->getAccessPickListValues();
+			if ($is_admin === false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) {
+							$picklistarray = $this->getAccessPickListValues();
+			}
 
 			if ($result) {
 				$y = $adb->getFieldsCount($result);
@@ -2646,45 +2677,49 @@ 
 						$value = trim($key);
 						$arraykey = $value . '__SUM';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
 						$arraykey = $value . '__AVG';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
 						$arraykey = $value . '__MIN';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
 						$arraykey = $value . '__MAX';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 						$rowcount++;
@@ -2758,45 +2793,49 @@ 
 						$value = trim($key);
 						$arraykey = $value . '__SUM';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
 						$arraykey = $value . '__AVG';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
 						$arraykey = $value . '__MIN';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
 						$arraykey = $value . '__MAX';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= '<td class="rptTotal">' . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= '<td class="rptTotal">&nbsp;</td>';
 						}
 
@@ -2824,8 +2863,9 @@ 
 		} elseif ($outputformat == "PRINT") {
 			$sSQL = $this->sGetSQLforReport($this->reportid, $filtersql, $outputformat);
 			$result = $adb->query($sSQL);
-			if ($is_admin === false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1)
-				$picklistarray = $this->getAccessPickListValues();
+			if ($is_admin === false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) {
+							$picklistarray = $this->getAccessPickListValues();
+			}
 
 			if ($result) {
 				$y = $adb->getFieldsCount($result);
@@ -2854,14 +2894,17 @@ 
 						$tnewvalue = $custom_field_values[2];
 					}
 
-					if ($newvalue == "")
-						$newvalue = "-";
+					if ($newvalue == "") {
+											$newvalue = "-";
+					}
 
-					if ($snewvalue == "")
-						$snewvalue = "-";
+					if ($snewvalue == "") {
+											$snewvalue = "-";
+					}
 
-					if ($tnewvalue == "")
-						$tnewvalue = "-";
+					if ($tnewvalue == "") {
+											$tnewvalue = "-";
+					}
 
 					$valtemplate .= "<tr>";
 
@@ -2963,45 +3006,49 @@ 
 						$value = trim($key);
 						$arraykey = $value . '__SUM';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
 						$arraykey = $value . '__AVG';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
 						$arraykey = $value . '__MIN';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
 						$arraykey = $value . '__MAX';
 						if (isset($keyhdr[$arraykey])) {
-							if ($convert_price)
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
-							else
-								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							if ($convert_price) {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey]);
+							} else {
+															$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
+							}
 							$coltotalhtml .= "<td class='rptTotal'>" . $conv_value . '</td>';
-						}else {
+						} else {
 							$coltotalhtml .= "<td class='rptTotal'>&nbsp;</td>";
 						}
 
@@ -3256,8 +3303,9 @@ 
 		$adb = PearDatabase::getInstance();
 		$current_user = vglobal('current_user');
 		$id = array(\includes\Modules::getModuleId($this->primarymodule));
-		if ($this->secondarymodule != '')
-			array_push($id, \includes\Modules::getModuleId($this->secondarymodule));
+		if ($this->secondarymodule != '') {
+					array_push($id, \includes\Modules::getModuleId($this->secondarymodule));
+		}
 
 		$query = sprintf('select fieldname,columnname,fieldid,fieldlabel,tabid,uitype from vtiger_field where tabid in(%s) and uitype in (15,33,55)', generateQuestionMarks($id)); //and columnname in (?)';
 		$result = $adb->pquery($query, $id); //,$select_column));
@@ -3285,12 +3333,14 @@ 
 			} else {
 				$mulsel = "select distinct $fieldname from vtiger_$fieldname inner join vtiger_role2picklist on vtiger_role2picklist.picklistvalueid = vtiger_$fieldname.picklist_valueid where roleid ='" . $roleid . "' and picklistid in (select picklistid from vtiger_$fieldname)"; // order by sortid asc - not requried
 			}
-			if ($fieldname != 'firstname')
-				$mulselresult = $adb->query($mulsel);
+			if ($fieldname != 'firstname') {
+							$mulselresult = $adb->query($mulsel);
+			}
 			for ($j = 0; $j < $adb->num_rows($mulselresult); $j++) {
 				$fldvalue = $adb->query_result($mulselresult, $j, $fieldname);
-				if (in_array($fldvalue, $fieldvalues))
-					continue;
+				if (in_array($fldvalue, $fieldvalues)) {
+									continue;
+				}
 				$fieldvalues[] = $fldvalue;
 			}
 			$field_count = count($fieldvalues);
@@ -3301,16 +3351,18 @@ 
 						$temp_status[$keyvalue][($temp_count + $t)] = $fieldvalues[$t];
 					}
 					$fieldvalues = $temp_status[$keyvalue];
-				} else
-					$temp_status[$keyvalue] = $fieldvalues;
+				} else {
+									$temp_status[$keyvalue] = $fieldvalues;
+				}
 			}
 
-			if ($uitype == 33)
-				$fieldlists[1][$keyvalue] = $fieldvalues;
-			else if ($uitype == 55 && $fieldname == 'salutationtype')
-				$fieldlists[$keyvalue] = $fieldvalues;
-			else if ($uitype == 15)
-				$fieldlists[$keyvalue] = $fieldvalues;
+			if ($uitype == 33) {
+							$fieldlists[1][$keyvalue] = $fieldvalues;
+			} else if ($uitype == 55 && $fieldname == 'salutationtype') {
+							$fieldlists[$keyvalue] = $fieldvalues;
+			} else if ($uitype == 15) {
+							$fieldlists[$keyvalue] = $fieldvalues;
+			}
 		}
 		return $fieldlists;
 	}

modules/Reports/Reports.php

Doc Comments +1 added lines

@@ -387,6 +387,7 @@
 	 *  This function accepts the folderid
 	 *  This Generates the Reports under each Reports module
 	 *  This Returns a HTML sring
+	 * @param boolean $rpt_fldr_id
 	 */
 	public function sgetRptsforFldr($rpt_fldr_id, $paramsList = false)
 	{

Spacing +21 added lines, -21 removed lines

@@ -190,9 +190,9 @@ 
 			if ($modulerows) {
 				foreach ($modulerows as $resultrow) {
 					if ($resultrow['presence'] == '1')
-						continue;   // skip disabled modules
+						continue; // skip disabled modules
 					if ($resultrow['isentitytype'] != '1')
-						continue;  // skip extension modules
+						continue; // skip extension modules
 					if (in_array($resultrow['name'], $restricted_modules)) { // skip restricted modules
 						continue;
 					}
@@ -309,7 +309,7 @@ 
 					$details = [];
 					$details['state'] = $reportfldrow["state"];
 					$details['id'] = $reportfldrow["folderid"];
-					$details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"] : $mod_strings[$reportfldrow["foldername"]];
+					$details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '') ? $reportfldrow["foldername"] : $mod_strings[$reportfldrow["foldername"]];
 					$details['description'] = $reportfldrow["description"];
 					$details['fname'] = popup_decode_html($details['name']);
 					$details['fdescription'] = popup_decode_html($reportfldrow["description"]);
@@ -322,7 +322,7 @@ 
 				$details = [];
 				$details['state'] = $reportfldrow["state"];
 				$details['id'] = $reportfldrow["folderid"];
-				$details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"] : $mod_strings[$reportfldrow["foldername"]];
+				$details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '') ? $reportfldrow["foldername"] : $mod_strings[$reportfldrow["foldername"]];
 				$details['description'] = $reportfldrow["description"];
 				$details['fname'] = popup_decode_html($details['name']);
 				$details['fdescription'] = popup_decode_html($reportfldrow["description"]);
@@ -345,7 +345,7 @@ 
 		$log = LoggerManager::getInstance();
 		$returndata = [];
 		$sql = "select vtiger_report.*, vtiger_reportmodules.*, vtiger_reportfolder.folderid from vtiger_report inner join vtiger_reportfolder on vtiger_reportfolder.folderid = vtiger_report.folderid";
-		$sql.=" inner join vtiger_reportmodules on vtiger_reportmodules.reportmodulesid = vtiger_report.reportid";
+		$sql .= " inner join vtiger_reportmodules on vtiger_reportmodules.reportmodulesid = vtiger_report.reportid";
 		if ($paramsList) {
 			$startIndex = $paramsList['startIndex'];
 			$pageLimit = $paramsList['pageLimit'];
@@ -377,7 +377,7 @@ 
 
 				if (isPermitted($report["primarymodule"], 'index') == "yes")
 					$returndata[] = $report_details;
-			}while ($report = $adb->fetch_array($result));
+			} while ($report = $adb->fetch_array($result));
 		}
 		$log->info("Reports :: ListView->Successfully returned vtiger_report details HTML");
 		return $returndata;
@@ -464,7 +464,7 @@ 
 
 				if (isPermitted($report["primarymodule"], 'index') == "yes")
 					$returndata [$report["folderid"]][] = $report_details;
-			}while ($report = $adb->fetch_array($result));
+			} while ($report = $adb->fetch_array($result));
 		}
 
 		if ($rpt_fldr_id !== false) {
@@ -613,9 +613,9 @@ 
 
 			//fix for Ticket #4016
 			if ($module == "Calendar")
-				$sql.=" group by vtiger_field.fieldlabel order by sequence";
+				$sql .= " group by vtiger_field.fieldlabel order by sequence";
 			else
-				$sql.=" order by sequence";
+				$sql .= " order by sequence";
 		}
 		else {
 
@@ -629,9 +629,9 @@ 
 
 			//fix for Ticket #4016
 			if ($module == "Calendar")
-				$sql.=" group by vtiger_field.fieldlabel order by sequence";
+				$sql .= " group by vtiger_field.fieldlabel order by sequence";
 			else
-				$sql.=" group by vtiger_field.fieldid order by sequence";
+				$sql .= " group by vtiger_field.fieldid order by sequence";
 		}
 		array_push($params, $skipTalbes);
 
@@ -967,7 +967,7 @@ 
 						inner join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_report.queryid
 						left join vtiger_relcriteria_grouping on vtiger_relcriteria.queryid = vtiger_relcriteria_grouping.queryid
 								and vtiger_relcriteria.groupid = vtiger_relcriteria_grouping.groupid';
-			$ssql.= " where vtiger_report.reportid = ? && vtiger_relcriteria.groupid = ? order by vtiger_relcriteria.columnindex";
+			$ssql .= " where vtiger_report.reportid = ? && vtiger_relcriteria.groupid = ? order by vtiger_relcriteria.columnindex";
 
 			$result = $adb->pquery($ssql, array($reportid, $groupId));
 			$noOfColumns = $adb->num_rows($result);
@@ -1141,29 +1141,29 @@ 
 		//Added to avoid display the Related fields (Account name,Vandor name,product name, etc) in Report Calculations(SUM,AVG..)
 		switch ($tabid) {
 			case 4://Contacts
-				$ssql.= " and vtiger_field.fieldname not in ('account_id')";
+				$ssql .= " and vtiger_field.fieldname not in ('account_id')";
 				break;
 			case 6://Accounts
-				$ssql.= " and vtiger_field.fieldname not in ('account_id')";
+				$ssql .= " and vtiger_field.fieldname not in ('account_id')";
 				break;
 			case 9://Calandar
-				$ssql.= " and vtiger_field.fieldname not in ('parent_id','contact_id')";
+				$ssql .= " and vtiger_field.fieldname not in ('parent_id','contact_id')";
 				break;
 			case 13://Trouble tickets(HelpDesk)
-				$ssql.= " and vtiger_field.fieldname not in ('parent_id','product_id')";
+				$ssql .= " and vtiger_field.fieldname not in ('parent_id','product_id')";
 				break;
 			case 14://Products
-				$ssql.= " and vtiger_field.fieldname not in ('vendor_id','product_id')";
+				$ssql .= " and vtiger_field.fieldname not in ('vendor_id','product_id')";
 				break;
 			case 21://Purchase Order
-				$ssql.= " and vtiger_field.fieldname not in ('contact_id','vendor_id','currency_id')";
+				$ssql .= " and vtiger_field.fieldname not in ('contact_id','vendor_id','currency_id')";
 				break;
 			case 26://Campaigns
-				$ssql.= " and vtiger_field.fieldname not in ('product_id')";
+				$ssql .= " and vtiger_field.fieldname not in ('product_id')";
 				break;
 		}
 
-		$ssql.= " order by sequence";
+		$ssql .= " order by sequence";
 
 		$result = $adb->pquery($ssql, $sparams);
 		$columntototalrow = $adb->fetch_array($result);
@@ -1324,7 +1324,7 @@ 
 		}
 
 		$temp_val = explode(",", $adv_filter_value);
-		if (($column_info[4] == 'D' || ($column_info[4] == 'T' && $column_info[1] != 'time_start' && $column_info[1] != 'time_end') || ($column_info[4] == 'DT')) && ($column_info[4] != '' && $adv_filter_value != '' )) {
+		if (($column_info[4] == 'D' || ($column_info[4] == 'T' && $column_info[1] != 'time_start' && $column_info[1] != 'time_end') || ($column_info[4] == 'DT')) && ($column_info[4] != '' && $adv_filter_value != '')) {
 			$val = [];
 			for ($x = 0; $x < count($temp_val); $x++) {
 				if (trim($temp_val[$x]) != '') {

Braces +79 added lines, -56 removed lines

@@ -129,10 +129,11 @@ 
 				$this->reportname = decode_html($cachedInfo["reportname"]);
 				$this->reportdescription = decode_html($cachedInfo["description"]);
 				$this->folderid = $cachedInfo["folderid"];
-				if ($is_admin === true || in_array($cachedInfo["owner"], $subordinate_users) || $cachedInfo["owner"] == $current_user->id)
-					$this->is_editable = 'true';
-				else
-					$this->is_editable = 'false';
+				if ($is_admin === true || in_array($cachedInfo["owner"], $subordinate_users) || $cachedInfo["owner"] == $current_user->id) {
+									$this->is_editable = 'true';
+				} else {
+									$this->is_editable = 'false';
+				}
 			} else {
 				throw new \Exception\NoPermitted('LBL_PERMISSION_DENIED');
 			}
@@ -143,8 +144,9 @@ 
 	public function updateModuleList($module)
 	{
 		$adb = PearDatabase::getInstance();
-		if (!isset($module))
-			return;
+		if (!isset($module)) {
+					return;
+		}
 		require_once('include/utils/utils.php');
 		$tabid = \includes\Modules::getModuleId($module);
 		if ($module == 'Calendar') {
@@ -153,12 +155,14 @@ 
 		$sql = sprintf('SELECT blockid, blocklabel FROM vtiger_blocks WHERE tabid IN (%s)', generateQuestionMarks($tabid));
 		$res = $adb->pquery($sql, [$tabid]);
 		$noOfRows = $adb->num_rows($res);
-		if ($noOfRows <= 0)
-			return;
+		if ($noOfRows <= 0) {
+					return;
+		}
 		for ($index = 0; $index < $noOfRows; ++$index) {
 			$blockid = $adb->query_result($res, $index, 'blockid');
-			if (in_array($blockid, $this->module_list[$module]))
-				continue;
+			if (in_array($blockid, $this->module_list[$module])) {
+							continue;
+			}
 			$blockid_list[] = $blockid;
 			$blocklabel = $adb->query_result($res, $index, 'blocklabel');
 			$this->module_list[$module][$blocklabel] = $blockid;
@@ -189,10 +193,14 @@ 
 
 			if ($modulerows) {
 				foreach ($modulerows as $resultrow) {
-					if ($resultrow['presence'] == '1')
-						continue;   // skip disabled modules
-					if ($resultrow['isentitytype'] != '1')
-						continue;  // skip extension modules
+					if ($resultrow['presence'] == '1') {
+											continue;
+					}
+					// skip disabled modules
+					if ($resultrow['isentitytype'] != '1') {
+											continue;
+					}
+					// skip extension modules
 					if (in_array($resultrow['name'], $restricted_modules)) { // skip restricted modules
 						continue;
 					}
@@ -223,10 +231,11 @@ 
 						}
 
 						if (!empty($blocklabel)) {
-							if ($module == 'Calendar' && $blocklabel == 'LBL_CUSTOM_INFORMATION')
-								$this->module_list[$module][$blockid] = \includes\Language::translate($blocklabel, $module);
-							else
-								$this->module_list[$module][$blockid] = \includes\Language::translate($blocklabel, $module);
+							if ($module == 'Calendar' && $blocklabel == 'LBL_CUSTOM_INFORMATION') {
+															$this->module_list[$module][$blockid] = \includes\Language::translate($blocklabel, $module);
+							} else {
+															$this->module_list[$module][$blockid] = \includes\Language::translate($blocklabel, $module);
+							}
 							$prev_block_label = $blocklabel;
 						} else {
 							$this->module_list[$module][$blockid] = \includes\Language::translate($prev_block_label, $module);
@@ -370,13 +379,15 @@ 
 				$report_details ['reportname'] = $report["reportname"];
 				$report_details ['sharingtype'] = $report["sharingtype"];
 				$report_details['folderid'] = $report["folderid"];
-				if ($is_admin === true)
-					$report_details ['editable'] = 'true';
-				else
-					$report_details['editable'] = 'false';
+				if ($is_admin === true) {
+									$report_details ['editable'] = 'true';
+				} else {
+									$report_details['editable'] = 'false';
+				}
 
-				if (isPermitted($report["primarymodule"], 'index') == "yes")
-					$returndata[] = $report_details;
+				if (isPermitted($report["primarymodule"], 'index') == "yes") {
+									$returndata[] = $report_details;
+				}
 			}while ($report = $adb->fetch_array($result));
 		}
 		$log->info("Reports :: ListView->Successfully returned vtiger_report details HTML");
@@ -457,13 +468,15 @@ 
 				$report_details['reportname'] = $report["reportname"];
 				$report_details['reporttype'] = $report["reporttype"];
 				$report_details['sharingtype'] = $report["sharingtype"];
-				if ($is_admin === true || in_array($report["owner"], $subordinate_users) || $report["owner"] == $currentUser->getId())
-					$report_details['editable'] = 'true';
-				else
-					$report_details['editable'] = 'false';
+				if ($is_admin === true || in_array($report["owner"], $subordinate_users) || $report["owner"] == $currentUser->getId()) {
+									$report_details['editable'] = 'true';
+				} else {
+									$report_details['editable'] = 'false';
+				}
 
-				if (isPermitted($report["primarymodule"], 'index') == "yes")
-					$returndata [$report["folderid"]][] = $report_details;
+				if (isPermitted($report["primarymodule"], 'index') == "yes") {
+									$returndata [$report["folderid"]][] = $report_details;
+				}
 			}while ($report = $adb->fetch_array($result));
 		}
 
@@ -596,8 +609,9 @@ 
 		$log = vglobal('log');
 		$current_user = vglobal('current_user');
 
-		if (is_string($block))
-			$block = explode(",", $block);
+		if (is_string($block)) {
+					$block = explode(",", $block);
+		}
 		$skipTalbes = array('vtiger_emaildetails', 'vtiger_attachments');
 
 		$tabid = \includes\Modules::getModuleId($module);
@@ -612,12 +626,12 @@ 
 			$sql = sprintf("select * from vtiger_field where vtiger_field.tabid in (%s) and vtiger_field.block in (%s) and vtiger_field.displaytype in (1,2,3,10) and vtiger_field.presence in (0,2) && tablename NOT IN (%s) ", generateQuestionMarks($tabid), generateQuestionMarks($block), generateQuestionMarks($skipTalbes));
 
 			//fix for Ticket #4016
-			if ($module == "Calendar")
-				$sql.=" group by vtiger_field.fieldlabel order by sequence";
-			else
-				$sql.=" order by sequence";
-		}
-		else {
+			if ($module == "Calendar") {
+							$sql.=" group by vtiger_field.fieldlabel order by sequence";
+			} else {
+							$sql.=" order by sequence";
+			}
+		} else {
 
 			$profileList = getCurrentUserProfileList();
 			$sql = sprintf("select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid in (%s)  and vtiger_field.block in (%s) and vtiger_field.displaytype in (1,2,3,10) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.presence in (0,2)", generateQuestionMarks($tabid), generateQuestionMarks($block));
@@ -628,10 +642,11 @@ 
 			$sql .= ' and tablename NOT IN (' . generateQuestionMarks($skipTalbes) . ') ';
 
 			//fix for Ticket #4016
-			if ($module == "Calendar")
-				$sql.=" group by vtiger_field.fieldlabel order by sequence";
-			else
-				$sql.=" group by vtiger_field.fieldid order by sequence";
+			if ($module == "Calendar") {
+							$sql.=" group by vtiger_field.fieldlabel order by sequence";
+			} else {
+							$sql.=" group by vtiger_field.fieldid order by sequence";
+			}
 		}
 		array_push($params, $skipTalbes);
 
@@ -679,8 +694,9 @@ 
 				$this->adv_rel_fields[$fieldtypeofdata][] = $adv_rel_field_tod_value;
 			}
 			//added to escape attachments fields in Reports as we have multiple attachments
-			if ($module == 'HelpDesk' && $fieldname == 'filename')
-				continue;
+			if ($module == 'HelpDesk' && $fieldname == 'filename') {
+							continue;
+			}
 
 			if (is_string($block) || $group_res_by_block === false) {
 				$module_columnlist[$optionvalue] = $fieldlabel;
@@ -971,8 +987,9 @@ 
 
 			$result = $adb->pquery($ssql, array($reportid, $groupId));
 			$noOfColumns = $adb->num_rows($result);
-			if ($noOfColumns <= 0)
-				continue;
+			if ($noOfColumns <= 0) {
+							continue;
+			}
 
 			while ($relcriteriarow = $adb->fetch_array($result)) {
 				$columnIndex = $relcriteriarow["columnindex"];
@@ -1029,8 +1046,9 @@ 
 			$i++;
 		}
 		// Clear the condition (and/or) for last group, if any.
-		if (!empty($advft_criteria[$i - 1]['condition']))
-			$advft_criteria[$i - 1]['condition'] = '';
+		if (!empty($advft_criteria[$i - 1]['condition'])) {
+					$advft_criteria[$i - 1]['condition'] = '';
+		}
 		$this->advft_criteria = $advft_criteria;
 		$log->info("Reports :: Successfully returned getAdvancedFilterList");
 		return true;
@@ -1289,13 +1307,15 @@ 
 	$idelrelcriteriagroupsql = "delete from vtiger_relcriteria_grouping where queryid=?";
 	$idelrelcriteriagroupsqlresult = $adb->pquery($idelrelcriteriagroupsql, array($reportid));
 
-	if (empty($advft_criteria))
-		return;
+	if (empty($advft_criteria)) {
+			return;
+	}
 
 	foreach ($advft_criteria as $column_index => $column_condition) {
 
-		if (empty($column_condition))
-			continue;
+		if (empty($column_condition)) {
+					continue;
+		}
 
 		$adv_filter_column = $column_condition["columnname"];
 		$adv_filter_comparator = $column_condition["comparator"];
@@ -1356,10 +1376,13 @@ 
 
 	foreach ($advft_criteria_groups as $group_index => $group_condition_info) {
 
-		if (empty($group_condition_info))
-			continue;
-		if (empty($group_condition_info["conditionexpression"]))
-			continue; // Case when the group doesn't have any column criteria
+		if (empty($group_condition_info)) {
+					continue;
+		}
+		if (empty($group_condition_info["conditionexpression"])) {
+					continue;
+		}
+		// Case when the group doesn't have any column criteria
 
 		$irelcriteriagroupsql = "insert into vtiger_relcriteria_grouping(GROUPID,QUERYID,GROUP_CONDITION,CONDITION_EXPRESSION) values (?,?,?,?)";
 		$irelcriteriagroupresult = $adb->pquery($irelcriteriagroupsql, array($group_index, $reportid, $group_condition_info["groupcondition"], $group_condition_info["conditionexpression"]));