YetiForceCompany / YetiForceCRM

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)
 	{

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 +16 added lines, -16 removed lines

@@ -1004,7 +1004,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]);
@@ -1447,7 +1447,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();
 					$countTempVal = count($temp_val);
 					for ($x = 0; $x < $countTempVal; $x++) {
@@ -2666,7 +2666,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
@@ -2677,7 +2677,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
@@ -2688,7 +2688,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 
@@ -2699,7 +2699,7 @@ 
 							else
 								$conv_value = CurrencyField::convertToUserFormat($keyhdr[$arraykey], null, true);
 							$totalpdf[$rowcount][$arraykey] = $conv_value;
-						}else {
+						} else {
 							$totalpdf[$rowcount][$arraykey] = '';
 						}
 						$rowcount++;
@@ -2778,7 +2778,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>';
 						}
 
@@ -2789,7 +2789,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>';
 						}
 
@@ -2800,7 +2800,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>';
 						}
 
@@ -2811,7 +2811,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>';
 						}
 
@@ -2983,7 +2983,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>";
 						}
 
@@ -2994,7 +2994,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>";
 						}
 
@@ -3005,7 +3005,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>";
 						}
 
@@ -3016,7 +3016,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>";
 						}
 
@@ -3377,7 +3377,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);
@@ -3442,7 +3442,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

@@ -53,8 +53,9 @@ 
 
 	protected function computeDependencies()
 	{
-		if ($this->computedMatrix !== null)
-			return;
+		if ($this->computedMatrix !== null) {
+					return;
+		}
 
 		$this->computedMatrix = array();
 		foreach ($this->matrix as $key => $values) {
@@ -93,8 +94,9 @@ 
 
 	public function addTable($table)
 	{
-		if (!empty($table))
-			$this->tables[$table] = $table;
+		if (!empty($table)) {
+					$this->tables[$table] = $table;
+		}
 	}
 
 	public function addCustomTable($table)
@@ -613,8 +615,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;
 	}
 
@@ -690,8 +693,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] . "'";
 				}
 			}
@@ -743,11 +747,12 @@ 
 			if (trim($value) == 'NULL') {
 				$rtvalue = ' is NOT NULL';
 			} elseif (trim($value) != '') {
-				if ($columnName)
-					$rtvalue = ' <> ' . $adb->quote($value) . ' OR ' . $columnName . " IS NULL ";
-				else
-					$rtvalue = ' <> ' . $adb->quote($value);
-			}elseif (trim($value) == '' && $datatype == 'V') {
+				if ($columnName) {
+									$rtvalue = ' <> ' . $adb->quote($value) . ' OR ' . $columnName . " IS NULL ";
+				} else {
+									$rtvalue = ' <> ' . $adb->quote($value);
+				}
+			} elseif (trim($value) == '' && $datatype == 'V') {
 				$rtvalue = ' <> ' . $adb->quote($value);
 			} else {
 				$rtvalue = ' is NOT NULL';
@@ -878,8 +883,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"];
@@ -903,8 +909,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;
 	}
 
@@ -1011,11 +1018,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]);
@@ -1067,10 +1075,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, \App\CustomView::STD_FILTER_CONDITIONS)) {
 							$columninfo['stdfilter'] = $columninfo['comparator'];
@@ -1115,13 +1125,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') {
@@ -1146,10 +1158,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) {
@@ -1229,18 +1242,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);
@@ -1286,8 +1301,9 @@ 
 				}
 			}
 		}
-		if (trim($advfiltersql) != "")
-			$advfiltersql = '(' . $advfiltersql . ')';
+		if (trim($advfiltersql) != "") {
+					$advfiltersql = '(' . $advfiltersql . ')';
+		}
 
 		return $advfiltersql;
 	}
@@ -1342,8 +1358,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);
@@ -1412,8 +1429,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] != "") {
@@ -1446,8 +1464,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"];
@@ -1504,10 +1523,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'])) {
@@ -1549,8 +1570,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 != '') {
@@ -1639,8 +1661,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
@@ -1733,8 +1756,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];
 			}
@@ -2357,8 +2381,9 @@ 
 		}
 		/* STRING TRANSLATION starts */
 		$moduleLabel = '';
