mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Minor GUI fixes

Browse Source
This commit is contained in:
Cameron 2014-11-23 12:01:00 -08:00
parent eca5c13af9
commit 15cb24c8fb
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/mailout.php
View File

@ -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>

5
e107_handlers/bounce_handler.php
View File

@ -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)
{

9
e107_handlers/mail.php
View File

@ -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
//--------------------------------------

2
e107_languages/English/admin/lan_mailout.php
View File

@ -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");