GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.
Completed
Push — master ( c515f9...b53356 )
by Marco
02:04
created
contrib/mailClassifier/result.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,10 +55,15 @@
 block discarded – undo
55 55
                 'warn' => NULL
56 56
 );
57 57
 
58
-if (empty($folder)) exit ('<p>No folder found.</p>'); /* This should not occur */
58
+if (empty($folder)) {
59
+	exit ('<p>No folder found.</p>');
60
+}
61
+/* This should not occur */
59 62
 $confimap['user'] = $username;
60 63
 $headers = imapFind($confimap, $account, $folder);
61
-if (empty($headers)) exit (sprintf('<p>No suitable mail found in <b>%s</b> folder.</p>', htmlentities("<$folder>")));
64
+if (empty($headers)) {
65
+	exit (sprintf('<p>No suitable mail found in <b>%s</b> folder.</p>', htmlentities("<$folder>")));
66
+}
62 67
 print '<table>';
63 68
 printTableHeader($folder,$data,TRUE,sprintf('Found %d suitable mails.',count($headers)));
64 69
 
Please login to merge, or discard this patch.
contrib/mailClassifier/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,8 +26,9 @@
 block discarded – undo
26 26
 $user = username();
27 27
 $isAdmin = in_array($user,array_keys($admins));
28 28
 $canChange = ($isAdmin) ? '' : 'readonly';
29
-if ( $require_auth )
29
+if ( $require_auth ) {
30 30
 	if ( $user == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
31
+}
31 32
 
32 33
 
33 34
 print <<<END
Please login to merge, or discard this patch.
contrib/mailClassifier/list.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,11 +14,12 @@
 block discarded – undo
14 14
 $folders=imapFolder($conf['imap'], $_POST['username']);
15 15
 if (is_array($folders)) {
16 16
 	print '<option  value="" selected disabled>Choose a folder</option>';
17
-	foreach ( $folders as $folder )
18
-        	printf('<option  value="%s">%s</option>',
17
+	foreach ( $folders as $folder ) {
18
+	        	printf('<option  value="%s">%s</option>',
19 19
 			$folder,
20 20
 			htmlspecialchars(mb_convert_encoding($folder, "UTF-8", "UTF7-IMAP")));
21
-}
21
+	}
22
+	}
22 23
 closelog();
23 24
 ?>
24 25
 </select>
Please login to merge, or discard this patch.
contrib/mailClassifier/function.php 1 patch
Braces   +106 added lines, -72 removed lines patch added patch discarded remove patch
@@ -5,18 +5,21 @@  discard block
 block discarded – undo
5 5
 	$open='{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}';
6 6
         $m_mail = imap_open($open, $username, $cf['authpassword'], OP_READONLY)
7 7
                 or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
8
-        if ( !$m_mail ) exit(254);
8
+        if ( !$m_mail ) {
9
+        	exit(254);
10
+        }
9 11
 
10 12
 
11 13
         syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
12 14
         //get all folder
13 15
 	$list = imap_list($m_mail, $open, "*");
14 16
 	imap_close($m_mail);
15
-	if (is_array($list))
16
-		foreach ($list as $mbox)
17
+	if (is_array($list)) {
18
+			foreach ($list as $mbox)
17 19
 			$return[] = explode($open,$mbox,2)[1];
18
-	else
19
-		syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
20
+	} else {
21
+			syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
22
+	}
20 23
 	return $return;
21 24
 }
22 25
 
@@ -24,7 +27,9 @@  discard block
 block discarded – undo
24 27
 	$head=array();
25 28
 	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username,$cf['authpassword'], OP_READONLY)
26 29
         	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
27
-	if ( !$m_mail ) exit(254);
30
+	if ( !$m_mail ) {
31
+		exit(254);
32
+	}
28 33
 		
29 34
 
30 35
 	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...');
@@ -36,29 +41,36 @@  discard block
 block discarded – undo
36 41
 	// Order results starting from newest message
37 42
 	if ( empty($m_search) ) {
38 43
 		syslog (LOG_INFO,$cf['user'].": No suitable mail found in <$folder> folder.");
39
-	        if ( $ierr = imap_errors() )
40
-	                foreach ( $ierr as $thiserr )
44
+	        if ( $ierr = imap_errors() ) {
45
+	        	                foreach ( $ierr as $thiserr )
41 46
 	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
42
-	        if ( $ierr = imap_alerts() )
43
-	                foreach ( $ierr as $thiserr )
47
+	        }
48
+	        if ( $ierr = imap_alerts() ) {
49
+	        	                foreach ( $ierr as $thiserr )
44 50
 	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
51
+	        }
45 52
 		imap_close( $m_mail );
46 53
 		return FALSE;
47 54
 	}
48 55
 	$nmes = count ($m_search);
49 56
 	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder.");
50
-	if ($nmes>0) rsort($m_search);
57
+	if ($nmes>0) {
58
+		rsort($m_search);
59
+	}
51 60
 
