YetiForceCompany / YetiForceCRM

vtlib/Vtiger/Zip.php

Doc Comments +2 added lines

@@ -69,6 +69,7 @@ 
 
 	/**
 	 * Normalize the directory path separators.
+	 * @param string $path
 	 */
 	public function __normalizePath($path)
 	{
@@ -79,6 +80,7 @@ 
 
 	/**
 	 * Copy the directory on the disk into zip file.
+	 * @param string $zipdirname
 	 */
 	public function copyDirectoryFromDisk($dirname, $zipdirname = null, $excludeList = null, $basedirname = null)
 	{

Braces +18 added lines, -12 removed lines

@@ -50,8 +50,9 @@ 
 		if ($search_index === 0) {
 			$startindex = strlen($base_realpath) + 1;
 			// On windows $base_realpath ends with / and On Linux it will not have / at end!
-			if (strrpos($base_realpath, '/') == strlen($base_realpath) - 1)
-				$startindex -= 1;
+			if (strrpos($base_realpath, '/') == strlen($base_realpath) - 1) {
+							$startindex -= 1;
+			}
 			$relpath = substr($src_realpath, $startindex);
 		}
 		return $relpath;
@@ -62,8 +63,9 @@ 
 	 */
 	public function __fixDirSeparator($path)
 	{
-		if ($path != '' && (strripos($path, '/') != strlen($path) - 1))
-			$path .= '/';
+		if ($path != '' && (strripos($path, '/') != strlen($path) - 1)) {
+					$path .= '/';
+		}
 		return $path;
 	}
 
@@ -72,8 +74,9 @@ 
 	 */
 	public function __normalizePath($path)
 	{
-		if ($path && strpos($path, '\\') !== false)
-			$path = preg_replace("/\\\\/", "/", $path);
+		if ($path && strpos($path, '\\') !== false) {
+					$path = preg_replace("/\\\\/", "/", $path);
+		}
 		return $path;
 	}
 
@@ -83,18 +86,21 @@ 
 	public function copyDirectoryFromDisk($dirname, $zipdirname = null, $excludeList = null, $basedirname = null)
 	{
 		$dir = opendir($dirname);
-		if (strripos($dirname, '/') != strlen($dirname) - 1)
-			$dirname .= '/';
+		if (strripos($dirname, '/') != strlen($dirname) - 1) {
+					$dirname .= '/';
+		}
 
-		if ($basedirname === null)
-			$basedirname = realpath($dirname);
+		if ($basedirname === null) {
+					$basedirname = realpath($dirname);
+		}
 
 		while (false !== ($file = readdir($dir))) {
 			if ($file != '.' && $file != '..' &&
 				$file != '.svn' && $file != 'CVS') {
 				// Exclude the file/directory 
-				if (!empty($excludeList) && in_array("$dirname$file", $excludeList))
-					continue;
+				if (!empty($excludeList) && in_array("$dirname$file", $excludeList)) {
+									continue;
+				}
 
 				if (is_dir("$dirname$file")) {
 					$this->copyDirectoryFromDisk("$dirname$file", $zipdirname, $excludeList, $basedirname);

api.php

Braces +7 added lines, -14 removed lines

@@ -19,33 +19,26 @@
 	if($service == "customerportal")
 	{
 		include("api/customerportal.php");
-	}	
-	elseif($service == "mobile")	
+	} elseif($service == "mobile")	
 	{		
 		include("api/mobile.php");
-	}
-	elseif($service == "yetiportal")	
+	} elseif($service == "yetiportal")	
 	{		
 		include("api/yetiportal.php");
-	}
-	elseif($service == "firefox")
+	} elseif($service == "firefox")
 	{
 		include("api/firefoxtoolbar.php");
-	}
-	elseif($service == "wordplugin")
+	} elseif($service == "wordplugin")
 	{
 		include("api/wordplugin.php");
-	}
-	elseif($service == "thunderbird")
+	} elseif($service == "thunderbird")
 	{
 		include("api/thunderbirdplugin.php");
-	}
-	else
+	} else
 	{
 		echo "No Service Configured for ". strip_tags($service);
 	}
