Merge branch 'add-as112-active-config-var' of git://github.com/rowant…

…horpe/IXP-Manager into rowanthorpe-add-as112-active-config-var
inex · Jun 29, 2015 · ad6cf91 · ad6cf91
2 parents 14497bf + 5ff31e2
commit ad6cf91
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 14 deletions.
diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist
@@ -105,6 +105,15 @@ reseller.enabled = true
 ;;
 reseller.no_billing_for_resold_customers = true
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Specifies whether to display and enable control of AS112 functionality for customers
+;;
+;; See https://github.com/inex/IXP-Manager/wiki/AS112
+;;
+
+as112_ui_active = true
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; We use Minify to bundle and compress CSS and JS in

diff --git a/application/controllers/CustomerController.php b/application/controllers/CustomerController.php
@@ -518,6 +518,7 @@ protected function formPostProcess( $form, $object, $isEdit, $options = null, $c
 
         $form->enableResller( $this->resellerMode() );
         $form->setMultiIXP( $this->multiIXP(), $isEdit );
+        $form->setAs112client( $this->as112UiActive(), $isEdit );
 
         if( $this->resellerMode() )
         {

diff --git a/application/controllers/VlanInterfaceController.php b/application/controllers/VlanInterfaceController.php
@@ -104,10 +104,10 @@ protected function _feInit()
                         'ipv6canping'      => 'Monitoring Enabled via IPv6 ICMP',
                         'ipv4monitorrcbgp' => 'Monitor Route Collector IPv4 BGP Session',
                         'ipv6monitorrcbgp' => 'Monitor Route Collector IPv6 BGP Session',
-                        'as112client'      => 'AS112 Client',
                         'busyhost'         => 'Busy Host?',
                         'notes'            => 'Notes'
-                    ]
+                    ],
+                    ( $this->as112UiActive() ? ['as112client' => 'AS112 Client'] : [] )
                 );
 
                 break;

diff --git a/application/views/customer/detail.phtml b/application/views/customer/detail.phtml
@@ -243,8 +243,13 @@
 	    <td><strong>Route Server Client:</strong></td>
 	    <td id="value">{if $vli->getRsclient()}Yes{else}No{/if}</td>
 	    <td></td>
-	    <td><strong>AS112 Client:</strong></td>
-	    <td id="value">{if $vli->getAs112client()}Yes{else}No{/if}</td>
+	    {if $as112UiActive}
+	        <td><strong>AS112 Client:</strong></td>
+	        <td id="value">{if $vli->getAs112client()}Yes{else}No{/if}</td>
+	    {else}
+	        <td></td>
+	        <td></td>
+	    {/if}
 	</tr>
 
 	</table>

diff --git a/application/views/customer/overview-tabs/overview.phtml b/application/views/customer/overview-tabs/overview.phtml
@@ -25,8 +25,10 @@
             <td colspan="2">
                 {if not $cust->isTypeAssociate()}
                     <span class="label label-{if $rsclient}success{else}important{/if}">RS Client</span>
-                    &nbsp;&nbsp;&nbsp;
-                    <span class="label label-{if $as112client}success{else}important{/if}">AS112</span>
+                    {if $as112UiActive}
+                        &nbsp;&nbsp;&nbsp;
+                        <span class="label label-{if $as112client}success{else}important{/if}">AS112</span>
+                    {/if}
                 {/if}
             </td>
         </tr>

diff --git a/application/views/customer/overview-tabs/ports/port.phtml b/application/views/customer/overview-tabs/ports/port.phtml
@@ -217,8 +217,13 @@
                 <td><strong>Route Server Client:</strong></td>
                 <td id="value">{if $vli->getRsclient()}Yes{else}No{/if}</td>
                 <td></td>
-                <td><strong>AS112 Client:</strong></td>
-                <td id="value">{if $vli->getAs112client()}Yes{else}No{/if}</td>
+                {if $as112UiActive}
+                    <td><strong>AS112 Client:</strong></td>
+                    <td id="value">{if $vli->getAs112client()}Yes{else}No{/if}</td>
+                {else}
+                    <td></td>
+                    <td></td>
+                {/if}
             </tr>
 
             </table>

diff --git a/application/views/virtual-interface/forms/add-wizard.phtml b/application/views/virtual-interface/forms/add-wizard.phtml
@@ -47,7 +47,9 @@
             {$element->irrdbfilter}
             {$element->mcastenabled}
             {$element->rsclient}
-            {$element->as112client}
+            {if $as112UiActive}
+                {$element->as112client}
+            {/if}
 
         </fieldset>
 

diff --git a/application/views/vlan-interface/forms/vlan-interface.phtml b/application/views/vlan-interface/forms/vlan-interface.phtml
@@ -15,7 +15,9 @@
 
         {$element->maxbgpprefix}
         {$element->rsclient}
-        {$element->as112client}
+        {if $as112UiActive}
+            {$element->as112client}
+        {/if}
         {$element->busyhost}
 
     </div>

diff --git a/library/IXP/Controller/Action.php b/library/IXP/Controller/Action.php
@@ -88,8 +88,9 @@ public function __construct(
         $this->view->registerClass( 'SWITCHPORT', '\\Entities\\SwitchPort' );
         $this->view->registerClass( 'VLAN',       '\\Entities\\Vlan' );
 
-        $this->view->resellerMode = $this->resellerMode();
-        $this->view->multiIXP     = $this->multiIXP();
+        $this->view->resellerMode  = $this->resellerMode();
+        $this->view->multiIXP      = $this->multiIXP();
+        $this->view->as112UiActive = $this->as112UiActive();
 
         if( $this->getAuth()->hasIdentity() && $this->getUser()->getPrivs() == Entities\User::AUTH_SUPERUSER )
             $this->superUserSetup();

diff --git a/library/IXP/Controller/CliAction.php b/library/IXP/Controller/CliAction.php
@@ -59,8 +59,9 @@ public function __construct(
         $this->view->registerClass( 'SWITCHPORT', '\\Entities\\SwitchPort' );
         $this->view->registerClass( 'VLAN',       '\\Entities\\Vlan' );
 
-        $this->view->resellerMode = $this->resellerMode();
-        $this->view->multiIXP     = $this->multiIXP();
+        $this->view->resellerMode  = $this->resellerMode();
+        $this->view->multiIXP      = $this->multiIXP();
+        $this->view->as112UiActive = $this->as112UiActive();
     }
 
 

diff --git a/library/IXP/Controller/Trait/Common.php b/library/IXP/Controller/Trait/Common.php
@@ -61,6 +61,20 @@ protected function multiIXP()
         return ( isset( $this->_options['multiixp']['enabled'] ) && $this->_options['multiixp']['enabled'] );
     }
 
+    /**
+     * Checks if as112 is activated in the UI.
+     *
+     * To enable as112 in the UI set as112_ui_active to true in application.ini
+     *
+     * @see https://github.com/inex/IXP-Manager/wiki/AS112
+     *
+     * @return bool
+     */
+    protected function as112UiActive()
+    {
+        return ( isset( $this->_options['as112_ui_active'] ) && $this->_options['as112_ui_active'] );
+    }
+
 
     /**
      * Loads a customer object via an optional posted / getted `shortname` parameter.