52 61
         // loop for each message
53
-	foreach ($m_search as $onem) 
54
-		$head[] = imap_fetchheader($m_mail, $onem );
62
+	foreach ($m_search as $onem) {
63
+			$head[] = imap_fetchheader($m_mail, $onem );
64
+	}
55 65
 	imap_close($m_mail);
56 66
 	return $head;
57 67
 }
58 68
 
59 69
 function dspamLevel($prob, $conf) {
60 70
 /* Calculate DSPAM Level as the Spamassassin Plugin */
61
-	if (is_null($prob) or is_null($conf)) return '-';
71
+	if (is_null($prob) or is_null($conf)) {
72
+		return '-';
73
+	}
62 74
 	$t_prob = abs((($prob - 0.5) * 2) * 100);
63 75
 	return round(($t_prob + ($conf*100)) / 2);
64 76
 }
@@ -123,7 +135,9 @@  discard block
 block discarded – undo
123 135
 		}
124 136
         }
125 137
 	$received=NULL;
126
-	if ($k>1) $result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
138
+	if ($k>1) {
139
+		$result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
140
+	}
127 141
 
128 142
         if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.]+)/m',$header,$received) ) {
129 143
 		$k=0;
@@ -139,7 +153,9 @@  discard block
 block discarded – undo
139 153
         	}
140 154
 	}
141 155
 	$received=NULL;
142
-	if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
156
+	if ($k>1) {
157
+		$result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
158
+	}
143 159
 
144 160
 	$k=0;
145 161
         if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m',$header,$received) ) {
@@ -155,7 +171,9 @@  discard block
 block discarded – undo
155 171
         	}
156 172
 	}
157 173
 	$received=NULL;
158
-	if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
174
+	if ($k>1) {
175
+		$result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
176
+	}
159 177
 
160 178
 	if ($dpl) { /* Use Spamassassin Plugin */
161 179
 		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*DSPAM_(?P<dtype>SPAM|HAM)_(?P<dlevel>\d\d)(?:.|\r\n\s+)*\]/m',$header,$received) ) {
@@ -165,57 +183,66 @@  discard block
 block discarded – undo
165 183
 			$result['dspam']['type'] = dspamType($received['dtype'][0]);
166 184
 			$result['dspam']['level'] =$received['dlevel'][0];
167 185
         	}
168
-        	if (count($received[0])>1) $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
169
-	}
170
-	else { /* Parse apart all DSPAM Header and calculate a level */
186
+        	if (count($received[0])>1) {
187
+        		$result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
188
+        	}
189
+	} else { /* Parse apart all DSPAM Header and calculate a level */
171 190
 		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*\]/m',$header,$received) ) {
172 191
                         $result['spam']['status']=$received['spamstatus'][0];
173 192
                         $result['spam']['score'] = $received['score'][0];
174 193
                         $result['spam']['th'] = $received['th'][0];
175
-			if (count($received[0])>1)
176
-				$result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.';
194
+			if (count($received[0])>1) {
195
+							$result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.';
196
+			}
177 197
 		}
178
-		if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1)
179
-	                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
180
-	        else
181
-                	$result['dspam']['type']=$received['result'];
198
+		if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1) {
199
+			                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
200
+		} else {
201
+	                        	$result['dspam']['type']=$received['result'];
202
+	        }
182 203
 		$prob = NULL;
183 204
 		$conf = NULL;
184
-                if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1)
185
-                        $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
186
-		else
187
-			$prob = $received['prob'];
188
-		if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1)
189
-                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
190
-		else
191
-			$conf = $received['conf'];
205
+                if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1) {
206
+                                        $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
207
+                } else {
208
+					$prob = $received['prob'];
209
+		}
210
+		if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1) {
211
+		                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
212
+		} else {
213
+					$conf = $received['conf'];
214
+		}
192 215
 		$result['dspam']['level'] = dspamLevel($prob,$conf);
193 216
 	}
194 217
 	$received=NULL;
195
-	if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1)
196
-                $result['warn'][] = 'From header invalid or not present';
197
-        else
198
-                $result['from'] = $received['from'];
218
+	if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1) {
219
+	                $result['warn'][] = 'From header invalid or not present';
220
+	} else {
221
+                        $result['from'] = $received['from'];
222
+        }
199 223
 
200
-        if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1)
201
-                $result['warn'][] = 'Date header invalid or not present';
202
-	else
203
-		$result['date'] = $received['date'];
224
+        if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1) {
225
+                        $result['warn'][] = 'Date header invalid or not present';
226
+        } else {
227
+			$result['date'] = $received['date'];
228
+	}
204 229
 
205 230
 	$received=NULL;
206
-        if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1)
207
-                $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
208
-	else
209
-		$result['messageid']=$received['mid'];
231
+        if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1) {
232
+                        $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
233
+        } else {
234
+			$result['messageid']=$received['mid'];
235
+	}
210 236
 