-}
-else
+} else
 {
 	echo "<h1>YetiForceCRM API Services</h1>";
 	echo "<li>YetiForceCRM Yeti Portal EndPoint URL -- Click <a href='api.php?service=yetiportal'>here</a></li>";

Spacing +10 added lines, -10 removed lines

@@ -11,39 +11,39 @@
 require_once 'config/api.php';
 $service = $_REQUEST['service'];
 
-if(isset($service))
+if (isset($service))
 {
-	if(!in_array($service,$enabledServices)){
-		echo $service.' - Service is not active';
+	if (!in_array($service, $enabledServices)) {
+		echo $service . ' - Service is not active';
 		return;
 	}	
-	if($service == "customerportal")
+	if ($service == "customerportal")
 	{
 		include("api/customerportal.php");
 	}	
-	elseif($service == "mobile")	
+	elseif ($service == "mobile")	
 	{		
 		include("api/mobile.php");
 	}
-	elseif($service == "yetiportal")	
+	elseif ($service == "yetiportal")	
 	{		
 		include("api/yetiportal.php");
 	}
-	elseif($service == "firefox")
+	elseif ($service == "firefox")
 	{
 		include("api/firefoxtoolbar.php");
 	}
-	elseif($service == "wordplugin")
+	elseif ($service == "wordplugin")
 	{
 		include("api/wordplugin.php");
 	}
-	elseif($service == "thunderbird")
+	elseif ($service == "thunderbird")
 	{
 		include("api/thunderbirdplugin.php");
 	}
 	else
 	{
-		echo "No Service Configured for ". strip_tags($service);
+		echo "No Service Configured for " . strip_tags($service);
 	}
 }
 else

include/Modules.php

Braces +10 added lines, -8 removed lines

@@ -16,10 +16,11 @@ 
 	{
 		$entity = false;
 		if ($mixed) {
-			if (is_numeric($mixed))
-				$entity = isset(self::$moduleEntityCacheById[$mixed]) ? self::$moduleEntityCacheById[$mixed] : false;
-			else
-				$entity = isset(self::$moduleEntityCacheByName[$mixed]) ? self::$moduleEntityCacheByName[$mixed] : false;
+			if (is_numeric($mixed)) {
+							$entity = isset(self::$moduleEntityCacheById[$mixed]) ? self::$moduleEntityCacheById[$mixed] : false;
+			} else {
+							$entity = isset(self::$moduleEntityCacheByName[$mixed]) ? self::$moduleEntityCacheByName[$mixed] : false;
+			}
 		}
 		if (!$entity) {
 			$adb = \PearDatabase::getInstance();
@@ -31,10 +32,11 @@ 
 				self::$moduleEntityCacheById[$row['tabid']] = $row;
 			}
 			if ($mixed) {
-				if (is_numeric($mixed))
-					return self::$moduleEntityCacheById[$mixed];
-				else
-					return self::$moduleEntityCacheByName[$mixed];
+				if (is_numeric($mixed)) {
+									return self::$moduleEntityCacheById[$mixed];
+				} else {
+									return self::$moduleEntityCacheByName[$mixed];
+				}
 			}
 		}
 		return $entity;

Doc Comments +3 added lines

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

include/ChartUtils.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 				$x = "";
 				for ($j = 0; $j < count($val); $j++) {
 					if ($j != $n) {
-						$x .=" " . $val[$j];
+						$x .= " " . $val[$j];
 					} else {
 						$x .= "@#" . $val[$j];
 					}
@@ -240,7 +240,7 @@ 
 				$x = "";
 				for ($j = 0; $j < count($val); $j++) {
 					if ($j != $n) {
-						$x .=" " . $val[$j];
+						$x .= " " . $val[$j];
 					} else {
 						$x .= "@#" . $val[$j];
 					}

Braces +55 added lines, -40 removed lines

@@ -32,14 +32,18 @@ 
 		} else {
 			$cache_file_name = $cachedFileName;
 		}
-		if (empty($width))
-			$width = '400';
-		if (empty($height))
-			$height = '300';
-		if ($target === false)
-			$target = [];
-		if (empty($color))
-			$color = 'black';
+		if (empty($width)) {
+					$width = '400';
+		}
+		if (empty($height)) {
+					$height = '300';
+		}
+		if ($target === false) {
+					$target = [];
+		}
+		if (empty($color)) {
+					$color = 'black';
+		}
 
 		$alts = [];
 		$temp = [];
@@ -48,8 +52,9 @@ 
 			$pos = substr_count($name, " ");
 			$alts[] = $name;
 			//If the daatx value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line
-			if (strlen($name) >= 14)
-				$name = substr($name, 0, 44);
+			if (strlen($name) >= 14) {
+							$name = substr($name, 0, 44);
+			}
 			if ($pos >= 2) {
 				$val = explode(" ", $name);
 				$n = count($val) - 1;
@@ -102,8 +107,9 @@ 
 
 		for ($i = 0; $i < count($yaxisData); $i++) {
 			$x = 1 + $i;
-			if ($yaxisData[$i] >= $max)
-				$max = $yaxisData[$i];
+			if ($yaxisData[$i] >= $max) {
+							$max = $yaxisData[$i];
+			}
 			$dataset->addPoint(
 				$x, $yaxisData[$i], array(
 				'url' => $target[$i],
@@ -125,8 +131,9 @@ 
 		$bplot->setFillStyle($fill);
 
 		//You can change the width of the bars if you like
-		if (!empty($xaxisData))
-			$bplot->setBarWidth($barwidth / count($xaxisData), "%");
+		if (!empty($xaxisData)) {
+					$bplot->setBarWidth($barwidth / count($xaxisData), "%");
+		}
 		$bplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', 'white')));
 		$xaxis = & $plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
 		$yaxis = & $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
@@ -150,8 +157,9 @@ 
 		$ticks = get_tickspacing(round(($max * 1.1) + 0.5));
 
 		// First make the labels look right
-		if ($charttype == 'horizontal')
-			$yaxis->setFontAngle('vertical');
+		if ($charttype == 'horizontal') {
+					$yaxis->setFontAngle('vertical');
+		}
 		$yaxis->setLabelInterval($ticks[0]);
 		$yaxis->setTickOptions(-5, 0);
 		$yaxis->setLabelInterval($ticks[1], 2);
@@ -165,8 +173,9 @@ 
 		$xaxis->setDataPreprocessor($array_data);
 		$xaxis->forceMinimum(0.5);
 		$xaxis->forceMaximum(0.5 + count($yaxisData));
-		if ($charttype == 'vertical')
-			$xaxis->setFontAngle('vertical');
+		if ($charttype == 'vertical') {
+					$xaxis->setFontAngle('vertical');
+		}
 		$xaxis->setLabelInterval(1);
 		$xaxis->setTickOptions(0, 0);
 		$xaxis->setLabelInterval(2, 2);
@@ -218,12 +227,15 @@ 
 			$cache_file_name = $cachedFileName;
 		}
 
-		if (empty($width))
-			$width = '500';
-		if (empty($height))
-			$height = '400';
-		if ($target === false)
-			$target = [];
+		if (empty($width)) {
+					$width = '500';
+		}
+		if (empty($height)) {
+					$height = '400';
+		}
+		if ($target === false) {
+					$target = [];
+		}
 
 		$alts = [];
 		$temp = [];
@@ -232,8 +244,9 @@ 
 			$pos = substr_count($name, " ");
 			$alts[] = $name;
 			//If the datax value of a string is greater, adding '\n' to it so that it'll come in 2nd line
-			if (strlen($name) >= 14)
-				$name = substr($name, 0, 34);
+			if (strlen($name) >= 14) {
+							$name = substr($name, 0, 34);
+			}
 			if ($pos >= 2) {
 				$val = explode(" ", $name);
 				$n = count($val) - 1;
@@ -297,8 +310,9 @@ 
 			$pcvalues[$yaxisData[$i]] = sprintf('%0.1f%%', 100 * $yaxisData[$i] / $sum);
 			$fills->addColor($colors[$i]);
 		}
-		if ($sum == 0)
-			return null;
+		if ($sum == 0) {
+					return null;
+		}
 		// create the pie chart and associate the filling colours
 		$gbplot = & $plotarea->addNew('pie', $dataset);
 		$plotarea->setPadding(array('top' => 0, 'bottom' => 0, 'left' => 0, 'right' => ($width / 20)));
@@ -361,8 +375,9 @@ 
 		$restrictedModules = false;
 		foreach ($reportModules as $mod) {
 			if (isPermitted($mod, 'index') != 'yes' || \includes\Modules::isModuleActive($mod) == false) {
-				if (!is_array($restrictedModules))
-					$restrictedModules = [];
+				if (!is_array($restrictedModules)) {
+									$restrictedModules = [];
+				}
 				$restrictedModules[] = $mod;
 			}
 		}
@@ -409,12 +424,12 @@ 
 					$groupFieldValue = $valueComp[1];
 				}
 				if ($dateField) {
-					if (!empty($groupFieldValue))
-						$groupByFields[] = CustomReportUtils::getXAxisDateFieldValue($groupFieldValue, $criteria);
-					else
-						$groupByFields[] = "Null";
-				}
-				else if (in_array($fieldname, array_keys($referenceFields))) {
+					if (!empty($groupFieldValue)) {
+											$groupByFields[] = CustomReportUtils::getXAxisDateFieldValue($groupFieldValue, $criteria);
+					} else {
+											$groupByFields[] = "Null";
+					}
+				} else if (in_array($fieldname, array_keys($referenceFields))) {
 					if (count($referenceFields[$fieldname]) > 1) {
 						$refenceModule = CustomReportUtils::getEntityTypeFromName($decodedGroupFieldValue, $referenceFields[$fieldname]);
 					} else {
@@ -443,10 +458,10 @@ 
 						$advanceSearchCondition = CustomReportUtils::getAdvanceSearchCondition($fieldDetails, $criteria, $groupFieldValue);
 						if ($module == 'Calendar') {
 							$link_val = "index.php?module=" . $module . "&query=true&action=ListView&" . $advanceSearchCondition;
-						} else
-							$link_val = "index.php?module=" . $module . "&query=true&action=index&" . $advanceSearchCondition;
-					}
-					else {
+						} else {
+													$link_val = "index.php?module=" . $module . "&query=true&action=index&" . $advanceSearchCondition;
+						}
+					} else {
 						$cvid = \vtlib\Deprecated::getIdOfCustomViewByNameAll($module);
 						$esc_search_str = urlencode($decodedGroupFieldValue);
 						if ($single == 'DT') {

include/utils/EmailTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 				$moduleTableIndexList = $meta->getEntityTableIndexList();
 				foreach ($tableList as $index => $tableName) {
 					if ($tableName != $tableList[0]) {
-						$sql .=' INNER JOIN ' . $tableName . ' ON ' . $tableList[0] . '.' .
+						$sql .= ' INNER JOIN ' . $tableName . ' ON ' . $tableList[0] . '.' .
 							$moduleTableIndexList[$tableList[0]] . '=' . $tableName . '.' .
 							$moduleTableIndexList[$tableName];
 					}
@@ -128,7 +128,7 @@ 
 				//If module is Leads and if you are not selected any leads fields then query failure is happening.
 				//By default we are checking where condition on base table.
 				if ($module == 'Leads' && !in_array('vtiger_leaddetails', $tableList)) {
-					$sql .=' INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_crmentity.crmid';
+					$sql .= ' INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_crmentity.crmid';
 				}
 
 				$sql .= ' WHERE';

Braces +6 added lines, -4 removed lines

@@ -209,8 +209,9 @@ 
 						$needle = '$' . strtolower($this->module) . '-' . $parentFieldColumnMapping[$params['field']] . ':' . $column . '$';
 						$this->processedDescription = str_replace($needle, $values[array_search($column, $fieldColumnMapping)], $this->processedDescription);
 					}
-					if (!$params['owner'])
-						$this->processedmodules[$module] = true;
+					if (!$params['owner']) {
+											$this->processedmodules[$module] = true;
+					}
 				}
 			}
 		}
@@ -253,7 +254,8 @@ 
 		$rows = $adb->num_rows($res);
 		if ($rows > 0) {
 			return true;
-		} else
-			return false;
+		} else {
+					return false;
+		}
 	}
 }

include/utils/ConfigReader.php

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 
 	public function setConfig($key, $value)
 	{
-		if (empty($key))
-			return;
+		if (empty($key)) {
+					return;
+		}
 		$this->properties[$key] = $value;
 		//not neccessary for php5.x versions
 		self::$propertiesCache[$this->name] = $this->properties;
@@ -46,8 +47,9 @@ 
 
 	public function getConfig($key)
 	{
-		if (empty($key))
-			return '';
+		if (empty($key)) {
+					return '';
+		}
 		return $this->properties[$key];
 	}
 }

Doc Comments +7 added lines

@@ -15,6 +15,10 @@ 
 	protected $name;
 	static $propertiesCache = [];
 
+	/**
+	 * @param string $path
+	 * @param string $name
+	 */
 	public function __construct($path, $name, $force = false)
 	{
 		$this->load($path, $name, $force);
@@ -41,6 +45,9 @@ 
 		self::$propertiesCache[$this->name] = $this->properties;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function getConfig($key)
 	{
 		if (empty($key))

include/utils/ExportUtils.php

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 	$blockid_list = '(';
 	for ($i = 0; $i < $noofrows; $i++) {
 		$blockid = $adb->query_result($result, $i, "blockid");
-		if ($i != 0)
-			$blockid_list .= ', ';
+		if ($i != 0) {
+					$blockid_list .= ', ';
+		}
 		$blockid_list .= $blockid;
 		$block_label[$blockid] = $adb->query_result($result, $i, "blocklabel");
 	}

include/utils/InventoryUtils.php

Spacing +8 added lines, -8 removed lines

@@ -313,7 +313,7 @@ 
 	$moduleName = $entity->getModuleName();
 
 	$statusChanged = false;
-	$vtEntityDelta = new VTEntityDelta ();
+	$vtEntityDelta = new VTEntityDelta();
 	$oldEntity = $vtEntityDelta->getOldValue($moduleName, $entity_id, $statusFieldName);
 	$recordDetails = $entity->getData();
 	$statusChanged = $vtEntityDelta->hasChanged($moduleName, $entity_id, $statusFieldName);
@@ -941,19 +941,19 @@ 
 		for ($i = 0; $i < $noOfRows; ++$i) {
 			$status = $adb->query_result($result, $i, 'temp_status');
 			if ($obj->getImportRecordStatus('none') == $status) {
-				$statusCount['PENDING'] ++;
+				$statusCount['PENDING']++;
 			} elseif ($obj->getImportRecordStatus('failed') == $status) {
-				$statusCount['FAILED'] ++;
+				$statusCount['FAILED']++;
 			} else {
-				$statusCount['IMPORTED'] ++;
+				$statusCount['IMPORTED']++;
 				switch ($status) {
-					case $obj->getImportRecordStatus('created') : $statusCount['CREATED'] ++;
+					case $obj->getImportRecordStatus('created') : $statusCount['CREATED']++;
 						break;
-					case $obj->getImportRecordStatus('skipped') : $statusCount['SKIPPED'] ++;
+					case $obj->getImportRecordStatus('skipped') : $statusCount['SKIPPED']++;
 						break;
-					case $obj->getImportRecordStatus('updated') : $statusCount['UPDATED'] ++;
+					case $obj->getImportRecordStatus('updated') : $statusCount['UPDATED']++;
 						break;
-					case $obj->getImportRecordStatus('merged') : $statusCount['MERGED'] ++;
+					case $obj->getImportRecordStatus('merged') : $statusCount['MERGED']++;
 						break;
 				}
 			}

Doc Comments +1 added lines, -3 removed lines

@@ -17,6 +17,7 @@ 
  * Param $ext_prod_arr - existing vtiger_products
  * Param $module - module name
  * return type void
+ * @param string $mode
  */
 function updateStk($product_id, $qty, $mode, $ext_prod_arr, $module)
 {
@@ -250,9 +251,6 @@ 
 }
 
 /** 	Function used to delete the Inventory product details for the passed entity
- * 	@param int $objectid - entity id to which we want to delete the product details from REQUEST values where as the entity will be Purchase Order or Invoice
- * 	@param string $return_old_values - string which contains the string return_old_values or may be empty, if the string is return_old_values then before delete old values will be retrieved
- * 	@return array $ext_prod_arr - if the second input parameter is 'return_old_values' then the array which contains the productid and quantity which will be retrieved before delete the product details will be returned otherwise return empty
  */
 function deleteInventoryProductDetails($focus)
 {

Braces +27 added lines, -19 removed lines

@@ -128,16 +128,18 @@ 
 	$taxpercentage = $adb->query_result($res, 0, 'taxpercentage');
 
 	//This is to retrive the default configured value if the taxpercentage related to product is empty
-	if ($taxpercentage == '' && $default == 'default')
-		$taxpercentage = getTaxPercentage($type);
+	if ($taxpercentage == '' && $default == 'default') {
+			$taxpercentage = getTaxPercentage($type);
+	}
 
 
 	$log->debug("Exiting from getProductTaxPercentage($productid,$type) function. return value=$taxpercentage");
-	if ($current_user->truncate_trailing_zeros === true)
-		return \vtlib\Functions::formatDecimal($taxpercentage);
-	else
-		return $taxpercentage;
-}
+	if ($current_user->truncate_trailing_zeros === true) {
+			return \vtlib\Functions::formatDecimal($taxpercentage);
+	} else {
+			return $taxpercentage;
+	}
+	}
 
 /** 	Function used to get the list of Tax types as a array
  * 	@param string $available - available or empty where as default is all, if available then the taxes which are available now will be returned otherwise all taxes will be returned
@@ -229,8 +231,9 @@ 
 		$params = array($productid);
 
 		//Postgres 8 fixes
-		if ($adb->isPostgres())
-			$query = fixPostgresQuery($query, $log, 0);
+		if ($adb->isPostgres()) {
+					$query = fixPostgresQuery($query, $log, 0);
+		}
 
 		$res = $adb->pquery($query, $params);
 		for ($i = 0; $i < $adb->num_rows($res); $i++) {
@@ -372,8 +375,9 @@ 
 
 	$inv_table_array = [];
 	$inv_id_array = [];
-	if (!array_key_exists($module, $inv_table_array))
-		return '';
+	if (!array_key_exists($module, $inv_table_array)) {
+			return '';
+	}
 
 	$res = $adb->pquery("select taxtype from $inv_table_array[$module] where $inv_id_array[$module]=?", array($id));
 
@@ -428,8 +432,9 @@ 
 	$res = $adb->pquery("select $taxname from vtiger_inventoryproductrel where id = ? and productid = ?", array($id, $productid));
 	$taxvalue = $adb->query_result($res, 0, $taxname);
 
-	if ($taxvalue == '')
-		$taxvalue = '0';
+	if ($taxvalue == '') {
+			$taxvalue = '0';
+	}
 
 	$log->debug("Exit from function getInventoryProductTaxValue($id, $productid, $taxname).");
 
@@ -477,8 +482,9 @@ 
 		}
 
 		//Postgres 8 fixes
-		if ($adb->isPostgres())
-			$query = fixPostgresQuery($query, $log, 0);
+		if ($adb->isPostgres()) {
+					$query = fixPostgresQuery($query, $log, 0);
+		}
 
 		$res = $adb->pquery($query, $params);
 		for ($i = 0; $i < $adb->num_rows($res); $i++) {
@@ -775,8 +781,9 @@ 
 		$subject = $row['subject'];
 		$sql = 'SELECT * FROM %s WHERE temp_status = %s';
 		$sql = sprintf($sql, $tableName, Import_Data_Action::$IMPORT_RECORD_NONE);
-		if (!empty($subject))
-			$sql .= ' && subject = "' . str_replace("\"", "\\\"", $subject) . '"';
+		if (!empty($subject)) {
+					$sql .= ' && subject = "' . str_replace("\"", "\\\"", $subject) . '"';
+		}
 		$subjectResult = $adb->query($sql);
 		$count = $adb->num_rows($subjectResult);
 		$subjectRowIDs = [];
@@ -893,8 +900,9 @@ 
 			foreach ($fieldMapping as $fieldName => $index) {
 				if ($moduleFields[$fieldName]->getTableName() == 'vtiger_inventoryproductrel') {
 					$lineItemData[$fieldName] = $lineItemFieldData[$fieldName];
-					if ($fieldName != 'productid')
-						$inventoryFieldData[$fieldName] = '';
+					if ($fieldName != 'productid') {
+											$inventoryFieldData[$fieldName] = '';
+					}
 				}
 			}
 			array_push($lineItems, $lineItemData);

include/utils/EditViewUtils.php

Braces +25 added lines, -15 removed lines

@@ -111,10 +111,12 @@ 
 			$product_Detail[$i]['entityType' . $i] = $entitytype;
 		}
 
-		if ($listprice == '')
-			$listprice = $unitprice;
-		if ($qty == '')
-			$qty = 1;
+		if ($listprice == '') {
+					$listprice = $unitprice;
+		}
+		if ($qty == '') {
+					$qty = 1;
+		}
 
 		//calculate productTotal
 		$productTotal = $qty * $listprice;
@@ -136,8 +138,9 @@ 
 				$sprod_id = $adb->query_result($sub_prod_query, $j, 'prod_id');
 				$sprod_name = $subProductArray[] = \vtlib\Functions::getCRMRecordLabel($sprod_id);
 				$str_sep = "";
-				if ($j > 0)
-					$str_sep = ":";
+				if ($j > 0) {
+									$str_sep = ":";
+				}
 				$subprodid_str .= $str_sep . $sprod_id;
 				if (isset($sprod_name)) {
 					$subprodname_str .= $str_sep . " - " . $sprod_name;
@@ -219,12 +222,17 @@ 
 
 			//condition to avoid this function call when create new PO/Invoice from Product module
 			if ($focus->id != '') {
-				if ($taxtype == 'individual')//if individual then show the entered tax percentage
+				if ($taxtype == 'individual') {
+					//if individual then show the entered tax percentage
 					$tax_value = getInventoryProductTaxValue($focus->id, $hdnProductId, $tax_name);
-				else//if group tax then we have to show the default value when change to individual tax
+				} else {
+					//if group tax then we have to show the default value when change to individual tax
 					$tax_value = $tax_details[$tax_count]['percentage'];
-			} else//if the above function not called then assign the default associated value of the product
+				}
+			} else {
+				//if the above function not called then assign the default associated value of the product
 				$tax_value = $tax_details[$tax_count]['percentage'];
+			}
 
 
 			$product_Detail[$i]['taxes'][$tax_count]['taxname'] = $tax_name;
@@ -310,13 +318,15 @@ 
 
 		//if taxtype is individual and want to change to group during edit time then we have to show the all available taxes and their default values
 		//Also taxtype is group and want to change to individual during edit time then we have to provide the asspciated taxes and their default tax values for individual products
-		if ($taxtype == 'group')
-			$tax_percent = $adb->query_result($result, 0, $tax_name);
-		else
-			$tax_percent = $allTaxes[$tax_count]['percentage'];
+		if ($taxtype == 'group') {
+					$tax_percent = $adb->query_result($result, 0, $tax_name);
+		} else {
+					$tax_percent = $allTaxes[$tax_count]['percentage'];
+		}
 
-		if ($tax_percent == '' || $tax_percent == 'NULL')
-			$tax_percent = '0';
+		if ($tax_percent == '' || $tax_percent == 'NULL') {
+					$tax_percent = '0';
+		}
 		$taxamount = ($subTotal - $finalDiscount) * $tax_percent / 100;
 		$taxamount = number_format($taxamount, $no_of_decimal_places, '.', '');
 		$product_Detail[1]['final_details']['taxes'][$tax_count]['taxname'] = $tax_name;