Completed
Push — developer ( 7fcd26...56069b )
by Błażej
159:56 queued 116:48
created
include/database/Postgres8.php 3 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -14,6 +14,9 @@  discard block
 block discarded – undo
14 14
  * ****************************************************************************** */
15 15
 
16 16
 //Fix postgres queries
17
+/**
18
+ * @param integer $debug
19
+ */
17 20
 function fixPostgresQuery($query, $log, $debug)
18 21
 {
19 22
 	// First select the query fields from the remaining query
@@ -115,6 +118,9 @@  discard block
 block discarded – undo
115 118
 }
116 119
 
117 120
 //return an expanded table field list
121
+/**
122
+ * @param string $table
123
+ */
118 124
 function expandRecord($table, $log)
119 125
 {
120 126
 	$result = "";
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	if ($debug)
73 73
 		$log->info("fixPostgresQuery result: " . $query);
74 74
 
75
-	return( $query);
75
+	return($query);
76 76
 }
77 77
 
78 78
 // Postgres8 will not accept a "tablename.*" entry in the GROUP BY clause
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	if ($expanded != '')
112 112
 		$expanded = " GROUP BY " . trim($expanded, ",");
113 113
 	//return the expanded fieldlist
114
-	return( $expanded);
114
+	return($expanded);
115 115
 }
116 116
 
117 117
 //return an expanded table field list
@@ -195,5 +195,5 @@  discard block
 block discarded – undo
195 195
 		$result = substr($result, 0, strlen($result) - 1);
196 196
 
197 197
 	//return out new string
198
-	return( $result);
198
+	return($result);
199 199
 }
Please login to merge, or discard this patch.
Braces   +81 added lines, -56 removed lines patch added patch discarded remove patch
@@ -22,8 +22,9 @@  discard block
 block discarded – undo
22 22
 	$groupClause = "";
23 23
 	$orderClause = "";
24 24
 
25
-	if ($debug)
26
-		$log->info("fixPostgresQuery: " . $query);
25
+	if ($debug) {
26
+			$log->info("fixPostgresQuery: " . $query);
27
+	}
27 28
 
28 29
 	// If we already have an order or group cluase separate ist for later use
29 30
 	if (stripos($queryRecord, 'GROUP BY') > 0) {
@@ -45,32 +46,36 @@  discard block
 block discarded – undo
45 46
 	$privateGroupList = [];
46 47
 	$token = strtok($queryFields, ", ()	");
47 48
 	while ($token !== false) {
48
-		if (strpos($token, ".") !== false)
49
-			array_push($privateGroupList, $token);
49
+		if (strpos($token, ".") !== false) {
50
+					array_push($privateGroupList, $token);
51
+		}
50 52
 		$token = strtok(", ()	");
51 53
 	}
52 54
 	sort($privateGroupList);
53 55
 	$groupFields = "";
54 56
 	$last = "";
55 57
 	for ($i = 0; $i < count($privateGroupList); $i++) {
56
-		if ($last != $privateGroupList[$i])
57
-			if ($groupFields == "")
58
+		if ($last != $privateGroupList[$i]) {
59
+					if ($groupFields == "")
58 60
 				$groupFields = $privateGroupList[$i];
59
-			else
60
-				$groupFields .= "," . $privateGroupList[$i];
61
+		} else {
62
+							$groupFields .= "," . $privateGroupList[$i];
63
+			}
61 64
 		$last = $privateGroupList[$i];
62 65
 	}
63 66
 
64 67
 	// Rebuild the query
65 68
 	$query = sprintf("SELECT %s%s", $queryFields, $queryRecord);
66
-	if ($groupClause != "")
67
-		$groupClause = $groupClause . "," . $groupFields;
68
-	else
69
-		$groupClause = $groupFields;
69
+	if ($groupClause != "") {
70
+			$groupClause = $groupClause . "," . $groupFields;
71
+	} else {
72
+			$groupClause = $groupFields;
73
+	}
70 74
 	$query .= expandStar($groupClause, $log) . " " . $orderClause;
71 75
 
72
-	if ($debug)
73
-		$log->info("fixPostgresQuery result: " . $query);
76
+	if ($debug) {
77
+			$log->info("fixPostgresQuery result: " . $query);
78
+	}
74 79
 
75 80
 	return( $query);
76 81
 }
@@ -94,22 +99,25 @@  discard block
 block discarded – undo
94 99
 				$subfield = substr($field, $pos + 1, strlen($field) - $pos);
95 100
 
96 101
 				//do we need to expand?
97
-				if ($subfield == "*")
98
-					$field = expandRecord($table, $log);
102
+				if ($subfield == "*") {
103
+									$field = expandRecord($table, $log);
104
+				}
99 105
 			}
100 106
 
101 107
 			//add the propably expanded field to the querylist
102
-			if ($expanded == "")
103
-				$expanded = $field;
104
-			else
105
-				$expanded .= "," . $field;
108
+			if ($expanded == "") {
109
+							$expanded = $field;
110
+			} else {
111
+							$expanded .= "," . $field;
112
+			}
106 113
 		}
107 114
 
108 115
 		//next field
109 116
 		$field = strtok(",");
110 117
 	}
111
-	if ($expanded != '')
112
-		$expanded = " GROUP BY " . trim($expanded, ",");
118
+	if ($expanded != '') {
119
+			$expanded = " GROUP BY " . trim($expanded, ",");
120
+	}
113 121
 	//return the expanded fieldlist
114 122
 	return( $expanded);
115 123
 }
@@ -122,68 +130,84 @@  discard block
 block discarded – undo
122 130
 	$subfields = [];
123 131
 
124 132
 	//vtiger_products table
125
-	if ($table == "vtiger_products")
126
-		$subfields = array("productid", "productname", "productcode", "productcategory", "manufacturer", "qty_per_unit", "unit_price", "weight", "pack_size", "sales_start_date", "sales_end_date", "start_date", "expiry_date", "cost_factor", "commissionrate", "commissionmethod", "discontinued", "usageunit", "currency", "reorderlevel", "website", "taxclass", "mfr_part_no", "vendor_part_no", "serialno", "qtyinstock", "productsheet", "qtyindemand", "glacct", "vendor_id", "imagename");
133
+	if ($table == "vtiger_products") {
134
+			$subfields = array("productid", "productname", "productcode", "productcategory", "manufacturer", "qty_per_unit", "unit_price", "weight", "pack_size", "sales_start_date", "sales_end_date", "start_date", "expiry_date", "cost_factor", "commissionrate", "commissionmethod", "discontinued", "usageunit", "currency", "reorderlevel", "website", "taxclass", "mfr_part_no", "vendor_part_no", "serialno", "qtyinstock", "productsheet", "qtyindemand", "glacct", "vendor_id", "imagename");
135
+	}
127 136
 	
128 137
 	//vtiger_activity table
129
-	elseif ($table == "vtiger_activity")
130
-		$subfields = array("activityid", "subject", "semodule", "activitytype", "date_start", "due_date", "time_start", "time_end", "sendnotification", "duration_hours", "duration_minutes", "status", "eventstatus", "priority", "location", "notime", "visibility", "recurringtype");
138
+	elseif ($table == "vtiger_activity") {
139
+			$subfields = array("activityid", "subject", "semodule", "activitytype", "date_start", "due_date", "time_start", "time_end", "sendnotification", "duration_hours", "duration_minutes", "status", "eventstatus", "priority", "location", "notime", "visibility", "recurringtype");
140
+	}
131 141
 
132 142
 	//vtiger_notes table
133
-	elseif ($table == "vtiger_notes")
134
-		$subfields = array("notesid", "contact_id", "title", "filename", "notecontent");
143
+	elseif ($table == "vtiger_notes") {
144
+			$subfields = array("notesid", "contact_id", "title", "filename", "notecontent");
145
+	}
135 146
 
