From 1a8ffd94fcfc68d3a3c850f7ddfbf55a2facc019 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sun, 24 May 2020 08:24:42 +0100
Subject: [PATCH] Replaced tabs w/ spaces, applied PSR-2 code standard

---
 includes/wifi_functions.php |  56 ++++++++++---------
 templates/wifi_stations.php | 104 +++++++++++++++++++-----------------
 2 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/includes/wifi_functions.php b/includes/wifi_functions.php
index d7194b56..eb1e8d92 100755
--- a/includes/wifi_functions.php
+++ b/includes/wifi_functions.php
@@ -52,7 +52,8 @@ function nearbyWifiStations(&$networks, $cached = true)
     }
 
     $scan_results = cache(
-        $cacheKey, function () {
+        $cacheKey,
+        function () {
             exec('sudo wpa_cli -i ' . RASPI_WIFI_CLIENT_INTERFACE . ' scan');
             sleep(3);
 
@@ -63,18 +64,22 @@ function nearbyWifiStations(&$networks, $cached = true)
         }
     );
 
-    // get the name of the AP - should be excluded von the nearby networks
-    exec('cat '.RASPI_HOSTAPD_CONFIG.' | sed -rn "s/ssid=(.*)\s*$/\1/p" ',$ap_ssid);
+    // get the name of the AP. Should be excluded from nearby networks
+    exec('cat '.RASPI_HOSTAPD_CONFIG.' | sed -rn "s/ssid=(.*)\s*$/\1/p" ', $ap_ssid);
     $ap_ssid = $ap_ssid[0];
-	
-	foreach (explode("\n", $scan_results) as $network) {
-		$arrNetwork = preg_split("/[\t]+/", $network);  // split result into array
+
+    foreach (explode("\n", $scan_results) as $network) {
+        $arrNetwork = preg_split("/[\t]+/", $network);  // split result into array
         if (!array_key_exists(4, $arrNetwork) ||
-            trim($arrNetwork[4]) == $ap_ssid) continue;
+            trim($arrNetwork[4]) == $ap_ssid) {
+            continue;
+        }
 
         $ssid = trim($arrNetwork[4]);
-        // filter SSID string - anything invisable in 7bit ASCII or quotes -> ignore network
-        if( preg_match('[\x00-\x1f\x7f-\xff\'\`\´\"]',$ssid)) continue;
+        // filter SSID string: anything invisible in 7bit ASCII or quotes -> ignore network
+        if (preg_match('[\x00-\x1f\x7f-\xff\'\`\´\"]', $ssid)) {
+            continue;
+        }
 
         // If network is saved
         if (array_key_exists($ssid, $networks)) {
@@ -93,11 +98,11 @@ function nearbyWifiStations(&$networks, $cached = true)
         }
 
         // Save RSSI, if the current value is larger than the already stored
-        if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4],$networks)) {
-            if(! array_key_exists('RSSI',$networks[$arrNetwork[4]]) || $networks[$ssid]['RSSI'] < $arrNetwork[2])
+        if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4], $networks)) {
+            if (! array_key_exists('RSSI', $networks[$arrNetwork[4]]) || $networks[$ssid]['RSSI'] < $arrNetwork[2]) {
                 $networks[$ssid]['RSSI'] = $arrNetwork[2];
+            }
         }
-
     }
 }
 
@@ -111,17 +116,20 @@ function connectedWifiStations(&$networks)
     }
 }
 
