From 15cb24c8fb92bce2d3fc68be00e076f11da87fdf Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 23 Nov 2014 12:01:00 -0800
Subject: [PATCH] Minor GUI fixes

---
 e107_admin/mailout.php                       | 8 ++++----
 e107_handlers/bounce_handler.php             | 5 ++++-
 e107_handlers/mail.php                       | 9 +++++++++
 e107_languages/English/admin/lan_mailout.php | 2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 15bb8051f..4ca6f3d27 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -881,10 +881,10 @@ class mailout_main_ui extends e_admin_ui
 		<tbody>
 		<tr>
 			<td>".LAN_MAILOUT_110."<br /></td>
-			<td class='form-inline'>".$frm->admin_button('testemail', LAN_MAILOUT_112,'other')."&nbsp;
-			<input name='testaddress' class='tbox' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" />
-			".$this->mailAdmin->sendStyleSelect(varset($_POST['testtemplate'], 'textonly'), 'testtemplate')."
-			</td>
+			<td class='form-inline'><div class='input-append'>".$frm->admin_button('testemail', LAN_MAILOUT_112,'other')."&nbsp;
+			<input name='testaddress' class='tbox input-xlarge' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" />
+			 <span style='padding-left:5px'>".$this->mailAdmin->sendStyleSelect(varset($_POST['testtemplate'], 'textonly'), 'testtemplate')."</span>
+			</div></td>
 		</tr>
 
 		<tr>
diff --git a/e107_handlers/bounce_handler.php b/e107_handlers/bounce_handler.php
index d336a9969..2236eb3cb 100644
--- a/e107_handlers/bounce_handler.php
+++ b/e107_handlers/bounce_handler.php
@@ -47,6 +47,9 @@ class e107Bounce
 		
 		$strEmail= ($this->source == false) ? $this->mailRead(-1) : file_get_contents(e_HANDLER."eml/".$this->source);
 		
+		file_put_contents(e_LOG."bounce.log",date('r')."\n\n".$strEmail."\n\n", FILE_APPEND);
+		
+		
 		if(strpos($strEmail,'X-Bounce-Test: true')!==false) // Bounce Test from Admin Area. 
 		{
 			$this->debug = true;	
@@ -73,7 +76,7 @@ class e107Bounce
 	 		$e107_userid = (isset($head[$identifier])) ? $head[$identifier] : $this->getHeader($strEmail, $identifier);
 		}
 		
-
+		
 		
 		if($this->debug === true)
 		{
diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php
index 7232de7ed..834450bd6 100644
--- a/e107_handlers/mail.php
+++ b/e107_handlers/mail.php
@@ -201,6 +201,10 @@ class e107Email extends PHPMailer
 		{
 			$this->debug = true;
 		}
+		else 
+		{
+			$this->Debugoutput = 'handlePHPMailerDebug';	
+		}
 		
 		$this->pref = $pref;
 
@@ -1140,6 +1144,11 @@ class e107MailerException extends phpmailerException
 }
 
 
+// Called by PHPMailer when SMTP debug is active. 
+function handlePHPMailerDebug($str,$other)
+{
+	e107::getMessage()->addInfo($str);		
+}
 //--------------------------------------
 //		Generic e107 Exception handler
 //--------------------------------------
diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php
index 43a6f1b2b..236bf37c5 100644
--- a/e107_languages/English/admin/lan_mailout.php
+++ b/e107_languages/English/admin/lan_mailout.php
@@ -122,7 +122,7 @@ define("LAN_MAILOUT_108", "Result");
 define("LAN_MAILOUT_109", "Show detail");
 define("LAN_MAILOUT_110", "Send test email");
 define("LAN_MAILOUT_111", "Email Title (not sent)");
-define("LAN_MAILOUT_112", "Click to send email to");
+define("LAN_MAILOUT_112", "Send test email to");
 define("LAN_MAILOUT_113", "Test email from");
 define("LAN_MAILOUT_114", "This is a test email, it appears that your email settings are working ok! [br][br] Regards [br] from the e107 website system.");
 define("LAN_MAILOUT_115", "Emailing method");