211 237
         $received=NULL;
212 238
 
213 239
         switch ($learn) {
214 240
 		case 'dspamc':
215
-        		if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1)
216
-				$result['warn'] = 'DSPAM Signature invalid, not present or present more than once.';
217
-			else
218
-				$result['dspam']['learn']=$received['sig'];			
241
+        		if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1) {
242
+        						$result['warn'] = 'DSPAM Signature invalid, not present or present more than once.';
243
+        		} else {
244
+							$result['dspam']['learn']=$received['sig'];
245
+			}
219 246
 			break;
220 247
 		case false:
221 248
 			break;
@@ -250,8 +277,9 @@  discard block
 block discarded – undo
250 277
 	for ($i=0; $i<$cols; $i++) {
251 278
 		$key = $kcontent[$i];
252 279
 		if (is_array($content[$key])&&($hs = array_keys($content[$key]))) {
253
-			foreach ($hs as $h)
254
-				printf('<th>%s</th>',$h);
280
+			foreach ($hs as $h) {
281
+							printf('<th>%s</th>',$h);
282
+			}
255 283
 		}
256 284
 	}
257 285
 		
@@ -267,15 +295,16 @@  discard block
 block discarded – undo
267 295
 
268 296
 function formatVal($val, $learn) {
269 297
 	foreach (array_keys($val) as $key) {
270
-		if (is_array($val["$key"]) and ($key!='warn'))
271
-			$val["$key"] = formatVal($val["$key"], $learn);
272
-		else {
298
+		if (is_array($val["$key"]) and ($key!='warn')) {
299
+					$val["$key"] = formatVal($val["$key"], $learn);
300
+		} else {
273 301
 			switch ($key) {
274 302
 				case 'warn':
275
-					if (empty($val["$key"]))
276
-						$val["$key"] = '-';
277
-					else 
278
-						$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
303
+					if (empty($val["$key"])) {
304
+											$val["$key"] = '-';
305
+					} else {
306
+											$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
307
+					}
279 308
 					break;
280 309
 				case 'learn':
281 310
 					$val["$key"] = formLearn($learn, $val);
@@ -297,9 +326,10 @@  discard block
 block discarded – undo
297 326
 				$par['class'] = $class;
298 327
 				$val["$class"] = sprintf('dspamc --user dspam --deliver=summary --class=%s --source=error --signature=%s',
299 328
 							strtolower($class), $par['learn']);
300
-				if (($class != $par['type'])||($par['level']<99))
301
-					$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
329
+				if (($class != $par['type'])||($par['level']<99)) {
330
+									$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
302 331
 						$class,$class,$val["$class"],base64_encode(json_encode($par)),$class);
332
+				}
303 333
 			}
304 334
 		default:
305 335
 			return $return;
@@ -308,37 +338,41 @@  discard block
 block discarded – undo
308 338
 
309 339
 function printTableRow($row, $learn, $init=true) {
310 340
 	$color = 'inherit';
311
-	if ($init) 
312
-		$row=formatVal($row,$learn);
341
+	if ($init) {
342
+			$row=formatVal($row,$learn);
343
+	}
313 344
 	foreach( $row as $key => $val) {
314
-		if (is_array($val))
315
-			printTableRow($val, $learn, false);
316
-		else {
345
+		if (is_array($val)) {
346
+					printTableRow($val, $learn, false);
347
+		} else {
317 348
 			/* DSPAM format */
318
-			if (isset($row['type']))
319
-				switch($row['type']) {
349
+			if (isset($row['type'])) {
350
+							switch($row['type']) {
320 351
 					case 'Innocent':
321 352
 					case 'HAM':
322 353
 						$color = 'rgba(0,255,0, %.1f)';
354
+			}
323 355
 						break;
324 356
 					case 'Spam':
325 357
 					case 'SPAM':
326 358
 						$color = 'rgba(255,0,0,%.1f)';
327 359
 			}
328 360
 			/* DMARC, DKIM, SPF format */
329
-			if (isset($row['result']))
330
-				switch($row['result']) {
361
+			if (isset($row['result'])) {
362
+							switch($row['result']) {
331 363
 					case 'pass':
332 364
 						$color = 'rgba(0,255,0, %.1f)';
365
+			}
333 366
 						break;
334 367
 					case 'fail':
335 368
 						$color = 'rgba(255,0,0,%.1f)';
336 369
 				}
337 370
 			/* Spamassassin format */
338
-			if (isset($row['status']))
339
-	                        switch($row['status']) {
371
+			if (isset($row['status'])) {
372
+				                        switch($row['status']) {
340 373
 					case 'No':
341 374
 						$color = 'rgba(0,255,0, %.1f)';
375
+			}
342 376
 						break;
343 377
 					case 'Yes':
344 378
 						$color = 'rgba(255,0,0,%.1f)';
Please login to merge, or discard this patch.