src: use the opportunity to scrub supurious ";;" spots

6801b20c · Franco Fichtner · 15aaebc8 · 6801b20c · 6801b20c · 6801b20c
Commit 6801b20c authored Jan 07, 2017 by Franco Fichtner
8 changed files
--- a/src/etc/inc/ipsec.inc
+++ b/src/etc/inc/ipsec.inc
@@ -943,7 +943,7 @@ EOD;
                    $authentication .= "\n\tleftcert={$certpath}/cert-{$ph1ent['ikeid']}.crt";
                }
                if (!empty($ph1ent['caref'])) {
-                    $ca = lookup_ca($ph1ent['caref']);;
+                    $ca = lookup_ca($ph1ent['caref']);
                    if (!empty($ca)) {
                         $rightca = "";
                         foreach (cert_get_subject_array($ca['crt']) as $ca_field) {

--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
@@ -210,6 +210,6 @@ class ApiControllerBase extends ControllerRoot
            }
        }

-        return $this->response->send();;
+        return $this->response->send();
    }
 }
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -68,7 +68,7 @@ function formTranslateAddresses() {
    // add Aliases
    foreach (legacy_list_aliases("network") as $alias) {
        if ($alias['type'] == "host") {
-            $retval[$alias['name']] = $alias['name'];;
+            $retval[$alias['name']] = $alias['name'];
        }
    }

@@ -275,9 +275,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
            $natent['destination']['address'] = trim($pconfig['destination']) ;
        } else {
            if (is_ipaddrv6($pconfig['destination'])) {
-                $natent['destination']['address'] = gen_subnetv6(trim($pconfig['destination']), $pconfig['destination_subnet']) . "/" . $pconfig['destination_subnet'];;
+                $natent['destination']['address'] = gen_subnetv6(trim($pconfig['destination']), $pconfig['destination_subnet']) . "/" . $pconfig['destination_subnet'];
            } else {
-                $natent['destination']['address'] = gen_subnet(trim($pconfig['destination']), $pconfig['destination_subnet']) . "/" . $pconfig['destination_subnet'];;
+                $natent['destination']['address'] = gen_subnet(trim($pconfig['destination']), $pconfig['destination_subnet']) . "/" . $pconfig['destination_subnet'];
            }
        }


--- a/src/www/index.php
+++ b/src/www/index.php
@@ -278,7 +278,7 @@ include("fbegin.inc");?>
              if (classname.indexOf('col-md') > -1) {
                  widget_col.removeClass(classname);
              }
-           });;
+           });
           widget_col.addClass('col-md-'+(12 / $("#column_count_input").val()));
         });
      });

--- a/src/www/services_ntpd.php
+++ b/src/www/services_ntpd.php
@@ -60,7 +60,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
    // parse timeservers
    $pconfig['timeservers_host'] = array();
    $pconfig['timeservers_noselect'] = array();
-    $pconfig['timeservers_prefer'] = array();;
+    $pconfig['timeservers_prefer'] = array();
    if (!empty($config['system']['timeservers'])) {
        $pconfig['timeservers_noselect'] = !empty($a_ntpd['noselect']) ? explode(' ', $a_ntpd['noselect']) : array();
        $pconfig['timeservers_prefer'] = !empty($a_ntpd['prefer']) ? explode(' ', $a_ntpd['prefer']) : array();

--- a/src/www/system_authservers.php
+++ b/src/www/system_authservers.php
@@ -744,7 +744,7 @@ $i = 0;
 ?>
                <tr>
                  <td><?=$server['name']?></td>
-                  <td><?=!empty($authCNFOptions[$server['type']]) ? $authCNFOptions[$server['type']]['description'] : "";;?></td>
+                  <td><?= !empty($authCNFOptions[$server['type']]) ? $authCNFOptions[$server['type']]['description'] : '' ?></td>
                  <td><?=$server['host'];?></td>
                  <td>
                    <?php if ($i < (count($a_server) - 1)) :

--- a/src/www/system_certmanager.php
+++ b/src/www/system_certmanager.php
@@ -526,7 +526,7 @@ if (empty($act)) {
 <body>
  <style>
    .monospace-dialog {
-      font-family: monospace;;
+      font-family: monospace;
      white-space: pre;
    }


--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -430,7 +430,7 @@ include("head.inc");
            <tr>
              <td><a id="help_for_dnsservers_opt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS server options"); ?></td>
              <td>
-                <input name="dnsallowoverride" type="checkbox" value="yes" <?=$pconfig['dnsallowoverride'] ? "checked=\"checked\"" : ""; ;?> />
+                <input name="dnsallowoverride" type="checkbox" value="yes" <?= $pconfig['dnsallowoverride'] ? 'checked="checked"' : '' ?>/>
                <strong>
                  <?=gettext("Allow DNS server list to be overridden by DHCP/PPP on WAN"); ?>
                </strong>