From eb0065592c10b496ab1792ebfbb25d8cbcb1c246 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Wed, 3 May 2017 16:16:23 +0200
Subject: [PATCH] move includes, namespace after the copyright headers, remove
 unused

---
 .../OPNsense/Quagga/Api/BgpController.php     | 15 +++++------
 .../Quagga/Api/DiagnosticsController.php      |  2 +-
 .../OPNsense/Quagga/Api/GeneralController.php | 11 ++++----
 .../Quagga/Api/Ospf6settingsController.php    | 13 +++++-----
 .../Quagga/Api/OspfsettingsController.php     | 14 +++++-----
 .../OPNsense/Quagga/Api/RipController.php     | 11 ++++----
 .../OPNsense/Quagga/Api/ServiceController.php |  2 +-
 .../OPNsense/Quagga/BgpController.php         |  5 ++--
 .../OPNsense/Quagga/DiagnosticsController.php |  4 +--
 .../OPNsense/Quagga/GeneralController.php     |  4 +--
 .../OPNsense/Quagga/IsisController.php        | 26 +++++++++++++++++++
 .../OPNsense/Quagga/Ospf6Controller.php       |  1 +
 .../OPNsense/Quagga/OspfController.php        |  4 +--
 .../OPNsense/Quagga/RipController.php         | 26 +++++++++++++++++++
 14 files changed, 94 insertions(+), 44 deletions(-)

diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
index 43517cdb6..44092b272 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
@@ -1,12 +1,4 @@
 <?php
-namespace OPNsense\Quagga\Api;
-
-use \OPNsense\Base\ApiControllerBase;
-use \OPNsense\Quagga\BGP;
-use \OPNsense\Core\Config;
-use \OPNsense\Base\ApiMutableModelControllerBase;
-use \OPNsense\Base\UIModelGrid;
-
 /**
  *    Copyright (C) 2015 - 2017 Deciso B.V.
  *    Copyright (C) 2017 Fabian Franz
@@ -36,6 +28,13 @@ use \OPNsense\Base\UIModelGrid;
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
+namespace OPNsense\Quagga\Api;
+use \OPNsense\Quagga\BGP;
+use \OPNsense\Core\Config;
+use \OPNsense\Base\ApiMutableModelControllerBase;
+use \OPNsense\Base\UIModelGrid;
+
 class BgpController extends ApiMutableModelControllerBase
 {
     static protected $internalModelName = 'BGP';
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php
index d938c5b8e..7e009762c 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php
@@ -27,8 +27,8 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
-namespace OPNsense\Quagga\Api;
 
+namespace OPNsense\Quagga\Api;
 use \OPNsense\Base\ApiControllerBase;
 use \OPNsense\Core\Backend;
 use \OPNsense\Core\Config;
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/GeneralController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/GeneralController.php
index 2501b18f4..125d646f5 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/GeneralController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/GeneralController.php
@@ -1,10 +1,4 @@
 <?php
-namespace OPNsense\Quagga\Api;
-
-use \OPNsense\Base\ApiControllerBase;
-use \OPNsense\Quagga\General;
-use \OPNsense\Core\Config;
-
 /**
  *    Copyright (C) 2015 - 2017 Deciso B.V.
  *    Copyright (C) 2017 Fabian Franz
@@ -33,6 +27,11 @@ use \OPNsense\Core\Config;
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+ 
+namespace OPNsense\Quagga\Api;
+use \OPNsense\Base\ApiControllerBase;
+use \OPNsense\Quagga\General;
+use \OPNsense\Core\Config;
 
 class GeneralController extends ApiControllerBase
 {
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php
index 472527127..c2c3c8de0 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php
@@ -1,10 +1,4 @@
 <?php
-namespace OPNsense\Quagga\Api;
-use \OPNsense\Base\ApiControllerBase;
-use \OPNsense\Quagga\OSPF6;
-use \OPNsense\Core\Config;
-use \OPNsense\Base\ApiMutableModelControllerBase;
-use \OPNsense\Base\UIModelGrid;
 /**
  *    Copyright (C) 2015 - 2017 Deciso B.V.
  *    Copyright (C) 2015 J. Schellevis - Deciso B.V.
@@ -35,6 +29,13 @@ use \OPNsense\Base\UIModelGrid;
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
+namespace OPNsense\Quagga\Api;
+use \OPNsense\Quagga\OSPF6;
+use \OPNsense\Core\Config;
+use \OPNsense\Base\ApiMutableModelControllerBase;
+use \OPNsense\Base\UIModelGrid;
+
 class Ospf6settingsController extends ApiMutableModelControllerBase
 {
     static protected $internalModelName = 'OSPF6';
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php
index 0a7de07f3..407b0a4f4 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php
@@ -1,12 +1,4 @@
 <?php
-namespace OPNsense\Quagga\Api;
-
-use \OPNsense\Base\ApiControllerBase;
-use \OPNsense\Quagga\OSPF;
-use \OPNsense\Core\Config;
-use \OPNsense\Base\ApiMutableModelControllerBase;
-use \OPNsense\Base\UIModelGrid;
-
 /**
  *    Copyright (C) 2015 - 2017 Deciso B.V.
  *    Copyright (C) 2015 J. Schellevis - Deciso B.V.
@@ -37,6 +29,12 @@ use \OPNsense\Base\UIModelGrid;
  *
  */
 
