mvc: style sweep

src/opnsense/mvc/app/config/services.php

@@ -155,7 +155,6 @@ $di->set('router', function () {
             "action" => 2,
             "params" => 3
         ));
-
     }
 
     $router->handle();

src/opnsense/mvc/app/config/services_api.php

@@ -144,7 +144,6 @@ $di->set('router', function () {
             "action" => 2,
             "params" => 3
         ));
-
     }
 
     $router->handle();

src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/NetworkinsightController.php

 <?php
+
 /**
  *    Copyright (C) 2016 Deciso B.V.
  *
@@ -52,7 +53,7 @@ class NetworkinsightController extends ApiControllerBase
      * @param string $field field name to aggregate
      * @return array timeseries
      */
-     public function timeserieAction(
+    public function timeserieAction(
         $provider = null,
         $measure = null,
         $from_date = null,
@@ -74,9 +75,14 @@ class NetworkinsightController extends ApiControllerBase
         if ($this->request->isGet()) {
             $backend = new Backend();
             // request current data
-            $response = $backend->configdRun("netflow aggregate fetch {$provider} {$from_date} {$to_date} {$resolution} {$field}"); //
+            $response = $backend->configdRun(
+                "netflow aggregate fetch {$provider} {$from_date} {$to_date} {$resolution} {$field}"
+            );
             // for test, request random data
-            //$response = $backend->configdRun("netflow aggregate fetch {$provider} {$from_date} {$to_date} {$resolution} {$field} em0,in~em0,out~em1,in~em1,out~em2,in~em2,out~em3,in~em3,out"); //
+            //$response = $backend->configdRun(
+            //    "netflow aggregate fetch {$provider} {$from_date} {$to_date} {$resolution} {$field} " .
+            //    "em0,in~em0,out~em1,in~em1,out~em2,in~em2,out~em3,in~em3,out"
+            //);
             $graph_data = json_decode($response, true);
             if ($graph_data != null) {
                 ksort($graph_data);
@@ -121,7 +127,7 @@ class NetworkinsightController extends ApiControllerBase
      * @param string $max_hits maximum number of results
      * @return array timeseries
      */
-     public function topAction(
+    public function topAction(
         $provider = null,
         $from_date = null,
         $to_date = null,
@@ -208,7 +214,7 @@ class NetworkinsightController extends ApiControllerBase
     public function getProtocolsAction()
     {
         $result = array();
-        foreach (explode ("\n", file_get_contents('/etc/protocols')) as $line) {
+        foreach (explode("\n", file_get_contents('/etc/protocols')) as $line) {
             if (strlen($line) > 1 && $line[0] != '#') {
                 $parts = preg_split('/\s+/', $line);
                 if (count($parts) >= 4) {
@@ -225,7 +231,7 @@ class NetworkinsightController extends ApiControllerBase
     public function getServicesAction()
     {
         $result = array();
-        foreach (explode ("\n", file_get_contents('/etc/services')) as $line) {
+        foreach (explode("\n", file_get_contents('/etc/services')) as $line) {
             if (strlen($line) > 1 && $line[0] != '#') {
                 // there a few ports which have different names for different protocols, but to not overcomplicate
                 // things here, we ignore those exceptions.
@@ -247,7 +253,7 @@ class NetworkinsightController extends ApiControllerBase
      * @param string $resolution resolution in seconds
      * @return string csv output
      */
-     public function exportAction(
+    public function exportAction(
         $provider = null,
         $from_date = null,
         $to_date = null,
@@ -255,9 +261,9 @@ class NetworkinsightController extends ApiControllerBase
     ) {
         $this->response->setContentType('application/CSV', 'UTF-8');
         $this->response->setHeader(
-                'Content-Disposition:',
-                "Attachment; filename=\"" . $provider . ".csv\""
-            );
+            'Content-Disposition:',
+            "Attachment; filename=\"" . $provider . ".csv\""
+        );
         if ($this->request->isGet()) {
             $backend = new Backend();
             $configd_cmd = "netflow aggregate export {$provider} {$from_date} {$to_date} {$resolution}" ;

src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/SystemhealthController.php

@@ -71,7 +71,6 @@ class SystemhealthController extends ApiControllerBase
                     "recorded_time" => ($step * (int)$value->pdp_per_row) *
                         ($this->countRows($value) - $firstValue_rowNumber)
                 ]);
-
             }
         }
         return ($info);
@@ -224,7 +223,6 @@ class SystemhealthController extends ApiControllerBase
             $last = $rra_info[0]["firstValue_timestamp"];
             $first = $rra_info[$last_rra_key]["firstValue_timestamp"] + $rra_info[$last_rra_key]["recorded_time"] -
                 $rra_info[$last_rra_key]["full_step"];
-
         } else {
             $first = 0;
             $last = 0;
@@ -370,7 +368,6 @@ class SystemhealthController extends ApiControllerBase
                                             $skip_nan = true;
 
                                             $condensed_row_values[$count_values][$column_counter] = "NaN";
-
                                         } elseif ($skip_nan == false) {
                                             if ($archValue["type"] == "overview") {
                                                 // overwrite this values and skip averaging, looks better for overview
@@ -424,12 +421,9 @@ class SystemhealthController extends ApiControllerBase
                                 }
                             }
                             $rowCount++;
-
                         }
                     }
-
                 }
-
             }
 
             $key_counter++;
@@ -555,7 +549,6 @@ class SystemhealthController extends ApiControllerBase
                 if (trim((string)$xml->rra[$count]->cf) != "AVERAGE") {
                     unset($xml->rra[$count]);
                 }
-
             }
             $data_sets_full = $this->getDataSetInfo($xml); // get dataSet information to include in answer
 

src/opnsense/mvc/app/controllers/OPNsense/IDS/Api/ServiceController.php

@@ -166,7 +166,6 @@ class ServiceController extends ApiControllerBase
             } else {
                 $status = "error generating ids template (".$bckresult.")";
             }
-
         }
         return array("status" => $status);
     }

src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php

@@ -85,7 +85,6 @@ class SettingsController extends ApiControllerBase
                 $cnf->save();
                 $result["result"] = "saved";
             }
-
         }
 
         return $result;

src/opnsense/mvc/app/library/OPNsense/Auth/Radius.php

@@ -171,7 +171,6 @@ class Radius implements IAuthConnector
                         break;
                     default:
                         syslog(LOG_ERR, "Unexpected return value:$radius\n");
-
                 }
                 radius_close($radius);
             }