-		if (in_array($module, $modules_selected))
-			$moduleLabel = \App\Language::translate($module, $module);
+		if (in_array($module, $modules_selected)) {
+					$moduleLabel = \App\Language::translate($module, $module);
+		}
 
 		if (empty($translatedLabel)) {
 			$translatedLabel = \App\Language::translate(str_replace('__', " ", $fld->name), $module);
@@ -2438,8 +2463,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();
@@ -2473,10 +2499,11 @@ 
 							$headerLabel_tmp = \App\Language::translate($mod_name[0] . " " . $mod_name[1]);
 						}
 					}
-					if ($headerLabel == $headerLabel_tmp)
-						$headerLabel = \App\Language::translate($headerLabel_tmp);
-					else
-						$headerLabel = $headerLabel_tmp;
+					if ($headerLabel == $headerLabel_tmp) {
+											$headerLabel = \App\Language::translate($headerLabel_tmp);
+					} else {
+											$headerLabel = $headerLabel_tmp;
+					}
 					/* STRING TRANSLATION ends */
 					$header .= "<td class='rptCellLabel'>" . $headerLabel . "</td>";
 
@@ -2512,14 +2539,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>";
 
@@ -2645,8 +2675,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);
@@ -2736,45 +2767,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++;
@@ -2848,45 +2883,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>';
 						}
 
@@ -2914,8 +2953,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);
@@ -2944,14 +2984,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>";
 
@@ -3053,45 +3096,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>";
 						}
 
@@ -3346,8 +3393,9 @@ 
 		$adb = PearDatabase::getInstance();
 		$current_user = vglobal('current_user');
 		$id = array(\App\Module::getModuleId($this->primarymodule));
-		if ($this->secondarymodule != '')
-			array_push($id, \App\Module::getModuleId($this->secondarymodule));
+		if ($this->secondarymodule != '') {
+					array_push($id, \App\Module::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));
@@ -3376,13 +3424,15 @@ 
 			} 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);
+			}
 			$countMulSelResult = $adb->num_rows($mulselresult);
 			for ($j = 0; $j < $countMulSelResult; $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);
@@ -3393,16 +3443,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 +7 added lines, -7 removed lines

@@ -188,9 +188,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;
 					}
@@ -307,7 +307,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"]);
@@ -320,7 +320,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"]);
@@ -375,7 +375,7 @@ 
 
 				if (isPermitted($report["primarymodule"], 'index') == "yes")
 					$returndata[] = $report_details;
-			}while ($report = $adb->fetch_array($result));
+			} while ($report = $adb->fetch_array($result));
 		}
 		\App\Log::trace("Reports :: ListView->Successfully returned vtiger_report details HTML");
 		return $returndata;
@@ -462,7 +462,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) {
@@ -1264,7 +1264,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 = [];
 			$countTempVal = count($temp_val);
 			for ($x = 0; $x < $countTempVal; $x++) {

Braces +73 added lines, -50 removed lines

@@ -127,10 +127,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');
 			}
@@ -141,8 +142,9 @@ 
 	public function updateModuleList($module)
 	{
 		$adb = PearDatabase::getInstance();
-		if (!isset($module))
-			return;
+		if (!isset($module)) {
+					return;
+		}
 		require_once('include/utils/utils.php');
 		$tabid = \App\Module::getModuleId($module);
 		if ($module == 'Calendar') {
@@ -151,12 +153,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;
@@ -187,10 +191,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;
 					}
@@ -221,10 +229,11 @@ 
 						}
 
 						if (!empty($blocklabel)) {
-							if ($module == 'Calendar' && $blocklabel == 'LBL_CUSTOM_INFORMATION')
-								$this->module_list[$module][$blockid] = \App\Language::translate($blocklabel, $module);
-							else
-								$this->module_list[$module][$blockid] = \App\Language::translate($blocklabel, $module);
+							if ($module == 'Calendar' && $blocklabel == 'LBL_CUSTOM_INFORMATION') {
+															$this->module_list[$module][$blockid] = \App\Language::translate($blocklabel, $module);
+							} else {
+															$this->module_list[$module][$blockid] = \App\Language::translate($blocklabel, $module);
+							}
 							$prev_block_label = $blocklabel;
 						} else {
 							$this->module_list[$module][$blockid] = \App\Language::translate($prev_block_label, $module);
@@ -368,13 +377,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));
 		}
 		\App\Log::trace("Reports :: ListView->Successfully returned vtiger_report details HTML");
