Processed with phpcs for PSR-2 coding standard

includes/about.php

@@ -2,7 +2,8 @@
 
 include_once('includes/status_messages.php');
 
-function DisplayAbout() {
+function DisplayAbout()
+{
 /**
  *
  * Displays info about the RaspAP project

includes/admin.php

@@ -2,7 +2,8 @@
 
 include_once('includes/status_messages.php');
 
-function DisplayAuthConfig($username, $password){
+function DisplayAuthConfig($username, $password)
+{
     $status = new StatusMessages();
     if (isset($_POST['UpdateAdminPassword'])) {
         if (CSRFValidate()) {

includes/authenticate.php

@@ -15,4 +15,3 @@ if (!$validated) {
 
     exit('Not authorized'.PHP_EOL);
 }
-

includes/config.php

@@ -33,4 +33,3 @@ define('RASPI_VNSTAT_ENABLED', true );
 // Locale settings
 define('LOCALE_ROOT', 'locale');
 define('LOCALE_DOMAIN', 'messages');
-

includes/configure_client.php

@@ -4,7 +4,8 @@
 *
 *
 */
-function DisplayWPAConfig(){
+function DisplayWPAConfig()
+{
     $status = new StatusMessages();
     $networks = array();
 
@@ -52,8 +53,7 @@ function DisplayWPAConfig(){
     if (isset($_POST['connect'])) {
         $result = 0;
         exec('sudo wpa_cli -i ' . RASPI_WPA_CTRL_INTERFACE . ' select_network '.strval($_POST['connect']));
-  }
+    } elseif (isset($_POST['client_settings']) && CSRFValidate()) {
-  else if ( isset($_POST['client_settings']) && CSRFValidate() ) {
         $tmp_networks = $networks;
         if ($wpa_file = fopen('/tmp/wifidata', 'w')) {
             fwrite($wpa_file, 'ctrl_interface=DIR=' . RASPI_WPA_CTRL_INTERFACE . ' GROUP=netdev' . PHP_EOL);
@@ -231,9 +231,13 @@ function DisplayWPAConfig(){
                     <div class="col-xs-6 col-md-6">
                     <?php echo htmlspecialchars($network['RSSI'], ENT_QUOTES);
                         echo "dB (";
-                        if($network['RSSI'] >= -50) { echo 100; }
+                    if ($network['RSSI'] >= -50) {
-                        else if($network['RSSI'] <= -100) { echo 0;}
+                        echo 100;
-                        else {echo  2*($network['RSSI'] + 100); }
+                    } elseif ($network['RSSI'] <= -100) {
+                        echo 0;
+                    } else {
+                        echo  2*($network['RSSI'] + 100);
+                    }
                         echo "%)";
                     ?>
                     </div>

includes/dashboard.php

@@ -3,7 +3,8 @@
 /**
 * Show dashboard page.
 */
-function DisplayDashboard(){
+function DisplayDashboard()
+{
 
     $status = new StatusMessages();
     // Need this check interface name for proper shell execution.

includes/dhcp.php

@@ -7,7 +7,8 @@ include_once( 'includes/status_messages.php' );
 * Manage DHCP configuration
 *
 */
-function DisplayDHCPConfig() {
+function DisplayDHCPConfig()
+{
 
     $status = new StatusMessages();
     if (isset($_POST['savedhcpdsettings'])) {

includes/functions.php

@@ -1,7 +1,8 @@
 <?php
 /* Functions for Networking */
 
-function mask2cidr($mask){
+function mask2cidr($mask)
+{
     $long = ip2long($mask);
     $base = ip2long('255.255.255.255');
     return 32-log(($long ^ $base)+1, 2);
@@ -9,14 +10,18 @@ function mask2cidr($mask){
 
 /* Functions to write ini files */
 
-function write_php_ini($array, $file) {
+function write_php_ini($array, $file)
+{
     $res = array();
     foreach ($array as $key => $val) {
         if (is_array($val)) {
             $res[] = "[$key]";
-            foreach($val as $skey => $sval) $res[] = "$skey = ".(is_numeric($sval) ? $sval : '"'.$sval.'"');
+            foreach ($val as $skey => $sval) {
+                $res[] = "$skey = ".(is_numeric($sval) ? $sval : '"'.$sval.'"');
+            }
+        } else {
+            $res[] = "$key = ".(is_numeric($val) ? $val : '"'.$val.'"');
         }
-        else $res[] = "$key = ".(is_numeric($val) ? $val : '"'.$val.'"');
     }
     if (safefilerewrite($file, implode("\r\n", $res))) {
         return true;
@@ -25,14 +30,17 @@ function write_php_ini($array, $file) {
     }
 }
 
-function safefilerewrite($fileName, $dataToSave) {
+function safefilerewrite($fileName, $dataToSave)
+{
     if ($fp = fopen($fileName, 'w')) {
-        $startTime = microtime(TRUE);
+        $startTime = microtime(true);
         do {
             $canWrite = flock($fp, LOCK_EX);
             // If lock not obtained sleep for 0 - 100 milliseconds, to avoid collision and CPU load
-            if(!$canWrite) usleep(round(rand(0, 100)*1000));
+            if (!$canWrite) {
-        } while ((!$canWrite)and((microtime(TRUE)-$startTime) < 5));
+                usleep(round(rand(0, 100)*1000));
+            }
+        } while ((!$canWrite)and((microtime(true)-$startTime) < 5));
 
         //file was locked so now we can store information
         if ($canWrite) {
@@ -46,16 +54,16 @@ function safefilerewrite($fileName, $dataToSave) {
     }
 }
 
-
-
 /**
 *
 * Add CSRF Token to form
 *
 */
-function CSRFToken() {
+function CSRFToken()
+{
 ?>
-<input id="csrf_token" type="hidden" name="csrf_token" value="<?php echo htmlspecialchars($_SESSION['csrf_token'], ENT_QUOTES);; ?>" />
+<input id="csrf_token" type="hidden" name="csrf_token" value="<?php echo htmlspecialchars($_SESSION['csrf_token'], ENT_QUOTES);
+; ?>" />
 <?php
 }
 
@@ -64,7 +72,8 @@ function CSRFToken() {
 * Validate CSRF Token
 *
 */
-function CSRFValidate() {
+function CSRFValidate()
+{
     if (hash_equals($_POST['csrf_token'], $_SESSION['csrf_token'])) {
         return true;
     } else {
@@ -76,7 +85,8 @@ function CSRFValidate() {
 /**
 * Test whether array is associative
 */
-function isAssoc($arr) {
+function isAssoc($arr)
+{
     return array_keys($arr) !== range(0, count($arr) - 1);
 }
 
@@ -89,7 +99,8 @@ function isAssoc($arr) {
 *       If $options is an associative array this should be the key
 *
 */
-function SelectorOptions($name, $options, $selected = null, $id = null) {
+function SelectorOptions($name, $options, $selected = null, $id = null)
+{
     echo '<select class="form-control" name="'.htmlspecialchars($name, ENT_QUOTES).'"';
     if (isset($id)) {
         echo ' id="' . htmlspecialchars($id, ENT_QUOTES) .'"';
@@ -118,7 +129,8 @@ function SelectorOptions($name, $options, $selected = null, $id = null) {
 * @param string $separator
 * @return $string
 */
-function GetDistString( $input,$string,$offset,$separator ) {
+function GetDistString($input, $string, $offset, $separator)
+{
     $string = substr($input, strpos($input, $string)+$offset, strpos(substr($input, strpos($input, $string)+$offset), $separator));
     return $string;
 }
@@ -128,7 +140,8 @@ function GetDistString( $input,$string,$offset,$separator ) {
 * @param array $arrConfig
 * @return $config
 */
-function ParseConfig( $arrConfig ) {
+function ParseConfig($arrConfig)
+{
     $config = array();
     foreach ($arrConfig as $line) {
         $line = trim($line);
@@ -145,7 +158,8 @@ function ParseConfig( $arrConfig ) {
 * @param string $freq
 * @return $channel
 */
-function ConvertToChannel( $freq ) {
+function ConvertToChannel($freq)
+{
     if ($freq >= 2412 && $freq <= 2484) {
         $channel = ($freq - 2407)/5;
     } elseif ($freq >= 4915 && $freq <= 4980) {
@@ -167,7 +181,8 @@ function ConvertToChannel( $freq ) {
 * @param string $security
 * @return string
 */
-function ConvertToSecurity( $security ) {
+function ConvertToSecurity($security)
+{
     $options = array();
     preg_match_all('/\[([^\]]+)\]/s', $security, $matches);
     foreach ($matches[1] as $match) {
@@ -196,7 +211,8 @@ function ConvertToSecurity( $security ) {
 *
 *
 */
-function DisplayOpenVPNConfig() {
+function DisplayOpenVPNConfig()
+{
 
     exec('cat '. RASPI_OPENVPN_CLIENT_CONFIG, $returnClient);
     exec('cat '. RASPI_OPENVPN_SERVER_CONFIG, $returnServer);
@@ -324,7 +340,8 @@ function DisplayOpenVPNConfig() {
 *
 *
 */
-function DisplayTorProxyConfig(){
+function DisplayTorProxyConfig()
+{
 
     exec('cat '. RASPI_TORPROXY_CONFIG, $return);
     exec('pidof tor | wc -l', $torproxystatus);
@@ -466,7 +483,8 @@ function DisplayTorProxyConfig(){
 *
 *
 */
-function SaveTORAndVPNConfig(){
+function SaveTORAndVPNConfig()
+{
     if (isset($_POST['SaveOpenVPNSettings'])) {
         // TODO
     } elseif (isset($_POST['SaveTORProxySettings'])) {

includes/hostapd.php

@@ -9,9 +9,7 @@ include_once( 'includes/status_messages.php' );
 function DisplayHostAPDConfig()
 {
     $status = new StatusMessages();
-
     $arrHostapdConf = parse_ini_file('/etc/raspap/hostapd.ini');
-
     $arrConfig = array();
     $arr80211Standard = array('a','b','g','n');
     $arrSecurity = array(1 => 'WPA', 2 => 'WPA2', 3 => 'WPA+WPA2', 'none' => _("None"));
@@ -513,7 +511,8 @@ for (var i = 0; i < ops.length; ++i) {
 <?php
 }
 
-function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status) {
+function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
+{
     // It should not be possible to send bad data for these fields so clearly
     // someone is up to something if they fail. Fail silently.
     if (!(array_key_exists($_POST['wpa'], $wpa_array) &&

includes/locale.php

@@ -1,11 +1,9 @@
 <?php
-
 /**
 * Sets locale information for i18n support
 *
 */
 
-
 /**
 * Rudimentary language detection via the browser.
 * Accept-Language returns a list of weighted values with a quality (or 'q') parameter.
@@ -72,4 +70,3 @@ bindtextdomain(LOCALE_DOMAIN, LOCALE_ROOT);
 bind_textdomain_codeset(LOCALE_DOMAIN, 'UTF-8');
 
 textdomain(LOCALE_DOMAIN);
-

includes/networking.php

@@ -6,7 +6,8 @@ include_once( 'includes/status_messages.php' );
 *
 *
 */
-function DisplayNetworkingConfig(){
+function DisplayNetworkingConfig()
+{
 
     $status = new StatusMessages();
 

includes/status_messages.php

@@ -1,22 +1,30 @@
 <?php
-class StatusMessages {
+class StatusMessages
+{
     public $messages = array();
 
-  public function addMessage($message, $level='success', $dismissable=true) {
+    public function addMessage($message, $level = 'success', $dismissable = true)
+    {
         $status = '<div class="alert alert-'.$level;
-    if ($dismissable) $status .= ' alert-dismissable';
+        if ($dismissable) {
+            $status .= ' alert-dismissable';
+        }
         $status .= '">'. _($message);
-    if ($dismissable) $status .= '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">x</button>';
+        if ($dismissable) {
+            $status .= '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">x</button>';
+        }
         $status .= '</div>';
 
         array_push($this->messages, $status);
     }
 
-  public function showMessages($clear = true) {
+    public function showMessages($clear = true)
+    {
         foreach ($this->messages as $message) {
             echo $message;
         }
-    if ( $clear ) $this->messages = array();
+        if ($clear) {
+            $this->messages = array();
+        }
     }
 }
-?>

includes/system.php

@@ -9,7 +9,8 @@ include_once( 'includes/status_messages.php' );
  *
  */
 
-function RPiVersion() {
+function RPiVersion()
+{
     // Lookup table from http://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
     $revisions = array(
     '0002' => 'Model B Revision 1.0',
@@ -56,7 +57,8 @@ function RPiVersion() {
  *
  *
  */
-function DisplaySystem(){
+function DisplaySystem()
+{
 
     $status = new StatusMessages();
 
@@ -101,25 +103,39 @@ function DisplaySystem(){
     $hours   = floor($hours   - ($days * 24));
     $minutes = floor($minutes - ($days * 24 * 60) - ($hours * 60));
     $uptime= '';
-  if ($days    != 0) { $uptime .= $days    . ' day'    . (($days    > 1)? 's ':' '); }
+    if ($days    != 0) {
-  if ($hours   != 0) { $uptime .= $hours   . ' hour'   . (($hours   > 1)? 's ':' '); }
+        $uptime .= $days    . ' day'    . (($days    > 1)? 's ':' ');
-  if ($minutes != 0) { $uptime .= $minutes . ' minute' . (($minutes > 1)? 's ':' '); }
+    }
+    if ($hours   != 0) {
+        $uptime .= $hours   . ' hour'   . (($hours   > 1)? 's ':' ');
+    }
+    if ($minutes != 0) {
+        $uptime .= $minutes . ' minute' . (($minutes > 1)? 's ':' ');
+    }
 
     // mem used
     $memused_status = "primary";
     exec("free -m | awk '/Mem:/ { total=$2 ; used=$3 } END { print used/total*100}'", $memarray);
     $memused = floor($memarray[0]);
-  if     ($memused > 90) { $memused_status = "danger";  }
+    if ($memused > 90) {
-  elseif ($memused > 75) { $memused_status = "warning"; }
+        $memused_status = "danger";
-  elseif ($memused >  0) { $memused_status = "success"; }
+    } elseif ($memused > 75) {
+        $memused_status = "warning";
+    } elseif ($memused >  0) {
+        $memused_status = "success";
+    }
 
     // cpu load
     $cores   = exec("grep -c ^processor /proc/cpuinfo");
     $loadavg = exec("awk '{print $1}' /proc/loadavg");
     $cpuload = floor(($loadavg * 100) / $cores);
-  if     ($cpuload > 90) { $cpuload_status = "danger";  }
+    if ($cpuload > 90) {
-  elseif ($cpuload > 75) { $cpuload_status = "warning"; }
+        $cpuload_status = "danger";
-  elseif ($cpuload >  0) { $cpuload_status = "success"; }
+    } elseif ($cpuload > 75) {
+        $cpuload_status = "warning";
+    } elseif ($cpuload >  0) {
+        $cpuload_status = "success";
+    }
 
 ?>
   <div class="row">

includes/themes.php

@@ -3,7 +3,8 @@
 *
 *
 */
-function DisplayThemeConfig(){
+function DisplayThemeConfig()
+{
 
     $cselected = '';
     $hselected = '';

raspap.php

@@ -12,4 +12,3 @@ if(file_exists(RASPI_CONFIG.'/raspap.auth')) {
         fclose($auth_details);
     }
 }
-?>