136 147
 	//vtiger_faq table
137
-	elseif ($table == "vtiger_faq")
138
-		$subfields = array("id", "product_id", "question", "answer", "category", "status");
148
+	elseif ($table == "vtiger_faq") {
149
+			$subfields = array("id", "product_id", "question", "answer", "category", "status");
150
+	}
139 151
 
140 152
 	//vtiger_profile2field
141
-	elseif ($table == "vtiger_profile2field")
142
-		$subfields = array("profileid", "tabid", "fieldid", "visible", "readonly");
153
+	elseif ($table == "vtiger_profile2field") {
154
+			$subfields = array("profileid", "tabid", "fieldid", "visible", "readonly");
155
+	}
143 156
 
144 157
 	//vtiger_field
145
-	elseif ($table == "vtiger_field")
146
-		$subfields = array("tabid", "fieldid", "columnname", "tablename", "generatedtype", "uitype", "fieldname", "fieldlabel", "readonly", "presence", "selected", "maximumlength", "sequence", "block", "displaytype", "typeofdata", "quickcreate", "quickcreatesequence", "info_type");
158
+	elseif ($table == "vtiger_field") {
159
+			$subfields = array("tabid", "fieldid", "columnname", "tablename", "generatedtype", "uitype", "fieldname", "fieldlabel", "readonly", "presence", "selected", "maximumlength", "sequence", "block", "displaytype", "typeofdata", "quickcreate", "quickcreatesequence", "info_type");
160
+	}
147 161
 
148 162
 	//vtiger_producttaxrel
149
-	elseif ($table == "vtiger_producttaxrel")
150
-		$subfields = array("productid", "taxid", "taxpercentage");
163
+	elseif ($table == "vtiger_producttaxrel") {
164
+			$subfields = array("productid", "taxid", "taxpercentage");
165
+	}
151 166
 
152 167
 	//vtiger_inventorytaxinfo
153
-	elseif ($table == "vtiger_inventorytaxinfo")
154
-		$subfields = array("taxid", "taxname", "taxlabel", "percentage", "deleted");
168
+	elseif ($table == "vtiger_inventorytaxinfo") {
169
+			$subfields = array("taxid", "taxname", "taxlabel", "percentage", "deleted");
170
+	}
155 171
 
156 172
 	//vtiger_role2picklist
157
-	elseif ($table == "vtiger_role2picklist")
158
-		$subfields = array("roleid", "picklistid", "sortid");
173
+	elseif ($table == "vtiger_role2picklist") {
174
+			$subfields = array("roleid", "picklistid", "sortid");
175
+	}
159 176
 
160 177
 	//vtiger_contactdetails
161
-	elseif ($table == "vtiger_contactdetails")
162
-		$subfields = array("lastname", "contactid", "accountid", "salutation", "firstname", "email", "phone", "mobile", "title", "department", "fax", "reportsto", "training", "usertype", "contacttype", "otheremail", "yahooid", "donotcall", "emailoptout", "imagename", "reference", "notify_owner");
178
+	elseif ($table == "vtiger_contactdetails") {
179
+			$subfields = array("lastname", "contactid", "accountid", "salutation", "firstname", "email", "phone", "mobile", "title", "department", "fax", "reportsto", "training", "usertype", "contacttype", "otheremail", "yahooid", "donotcall", "emailoptout", "imagename", "reference", "notify_owner");
180
+	}
163 181
 
164 182
 	//vtiger_crmentity
165
-	elseif ($table == "vtiger_crmentity")
166
-		$subfields = array("crmid", "smcreatorid", "smownerid", "modifiedby", "setype", "description", "createdtime", "modifiedtime", "viewedtime", "status", "version", "presence", "deleted");
183
+	elseif ($table == "vtiger_crmentity") {
184
+			$subfields = array("crmid", "smcreatorid", "smownerid", "modifiedby", "setype", "description", "createdtime", "modifiedtime", "viewedtime", "status", "version", "presence", "deleted");
185
+	}
167 186
 
168 187
 	//vtiger_seactivityrel
169
-	elseif ($table == "vtiger_seactivityrel")
170
-		$subfields = array("crmid", "activityid");
188
+	elseif ($table == "vtiger_seactivityrel") {
189
+			$subfields = array("crmid", "activityid");
190
+	}
171 191
 
172 192
 	//vtiger_cntactivityrel
173
-	elseif ($table == "vtiger_cntactivityrel")
174
-		$subfields = array("contactid", "activityid");
193
+	elseif ($table == "vtiger_cntactivityrel") {
194
+			$subfields = array("contactid", "activityid");
195
+	}
175 196
 
176 197
 	//vtiger_leaddetails
177
-	elseif ($table == "vtiger_leaddetails")
178
-		$subfields = array("leadid", "email", "interest", "firstname", "salutation", "lastname", "company", "annualrevenue", "industry", "campaign", "rating", "leadstatus", "leadsource", "converted", "designation", "space", "comments", "priority", "demorequest", "partnercontact", "productversion", "product", "maildate", "nextstepdate", "fundingsituation", "purpose", "evaluationstatus", "transferdate", "revenuetype", "noofemployees", "yahooid", "assignleadchk");
198
+	elseif ($table == "vtiger_leaddetails") {
199
+			$subfields = array("leadid", "email", "interest", "firstname", "salutation", "lastname", "company", "annualrevenue", "industry", "campaign", "rating", "leadstatus", "leadsource", "converted", "designation", "space", "comments", "priority", "demorequest", "partnercontact", "productversion", "product", "maildate", "nextstepdate", "fundingsituation", "purpose", "evaluationstatus", "transferdate", "revenuetype", "noofemployees", "yahooid", "assignleadchk");
200
+	}
179 201
 
180 202
 	//vtiger_pricebook
181
-	elseif ($table == "vtiger_pricebook")
182
-		$subfields = array("pricebookid", "bookname", "active", "description");
203
+	elseif ($table == "vtiger_pricebook") {
204
+			$subfields = array("pricebookid", "bookname", "active", "description");
205
+	}
183 206
 
184 207
 	//fields of the requested array still undefined
185
-	else
186
-		$log->info("function expandRecord: please add structural information for table '" . $table . "'");
208
+	else {
209
+			$log->info("function expandRecord: please add structural information for table '" . $table . "'");
210
+	}
187 211
 
188 212
 	//construct an entity string
189 213
 	for ($i = 0; $i < count($subfields); $i++) {
@@ -191,8 +215,9 @@  discard block
 block discarded – undo
191 215
 	}
192 216
 
193 217
 	//remove the trailiung ,
194
-	if (strlen($result) > 0)
195
-		$result = substr($result, 0, strlen($result) - 1);
218
+	if (strlen($result) > 0) {
219
+			$result = substr($result, 0, strlen($result) - 1);
220
+	}
196 221
 
197 222
 	//return out new string
198 223
 	return( $result);
Please login to merge, or discard this patch.
include/InventoryPDFController.php 3 patches
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -390,6 +390,9 @@  discard block
 block discarded – undo
390 390
 		return false;
391 391
 	}
392 392
 
393
+	/**
394
+	 * @param string[] $names
395
+	 */
393 396
 	public function focusColumnValues($names, $delimeter = "\n")
