mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Issue #382 SMTP setting were being saved in wrong format.

Browse Source
This commit is contained in:
Cameron
2015-03-13 13:57:09 -07:00
parent b8bbbd3390
commit 15398155b2
2 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
e107_admin/prefs.php
View File

@@ -118,6 +118,46 @@ if(isset($_POST['updateprefs']))
); );
$pref['post_html'] = intval($_POST['post_html']); // This ensures the setting is reflected in set text $pref['post_html'] = intval($_POST['post_html']); // This ensures the setting is reflected in set text
$smtp_opts = array();
if(!empty($_POST['smtp_options']))
{
switch (trim($_POST['smtp_options']))
{
case 'smtp_ssl' :
$smtp_opts[] = 'secure=SSL';
break;
case 'smtp_tls' :
$smtp_opts[] = 'secure=TLS';
break;
case 'smtp_pop3auth' :
$smtp_opts[] = 'pop3auth';
break;
}
if (!empty($_POST['smtp_keepalive']))
{
$smtp_opts[] = 'keepalive';
}
if (!empty($_POST['smtp_useVERP']))
{
$smtp_opts[] = 'useVERP';
}
$_POST['smtp_options'] = implode(',',$smtp_opts);
unset($_POST['smtp_keepalive'],$_POST['smtp_useVERP']);
// e107::getMessage()->addDebug(print_a($_POST['smtp_options'],true));
}
$_POST['membersonly_exceptions'] = explode("\n",$_POST['membersonly_exceptions']); $_POST['membersonly_exceptions'] = explode("\n",$_POST['membersonly_exceptions']);
@@ -475,10 +515,10 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
'smtp_pop3auth' => LAN_MAILOUT_91 'smtp_pop3auth' => LAN_MAILOUT_91
); );
$text .= $frm->select('smtp_options', $sslOpts, $smtp_opts, '', LAN_MAILOUT_96); // $text .= $frm->select('smtp_options', $sslOpts, $smtp_opts, '', LAN_MAILOUT_96);
/*
<select class='tbox' name='smtp_options' id='smtp_options'>\n $text .="<select class='tbox' name='smtp_options' id='smtp_options'>\n
<option value=''>".LAN_MAILOUT_96."</option>\n"; <option value=''>".LAN_MAILOUT_96."</option>\n";
$selected = (in_array('secure=SSL',$smtp_opts) ? " selected='selected'" : ''); $selected = (in_array('secure=SSL',$smtp_opts) ? " selected='selected'" : '');
$text .= "<option value='smtp_ssl'{$selected}>".LAN_MAILOUT_92."</option>\n"; $text .= "<option value='smtp_ssl'{$selected}>".LAN_MAILOUT_92."</option>\n";
@@ -486,8 +526,8 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
$text .= "<option value='smtp_tls'{$selected}>".LAN_MAILOUT_93."</option>\n"; $text .= "<option value='smtp_tls'{$selected}>".LAN_MAILOUT_93."</option>\n";
$selected = (in_array('pop3auth',$smtp_opts) ? " selected='selected'" : ''); $selected = (in_array('pop3auth',$smtp_opts) ? " selected='selected'" : '');
$text .= "<option value='smtp_pop3auth'{$selected}>".LAN_MAILOUT_91."</option>\n"; $text .= "<option value='smtp_pop3auth'{$selected}>".LAN_MAILOUT_91."</option>\n";
$text .= "</select> $text .= "</select>";
*/
$text .= "<span class='field-help'>".LAN_MAILOUT_94."</span></td></tr>"; $text .= "<span class='field-help'>".LAN_MAILOUT_94."</span></td></tr>";
@@ -498,13 +538,15 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
</td> </td>
</tr>"; </tr>";
$text .= "<tr> $text .= "<tr>
<td><label for='smtp_useVERP'>".LAN_MAILOUT_95."</label></td><td>".$frm->radio_switch('smtp_useVERP',$pref['smtp_useVERP'])." <td><label for='smtp_useVERP'>".LAN_MAILOUT_95."</label></td><td>".$frm->radio_switch('smtp_useVERP',(in_array('useVERP',$smtp_opts)))."
</td> </td>
</tr> </tr>
</table></div>"; </table></div>";
/* FIXME - posting SENDMAIL path triggers Mod-Security rules. /* FIXME - posting SENDMAIL path triggers Mod-Security rules.
// Sendmail. --------------> // Sendmail. -------------->

2
e107_core/xml/default_install.xml
View File

@@ -238,9 +238,7 @@ City, State, Country
<core name="smtp_server"></core> <core name="smtp_server"></core>
<core name="smtp_username"></core> <core name="smtp_username"></core>
<core name="smtp_password"></core> <core name="smtp_password"></core>
<core name="smtp_keepalive"></core>
<core name="smtp_options"></core> <core name="smtp_options"></core>
<core name="smtp_useVERP"></core>
<core name="social_login_active">0</core> <core name="social_login_active">0</core>
<core name="social_login"><![CDATA[array()]]></core> <core name="social_login"><![CDATA[array()]]></core>
<core name="ssl_enabled">0</core> <core name="ssl_enabled">0</core>