+namespace OPNsense\Quagga\Api;
+use \OPNsense\Quagga\OSPF;
+use \OPNsense\Core\Config;
+use \OPNsense\Base\ApiMutableModelControllerBase;
+use \OPNsense\Base\UIModelGrid;
+
 class OspfsettingsController extends ApiMutableModelControllerBase
 {
     static protected $internalModelName = 'OSPF';
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php
index c53b5199c..a8d9c51be 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php
@@ -1,10 +1,4 @@
 <?php
-namespace OPNsense\Quagga\Api;
-
-use \OPNsense\Base\ApiControllerBase;
-use \OPNsense\Quagga\RIP;
-use \OPNsense\Core\Config;
-
 /**
  *    Copyright (C) 2015 - 2017 Deciso B.V.
  *    Copyright (C) 2017 Fabian Franz
@@ -34,6 +28,11 @@ use \OPNsense\Core\Config;
  *
  */
 
+namespace OPNsense\Quagga\Api;
+use \OPNsense\Base\ApiControllerBase;
+use \OPNsense\Quagga\RIP;
+use \OPNsense\Core\Config;
+
 class RipController extends ApiControllerBase
 {
     public function getAction()
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php
index 93271fd74..3be095f10 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php
@@ -27,8 +27,8 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
-namespace OPNsense\Quagga\Api;
 
+namespace OPNsense\Quagga\Api;
 use \OPNsense\Base\ApiControllerBase;
 use \OPNsense\Core\Backend;
 use \OPNsense\Quagga\General;
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php
index 52ece6c3e..127e2d3de 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php
@@ -1,6 +1,4 @@
 <?php
-namespace OPNsense\Quagga;
-
 /*
     Copyright (C) 2017 Fabian Franz
     Copyright (C) 2017 Michael Muenz
@@ -23,6 +21,9 @@ namespace OPNsense\Quagga;
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+
+namespace OPNsense\Quagga;
+
 class BgpController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php
index 457048562..f57e9cda8 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php
@@ -1,6 +1,4 @@
 <?php
-namespace OPNsense\Quagga;
-
 /*
     Copyright (C) 2017 Fabian Franz
     Copyright (C) 2017 Michael Muenz
@@ -24,6 +22,8 @@ namespace OPNsense\Quagga;
     POSSIBILITY OF SUCH DAMAGE.
 */
 
+namespace OPNsense\Quagga;
+
 class DiagnosticsController extends \OPNsense\Base\IndexController
 {
     public function bgpAction()
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php
index 43d087f3b..b030ea9d4 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php
@@ -1,6 +1,4 @@
 <?php
-namespace OPNsense\Quagga;
-
 /*
     Copyright (C) 2017 Fabian Franz
     All rights reserved.
@@ -27,6 +25,8 @@ namespace OPNsense\Quagga;
     POSSIBILITY OF SUCH DAMAGE.
 */
 
+namespace OPNsense\Quagga;
+
 class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/IsisController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/IsisController.php
index 2fe22defc..5e1f17168 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/IsisController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/IsisController.php
@@ -1,4 +1,30 @@
 <?php
+/*
+    Copyright (C) 2017 Fabian Franz
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
 namespace OPNsense\Quagga;
 
 class IsisController extends \OPNsense\Base\IndexController
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php
index 53b757a85..3eaaa05b3 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php
@@ -23,6 +23,7 @@
 */
 
 namespace OPNsense\Quagga;
+
 class Ospf6Controller extends \OPNsense\Base\IndexController
 {
     public function indexAction()
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php
index 43c74a9e7..fcae1c8c9 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php
@@ -1,6 +1,4 @@
 <?php
-namespace OPNsense\Quagga;
-
 /*
     Copyright (C) 2017 Fabian Franz
     All rights reserved.
@@ -27,6 +25,8 @@ namespace OPNsense\Quagga;
     POSSIBILITY OF SUCH DAMAGE.
 */
 
+namespace OPNsense\Quagga;
+
 class OspfController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php
index ab552bc03..31eae7ba1 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php
@@ -1,4 +1,30 @@
 <?php
+/*
+    Copyright (C) 2017 Fabian Franz
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
 namespace OPNsense\Quagga;
 
 class RipController extends \OPNsense\Base\IndexController