394 397
 	{
395 398
 		if (!is_array($names)) {
@@ -414,6 +417,9 @@  discard block
 block discarded – undo
414 417
 		return $defvalue;
415 418
 	}
416 419
 
420
+	/**
421
+	 * @param string $id
422
+	 */
417 423
 	public function resolveReferenceLabel($id, $module = false)
418 424
 	{
419 425
 		if (empty($id)) {
@@ -448,6 +454,9 @@  discard block
 block discarded – undo
448 454
 		return $currencyField->getDisplayValue(null, true);
449 455
 	}
450 456
 
457
+	/**
458
+	 * @param string $value
459
+	 */
451 460
 	public function formatDate($value)
452 461
 	{
453 462
 		return DateTimeField::convertToUserFormat($value);
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 			$subProducts = $productLineItem["subProductArray{$productLineItemIndex}"];
149 149
 			if ($subProducts != '') {
150 150
 				foreach ($subProducts as $subProduct) {
151
-					$productName .="\n" . " - " . decode_html($subProduct);
151
+					$productName .= "\n" . " - " . decode_html($subProduct);
152 152
 				}
153 153
 			}
154 154
 			$contentModel->set('Name', $productName);
Please login to merge, or discard this patch.
Braces   +30 added lines, -20 removed lines patch added patch discarded remove patch
@@ -83,8 +83,9 @@  discard block
 block discarded – undo
83 83
 
84 84
 	public function Output($filename, $type)
85 85
 	{
86
-		if (is_null($this->focus))
87
-			return;
86
+		if (is_null($this->focus)) {
87
+					return;
88
+		}
88 89
 
89 90
 		$pdfgenerator = $this->getPDFGenerator();
90 91
 
@@ -256,24 +257,32 @@  discard block
 block discarded – undo
256 257
 
257 258
 			$addressValues = [];
258 259
 			$addressValues[] = $resultrow['address'];
259
-			if (!empty($resultrow['city']))
260
-				$addressValues[] = "\n" . $resultrow['city'];
261
-			if (!empty($resultrow['state']))
262
-				$addressValues[] = "," . $resultrow['state'];
263
-			if (!empty($resultrow['code']))
264
-				$addressValues[] = $resultrow['code'];
265
-			if (!empty($resultrow['country']))
266
-				$addressValues[] = "\n" . $resultrow['country'];
260
+			if (!empty($resultrow['city'])) {
261
+							$addressValues[] = "\n" . $resultrow['city'];
262
+			}
263
+			if (!empty($resultrow['state'])) {
264
+							$addressValues[] = "," . $resultrow['state'];
265
+			}
266
+			if (!empty($resultrow['code'])) {
267
+							$addressValues[] = $resultrow['code'];
268
+			}
269
+			if (!empty($resultrow['country'])) {
270
+							$addressValues[] = "\n" . $resultrow['country'];
271
+			}
267 272
 
268 273
 			$additionalCompanyInfo = [];
269
-			if (!empty($resultrow['phone']))
270
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Phone: ", $this->moduleName) . $resultrow['phone'];
271
-			if (!empty($resultrow['fax']))
272
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Fax: ", $this->moduleName) . $resultrow['fax'];
273
-			if (!empty($resultrow['website']))
274
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Website: ", $this->moduleName) . $resultrow['website'];
275
-			if (!empty($resultrow['vatid']))
276
-				$additionalCompanyInfo[] = "\n" . \includes\Language::translate("VAT ID: ", $this->moduleName) . $resultrow['vatid'];
274
+			if (!empty($resultrow['phone'])) {
275
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Phone: ", $this->moduleName) . $resultrow['phone'];
276
+			}
277
+			if (!empty($resultrow['fax'])) {
278
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Fax: ", $this->moduleName) . $resultrow['fax'];
279
+			}
280
+			if (!empty($resultrow['website'])) {
281
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("Website: ", $this->moduleName) . $resultrow['website'];
282
+			}
283
+			if (!empty($resultrow['vatid'])) {
284
+							$additionalCompanyInfo[] = "\n" . \includes\Language::translate("VAT ID: ", $this->moduleName) . $resultrow['vatid'];
285
+			}
277 286
 
278 287
 			$modelColumnLeft = array(
279 288
 				'logo' => "storage/Logo/" . $resultrow['logoname'],
@@ -430,8 +439,9 @@  discard block
 block discarded – undo
430 439
 	{
431 440
 		$valueString = '';
432 441
 		foreach ($values as $value) {
433
-			if (empty($value))
434
-				continue;
442
+			if (empty($value)) {
443
+							continue;
444
+			}
435 445
 			$valueString .= $value . $delimeter;
436 446
 		}
437 447
 		return rtrim($valueString, $delimeter);
Please login to merge, or discard this patch.
include/Loader.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 
99 99
 	/**
100 100
 	 * Function to get the class name of a given Component, of given Type, for a given Module
101
-	 * @param <String> $componentType
101
+	 * @param string $componentType
102 102
 	 * @param <String> $componentName
103 103
 	 * @param <String> $moduleName
104 104
 	 * @return <String> Required Class Name
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,8 +124,9 @@
 block discarded – undo
124 124
 			$secondFallBackModuleDir = $secondFallBackModuleClassPath = $actualModule;
125 125
 			if ($actualModule != 'Users') {
126 126
 				$baseModule = $moduleHierarchyParts[0];
127
-				if ($baseModule == 'Settings')
128
-					$baseModule = 'Settings:Vtiger';
127
+				if ($baseModule == 'Settings') {
128
+									$baseModule = 'Settings:Vtiger';
129
+				}
129 130
 				$firstFallBackDir = str_replace(':', '.', $baseModule);
130 131
 				$firstFallBackClassPath = str_replace(':', '_', $baseModule);
131 132
 			}
Please login to merge, or discard this patch.
include/main/WebUI.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -54,6 +54,9 @@  discard block
 block discarded – undo
54 54
 		return $user;
55 55
 	}
56 56
 
57
+	/**
58
+	 * @param Vtiger_Request $request
59
+	 */
57 60
 	protected function triggerCheckPermission($handler, $request)
58 61
 	{
59 62
 		$moduleName = $request->getModule();
@@ -73,6 +76,9 @@  discard block
 block discarded – undo
73 76
 		throw new \Exception\NoPermitted('LBL_NOT_ACCESSIBLE');
74 77
 	}
75 78
 
79
+	/**
80
+	 * @param Vtiger_Request $request
81
+	 */
76 82
 	protected function triggerPreProcess($handler, $request)
77 83
 	{
78 84
 		if ($request->isAjax()) {
@@ -82,6 +88,9 @@  discard block
 block discarded – undo
82 88
 		$handler->preProcess($request);
83 89
 	}
84 90
 
91
+	/**
92
+	 * @param Vtiger_Request $request
93
+	 */
85 94
 	protected function triggerPostProcess($handler, $request)
86 95
 	{
87 96
 		if ($request->isAjax()) {
Please login to merge, or discard this patch.
include/PrivilegeFile.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -31,6 +31,9 @@
 block discarded – undo
31 31
 		file_put_contents(self::$usersFile, '<?php return ' . \vtlib\Functions::varExportMin($users) . ';');
32 32
 	}
33 33
 
34
+	/**
35
+	 * @param string $type
36
+	 */
34 37
 	public static function getUser($type)
35 38
 	{
36 39
 		if (self::$usersFileCache === false) {
Please login to merge, or discard this patch.
include/recaptcha/recaptchalib.php 4 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -206,6 +206,9 @@  discard block
 block discarded – undo
206 206
 }
207 207
 /* Mailhide related code */
208 208
 
209
+/**
210
+ * @param string $ky
211
+ */
209 212
 function _recaptcha_aes_encrypt($val, $ky)
210 213
 {
211 214
 	if (!function_exists("mcrypt_encrypt")) {
@@ -217,6 +220,9 @@  discard block
 block discarded – undo
217 220
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
218 221
 }
219 222
 
223
+/**
224
+ * @param null|string $x
225
+ */
220 226
 function _recaptcha_mailhide_urlbase64($x)
221 227
 {
222 228
 	return strtr(base64_encode($x), '+/', '-_');
Please login to merge, or discard this patch.
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,6 @@
 block discarded – undo
98 98
  * @param string $pubkey A public key for reCAPTCHA
99 99
  * @param string $error The error given by reCAPTCHA (optional, default is null)
100 100
  * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
101
-
102 101
  * @return string - The HTML to be embedded in the user's form.
103 102
  */
104 103
 function recaptcha_get_html($pubkey, $error = null, $use_ssl = false)
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 	$http_request .= $req;
78 78
 
79 79
 	$response = '';
80
-	if (false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) )) {
80
+	if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
81 81
 		die('Could not open socket');
82 82
 	}
83 83
 
Please login to merge, or discard this patch.
Braces   +7 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,8 +47,9 @@  discard block
 block discarded – undo
47 47
 function _recaptcha_qsencode($data)
48 48
 {
49 49
 	$req = "";
50
-	foreach ($data as $key => $value)
51
-		$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
50
+	foreach ($data as $key => $value) {
51
+			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
52
+	}
52 53
 
53 54
 	// Cut the last '&'
54 55
 	$req = substr($req, 0, strlen($req) - 1);
@@ -83,8 +84,10 @@  discard block
 block discarded – undo
83 84
 
84 85
 	fwrite($fs, $http_request);
85 86
 
86
-	while (!feof($fs))
87
-		$response .= fgets($fs, 1160); // One TCP-IP packet
87
+	while (!feof($fs)) {
88
+			$response .= fgets($fs, 1160);
89
+	}
90
+	// One TCP-IP packet
88 91
 	fclose($fs);
89 92
 	$response = explode("\r\n\r\n", $response, 2);
90 93
 
Please login to merge, or discard this patch.
include/RelatedListView.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 
64 64
 /** 	Function to display the Products which are related to the PriceBook
65 65
  * 	@param string $query - query to get the list of products which are related to the current PriceBook
66
- * 	@param object $focus - PriceBook object which contains all the information of the current PriceBook
66
+ * 	@param PriceBooks $focus - PriceBook object which contains all the information of the current PriceBook
67 67
  * 	@param string $returnset - return_module, return_action and return_id which are sequenced with & to pass to the URL which is optional
68 68
  * 	return array $return_data which will be formed like array('header'=>$header,'entries'=>$entries_list) where as $header contains all the header columns and $entries_list will contain all the Product entries
69 69
  */
Please login to merge, or discard this patch.
Braces   +26 added lines, -18 removed lines patch added patch discarded remove patch
@@ -115,22 +115,26 @@  discard block
 block discarded – undo
115 115
 
116 116
 	$limit_start_rec = ($start - 1) * $listMaxEntriesPerPage;
117 117
 
118
-	if ($adb->isPostgres())
119
-		$list_result = $adb->pquery($query .
118
+	if ($adb->isPostgres()) {
119
+			$list_result = $adb->pquery($query .
120 120
 			" OFFSET $limit_start_rec LIMIT $listMaxEntriesPerPage ", []);
121
-	else
122
-		$list_result = $adb->pquery($query .
121
+	} else {
122
+			$list_result = $adb->pquery($query .
123 123
 			" LIMIT $limit_start_rec, $listMaxEntriesPerPage ", []);
124
+	}
124 125
 
125 126
 	$header = [];
126 127
 	$header[] = $mod_strings['LBL_LIST_PRODUCT_NAME'];
127
-	if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0')
128
-		$header[] = $mod_strings['LBL_PRODUCT_CODE'];
129
-	if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0')
130
-		$header[] = $mod_strings['LBL_PRODUCT_UNIT_PRICE'];
128
+	if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0') {
129
+			$header[] = $mod_strings['LBL_PRODUCT_CODE'];
130
+	}
131
+	if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0') {
132
+			$header[] = $mod_strings['LBL_PRODUCT_UNIT_PRICE'];
133
+	}
131 134
 	$header[] = $mod_strings['LBL_PB_LIST_PRICE'];
132
-	if (isPermitted("PriceBooks", "EditView", "") == 'yes' || isPermitted("PriceBooks", "Delete", "") == 'yes')
133
-		$header[] = $mod_strings['LBL_ACTION'];
135
+	if (isPermitted("PriceBooks", "EditView", "") == 'yes' || isPermitted("PriceBooks", "Delete", "") == 'yes') {
136
+			$header[] = $mod_strings['LBL_ACTION'];
137
+	}
134 138
 
135 139
 	$currency_id = $focus->column_fields['currency_id'];
136 140
 	$numRows = $adb->num_rows($list_result);
@@ -146,10 +150,12 @@  discard block
 block discarded – undo
146 150
 
147 151
 		$entries = [];
148 152
 		$entries[] = textlength_check($adb->query_result($list_result, $i, "productname"));
149
-		if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0')
150
-			$entries[] = $adb->query_result($list_result, $i, "productcode");
151
-		if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0')
152
-			$entries[] = CurrencyField::convertToUserFormat($unit_price, null, true);
153
+		if (getFieldVisibilityPermission('Products', $current_user->id, 'productcode') == '0') {
154
+					$entries[] = $adb->query_result($list_result, $i, "productcode");
155
+		}
156
+		if (getFieldVisibilityPermission('Products', $current_user->id, 'unit_price') == '0') {
157
+					$entries[] = CurrencyField::convertToUserFormat($unit_price, null, true);
158
+		}
153 159
 
154 160
 		$entries[] = CurrencyField::convertToUserFormat($listprice, null, true);
155 161
 		$action = "";
@@ -159,12 +165,14 @@  discard block
 block discarded – undo
159 165
 			$action .= '<img src="' . vtiger_imageurl('blank.gif', $theme) . '" border="0" />';
160 166
 		}
161 167
 		if (isPermitted("PriceBooks", "Delete", "") == 'yes' && isPermitted('Products', 'Delete', $entity_id) == 'yes') {
162
-			if ($action != "")
163
-				$action .= '&nbsp;|&nbsp;';
168
+			if ($action != "") {
169
+							$action .= '&nbsp;|&nbsp;';
170
+			}
164 171
 			$action .= '<img src="' . vtiger_imageurl('delete.gif', $theme) . '" onclick="if(confirm(\'' . \includes\Language::translate('ARE_YOU_SURE') . '\')) deletePriceBookProductRel(' . $entity_id . ',' . $pricebook_id . ');" alt="' . \includes\Language::translate('LBL_DELETE') . '" title="' . \includes\Language::translate('LBL_DELETE') . '" style="cursor:pointer;" border="0">';
165 172
 		}
166
-		if ($action != "")
167
-			$entries[] = $action;
173
+		if ($action != "") {
174
+					$entries[] = $action;
175
+		}
168 176
 		$entries_list[] = $entries;
169 177
 	}
170 178
 	$navigationOutput[] = getRecordRangeMessage($list_result, $limit_start_rec, $noofrows);
Please login to merge, or discard this patch.
include/simplehtmldom/simple_html_dom.php 4 patches
Doc Comments   +35 added lines patch added patch discarded remove patch
@@ -120,6 +120,9 @@  discard block
 block discarded – undo
120 120
 	public $tag_start = 0;
121 121
 	private $dom = null;
122 122
 
123
+	/**
124
+	 * @param simple_html_dom $dom
125
+	 */
123 126
 	public function __construct($dom)
124 127
 	{
125 128
 		$this->dom = $dom;
@@ -1553,6 +1556,10 @@  discard block
 block discarded – undo
1553 1556
 }
1554 1557
 
1555 1558
 // parse attributes
1559
+/**
1560
+ * @param simple_html_dom_node $node
1561
+ * @param string[] $space
1562
+ */
1556 1563
 protected function parse_attr($node, $name, &$space)
1557 1564
 {
1558 1565
 // Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
@@ -1589,6 +1596,10 @@  discard block
 block discarded – undo
1589 1596
 }
1590 1597
 
1591 1598
 // link node's parent
1599
+/**
1600
+ * @param simple_html_dom_node $node
1601
+ * @param boolean $is_child
1602
+ */
1592 1603
 protected function link_nodes(&$node, $is_child)
1593 1604
 {
1594 1605
 $node->parent = $this->parent;
@@ -1599,6 +1610,9 @@  discard block
 block discarded – undo
1599 1610
 }
1600 1611
 
1601 1612
 // as a text node
1613
+/**
1614
+ * @param string $tag
1615
+ */
1602 1616
 protected function as_text_node($tag)
1603 1617
 {
1604 1618
 $node = new simple_html_dom_node($this);
@@ -1609,12 +1623,18 @@  discard block
 block discarded – undo
1609 1623
 return true;
1610 1624
 }
1611 1625
 
1626
+/**
1627
+ * @param string $chars
1628
+ */
1612 1629
 protected function skip($chars)
1613 1630
 {
1614 1631
 $this->pos += strspn($this->doc, $chars, $this->pos);
1615 1632
 $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1616 1633
 }
1617 1634
 
1635
+/**
1636
+ * @param string $chars
1637
+ */
1618 1638
 protected function copy_skip($chars)
1619 1639
 {
1620 1640
 $pos = $this->pos;
@@ -1626,6 +1646,9 @@  discard block
 block discarded – undo
1626 1646
 return substr($this->doc, $pos, $len);
1627 1647
 }
1628 1648
 
1649
+/**
1650
+ * @param string $chars
1651
+ */
1629 1652
 protected function copy_until($chars)
1630 1653
 {
1631 1654
 $pos = $this->pos;
@@ -1635,6 +1658,9 @@  discard block
 block discarded – undo
1635 1658
 return substr($this->doc, $pos, $len);
1636 1659
 }
1637 1660
 
1661
+/**
1662
+ * @param string $char
1663
+ */
1638 1664
 protected function copy_until_char($char)
1639 1665
 {
1640 1666
 if ($this->char === null)
@@ -1655,6 +1681,9 @@  discard block
 block discarded – undo
1655 1681
 return substr($this->doc, $pos_old, $pos - $pos_old);
1656 1682
 }
1657 1683
 
1684
+/**
1685
+ * @param string $char
1686
+ */
1658 1687
 protected function copy_until_char_escape($char)
1659 1688
 {
1660 1689
 if ($this->char === null)
@@ -1686,6 +1715,9 @@  discard block
 block discarded – undo
1686 1715
 
1687 1716
 // remove noise from html content
1688 1717
 // save the noise in the $this->noise array.
1718
+/**
1719
+ * @param string $pattern
1720
+ */
1689 1721
 protected function remove_noise($pattern, $remove_tag = false)
1690 1722
 {
1691 1723
 global $debugObject;
@@ -1713,6 +1745,9 @@  discard block
 block discarded – undo
1713 1745
 }
1714 1746
 
1715 1747
 // restore noise to html content
1748
+/**
1749
+ * @param string|null $text
1750
+ */
1716 1751
 function restore_noise($text)
1717 1752
 {
1718 1753
 global $debugObject;
Please login to merge, or discard this patch.
Switch Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -399,9 +399,9 @@  discard block
 block discarded – undo
399 399
 if (isset($this->_[HDOM_INFO_INNER]))
400 400
 	return $this->_[HDOM_INFO_INNER];
401 401
 switch ($this->nodetype) {
402
-	case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
403
-	case HDOM_TYPE_COMMENT: return '';
404
-	case HDOM_TYPE_UNKNOWN: return '';
402
+		case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
403
+		case HDOM_TYPE_COMMENT: return '';
404
+		case HDOM_TYPE_UNKNOWN: return '';
405 405
 }
406 406
 if (strcasecmp($this->tag, 'script') === 0)
407 407
 	return '';
@@ -640,19 +640,19 @@  discard block
 block discarded – undo
640 640
 }
641 641
 
642 642
 switch ($exp) {
643
-	case '=':
644
-		return ($value === $pattern);
645
-	case '!=':
646
-		return ($value !== $pattern);
647
-	case '^=':
648
-		return preg_match("/^" . preg_quote($pattern, '/') . "/", $value);
649
-	case '$=':
650
-		return preg_match("/" . preg_quote($pattern, '/') . "$/", $value);
651
-	case '*=':
652
-		if ($pattern[0] == '/') {
653
-			return preg_match($pattern, $value);
654
-		}
655
-		return preg_match("/" . $pattern . "/i", $value);
643
+		case '=':
644
+			return ($value === $pattern);
645
+		case '!=':
646
+			return ($value !== $pattern);
647
+		case '^=':
648
+			return preg_match("/^" . preg_quote($pattern, '/') . "/", $value);
649
+		case '$=':
650
+			return preg_match("/" . preg_quote($pattern, '/') . "$/", $value);
651
+		case '*=':
652
+			if ($pattern[0] == '/') {
653
+				return preg_match($pattern, $value);
654
+			}
655
+			return preg_match("/" . $pattern . "/i", $value);
656 656
 }
657 657
 return false;
658 658
 }
@@ -736,11 +736,11 @@  discard block
 block discarded – undo
736 736
 	return $this->convert_text($this->attr[$name]);
737 737
 }
738 738
 switch ($name) {
739
-	case 'outertext': return $this->outertext();
740
-	case 'innertext': return $this->innertext();
741
-	case 'plaintext': return $this->text();
742
-	case 'xmltext': return $this->xmltext();
743
-	default: return array_key_exists($name, $this->attr);
739
+		case 'outertext': return $this->outertext();
740
+		case 'innertext': return $this->innertext();
741
+		case 'plaintext': return $this->text();
742
+		case 'xmltext': return $this->xmltext();
743
+		default: return array_key_exists($name, $this->attr);
744 744
 }
745 745
 }
746 746
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 	{
225 225
 	// I am SURE that this doesn't work properly.
226 226
 	// It fails to unset the current node from it's current parents nodes or children list first.
227
-	if($parent !== null)
227
+	if ($parent !== null)
228 228
 	{
229 229
 	$this->parent = $parent;
230 230
 	$this->parent->nodes[] = $this;
@@ -1427,7 +1427,7 @@  discard block
 block discarded – undo
1427 1427
 		$node->tag = 'unknown';
1428 1428
 	}
1429 1429
 	if ($this->char === '>')
1430
-		$node->_[HDOM_INFO_TEXT].='>';
1430
+		$node->_[HDOM_INFO_TEXT] .= '>';
1431 1431
 	$this->link_nodes($node, true);
1432 1432
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1433 1433
 	return true;
@@ -1450,7 +1450,7 @@  discard block
 block discarded – undo
1450 1450
 	}
1451 1451
 
1452 1452
 	if ($this->char === '>')
1453
-		$node->_[HDOM_INFO_TEXT].='>';
1453
+		$node->_[HDOM_INFO_TEXT] .= '>';
1454 1454
 	$this->link_nodes($node, false);
1455 1455
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1456 1456
 	return true;
Please login to merge, or discard this patch.
Braces   +164 added lines, -107 removed lines patch added patch discarded remove patch
@@ -153,8 +153,9 @@  discard block
 block discarded – undo
153 153
 		echo $lead . $this->tag;
154 154
 		if ($show_attr && count($this->attr) > 0) {
155 155
 			echo '(';
156
-			foreach ($this->attr as $k => $v)
157
-				echo "[$k]=>\"" . $this->$k . '", ';
156
+			foreach ($this->attr as $k => $v) {
157
+							echo "[$k]=>\"" . $this->$k . '", ';
158
+			}
158 159
 			echo ')';
159 160
 		}
160 161
 		echo "\n";
@@ -246,8 +247,9 @@  discard block
 block discarded – undo
246 247
 if ($idx === -1) {
247 248
 	return $this->children;
248 249
 }
249
-if (isset($this->children[$idx]))
250
+if (isset($this->children[$idx])) {
250 251
 	return $this->children[$idx];
252
+}
251 253
 return null;
252 254
 }
253 255
 
@@ -290,14 +292,17 @@  discard block
 block discarded – undo
290 292
 // returns the previous sibling of node
291 293
 function prev_sibling()
292 294
 {
293
-if ($this->parent === null)
295
+if ($this->parent === null) {
294 296
 	return null;
297
+}
295 298
 $idx = 0;
296 299
 $count = count($this->parent->children);
297
-while ($idx < $count && $this !== $this->parent->children[$idx])
300
+while ($idx < $count && $this !== $this->parent->children[$idx]) {
298 301
 	++$idx;
299
-if (--$idx < 0)
302
+}
303
+if (--$idx < 0) {
300 304
 	return null;
305
+}
301 306
 return $this->parent->children[$idx];
302 307
 }
303 308
 
@@ -328,14 +333,17 @@  discard block
 block discarded – undo
328 333
 // get dom node's inner html
329 334
 function innertext()
330 335
 {
331
-if (isset($this->_[HDOM_INFO_INNER]))
336
+if (isset($this->_[HDOM_INFO_INNER])) {
332 337
 	return $this->_[HDOM_INFO_INNER];
333
-if (isset($this->_[HDOM_INFO_TEXT]))
338
+}
339
+if (isset($this->_[HDOM_INFO_TEXT])) {
334 340
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
341
+}
335 342
 
336 343
 $ret = '';
337
-foreach ($this->nodes as $n)
344
+foreach ($this->nodes as $n) {
338 345
 	$ret .= $n->outertext();
346
+}
339 347
 return $ret;
340 348
 }
341 349
 
@@ -353,18 +361,21 @@  discard block
 block discarded – undo
353 361
 	$debugObject->debugLog(1, 'Innertext of tag: ' . $this->tag . $text);
354 362
 }
355 363
 
356
-if ($this->tag === 'root')
364
+if ($this->tag === 'root') {
357 365
 	return $this->innertext();
366
+}
358 367
 
359 368
 // trigger callback
360 369
 if ($this->dom && $this->dom->callback !== null) {
361 370
 	call_user_func_array($this->dom->callback, array($this));
362 371
 }
363 372
 
364
-if (isset($this->_[HDOM_INFO_OUTER]))
373
+if (isset($this->_[HDOM_INFO_OUTER])) {
365 374
 	return $this->_[HDOM_INFO_OUTER];
366
-if (isset($this->_[HDOM_INFO_TEXT]))
375
+}
376
+if (isset($this->_[HDOM_INFO_TEXT])) {
367 377
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
378
+}
368 379
 
369 380
 // render begin tag
370 381
 if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) {
@@ -388,25 +399,29 @@  discard block
 block discarded – undo
388 399
 }
389 400
 
390 401
 // render end tag
391
-if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
402
+if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) {
392 403
 	$ret .= '</' . $this->tag . '>';
404
+}
393 405
 return $ret;
394 406
 }
395 407
 
396 408
 // get dom node's plain text
397 409
 function text()
398 410
 {
399
-if (isset($this->_[HDOM_INFO_INNER]))
411
+if (isset($this->_[HDOM_INFO_INNER])) {
400 412
 	return $this->_[HDOM_INFO_INNER];
413
+}
401 414
 switch ($this->nodetype) {
402 415
 	case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
403 416
 	case HDOM_TYPE_COMMENT: return '';
404 417
 	case HDOM_TYPE_UNKNOWN: return '';
405 418
 }
406
-if (strcasecmp($this->tag, 'script') === 0)
419
+if (strcasecmp($this->tag, 'script') === 0) {
407 420
 	return '';
408
-if (strcasecmp($this->tag, 'style') === 0)
421
+}
422
+if (strcasecmp($this->tag, 'style') === 0) {
409 423
 	return '';
424
+}
410 425
 
411 426
 $ret = '';
412 427
 // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -437,8 +452,9 @@  discard block
 block discarded – undo
437 452
 function makeup()
438 453
 {
439 454
 // text, comment, unknown
440
-if (isset($this->_[HDOM_INFO_TEXT]))
455
+if (isset($this->_[HDOM_INFO_TEXT])) {
441 456
 	return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
457
+}
442 458
 
443 459
 $ret = '<' . $this->tag;
444 460
 $i = -1;
@@ -447,14 +463,15 @@  discard block
 block discarded – undo
447 463
 	++$i;
448 464
 
449 465
 	// skip removed attribute
450
-	if ($val === null || $val === false)
451
-		continue;
466
+	if ($val === null || $val === false) {
467
+			continue;
468
+	}
452 469
 
453 470
 	$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
454 471
 	//no value attr: nowrap, checked selected...
455
-	if ($val === true)
456
-		$ret .= $key;
457
-	else {
472
+	if ($val === true) {
473
+			$ret .= $key;
474
+	} else {
458 475
 		switch ($this->_[HDOM_INFO_QUOTE][$i]) {
459 476
 			case HDOM_QUOTE_DOUBLE: $quote = '"';
460 477
 				break;
@@ -474,18 +491,21 @@  discard block
 block discarded – undo
474 491
 function find($selector, $idx = null, $lowercase = false)
475 492
 {
476 493
 $selectors = $this->parse_selector($selector);
477
-if (($count = count($selectors)) === 0)
494
+if (($count = count($selectors)) === 0) {
478 495
 	return [];
496
+}
479 497
 $found_keys = [];
480 498
 
481 499
 // find each selector
482 500
 for ($c = 0; $c < $count; ++$c) {
483 501
 	// The change on the below line was documented on the sourceforge code tracker id 2788009
484 502
 	// used to be: if (($levle=count($selectors[0]))===0) return [];
485
-	if (($levle = count($selectors[$c])) === 0)
486
-		return [];
487
-	if (!isset($this->_[HDOM_INFO_BEGIN]))
488
-		return [];
503
+	if (($levle = count($selectors[$c])) === 0) {
504
+			return [];
505
+	}
506
+	if (!isset($this->_[HDOM_INFO_BEGIN])) {
507
+			return [];
508
+	}
489 509
 
490 510
 	$head = array($this->_[HDOM_INFO_BEGIN] => 1);
491 511
 
@@ -501,8 +521,9 @@  discard block
 block discarded – undo
501 521
 	}
502 522
 
503 523
 	foreach ($head as $k => $v) {
504
-		if (!isset($found_keys[$k]))
505
-			$found_keys[$k] = 1;
524
+		if (!isset($found_keys[$k])) {
525
+					$found_keys[$k] = 1;
526
+		}
506 527
 	}
507 528
 }
508 529
 
@@ -510,14 +531,16 @@  discard block
 block discarded – undo
510 531
 ksort($found_keys);
511 532
 
512 533
 $found = [];
513
-foreach ($found_keys as $k => $v)
534
+foreach ($found_keys as $k => $v) {
514 535
 	$found[] = $this->dom->nodes[$k];
536
+}
515 537
 
516 538
 // return nth-element or array
517
-if (is_null($idx))
539
+if (is_null($idx)) {
518 540
 	return $found;
519
-else if ($idx < 0)
541
+} else if ($idx < 0) {
520 542
 	$idx = count($found) + $idx;
543
+}
521 544
 return (isset($found[$idx])) ? $found[$idx] : null;
522 545
 }
523 546
 
@@ -562,8 +585,9 @@  discard block
 block discarded – undo
562 585
 	$pass = true;
563 586
 
564 587
 	if ($tag === '*' && !$key) {
565
-		if (in_array($node, $this->children, true))
566
-			$ret[$i] = 1;
588
+		if (in_array($node, $this->children, true)) {
589
+					$ret[$i] = 1;
590
+		}
567 591
 		continue;
568 592
 	}
569 593
 
@@ -574,11 +598,13 @@  discard block
 block discarded – undo
574 598
 	// compare key
575 599
 	if ($pass && $key) {
576 600
 		if ($no_key) {
577
-			if (isset($node->attr[$key]))
578
-				$pass = false;
601
+			if (isset($node->attr[$key])) {
602
+							$pass = false;
603
+			}
579 604
 		} else {
580
-			if (($key != "plaintext") && !isset($node->attr[$key]))
581
-				$pass = false;
605
+			if (($key != "plaintext") && !isset($node->attr[$key])) {
606
+							$pass = false;
607
+			}
582 608
 		}
583 609
 	}
584 610
 	// compare value
@@ -614,16 +640,19 @@  discard block
 block discarded – undo
614 640
 					} else {
615 641
 						$check = $this->match($exp, $val, $k);
616 642
 					}
617
-					if ($check)
618
-						break;
643
+					if ($check) {
644
+											break;
645
+					}
619 646
 				}
620 647
 			}
621 648
 		}
622
-		if (!$check)
623
-			$pass = false;
649
+		if (!$check) {
650
+					$pass = false;
651
+		}
652
+	}
653
+	if ($pass) {
654
+			$ret[$i] = 1;
624 655
 	}
