(legacy) refactor interfaces_wireless_edit.php

src/www/interfaces_wireless_edit.php

@@ -30,71 +30,62 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 
-$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_wireless.php');
-
-if (!is_array($config['wireless']))
-	$config['wireless'] = array();
-if (!is_array($config['wireless']['clone']))
-	$config['wireless']['clone'] = array();
-
-$a_clones = &$config['wireless']['clone'];
-
-function clone_inuse($num) {
-	global $config, $a_clones;
-
+function clone_inuse($cloneif) {
+    global $config;
     $iflist = get_configured_interface_list(false, true);
     foreach ($iflist as $if) {
-		if ($config['interfaces'][$if]['if'] == $a_clones[$num]['cloneif'])
+        if ($config['interfaces'][$if]['if'] == $cloneif) {
             return true;
         }
-
+    }
     return false;
 }
 
-function clone_compare($a, $b) {
-	return strnatcmp($a['cloneif'], $b['cloneif']);
+if (!isset($config['wireless']) || !is_array($config['wireless'])) {
+    $config['wireless'] = array();
+}
+if (!isset($config['wireless']['clone']) || !is_array($config['wireless']['clone'])) {
+    $config['wireless']['clone'] = array();
 }
+$a_clones = &$config['wireless']['clone'];
 
-$portlist = get_interface_list();
 
-if (is_numericint($_GET['id']))
+if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+    if (isset($_GET['id']) && !empty($a_clones[$_GET['id']])) {
         $id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
-	$id = $_POST['id'];
-
-if (isset($id) && $a_clones[$id]) {
+    }
+    if (isset($id)) {
         $pconfig['if'] = $a_clones[$id]['if'];
         $pconfig['cloneif'] = $a_clones[$id]['cloneif'];
         $pconfig['mode'] = $a_clones[$id]['mode'];
         $pconfig['descr'] = $a_clones[$id]['descr'];
-}
-
-if ($_POST) {
-
-	unset($input_errors);
+    }
+} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $input_errors = array();
     $pconfig = $_POST;
-
+    if (isset($_POST['id']) && !empty($a_clones[$pconfig['id']])) {
+        $id = $pconfig['id'];
+    }
     /* input validation */
     $reqdfields = explode(" ", "if mode");
     $reqdfieldsn = array(gettext("Parent interface"),gettext("Mode"));
 
     do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-	if (!$input_errors) {
+    if (count($input_errors) == 0) {
         $clone = array();
-		$clone['if'] = $_POST['if'];
-		$clone['mode'] = $_POST['mode'];
-		$clone['descr'] = $_POST['descr'];
+        $clone['if'] = $pconfig['if'];
+        $clone['mode'] = $pconfig['mode'];
+        $clone['descr'] = $pconfig['descr'];
 
-		if (isset($id) && $a_clones[$id]) {
-			if ($clone['if'] == $a_clones[$id]['if'])
+        if (isset($id) && $clone['if'] == $a_clones[$id]['if']) {
             $clone['cloneif'] = $a_clones[$id]['cloneif'];
         }
-		if (!$clone['cloneif']) {
+        if (empty($clone['cloneif'])) {
             $clone_id = 1;
             do {
                 $clone_exists = false;
-				$clone['cloneif'] = "{$_POST['if']}_wlan{$clone_id}";
+                $clone['cloneif'] = "{$pconfig['if']}_wlan{$clone_id}";
                 foreach ($a_clones as $existing) {
                     if ($clone['cloneif'] == $existing['cloneif']) {
                         $clone_exists = true;
@@ -105,29 +96,29 @@ if ($_POST) {
             } while ($clone_exists);
         }
 
-		if (isset($id) && $a_clones[$id]) {
-			if (clone_inuse($id)) {
-				if ($clone['if'] != $a_clones[$id]['if'])
+        if (isset($id) && clone_inuse($a_clones[$id]['cloneif'])) {
+            if ($clone['if'] != $a_clones[$id]['if']) {
                 $input_errors[] = gettext("This wireless clone cannot be modified because it is still assigned as an interface.");
-				else if ($clone['mode'] != $a_clones[$id]['mode'])
+            } elseif ($clone['mode'] != $a_clones[$id]['mode']) {
                 $input_errors[] = gettext("Use the configuration page for the assigned interface to change the mode.");
             }
         }
-		if (!$input_errors) {
+        if (count($input_errors) == 0) {
             if (!interface_wireless_clone($clone['cloneif'], $clone)) {
                 $input_errors[] = sprintf(gettext('Error creating interface with mode %s. The %s interface may not support creating more clones with the selected mode.'), $wlan_modes[$clone['mode']], $clone['if']);
             } else {
-				if (isset($id) && $a_clones[$id]) {
-					if ($clone['if'] != $a_clones[$id]['if'])
-						mwexec("/sbin/ifconfig " . $a_clones[$id]['cloneif'] . " destroy");
-					$input_errors[] = sprintf(gettext("Created with id %s"), $id);
+                if (isset($id)) {
+                    if ($clone['if'] != $a_clones[$id]['if']) {
+                        mwexec("/sbin/ifconfig " . escapeshellarg($a_clones[$id]['cloneif']) . " destroy");
+                    }
                     $a_clones[$id] = $clone;
                 } else {
-					$input_errors[] = gettext("Created without id");
                     $a_clones[] = $clone;
                 }
 
-				usort($a_clones, "clone_compare");
+                usort($a_clones, function($a, $b) {
+                    return strnatcmp($a['cloneif'], $b['cloneif']);
+                });
                 write_config();
 
                 header("Location: interfaces_wireless.php");
@@ -137,8 +128,8 @@ if ($_POST) {
     }
 }
 
+legacy_html_escape_form_data($pconfig);
 include("head.inc");
-
 ?>
 
 <body>
@@ -148,65 +139,71 @@ include("head.inc");
   <div class="container-fluid">
     <div class="row">
       <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
-			<div id="inputerrors"></div>
       <section class="col-xs-12">
         <div class="content-box">
-					<header class="content-box-head container-fluid">
-				        <h3><?=gettext("Wireless clone configuration");?></h3>
-				    </header>
-
           <div class="content-box-main">
-						<form action="interfaces_wireless_edit.php" method="post" name="iform" id="iform">
-			                <table class="table table-striped table-sort">
+            <div class="table-responsive">
+              <form method="post" name="iform" id="iform">
+                <table class="table table-striped">
+                  <thead>
                     <tr>
-					                <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td>
-					                <td width="78%" class="vtable">
+                      <td width="22%"><strong><?=gettext("Wireless clone configuration");?></strong></td>
+                      <td width="78%" align="right">
+                        <small><?=gettext("full help"); ?> </small>
+                        <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page" type="button"></i></a>
+                        &nbsp;
+                      </td>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Parent interface");?></td>
+                      <td>
                         <select name="if" class="selectpicker">
-					                      <?php
-					                      foreach ($portlist as $ifn => $ifinfo)
-					                        if (match_wireless_interface($ifn)) {
+<?php
+                        foreach (get_interface_list() as $ifn => $ifinfo):
+                            if (match_wireless_interface($ifn)):
                               if (strstr($ifn, '_wlan')) {
                                   continue;
-					                            }
-					                            echo "<option value=\"{$ifn}\"";
-					                            if ($ifn == $pconfig['if']) {
-					                                echo " selected=\"selected\"";
-					                            }
-					                            echo ">";
-					                            echo htmlspecialchars($ifn . " (" . $ifinfo['mac'] . ")");
-					                            echo "</option>";
-					                        }
-					                      ?>
+                              }?>
+                          <option value="<?=$ifn;?>" <?=$ifn == $pconfig['if'] ? "selected=\"selected\"" : "";?>>
+                              <?=htmlspecialchars($ifn . " (" . $ifinfo['mac'] . ")");?>
+                          </option>
+<?php
+                          endif;
+                        endforeach;?>
                         </select>
                       </td>
                     </tr>
                     <tr>
-					                <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
-					                <td width="78%" class="vtable">
-					                    <input name="descr" type="text" class="form-control unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-					                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
-					                    "for your reference (not parsed).");?></span>
-					                </td>
+                      <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
+                      <td>
+                        <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
+                        <div class="hidden" for="help_for_descr">
+                          <?=gettext("You may enter a description here for your reference (not parsed).");?>
+                        </div>
+                      </div>
                     </tr>
                     <tr>
-				                  <td width="22%" valign="top">&nbsp;</td>
-				                  <td width="78%">
-				                    <input type="hidden" name="mode" value="<?= isset($pconfig['mode']) ? $pconfig['mode'] : 'bss' ?>" />
-				                    <input type="hidden" name="cloneif" value="<?=htmlspecialchars($pconfig['cloneif']); ?>" />
+                      <td></td>
+                      <td>
+                        <input type="hidden" name="mode" value="<?=isset($pconfig['mode']) ? $pconfig['mode'] : 'bss' ?>" />
+                        <input type="hidden" name="cloneif" value="<?=$pconfig['cloneif']; ?>" />
                         <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
-				                    <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-				                    <?php if (isset($id) && $a_clones[$id]): ?>
-				                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+                        <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_wireless.php');?>'" />
+                        <?php if (isset($id)): ?>
+                        <input name="id" type="hidden" value="<?=$id;?>" />
                         <?php endif; ?>
                       </td>
                     </tr>
+                  </tbody>
                 </table>
               </form>
             </div>
           </div>
+        </div>
       </section>
     </div>
   </div>
 </section>
-
 <?php include("foot.inc"); ?>