src: multiple crash reports and whitespace sweep

src/opnsense/scripts/OPNsense/CaptivePortal/fetch_template.py

@@ -46,7 +46,7 @@ with zipfile.ZipFile(output_data, mode='w', compression=zipfile.ZIP_DEFLATED) as
     user_filenames = list()
     if len(sys.argv) > 1:
         # Search for user template, using fileid
-        # In this case, we must use the config.xml to retrieve the latest content. 
+        # In this case, we must use the config.xml to retrieve the latest content.
         # When using the generated config, the user experience will be a bit odd (old content after upload)
         cnf = OPNSenseConfig()
         template_content = cnf.get_template(sys.argv[1])

src/www/diag_backup.php

@@ -71,8 +71,8 @@ function rrd_data_xml() {
 		$basename = basename($rrd_file);
 		$xml_file = preg_replace('/\.rrd$/', ".xml", $rrd_file);
 		exec("$rrdtool dump '{$rrd_file}' '{$xml_file}'");
-		$xml_data = file_get_contents($xml_file);
-		unlink($xml_file);
+		$xml_data = @file_get_contents($xml_file);
+		@unlink($xml_file);
 		if ($xml_data !== false) {
 			$result .= "\t\t<rrddatafile>\n";
 			$result .= "\t\t\t<filename>{$basename}</filename>\n";

src/www/firewall_rules_edit.php

@@ -744,7 +744,7 @@ include("head.inc");
 <?php
                     endif;
                     foreach (formInterfaces() as $iface => $ifacename): ?>
-                        <option value="<?=$iface;?>" <?= !empty($pconfig['interface']) && ($iface == $pconfig['interface'] || in_array($iface, explode(",", $pconfig['interface']))) ? "selected=\"selected\"" : ""; ?>>
+                        <option value="<?=$iface;?>" <?= !empty($pconfig['interface']) && ($iface == $pconfig['interface'] || (strpos($pconfig['interface'], ',') !== false && in_array($iface, explode(',', $pconfig['interface'])))) ? 'selected="selected"' : ''; ?>>
                           <?=htmlspecialchars($ifacename);?>
                         </option>
 <?php

src/www/vpn_ipsec_phase2.php

@@ -868,7 +868,7 @@ endif; ?>
     <?php                    foreach ($p2_halgos as $algo => $algoname) :
     ?>
                     <input type="checkbox" name="hash-algorithm-option[]" value="<?=$algo;
-?>" <?=in_array($algo, $pconfig['hash-algorithm-option']) ?  "checked=\"checked\"" : "";?>/>
+?>" <?= isset($pconfig['hash-algorithm-option']) && in_array($algo, $pconfig['hash-algorithm-option']) ?  'checked="checked"' : '';?>/>
                     <?=$algoname;?>
                     </br>
     <?php

src/www/widgets/widgets/system_information.widget.php

@@ -156,7 +156,7 @@ endif; ?>
                     ?>
 			</td>
 		</tr>
-		<?php if ($config['revision']) :
+		<?php if (isset($config['revision']['time'])) :
 ?>
 		<tr>
 			<td width="25%" class="vncellt"><?=gettext("Last config change");?></td>