625
-	if ($pass)
626
-		$ret[$i] = 1;
627 656
 	unset($node);
628 657
 }
629 658
 // It's passed by reference so this is actually what this function returns.
@@ -683,11 +712,13 @@  discard block
 block discarded – undo
683 712
 
684 713
 foreach ($matches as $m) {
685 714
 	$m[0] = trim($m[0]);
686
-	if ($m[0] === '' || $m[0] === '/' || $m[0] === '//')
687
-		continue;
715
+	if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') {
716
+			continue;
717
+	}
688 718
 	// for browser generated xpath
689
-	if ($m[1] === 'tbody')
690
-		continue;
719
+	if ($m[1] === 'tbody') {
720
+			continue;
721
+	}
691 722
 
692 723
 	list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
693 724
 	if (!empty($m[2])) {
@@ -725,8 +756,9 @@  discard block
 block discarded – undo
725 756
 		$result = [];
726 757
 	}
727 758
 }
728
-if (count($result) > 0)
759
+if (count($result) > 0) {
729 760
 	$selectors[] = $result;
761
+}
730 762
 return $selectors;
731 763
 }
732 764
 
@@ -749,8 +781,9 @@  discard block
 block discarded – undo
749 781
 switch ($name) {
750 782
 	case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
751 783
 	case 'innertext':
752
-		if (isset($this->_[HDOM_INFO_TEXT]))
753
-			return $this->_[HDOM_INFO_TEXT] = $value;
784
+		if (isset($this->_[HDOM_INFO_TEXT])) {
785
+					return $this->_[HDOM_INFO_TEXT] = $value;
786
+		}
754 787
 		return $this->_[HDOM_INFO_INNER] = $value;
755 788
 }
