From 272648b2ea0404d4b41a727d369a2d3a3ffedad6 Mon Sep 17 00:00:00 2001
From: Barry O'Donovan <barry@opensolutions.ie>
Date: Thu, 27 Nov 2014 19:58:47 +0000
Subject: [PATCH] [IM] de-inexify peering manager - fixes #180

Documentation updated at:

https://github.com/inex/IXP-Manager/wiki/Peering-Manager
---
 application/controllers/PeeringManagerController.php       | 7 +++++--
 .../views/peering-manager/peering-request-message.phtml    | 6 ++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/controllers/PeeringManagerController.php b/application/controllers/PeeringManagerController.php
index 438758b4b..7ef88eb92 100644
--- a/application/controllers/PeeringManagerController.php
+++ b/application/controllers/PeeringManagerController.php
@@ -266,7 +266,7 @@ public function peeringRequestAction()
                 if( $bccOk )
                 {
                     $mail = new Zend_Mail();
-                    $mail->setFrom( 'no-reply@inex.ie', $this->getCustomer()->getName() . ' Peering Team' )
+                    $mail->setFrom( $this->_options['identity']['mailer']['email'], $this->getCustomer()->getName() . ' Peering Team' )
                          ->setReplyTo( $this->getCustomer()->getPeeringemail(), $this->getCustomer()->getName() . ' Peering Team' )
                          ->setSubject( $f->getValue( 'subject' ) )
                          ->setBodyText( $f->getValue( 'message' ) );
@@ -345,7 +345,10 @@ public function peeringRequestAction()
         else
         {
             $f->getElement( 'bcc' )->setValue( $this->getUser()->getEmail() );
-            $f->getElement( 'subject' )->setValue( "[INEX] Peering Request from {$this->getCustomer()->getName()} (ASN{$this->getCustomer()->getAutsys()})" );
+            $f->getElement( 'subject' )->setValue(
+                "[" . $this->_options['identity']['orgname'] . "] Peering Request from "
+                    . $this->getCustomer()->getName() . " (ASN{$this->getCustomer()->getAutsys()})"
+            );
             $f->getElement( 'message' )->setValue( $this->view->render( 'peering-manager/peering-request-message.phtml' ) );
         }
 
diff --git a/application/views/peering-manager/peering-request-message.phtml b/application/views/peering-manager/peering-request-message.phtml
index b1404b2bc..d4fb03931 100644
--- a/application/views/peering-manager/peering-request-message.phtml
+++ b/application/views/peering-manager/peering-request-message.phtml
@@ -1,7 +1,7 @@
 
 Dear {$peer->getName()} Peering Team,
 
-We are {$user->getCustomer()->getName()} ({$user->getCustomer()->getCorpwww()}) and we are fellow members of INEX, Ireland's IXP.
+We are {$user->getCustomer()->getName()} ({$user->getCustomer()->getCorpwww()}) and we are fellow members of {$options.identity.orgname} ({$options.identity.location.city}, {$options.identity.location.country}).
 
 We would like to arrange peering session(s) with you on the following interface(s):
 
@@ -50,7 +50,5 @@ The {$user->getCustomer()->getName()} Peering Team
 
 
 --
-  
-INEX (https://www.inex.ie/) is Ireland's IXP. This email was composed with the assistance of INEX's Peering Manager which is part of your member area at: {genUrl}.
-
 
+This email was composed with the assistance of the {$options.identity.orgname} Peering Manager which is part of your members' area at: {genUrl}.