Skip to content

Sendmail transport #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BastienDurel wants to merge 5 commits into
base: 16.1
Choose a base branch
from
Open

Sendmail transport #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3066ab
Add ability to force Sendmail transport from config file
BastienDurel Feb 10, 2017
dcc7387
put Horde_Mail_Transport_Sendmail definition in Mailer::smtpTransport()
BastienDurel Feb 10, 2017
f505603
use setting from database to force sendmail transport
BastienDurel Feb 15, 2017
80432eb
Skip SMTP configuration if sendmail transport is selected
BastienDurel Mar 3, 2017
a34477b
as $GLOBALS['egw_info']['server'] is loaded from 'phpgwapi' config, t…
BastienDurel Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions admin/templates/default/config.xet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,16 @@
</vbox>
<textbox id="newsettings[recaptcha_site]" size="60"/>
</row>
<row>
<description value="Emails" span="all" class="subHeader"/>
</row>
<row>
<description value="Force sending email via Sendmail transport (local mail)" label="%s:"/>
<select id="newsettings[sendmail]">
<option value="">{No} - {Default}</option>
<option value="True">Yes</option>
</select>
</row>
</rows>
</grid>
</template>
Expand Down
5 changes: 4 additions & 1 deletion api/src/Mail/Account.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,10 @@ public function smtpTransport()
// Horde use locale for translation of error messages
Api\Preferences::setlocale(LC_MESSAGES);

if (!empty($GLOBALS['egw_info']['server']['sendmail']))
$api_config = Api\Config::read('phpgwapi');

if (!empty($GLOBALS['egw_info']['server']['sendmail']) ||
!empty($api_config['sendmail']))
{
Copy link
Member

@ralfbecker ralfbecker Mar 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you add that code?

Your $api_config is identical to $GLOBALS['egw_info']['server'].

Copy link
Author

@BastienDurel BastienDurel Mar 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I didn't found a way to make the changes in config file persistant across setup.php usage ; so I moved to DB configuration to have an in-browser configuration

Copy link
Member

@ralfbecker ralfbecker Mar 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the same thing, first thing EGroupware does is to read what you call DB configuration into $GLOBALS['egw_info']['server'] to the stuff already there from the header.inc.php.

So please remove/revert that, as it is unnecessary.

Copy link
Author

@BastienDurel BastienDurel Mar 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, thanks (I did not knew that)

$this->smtpTransport = new Horde_Mail_Transport_Sendmail();
}
Expand Down