756 789
 if (!isset($this->attr[$name])) {
@@ -773,9 +806,10 @@  discard block
 block discarded – undo
773 806
 
774 807
 function __unset($name)
775 808
 {
776
-if (isset($this->attr[$name]))
809
+if (isset($this->attr[$name])) {
777 810
 	unset($this->attr[$name]);
778 811
 }
812
+}
779 813
 
780 814
 // PaperG - Function to convert the text from one character set to another if the two sets are not the same.
781 815
 function convert_text($text)
@@ -835,27 +869,30 @@  discard block
 block discarded – undo
835 869
 for ($i = 0; $i < $len; $i++) {
836 870
 	$c = ord($str[$i]);
837 871
 	if ($c > 128) {
838
-		if (($c >= 254))
839
-			return false;
840
-		elseif ($c >= 252)
841
-			$bits = 6;
842
-		elseif ($c >= 248)
843
-			$bits = 5;
844
-		elseif ($c >= 240)
845
-			$bits = 4;
846
-		elseif ($c >= 224)
847
-			$bits = 3;
848
-		elseif ($c >= 192)
849
-			$bits = 2;
850
-		else
851
-			return false;
852
-		if (($i + $bits) > $len)
853
-			return false;
872
+		if (($c >= 254)) {
873
+					return false;
874
+		} elseif ($c >= 252) {
875
+					$bits = 6;
876
+		} elseif ($c >= 248) {
877
+					$bits = 5;
878
+		} elseif ($c >= 240) {
879
+					$bits = 4;
880
+		} elseif ($c >= 224) {
881
+					$bits = 3;
882
+		} elseif ($c >= 192) {
883
+					$bits = 2;
884
+		} else {
885
+					return false;
886
+		}
887
+		if (($i + $bits) > $len) {
888
+					return false;
889
+		}
854 890
 		while ($bits > 1) {
855 891
 			$i++;
856 892
 			$b = ord($str[$i]);
857
-			if ($b < 128 || $b > 191)
858
-				return false;
893
+			if ($b < 128 || $b > 191) {
894
+							return false;
895
+			}
859 896
 			$bits--;
860 897
 		}
861 898
 	}
@@ -1175,8 +1212,9 @@  discard block
 block discarded – undo
1175 1212
 function save($filepath = '')
1176 1213
 {
1177 1214
 $ret = $this->root->innertext();
1178
-if ($filepath !== '')
1215
+if ($filepath !== '') {
1179 1216
 	file_put_contents($filepath, $ret, LOCK_EX);
1217
+}
1180 1218
 return $ret;
1181 1219
 }
1182 1220
 
@@ -1195,9 +1233,10 @@  discard block
 block discarded – undo
1195 1233
 	$n = null;
1196 1234
 }
1197 1235
 // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
1198
-if (isset($this->children))
1236
+if (isset($this->children)) {
1199 1237
 	foreach ($this->children as $n) {
1200 1238
 		$n->clear();
1239
+}
1201 1240
 		$n = null;
1202 1241
 	}
1203 1242
 if (isset($this->parent)) {
@@ -1249,9 +1288,10 @@  discard block
 block discarded – undo
1249 1288
 $this->root->_[HDOM_INFO_BEGIN] = -1;
1250 1289
 $this->root->nodetype = HDOM_TYPE_ROOT;
1251 1290
 $this->parent = $this->root;
1252
-if ($this->size > 0)
1291
+if ($this->size > 0) {
1253 1292
 	$this->char = $this->doc[0];
1254 1293
 }
1294
+}
1255 1295
 
1256 1296
 // parse html content
1257 1297
 protected function parse()
@@ -1360,8 +1400,9 @@  discard block
 block discarded – undo
1360 1400
 	$tag = $this->copy_until_char('>');
1361 1401
 
1362 1402
 	// skip attributes in end tag
1363
-	if (($pos = strpos($tag, ' ')) !== false)
1364
-		$tag = substr($tag, 0, $pos);
1403
+	if (($pos = strpos($tag, ' ')) !== false) {
1404
+			$tag = substr($tag, 0, $pos);
1405
+	}
1365 1406
 
1366 1407
 	$parent_lower = strtolower($this->parent->tag);
1367 1408
 	$tag_lower = strtolower($tag);
@@ -1371,23 +1412,25 @@  discard block
 block discarded – undo
1371 1412
 			$this->parent->_[HDOM_INFO_END] = 0;
1372 1413
 			$org_parent = $this->parent;
1373 1414
 
1374
-			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
1375
-				$this->parent = $this->parent->parent;
1415
+			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) {
1416
+							$this->parent = $this->parent->parent;
1417
+			}
1376 1418
 
