[BF] First pass at FB peering manager issue - works in dev - islandbr…

…idgenetworks/IXP-Manager-Archive-Yann#80
inex · Oct 27, 2017 · 63febeb · 63febeb
1 parent f8266cc
commit 63febeb
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 29 deletions.
diff --git a/.idea/ixpv.iml b/.idea/ixpv.iml
diff --git a/app/Providers/ZendFrameworkServiceProvider.php b/app/Providers/ZendFrameworkServiceProvider.php
@@ -220,10 +220,10 @@ private function setupIdentity( array $options ): array {
      * Setup peering manager
      */
     private function setupPeeringManager( array $options ): array {
-        $options['peering_manager']['testmode']  = config( 'ixp.peering_manager.testmode' );
-        $options['peering_manager']['testemail'] = config( 'ixp.peering_manager.testemail' );
-        $options['peering_manager']['testnote']  = config( 'ixp.peering_manager.testnote' );
-        $options['peering_manager']['testdate']  = config( 'ixp.peering_manager.testdate' );
+        $options['peeringmanager']['testmode']  = config( 'ixp.peering_manager.testmode' );
+        $options['peeringmanager']['testemail'] = config( 'ixp.peering_manager.testemail' );
+        $options['peeringmanager']['testnote']  = config( 'ixp.peering_manager.testnote' );
+        $options['peeringmanager']['testdate']  = config( 'ixp.peering_manager.testdate' );
 
         $options['peeringdb']['url'] = "https://www.peeringdb.com/view.php?asn=%ASN%";
 

diff --git a/application/controllers/PeeringManagerController.php b/application/controllers/PeeringManagerController.php
@@ -271,34 +271,40 @@ public function peeringRequestAction()
                          ->setSubject( $f->getValue( 'subject' ) )
                          ->setBodyText( $f->getValue( 'message' ) );
 
-                    if( $sendtome )
-                        $mail->addTo( $this->getUser()->getEmail() );
-                    else
+                    if( isset( $this->_options['peeringmanager']['testmode'] ) && $this->_options['peeringmanager']['testmode'] )
                     {
-                        if( isset( $this->_options['peeringmanager']['testmode'] ) && $this->_options['peeringmanager']['testmode'] )
+                        if( !isset( $this->_options['peeringmanager']['testemail'] ) )
                         {
-                            if( !isset( $this->_options['peeringmanager']['testemail'] ) )
-                            {
-                                $this->getLogger()->alert( "Peering Manager test mode enabled but testemail not defined" );
-                                echo "ERR:Peering Manager test mode enabled but testemail not defined in application.ini.";
-                                return true;
-                            }
-                            $mail->addTo( $this->_options['peeringmanager']['testemail'] );
+                            $this->getLogger()->alert( "Peering Manager test mode enabled but testemail not defined" );
+                            echo "ERR:Peering Manager test mode enabled but testemail not defined in application.ini.";
+                            return true;
                         }
-                        else
-                        {
+                        $mail->addTo( $this->_options['peeringmanager']['testemail'] );
+                    }
+                    else
+                    {
+                        dd('cx');
+                        if( $sendtome ) {
+                            $mail->addTo( $this->getUser()->getEmail() );
+                        } else {
+
                             $mail->addTo( $peer->getPeeringemail(), "{$peer->getName()} Peering Team" )
-                                 ->addCc( $this->getCustomer()->getPeeringemail(), "{$this->getCustomer()->getName()} Peering Team" );
+                                ->addCc( $this->getCustomer()->getPeeringemail(), "{$this->getCustomer()->getName()} Peering Team" );
+
+                            if( count( $bcc ) ) {
+                                foreach( $bcc as $b ) {
+                                    $mail->addBcc( $b );
+                                }
+                            }
+
                         }
-                    }
 
-                    if( count( $bcc ) )
-                        foreach( $bcc as $b )
-                            $mail->addBcc( $b );
+                    }
 
                     try {
-                        if( !$marksent )
+                        if( !$marksent ) {
                             $mail->send();
+                        }
 
                         if( !$sendtome )
                         {
@@ -426,13 +432,13 @@ public function markRejectedAction()
      *
      * @return \Entities\Customer
      */
-    private function _loadPeer()
+    private function _loadPeer( $custid )
     {
-        if( $this->getParam( 'custid', false ) )
-            $this->view->peer = $peer = $this->getD2EM()->getRepository( '\\Entities\\Customer' )->find( $this->getParam( 'custid' ) );
+        if( $custid ) {
+            $this->view->peer = $peer = $this->getD2EM()->getRepository( '\\Entities\\Customer' )->find( $custid );
+        }
 
-        if( !isset( $peer ) || !$peer )
-        {
+        if( !isset( $peer ) || !$peer ) {
             echo "ERR:Could not find peer's information in the database. Please contact support.";
             die;
         }