(legacy) refactor status_upnp.php

d67d70ba · Ad Schellevis · 0c0d3a3c · d67d70ba
Commit d67d70ba authored Mar 10, 2016 by Ad Schellevis
Show whitespace changes
Inline Side-by-side

Showing with 92 additions and 101 deletions

status_upnp.php src/www/status_upnp.php +92 -101

No files found.
--- a/src/www/status_upnp.php
+++ b/src/www/status_upnp.php
 <?php

 /*
-	Copyright (C) 2014-2015 Deciso B.V.
+    Copyright (C) 2014-2016 Deciso B.V.
    Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
    All rights reserved.

@@ -31,95 +31,86 @@ require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("interfaces.inc");

-if ($_POST) {
-	if ($_POST['clear'] == "Clear") {
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    if (!empty($_POST['clear'])) {
        upnp_stop();
        upnp_start();
-		$savemsg = gettext("Rules have been cleared and the daemon restarted");
+        header("Location: status_upnp.php");
+        exit;
    }
 }

 $rdr_entries = array();
 exec("/sbin/pfctl -aminiupnpd -sn", $rdr_entries, $pf_ret);

-$now = time();
-$year = date("Y");
-
 $service_hook = 'miniupnpd';
-
 include("head.inc");
-
 ?>
 <body>
 <?php include("fbegin.inc"); ?>

-
 <section class="page-content-main">
  <div class="container-fluid">
-
    <div class="row">
-
-			<?php if (isset($savemsg)) print_info_box($savemsg); ?>
-
-
      <section class="col-xs-12">
        <div class="content-box">
-
-	                <?php if(!$config['installedpackages'] || !$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] || !$config['installedpackages']['miniupnpd']['config'][0]['enable']): ?>
+<?php
+          if (empty($config['installedpackages']['miniupnpd']['config'][0]['iface_array']) || empty($config['installedpackages']['miniupnpd']['config'][0]['enable'])): ?>
          <header class="content-box-head container-fluid">
            <h3><?php echo gettext("UPnP is currently disabled."); ?></h3>
          </header>
-
-	                <?php else: ?>
-
+<?php
+          else: ?>
          <div class="table-responsive">
-
-                        <table class="table table-striped table-sort sortable">
+            <table class="table table-striped">
+              <thead>
                <tr>
-						      <td width="10%" class="listhdrr"><?=gettext("Port");?></td>
-						      <td width="10%" class="listhdrr"><?=gettext("Protocol");?></td>
-						      <td width="20%" class="listhdrr"><?=gettext("Internal IP");?></td>
-						      <td width="10%" class="listhdrr"><?=gettext("Int. Port");?></td>
-						      <td width="50%" class="listhdr"><?=gettext("Description");?></td>
+                  <td><?=gettext("Port");?></td>
+                  <td><?=gettext("Protocol");?></td>
+                  <td><?=gettext("Internal IP");?></td>
+                  <td><?=gettext("Int. Port");?></td>
+                  <td><?=gettext("Description");?></td>
                </tr>
-							<?php $i = 0; foreach ($rdr_entries as $rdr_entry) {
-								if (preg_match("/on (.*) inet proto (.*) from any to any port = (.*) keep state label \"(.*)\" rtable [0-9] -> (.*) port (.*)/", $rdr_entry, $matches))
+              </thead>
+              <tbody>
+<?php
+              foreach ($rdr_entries as $rdr_entry):
+                  if (!preg_match("/on (.*) inet proto (.*) from (.*) to (.*) port = (.*) keep state label \"(.*)\" rtable [0-9] -> (.*) port (.*)/", $rdr_entry, $matches)) {
+                      continue;
+                  }
                  $rdr_proto = $matches[2];
-								$rdr_port = $matches[3];
-								$rdr_label =$matches[4];
-								$rdr_ip = $matches[5];
-								$rdr_iport = $matches[6];
+                  $rdr_port = $matches[5];
+                  $rdr_label =$matches[6];
+                  $rdr_ip = $matches[7];
+                  $rdr_iport = $matches[8];
              ?>
                <tr>
-						      <td class="listlr">
-							<?php print $rdr_port;?>
-						      </td>
-						      <td class="listlr">
-							<?php print $rdr_proto;?>
-						      </td>
-						      <td class="listlr">
-							<?php print $rdr_ip;?>
-						      </td>
-						      <td class="listlr">
-							<?php print $rdr_iport;?>
-						      </td>
-						      <td class="listlr">
-							<?php print $rdr_label;?>
+                  <td><?=$rdr_port;?></td>
+                  <td><?=$rdr_proto;?></td>
+                  <td><?=$rdr_ip;?></td>
+                  <td><?=$rdr_iport;?></td>
+                  <td><?=$rdr_label;?></td>
+                </tr>
+<?php
+              endforeach;?>
+              </tbody>
+              <tfoot>
+                  <tr>
+                    <td colspan="5">
+                      <form method="post">
+                        <button type="submit" name="clear" id="clear" class="btn btn-primary" value="Clear"><?=gettext("Clear");?></button>
+                        <?=gettext("all currently connected sessions");?>.
+                      </form>
                    </td>
                  </tr>
-						    <?php $i++; }?>
+              </tfoot>
            </table>
          </div>
-
-					<form action="status_upnp.php" method="post">
-					  <button type="submit" name="clear" id="clear" class="btn btn-primary" value="Clear"><?=gettext("Clear");?></button> <?=gettext("all currently connected sessions");?>.
-					</form>
-					<?php endif; ?>
-
+<?php
+          endif; ?>
        </div>
      </section>
    </div>
  </div>
 </section>
-
 <?php include("foot.inc"); ?>