1377 1419
 			if (strtolower($this->parent->tag) !== $tag_lower) {
1378 1420
 				$this->parent = $org_parent; // restore origonal parent
1379
-				if ($this->parent->parent)
1380
-					$this->parent = $this->parent->parent;
1421
+				if ($this->parent->parent) {
1422
+									$this->parent = $this->parent->parent;
1423
+				}
1381 1424
 				$this->parent->_[HDOM_INFO_END] = $this->cursor;
1382 1425
 				return $this->as_text_node($tag);
1383 1426
 			}
1384
-		}
1385
-		else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
1427
+		} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
1386 1428
 			$this->parent->_[HDOM_INFO_END] = 0;
1387 1429
 			$org_parent = $this->parent;
1388 1430
 
1389
-			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
1390
-				$this->parent = $this->parent->parent;
1431
+			while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) {
1432
+							$this->parent = $this->parent->parent;
1433
+			}
1391 1434
 
1392 1435
 			if (strtolower($this->parent->tag) !== $tag_lower) {
1393 1436
 				$this->parent = $org_parent; // restore origonal parent
@@ -1397,13 +1440,15 @@  discard block
 block discarded – undo
1397 1440
 		} else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower) {
1398 1441
 			$this->parent->_[HDOM_INFO_END] = 0;
1399 1442
 			$this->parent = $this->parent->parent;
1400
-		} else
1401
-			return $this->as_text_node($tag);
1443
+		} else {
1444
+					return $this->as_text_node($tag);
1445
+		}
1402 1446
 	}