@@ -240,7 +239,6 @@ class Radius implements IAuthConnector
                         break;
                     default:
                         syslog(LOG_ERR, "Unexpected return value:$radius\n");
-
                 }
                 radius_close($radius);
             }
@@ -310,7 +308,6 @@ class Radius implements IAuthConnector
                         break;
                     default:
                         syslog(LOG_ERR, "Unexpected return value:$radius\n");
-
                 }
                 radius_close($radius);
             }
@@ -388,7 +385,6 @@ class Radius implements IAuthConnector
                                 default:
                                     break;
                             }
-
                         }
                         return true;
                         break;

src/opnsense/mvc/app/library/OPNsense/Core/Backend.php

@@ -119,7 +119,6 @@ class Backend
                 $this->getLogger()->error("Timeout (".$timeout.") executing : ".$event);
                 return null;
             }
-
         }
 
         return  str_replace($endOfStream, "", $resp);

src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php

@@ -189,7 +189,6 @@ abstract class BaseModel
                 // add object as child to this node
                 $internal_data->addChildNode($xmlNode->getName(), $fieldObject);
             }
-
         }
 
     }
@@ -401,7 +400,6 @@ abstract class BaseModel
                 } else {
                     $target_node = $target_node->xpath($str_parts[$i])[0];
                 }
-
             }
         }
 
@@ -466,7 +464,6 @@ abstract class BaseModel
             } else {
                 return null;
             }
-
         }
         return $node;
     }

src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php

@@ -499,8 +499,6 @@ abstract class BaseField
             foreach ($this->getAttributes() as $AttrKey => $AttrValue) {
                 $subnode->addAttribute($AttrKey, $AttrValue);
             }
-
-
         }
 
         foreach ($this->__items as $key => $FieldNode) {

src/opnsense/mvc/app/models/OPNsense/Core/ACL.php

@@ -127,7 +127,6 @@ class ACL
 
                             $this->ACLtags[$aclID] = $aclPayload;
                         }
-
                     }
                 }
             }