Project

General

Profile

« Previous | Next » 

Revision e6f34d22

Added by Phil Davis almost 10 years ago

bootstrap usr\local\www\f minor changes

View differences:

src/usr/local/www/firewall_rules.php
173 173

  
174 174
		clear_subsystem_dirty('filter');
175 175

  
176
		$savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress"),"<a href='status_filter_reload.php'>","</a>");
176
		$savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress"), "<a href='status_filter_reload.php'>", "</a>");
177 177
	}
178 178
}
179 179

  
......
268 268
<?php
269 269
		// Show the anti-lockout rule if it's enabled, and we are on LAN with an if count > 1, or WAN with an if count of 1.
270 270
	if (!isset($config['system']['webgui']['noantilockout']) &&
271
		(((count($config['interfaces']) > 1) && ($if == 'lan'))
272
		|| ((count($config['interfaces']) == 1) && ($if == 'wan')))):
271
	    (((count($config['interfaces']) > 1) && ($if == 'lan')) ||
272
	     ((count($config['interfaces']) == 1) && ($if == 'wan')))):
273 273
		$alports = implode('<br />', filter_get_antilockout_ports(true));
274 274
?>
275 275
					<tr id="antilockout">
......
374 374
		$sched_caption_escaped = "";
375 375
		$sched_content = "";
376 376
		$schedstatus = false;
377
		$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
378
		$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
377
		$dayArray = array (gettext('Mon'), gettext('Tues'), gettext('Wed'), gettext('Thur'), gettext('Fri'), gettext('Sat'), gettext('Sun'));
378
		$monthArray = array (gettext('January'), gettext('February'), gettext('March'), gettext('April'), gettext('May'), gettext('June'), gettext('July'), gettext('August'), gettext('September'), gettext('October'), gettext('November'), gettext('December'));
379 379
		if ($config['schedules']['schedule'] != "" && is_array($config['schedules']['schedule'])) {
380 380
			foreach ($a_schedules as $schedule)
381 381
			{
382
				if ($schedule['name'] == $filterent['sched'] ){
382
				if ($schedule['name'] == $filterent['sched']) {
383 383
					$schedstatus = filter_get_time_based_rule_status($schedule);
384 384

  
385
					foreach($schedule['timerange'] as $timerange) {
385
					foreach ($schedule['timerange'] as $timerange) {
386 386
						$tempFriendlyTime = "";
387 387
						$tempID = "";
388 388
						$firstprint = false;
389
						if ($timerange){
389
						if ($timerange) {
390 390
							$dayFriendly = "";
391 391
							$tempFriendlyTime = "";
392 392

  
......
397 397
							$starttime = substr ($temptimerange, 0, $temptimeseparator);
398 398
							$stoptime = substr ($temptimerange, $temptimeseparator+1);
399 399

  
400
							if ($timerange['month']){
400
							if ($timerange['month']) {
401 401
								$tempmontharray = explode(",", $timerange['month']);
402
								$tempdayarray = explode(",",$timerange['day']);
402
								$tempdayarray = explode(",", $timerange['day']);
403 403
								$arraycounter = 0;
404 404
								$firstDayFound = false;
405 405
								$firstPrint = false;
406
								foreach ($tempmontharray as $monthtmp){
406
								foreach ($tempmontharray as $monthtmp) {
407 407
									$month = $tempmontharray[$arraycounter];
408 408
									$day = $tempdayarray[$arraycounter];
409 409

  
......
417 417
									$currentDay = $day;
418 418
									$nextDay = $tempdayarray[$arraycounter+1];
419 419
									$currentDay++;
420
									if (($currentDay != $nextDay) || ($tempmontharray[$arraycounter] != $tempmontharray[$arraycounter+1])){
420
									if (($currentDay != $nextDay) || ($tempmontharray[$arraycounter] != $tempmontharray[$arraycounter+1])) {
421 421
										if ($firstPrint)
422 422
											$dayFriendly .= ", ";
423 423
										$currentDay--;
......
440 440
								$firstDay = "";
441 441
								$nextDay = "";
442 442
								$counter = 0;
443
								foreach ($tempFriendlyDayArray as $day){
444
									if ($day != ""){
443
								foreach ($tempFriendlyDayArray as $day) {
444
									if ($day != "") {
445 445
										if (!$firstDayFound)
446 446
										{
447 447
											$firstDay = $tempFriendlyDayArray[$counter];
......
451 451
										//get next day
452 452
										$nextDay = $tempFriendlyDayArray[$counter+1];
453 453
										$currentDay++;
454
										if ($currentDay != $nextDay){
454
										if ($currentDay != $nextDay) {
455 455
											if ($firstprint)
456 456
												$dayFriendly .= ", ";
457 457
											$currentDay--;
......
504 504
				<td>
505 505
	<?php
506 506
		if (isset($filterent['ipprotocol'])) {
507
			switch($filterent['ipprotocol']) {
507
			switch ($filterent['ipprotocol']) {
508 508
				case "inet":
509 509
					echo "IPv4 ";
510 510
					break;
......
524 524

  
525 525
			if (strtoupper($filterent['protocol']) == "ICMP" && !empty($filterent['icmptype'])) {
526 526
				echo ' <span style="cursor: help;" title="ICMP type: ' .
527
					( $filterent['ipprotocol'] == "inet6" ?	 $icmp6types[$filterent['icmptype']] : $icmptypes[$filterent['icmptype']] ) .
527
					($filterent['ipprotocol'] == "inet6" ? $icmp6types[$filterent['icmptype']] : $icmptypes[$filterent['icmptype']]) .
528 528
					'"><u>';
529 529
				echo $filterent['icmptype'];
530 530
				echo '</u></span>';

Also available in: Unified diff