1403 1447
 
1404 1448
 	$this->parent->_[HDOM_INFO_END] = $this->cursor;
1405
-	if ($this->parent->parent)
1406
-		$this->parent = $this->parent->parent;
1449
+	if ($this->parent->parent) {
1450
+			$this->parent = $this->parent->parent;
1451
+	}
1407 1452
 
1408 1453
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1409 1454
 	return true;
@@ -1426,8 +1471,9 @@  discard block
 block discarded – undo
1426 1471
 		$node->nodetype = HDOM_TYPE_UNKNOWN;
1427 1472
 		$node->tag = 'unknown';
1428 1473
 	}
1429
-	if ($this->char === '>')
1430
-		$node->_[HDOM_INFO_TEXT].='>';
1474
+	if ($this->char === '>') {
1475
+			$node->_[HDOM_INFO_TEXT].='>';
1476
+	}
1431 1477
 	$this->link_nodes($node, true);
1432 1478
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1433 1479
 	return true;
@@ -1449,8 +1495,9 @@  discard block
 block discarded – undo
1449 1495
 		return true;
1450 1496
 	}
1451 1497
 
1452
-	if ($this->char === '>')
1453
-		$node->_[HDOM_INFO_TEXT].='>';
1498
+	if ($this->char === '>') {
1499
+			$node->_[HDOM_INFO_TEXT].='>';
1500
+	}
1454 1501
 	$this->link_nodes($node, false);