@@ -455,13 +466,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));
 		}
 
@@ -594,8 +607,9 @@ 
 		$adb = PearDatabase::getInstance();
 		$currentUser = Users_Privileges_Model::getCurrentUserPrivilegesModel();
 
-		if (is_string($block))
-			$block = explode(",", $block);
+		if (is_string($block)) {
+					$block = explode(",", $block);
+		}
 		$skipTalbes = array('vtiger_emaildetails', 'vtiger_attachments');
 
 		$tabid = \App\Module::getModuleId($module);
@@ -613,10 +627,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);
 
 		$result = $adb->pquery($sql, $params);
@@ -663,8 +678,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;
@@ -905,8 +921,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"];
@@ -964,8 +981,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;
 		\App\Log::trace("Reports :: Successfully returned getAdvancedFilterList");
 		return true;
@@ -1214,13 +1232,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"];
@@ -1282,10 +1302,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"]));

modules/Reports/ScheduledReports.php

Doc Comments +3 added lines

@@ -340,6 +340,9 @@
 		return $rolesAndSubHTML;
 	}
 
+	/**
+	 * @param Users $user
+	 */
 	public static function getScheduledReports($adb, $user)
 	{
 

Braces +15 added lines, -10 removed lines

@@ -258,8 +258,9 @@ 
 	public static function generateRecipientOption($type, $value, $name = '')
 	{
 		switch ($type) {
-			case 'users' : if (empty($name))
-					$name = \App\Fields\Owner::getUserLabel($value);
+			case 'users' : if (empty($name)) {
+								$name = \App\Fields\Owner::getUserLabel($value);
+			}
 				$optionName = 'User::' . addslashes(decode_html($name));
 				$optionValue = 'users::' . $value;
 				break;
@@ -269,13 +270,15 @@ 
 				$optionName = 'Group::' . addslashes(decode_html($name));
 				$optionValue = 'groups::' . $value;
 				break;
-			case 'roles' : if (empty($name))
-					$name = \App\PrivilegeUtil::getRoleName($value);
+			case 'roles' : if (empty($name)) {
+								$name = \App\PrivilegeUtil::getRoleName($value);
+			}
 				$optionName = 'Roles::' . addslashes(decode_html($name));
 				$optionValue = 'roles::' . $value;
 				break;
-			case 'rs' : if (empty($name))
-					$name = \App\PrivilegeUtil::getRoleName($value);
+			case 'rs' : if (empty($name)) {
+								$name = \App\PrivilegeUtil::getRoleName($value);
+			}
 				$optionName = 'RoleAndSubordinates::' . addslashes(decode_html($name));
 				$optionValue = 'rs::' . $value;
 				break;
@@ -375,10 +378,12 @@ 
 
 		$currentModule = vglobal('currentModule');
 		$current_language = vglobal('current_language');
-		if (empty($currentModule))
-			$currentModule = 'Reports';
-		if (empty($current_language))
-			vglobal('current_language', 'en_us');
+		if (empty($currentModule)) {
+					$currentModule = 'Reports';
+		}
+		if (empty($current_language)) {
+					vglobal('current_language', 'en_us');
+		}
 
 		$scheduledReports = self::getScheduledReports($adb, $adminUser);
 		foreach ($scheduledReports as $scheduledReport) {

modules/Reservations/actions/Calendar.php

Doc Comments +3 added lines

@@ -82,6 +82,9 @@
 		$response->emit();
 	}
 
+	/**
+	 * @param string $datetime
+	 */
 	public function changeDateTime($datetime, $delta)
 	{
 		$date = new DateTime($datetime);

modules/Settings/ConfReport/models/Module.php

Doc Comments +6 added lines

@@ -318,6 +318,9 @@ 
 		return $permissions;
 	}
 
+	/**
+	 * @param string $val
+	 */
 	public static function getFlag($val)
 	{
 		if ($val == 'On' || $val == 1 || stripos($val, 'On') !== false) {
@@ -326,6 +329,9 @@ 
 		return 'Off';
 	}
 
+	/**
+	 * @param string $value
+	 */
 	public function error2string($value)
 	{
 		$level_names = array(

Braces +66 added lines, -44 removed lines

@@ -120,56 +120,68 @@ 
 			$directiveValues['suhosin.post.max_value_length'] = array('prefer' => '1500000');
 		}
 
-		if (ini_get('display_errors') == '1' || stripos(ini_get('display_errors'), 'On') !== false)
-			$directiveValues['display_errors']['status'] = true;
+		if (ini_get('display_errors') == '1' || stripos(ini_get('display_errors'), 'On') !== false) {
+					$directiveValues['display_errors']['status'] = true;
+		}
 		$directiveValues['display_errors']['current'] = self::getFlag(ini_get('display_errors'));
 
-		if (ini_get('file_uploads') != '1' || stripos(ini_get('file_uploads'), 'Off') !== false)
-			$directiveValues['file_uploads']['status'] = true;
+		if (ini_get('file_uploads') != '1' || stripos(ini_get('file_uploads'), 'Off') !== false) {
+					$directiveValues['file_uploads']['status'] = true;
+		}
 		$directiveValues['file_uploads']['current'] = self::getFlag(ini_get('file_uploads'));
 
-		if ((ini_get('output_buffering') <= '4096' && ini_get('output_buffering') != '1') || stripos(ini_get('output_buffering'), 'Off') !== false)
-			$directiveValues['output_buffering']['status'] = true;
+		if ((ini_get('output_buffering') <= '4096' && ini_get('output_buffering') != '1') || stripos(ini_get('output_buffering'), 'Off') !== false) {
+					$directiveValues['output_buffering']['status'] = true;
+		}
 		if (!in_array(ini_get('output_buffering'), ['On', 1, 0, 'Off'])) {
 			$directiveValues['output_buffering']['current'] = ini_get('output_buffering');
 		} else {
 			$directiveValues['output_buffering']['current'] = self::getFlag(ini_get('output_buffering'));
 		}
 
-		if (ini_get('max_execution_time') != 0 && ini_get('max_execution_time') < 600)
-			$directiveValues['max_execution_time']['status'] = true;
+		if (ini_get('max_execution_time') != 0 && ini_get('max_execution_time') < 600) {
+					$directiveValues['max_execution_time']['status'] = true;
+		}
 		$directiveValues['max_execution_time']['current'] = ini_get('max_execution_time');
 
-		if (ini_get('max_input_time') != 0 && ini_get('max_input_time') < 600)
-			$directiveValues['max_input_time']['status'] = true;
+		if (ini_get('max_input_time') != 0 && ini_get('max_input_time') < 600) {
+					$directiveValues['max_input_time']['status'] = true;
+		}
 		$directiveValues['max_input_time']['current'] = ini_get('max_input_time');
 
-		if (ini_get('default_socket_timeout') != 0 && ini_get('default_socket_timeout') < 600)
-			$directiveValues['default_socket_timeout']['status'] = true;
+		if (ini_get('default_socket_timeout') != 0 && ini_get('default_socket_timeout') < 600) {
+					$directiveValues['default_socket_timeout']['status'] = true;
+		}
 		$directiveValues['default_socket_timeout']['current'] = ini_get('default_socket_timeout');
 
-		if (vtlib\Functions::parseBytes(ini_get('memory_limit')) < 33554432)
-			$directiveValues['memory_limit']['status'] = true;
+		if (vtlib\Functions::parseBytes(ini_get('memory_limit')) < 33554432) {
+					$directiveValues['memory_limit']['status'] = true;
+		}
 		$directiveValues['memory_limit']['current'] = vtlib\Functions::showBytes(ini_get('memory_limit'));
 
-		if (vtlib\Functions::parseBytes(ini_get('post_max_size')) < 10485760)
-			$directiveValues['post_max_size']['status'] = true;
+		if (vtlib\Functions::parseBytes(ini_get('post_max_size')) < 10485760) {
+					$directiveValues['post_max_size']['status'] = true;
+		}
 		$directiveValues['post_max_size']['current'] = vtlib\Functions::showBytes(ini_get('post_max_size'));
 
-		if (vtlib\Functions::parseBytes(ini_get('upload_max_filesize')) < 10485760)
-			$directiveValues['upload_max_filesize']['status'] = true;
+		if (vtlib\Functions::parseBytes(ini_get('upload_max_filesize')) < 10485760) {
+					$directiveValues['upload_max_filesize']['status'] = true;
+		}
 		$directiveValues['upload_max_filesize']['current'] = vtlib\Functions::showBytes(ini_get('upload_max_filesize'));
 
-		if (ini_get('zlib.output_compression') == '1' || stripos(ini_get('zlib.output_compression'), 'On') !== false)
-			$directiveValues['zlib.output_compression']['status'] = true;
+		if (ini_get('zlib.output_compression') == '1' || stripos(ini_get('zlib.output_compression'), 'On') !== false) {
+					$directiveValues['zlib.output_compression']['status'] = true;
+		}
 		$directiveValues['zlib.output_compression']['current'] = self::getFlag((ini_get('zlib.output_compression')));
 
-		if (ini_get('session.auto_start') == '1' || stripos(ini_get('session.auto_start'), 'On') !== false)
-			$directiveValues['session.auto_start']['status'] = true;
+		if (ini_get('session.auto_start') == '1' || stripos(ini_get('session.auto_start'), 'On') !== false) {
+					$directiveValues['session.auto_start']['status'] = true;
+		}
 		$directiveValues['session.auto_start']['current'] = self::getFlag(ini_get('session.auto_start'));
 
-		if (ini_get('session.cookie_httponly') != '1' || stripos(ini_get('session.cookie_httponly'), 'On') !== false)
-			$directiveValues['session.cookie_httponly']['status'] = true;
+		if (ini_get('session.cookie_httponly') != '1' || stripos(ini_get('session.cookie_httponly'), 'On') !== false) {
+					$directiveValues['session.cookie_httponly']['status'] = true;
+		}
 		$directiveValues['session.cookie_httponly']['current'] = self::getFlag(ini_get('session.cookie_httponly'));
 
 		/*
@@ -183,24 +195,29 @@ 
 		}
 		$directiveValues['mbstring.func_overload']['current'] = self::getFlag(ini_get('mbstring.func_overload'));
 
-		if (ini_get('log_errors') == '1' || stripos(ini_get('log_errors'), 'On') !== false)
-			$directiveValues['log_errors']['status'] = true;
+		if (ini_get('log_errors') == '1' || stripos(ini_get('log_errors'), 'On') !== false) {
+					$directiveValues['log_errors']['status'] = true;
+		}
 		$directiveValues['log_errors']['current'] = self::getFlag(ini_get('log_errors'));
 
-		if (ini_get('short_open_tag') != '1' || stripos(ini_get('short_open_tag'), 'Off') !== false)
-			$directiveValues['short_open_tag']['status'] = true;
+		if (ini_get('short_open_tag') != '1' || stripos(ini_get('short_open_tag'), 'Off') !== false) {
+					$directiveValues['short_open_tag']['status'] = true;
+		}
 		$directiveValues['short_open_tag']['current'] = self::getFlag(ini_get('short_open_tag'));
 
-		if (ini_get('session.gc_maxlifetime') < 21600)
-			$directiveValues['session.gc_maxlifetime']['status'] = true;
+		if (ini_get('session.gc_maxlifetime') < 21600) {
+					$directiveValues['session.gc_maxlifetime']['status'] = true;
+		}
 		$directiveValues['session.gc_maxlifetime']['current'] = ini_get('session.gc_maxlifetime');
 
-		if (ini_get('session.gc_divisor') < 500)
-			$directiveValues['session.gc_divisor']['status'] = true;
+		if (ini_get('session.gc_divisor') < 500) {
+					$directiveValues['session.gc_divisor']['status'] = true;
+		}
 		$directiveValues['session.gc_divisor']['current'] = ini_get('session.gc_divisor');
 
-		if (ini_get('session.gc_probability') < 1)
-			$directiveValues['session.gc_probability']['status'] = true;
+		if (ini_get('session.gc_probability') < 1) {
+					$directiveValues['session.gc_probability']['status'] = true;
+		}
 		$directiveValues['session.gc_probability']['current'] = ini_get('session.gc_probability');
 
 		if (ini_get('max_input_vars') < 5000) {
@@ -219,8 +236,9 @@ 
 
 
 		if (extension_loaded('suhosin')) {
-			if (ini_get('suhosin.session.encrypt') == '1' || stripos(ini_get('suhosin.session.encrypt'), 'On') !== false)
-				$directiveValues['suhosin.session.encrypt']['status'] = true;
+			if (ini_get('suhosin.session.encrypt') == '1' || stripos(ini_get('suhosin.session.encrypt'), 'On') !== false) {
+							$directiveValues['suhosin.session.encrypt']['status'] = true;
+			}
 			$directiveValues['suhosin.session.encrypt']['current'] = self::getFlag(ini_get('suhosin.session.encrypt'));
 
 			if (ini_get('suhosin.request.max_vars') < 5000) {
@@ -239,8 +257,9 @@ 
 			$directiveValues['suhosin.post.max_value_length']['current'] = ini_get('suhosin.post.max_value_length');
 		}
 		if (!$instalMode && App\Db::getInstance()->getDriverName() === 'mysql') {
-			if (ini_get('mysql.connect_timeout') != 0 && ini_get('mysql.connect_timeout') < 600)
-				$directiveValues['mysql.connect_timeout']['status'] = true;
+			if (ini_get('mysql.connect_timeout') != 0 && ini_get('mysql.connect_timeout') < 600) {
+							$directiveValues['mysql.connect_timeout']['status'] = true;
+			}
 			$directiveValues['mysql.connect_timeout']['current'] = ini_get('mysql.connect_timeout');
 
 			$db = PearDatabase::getInstance();
@@ -277,8 +296,9 @@ 
 		}
 
 		$errorReporting = stripos(ini_get('error_reporting'), '_') === false ? self::error2string(ini_get('error_reporting')) : ini_get('error_reporting');
-		if (in_array('E_NOTICE', $errorReporting) || in_array('E_DEPRECATED', $errorReporting) || in_array('E_STRICT', $errorReporting))
-			$directiveValues['error_reporting']['status'] = true;
+		if (in_array('E_NOTICE', $errorReporting) || in_array('E_DEPRECATED', $errorReporting) || in_array('E_STRICT', $errorReporting)) {
+					$directiveValues['error_reporting']['status'] = true;
+		}
 		$directiveValues['error_reporting']['current'] = implode(' | ', $errorReporting);
 
 		return $directiveValues;
@@ -333,16 +353,18 @@ 
 			E_COMPILE_ERROR => 'E_COMPILE_ERROR', E_COMPILE_WARNING => 'E_COMPILE_WARNING',
 			E_USER_ERROR => 'E_USER_ERROR', E_USER_WARNING => 'E_USER_WARNING',
 			E_USER_NOTICE => 'E_USER_NOTICE');
-		if (defined('E_STRICT'))
-			$level_names[E_STRICT] = 'E_STRICT';
+		if (defined('E_STRICT')) {
+					$level_names[E_STRICT] = 'E_STRICT';
+		}
 		$levels = array();
 		if (($value & E_ALL) == E_ALL) {
 			$levels[] = 'E_ALL';
 			$value &= ~E_ALL;
 		}
-		foreach ($level_names as $level => $name)
-			if (($value & $level) == $level)
+		foreach ($level_names as $level => $name) {
+					if (($value & $level) == $level)
 				$levels[] = $name;
+		}
 		return $levels;
 	}
 }

modules/Users/CreateUserPrivilegeFile.php

Doc Comments +6 added lines, -6 removed lines

@@ -938,8 +938,8 @@ 
 
 /** Gives an array which contains the information for what all roles, groups and user's related module data that is to be shared  for the specified parent module and shared module 
 
- * @param $par_mod -- parent module name:: Type varchar
- * @param $share_mod -- shared module name:: Type varchar
+ * @param string $par_mod -- parent module name:: Type varchar
+ * @param string $share_mod -- shared module name:: Type varchar
  * @param $userid -- user id:: Type integer
  * @param $def_org_share -- default organization sharing permission array:: Type array
  * @param $mod_sharingrule_members -- Sharing Rule Members array:: Type array
@@ -1355,9 +1355,9 @@ 
 
 /** Function to populate the read/wirte Sharing permissions data for the specified user into the database 
  * @param $userid -- user id:: Type integer
- * @param $enttype -- can have the value of User or Group:: Type varchar
+ * @param string $enttype -- can have the value of User or Group:: Type varchar
  * @param $module -- module name:: Type varchar
- * @param $pertype -- can have the value of read or write:: Type varchar
+ * @param string $pertype -- can have the value of read or write:: Type varchar
  * @param $var_name_arr - Variable to use instead of including the sharing access again
  */
 function populateSharingPrivileges($enttype, $userid, $module, $pertype, $var_name_arr = false)
@@ -1432,10 +1432,10 @@ 
 
 /** Function to populate the read/wirte Sharing permissions related module data for the specified user into the database 
  * @param $userid -- user id:: Type integer
- * @param $enttype -- can have the value of User or Group:: Type varchar
+ * @param string $enttype -- can have the value of User or Group:: Type varchar
  * @param $module -- module name:: Type varchar
  * @param $relmodule -- related module name:: Type varchar
- * @param $pertype -- can have the value of read or write:: Type varchar
+ * @param string $pertype -- can have the value of read or write:: Type varchar
  * @param $var_name_arr - Variable to use instead of including the sharing access again
  */
 function populateRelatedSharingPrivileges($enttype, $userid, $module, $relmodule, $pertype, $var_name_arr = false)

Braces +12 added lines, -8 removed lines

@@ -592,8 +592,9 @@ 
 			$var_name = $module . '_share_write_permission';
 		}
 		// Lookup for the variable if not set through function argument		
-		if (!$var_name_arr)
-			$var_name_arr = $$var_name;
+		if (!$var_name_arr) {
+					$var_name_arr = $$var_name;
+		}
 		$user_arr = [];
 		if (sizeof($var_name_arr['ROLE']) > 0) {
 			foreach ($var_name_arr['ROLE'] as $roleid => $roleusers) {
@@ -627,8 +628,9 @@ 
 			$var_name = $module . '_share_write_permission';
 		}
 		// Lookup for the variable if not set through function argument
-		if (!$var_name_arr)
-			$var_name_arr = $$var_name;
+		if (!$var_name_arr) {
+					$var_name_arr = $$var_name;
+		}
 		$grp_arr = [];
 		if (sizeof($var_name_arr['GROUP']) > 0) {
 
@@ -671,8 +673,9 @@ 
 			$var_name = $module . '_' . $relmodule . '_share_write_permission';
 		}
 		// Lookup for the variable if not set through function argument
-		if (!$var_name_arr)
-			$var_name_arr = $$var_name;
+		if (!$var_name_arr) {
+					$var_name_arr = $$var_name;
+		}
 		$user_arr = [];
 		if (sizeof($var_name_arr['ROLE']) > 0) {
 			foreach ($var_name_arr['ROLE'] as $roleid => $roleusers) {
@@ -706,8 +709,9 @@ 
 			$var_name = $module . '_' . $relmodule . '_share_write_permission';
 		}
 		// Lookup for the variable if not set through function argument
-		if (!$var_name_arr)
-			$var_name_arr = $$var_name;
+		if (!$var_name_arr) {
+					$var_name_arr = $$var_name;
+		}
 		$grp_arr = [];
 		if (sizeof($var_name_arr['GROUP']) > 0) {
 

Indentation -10 removed lines

@@ -150,7 +150,6 @@ 
 }
 
 /** Gives an array which contains the information for what all roles, groups and user's related module data that is to be shared  for the specified parent module and shared module 
-
  * @param $par_mod -- parent module name:: Type varchar
  * @param $share_mod -- shared module name:: Type varchar
  * @param $userid -- user id:: Type integer
@@ -310,7 +309,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -327,7 +325,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -352,7 +349,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -377,7 +373,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -394,7 +389,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -411,7 +405,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -432,7 +425,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -453,7 +445,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */
@@ -474,7 +465,6 @@ 
 }
 
 /** Converts the input array  to a single string to facilitate the writing of the input array in a flat file 
-
  * @param $var -- input array:: Type array
  * @returns $code -- contains the whole array in a single string:: Type array 
  */

modules/Vtiger/actions/GenerateRecords.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 		}
 	}
 
+	/**
+	 * @param Vtiger_Record_Model $recordModel
+	 */
 	public function checkMandatoryFields($recordModel)
 	{
 		$mandatoryFields = $recordModel->getModule()->getMandatoryFieldModels();

modules/Vtiger/actions/PDF.php

Doc Comments +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
 	/**
 	 * Checks if given record has valid pdf template
 	 * @param Vtiger_Request $request
-	 * @return boolean true if valid template exists for this record
+	 * @return boolean|null true if valid template exists for this record
 	 */
 	public function hasValidTemplate(Vtiger_Request $request)
 	{