-function sortNetworksByRSSI(&$networks) {
-        $valRSSI = array();
-        foreach ($networks as $SSID => $net) {
-                if (!array_key_exists('RSSI',$net)) $net['RSSI'] = -1000;
-                $valRSSI[$SSID] = $net['RSSI'];
-        }
-        $nets = $networks;
-        arsort($valRSSI);
-        $networks = array();
-        foreach ($valRSSI as $SSID => $RSSI) {
-                $networks[$SSID] = $nets[$SSID];
-                $networks[$SSID]['RSSI'] = $RSSI;
+function sortNetworksByRSSI(&$networks)
+{
+    $valRSSI = array();
+    foreach ($networks as $SSID => $net) {
+        if (!array_key_exists('RSSI', $net)) {
+            $net['RSSI'] = -1000;
         }
+        $valRSSI[$SSID] = $net['RSSI'];
+    }
+    $nets = $networks;
+    arsort($valRSSI);
+    $networks = array();
+    foreach ($valRSSI as $SSID => $RSSI) {
+        networks[$SSID] = $nets[$SSID];
+        $networks[$SSID]['RSSI'] = $RSSI;
+    }
 }
diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php
index cdfcb654..d6705628 100755
--- a/templates/wifi_stations.php
+++ b/templates/wifi_stations.php
@@ -16,40 +16,46 @@
         } ?>
         <h5 class="card-title"><?php echo htmlspecialchars($ssid, ENT_QUOTES); ?></h5>
 
-	<div class="info-item-wifi"><?php echo _("Status"); ?></div>
+    <div class="info-item-wifi"><?php echo _("Status"); ?></div>
         <div>
-	  <?php if ($network['configured']) { ?>
-	    <i class="fas fa-check-circle"></i>
-	  <?php } ?>
-	  <?php if ($network['connected']) { ?>
-	    <i class="fas fa-exchange-alt"></i>
-	  <?php } ?>
-          <?php if (!$network['configured'] && !$network['connected']) { 
-            echo _("Not configured"); 
+        <?php if ($network['configured']) { ?>
+        <i class="fas fa-check-circle"></i>
+        <?php } ?>
+        <?php if ($network['connected']) { ?>
+        <i class="fas fa-exchange-alt"></i>
+        <?php } ?>
+          <?php if (!$network['configured'] && !$network['connected']) {
+                echo _("Not configured");
           } ?>
          </div>
 
-	<div class="info-item-wifi"><?php echo _("Channel"); ?></div>
+    <div class="info-item-wifi"><?php echo _("Channel"); ?></div>
         <div>
-	  <?php if ($network['visible']) { ?>
-	      <?php echo htmlspecialchars($network['channel'], ENT_QUOTES) ?>
-	  <?php } else { ?>
-	    <span class="label label-warning"> X </span>
-	  <?php } ?>
+        <?php if ($network['visible']) { ?>
+            <?php echo htmlspecialchars($network['channel'], ENT_QUOTES) ?>
+        <?php } else { ?>
+        <span class="label label-warning"> X </span>
+        <?php } ?>
         </div>
 
-	<div class="info-item-wifi"><?php echo _("RSSI"); ?></div>
+    <div class="info-item-wifi"><?php echo _("RSSI"); ?></div>
         <div>
-	  <?php 
-		if (isset($network['RSSI']) && $network['RSSI'] >= -200 ) {
-			echo htmlspecialchars($network['RSSI'], ENT_QUOTES);
-			echo "dB (";
-            if ($network['RSSI'] >= -50) echo 100;
-            elseif ($network['RSSI'] <= -100) echo 0;
-            else echo  2*($network['RSSI'] + 100);
+        <?php
+        if (isset($network['RSSI']) && $network['RSSI'] >= -200) {
+            echo htmlspecialchars($network['RSSI'], ENT_QUOTES);
+            echo "dB (";
+            if ($network['RSSI'] >= -50) {
+                echo 100;
+            } elseif ($network['RSSI'] <= -100) {
+                echo 0;
+            } else {
+                echo  2*($network['RSSI'] + 100);
+            }
             echo "%)";
-        } else echo " not found ";
-	  ?>
+        } else {
+            echo " not found ";
+        }
+        ?>
         </div>
 
         <?php if (array_key_exists('priority', $network)) { ?>
@@ -57,35 +63,35 @@
         <?php } ?>
         <input type="hidden" name="protocol<?php echo $index ?>" value="<?php echo htmlspecialchars($network['protocol'], ENT_QUOTES); ?>" />
 
-	<div class="info-item-wifi"><?php echo _("Security"); ?></div>
+    <div class="info-item-wifi"><?php echo _("Security"); ?></div>
         <div><?php echo $network['protocol'] ?></div>
 
-	<div class="form-group">
-	  <div class="info-item-wifi"><?php echo _("Passphrase"); ?></div>
+    <div class="form-group">
+      <div class="info-item-wifi"><?php echo _("Passphrase"); ?></div>
           <div class="input-group">
-	    <?php if ($network['protocol'] === 'Open') { ?>
-	      <input type="password" disabled class="form-control" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="" />
-	    <?php } else { ?>
-	      <input type="password" class="form-control js-validate-psk" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="<?php echo $network['passphrase'] ?>" data-target="#update<?php echo $index ?>" data-colors="#ffd0d0,#d0ffd0">
-	      <div class="input-group-append">
-		<button class="btn btn-outline-secondary js-toggle-password" type="button" data-target="[name=passphrase<?php echo $index ?>]" data-toggle-with="<?php echo _("Hide") ?>">Show</button>
-	      </div>
-	    <?php } ?>
-	  </div>
-	</div>
+        <?php if ($network['protocol'] === 'Open') { ?>
+          <input type="password" disabled class="form-control" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="" />
+        <?php } else { ?>
+          <input type="password" class="form-control js-validate-psk" aria-describedby="passphrase" name="passphrase<?php echo $index ?>" value="<?php echo $network['passphrase'] ?>" data-target="#update<?php echo $index ?>" data-colors="#ffd0d0,#d0ffd0">
+          <div class="input-group-append">
+        <button class="btn btn-outline-secondary js-toggle-password" type="button" data-target="[name=passphrase<?php echo $index ?>]" data-toggle-with="<?php echo _("Hide") ?>">Show</button>
+          </div>
+        <?php } ?>
+      </div>
+    </div>
 
-	<div class="btn-group btn-block ">
-	  <?php if ($network['configured']) { ?>
-	      <input type="submit" class="col-xs-4 col-md-4 btn btn-warning" value="<?php echo _("Update"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>"<?php echo ($network['protocol'] === 'Open' ? ' disabled' : '')?> />
-	      <button type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo $index?>" name="connect"><?php echo _("Connect"); ?></button>
-	  <?php } else { ?>
-	      <input type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo _("Add"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>" <?php echo ($network['protocol'] === 'Open' ? '' : ' disabled')?> />
-	  <?php } ?>
-	      <input type="submit" class="col-xs-4 col-md-4 btn btn-danger" value="<?php echo _("Delete"); ?>" name="delete<?php echo $index ?>"<?php echo ($network['configured'] ? '' : ' disabled')?> />
-	</div><!-- /.btn-group -->
+    <div class="btn-group btn-block ">
+        <?php if ($network['configured']) { ?>
+          <input type="submit" class="col-xs-4 col-md-4 btn btn-warning" value="<?php echo _("Update"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>"<?php echo ($network['protocol'] === 'Open' ? ' disabled' : '')?> />
+          <button type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo $index?>" name="connect"><?php echo _("Connect"); ?></button>
+        <?php } else { ?>
+          <input type="submit" class="col-xs-4 col-md-4 btn btn-info" value="<?php echo _("Add"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>" <?php echo ($network['protocol'] === 'Open' ? '' : ' disabled')?> />
+        <?php } ?>
+          <input type="submit" class="col-xs-4 col-md-4 btn btn-danger" value="<?php echo _("Delete"); ?>" name="delete<?php echo $index ?>"<?php echo ($network['configured'] ? '' : ' disabled')?> />
+    </div><!-- /.btn-group -->
       </div><!-- /.card-body -->
     </div><!-- /.card -->
   </div><!-- /.col-sm -->
-  <?php $index += 1; ?>
-<?php endforeach ?>
+        <?php $index += 1; ?>
+  <?php endforeach ?>
 </div><!-- /.row -->