1455 1502
 	$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1456 1503
 	return true;
@@ -1511,8 +1558,9 @@  discard block
 block discarded – undo
1511 1558
 	if ($name !== '/' && $name !== '') {
1512 1559
 		$space[1] = $this->copy_skip($this->token_blank);
1513 1560
 		$name = $this->restore_noise($name);
1514
-		if ($this->lowercase)
1515
-			$name = strtolower($name);
1561
+		if ($this->lowercase) {
1562
+					$name = strtolower($name);
1563
+		}
1516 1564
 		if ($this->char === '=') {
1517 1565
 			$this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1518 1566
 			$this->parse_attr($node, $name, $space);
@@ -1520,14 +1568,17 @@  discard block
 block discarded – undo
1520 1568
 			//no value attr: nowrap, checked selected...
1521 1569
 			$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
1522 1570
 			$node->attr[$name] = true;
1523
-			if ($this->char != '>')
1524
-				$this->char = $this->doc[--$this->pos]; // prev
1571
+			if ($this->char != '>') {
1572
+							$this->char = $this->doc[--$this->pos];
1573
+			}
1574
+			// prev
1525 1575
 		}
1526 1576
 		$node->_[HDOM_INFO_SPACE][] = $space;
1527 1577
 		$space = array($this->copy_skip($this->token_blank), '', '');
1528
-	} else
1529
-		break;
1530
-} while ($this->char !== '>' && $this->char !== '/');
1578
+	} else {
1579
+			break;
1580
+	}
1581
+	} while ($this->char !== '>' && $this->char !== '/');
1531 1582
 
1532 1583
 $this->link_nodes($node, true);
1533 1584
 $node->_[HDOM_INFO_ENDSPACE] = $space[0];
@@ -1538,9 +1589,10 @@  discard block
 block discarded – undo
1538 1589
 	$node->_[HDOM_INFO_END] = 0;
1539 1590
 } else {
1540 1591
 	// reset parent
1541
-	if (!isset($this->self_closing_tags[strtolower($node->tag)]))
1542
-		$this->parent = $node;
1543
-}
1592
+	if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
1593
+			$this->parent = $node;
1594
+	}
1595
+	}
1544 1596
 $this->char = ( ++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1545 1597
 // If it's a BR tag, we need to set it's text to the default text.
1546 1598
 // This way when we see it in plaintext, we can generate formatting that the user wants.
@@ -1621,8 +1673,9 @@  discard block
 block discarded – undo
1621 1673
 $len = strspn($this->doc, $chars, $pos);
1622 1674
 $this->pos += $len;
1623 1675
 $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
1624
-if ($len === 0)
1676
+if ($len === 0) {
1625 1677
 	return '';
1678
+}
1626 1679
 return substr($this->doc, $pos, $len);
1627 1680
 }
1628 1681
 
@@ -1637,8 +1690,9 @@  discard block
 block discarded – undo
1637 1690
 
1638 1691
 protected function copy_until_char($char)
1639 1692
 {
1640
-if ($this->char === null)
1693
+if ($this->char === null) {
1641 1694
 	return '';
1695
+}
1642 1696
 
1643 1697
 if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
1644 1698
 	$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
@@ -1647,8 +1701,9 @@  discard block
 block discarded – undo
1647 1701
 	return $ret;
1648 1702
 }
1649 1703
 
1650
-if ($pos === $this->pos)
1704
+if ($pos === $this->pos) {
1651 1705
 	return '';
1706
+}
1652 1707
 $pos_old = $this->pos;
1653 1708
 $this->char = $this->doc[$pos];
1654 1709
 $this->pos = $pos;
@@ -1657,8 +1712,9 @@  discard block
 block discarded – undo
1657 1712
 
1658 1713
 protected function copy_until_char_escape($char)
1659 1714
 {
1660
-if ($this->char === null)
1715
+if ($this->char === null) {
1661 1716
 	return '';
1717
+}
1662 1718
 
1663 1719
 $start = $this->pos;
1664 1720
 while (1) {
@@ -1669,8 +1725,9 @@  discard block
 block discarded – undo
1669 1725
 		return $ret;
1670 1726
 	}
1671 1727
 
1672
-	if ($pos === $this->pos)
1673
-		return '';
1728
+	if ($pos === $this->pos) {
1729
+			return '';
1730
+	}
1674 1731
 
1675 1732
 	if ($this->doc[$pos - 1] === '\\') {
1676 1733
 		$start = $pos + 1;
Please login to merge, or discard this patch.
include/Tracker.php 2 patches
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -59,6 +59,8 @@
 block discarded – undo
59 59
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
60 60
 	 * All Rights Reserved.
61 61
 	 * Contributor(s): ______________________________________..
62
+	 * @param string $item_id
63
+	 * @param string $item_summary
62 64
 	 */
63 65
 	public function track_view($user_id, $current_module, $item_id, $item_summary)
64 66
 	{
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,8 +80,9 @@
 block discarded – undo
80 80
 				$fieldlists = explode(',', $fieldsname);
81 81
 				$fl = [];
82 82
 				foreach ($fieldlists as $w => $c) {
83
-					if (count($fl))
84
-						$fl[] = "' '";
83
+					if (count($fl)) {
84
+											$fl[] = "' '";
85
+					}
85 86
 					$fl[] = $c;
86 87
 				}
87 88
 				$fieldsname = $adb->concat($fl);
Please login to merge, or discard this patch.