Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to configure smtp settings for unauthenticated itip sending (#599)

Browse source
This commit is contained in:
Thomas Bruederli 2012-10-03 11:30:19 +02:00
parent 5ceb3e3ebc
commit 4f72e5d161
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/config.inc.php.dist
View file

@ -107,4 +107,14 @@ $rcmail_config['calendar_categories'] = array(
// enable asynchronous free-busy triggering after data changed // enable asynchronous free-busy triggering after data changed
$rcmail_config['calendar_freebusy_trigger'] = false; $rcmail_config['calendar_freebusy_trigger'] = false;
// SMTP username used to send (anonymous) itip messages
$rcmail_config['calendar_itip_smtp_server'] = null;
// SMTP username used to send (anonymous) itip messages
$rcmail_config['calendar_itip_smtp_user'] = 'smtpauth';
// SMTP password used to send (anonymous) itip messages
$rcmail_config['calendar_itip_smtp_pass'] = '123456';
?> ?>

25
plugins/calendar/lib/calendar_itip.php
View file

@ -29,12 +29,15 @@ class calendar_itip
private $rc; private $rc;
private $cal; private $cal;
private $event; private $event;
private $itip_send = false;
function __construct($cal) function __construct($cal)
{ {
$this->cal = $cal; $this->cal = $cal;
$this->rc = $cal->rc; $this->rc = $cal->rc;
$this->sender = $this->rc->user->get_identity(); $this->sender = $this->rc->user->get_identity();
$this->cal->add_hook('smtp_connect', array($this, 'smtp_connect_hook'));
} }
/** /**
@ -99,7 +102,27 @@ class calendar_itip
$message->setTXTBody(rcube_mime::format_flowed($mailbody, 79)); $message->setTXTBody(rcube_mime::format_flowed($mailbody, 79));
// finally send the message // finally send the message
return rcmail_deliver_message($message, $headers['X-Sender'], $mailto, $smtp_error); $this->itip_send = true;
$sent = rcmail_deliver_message($message, $headers['X-Sender'], $mailto, $smtp_error);
$this->itip_send = false;
return $sent;
}
/**
* Plugin hook to alter SMTP authentication.
* This is used if iTip messages are to be sent from an unauthenticated session
*/
public function smtp_connect_hook($p)
{
// replace smtp auth settings if we're not in an authenticated session
if ($this->itip_send && !$this->rc->user->ID) {
foreach (array('smtp_server', 'smtp_user', 'smtp_pass') as $prop) {
$p[$prop] = $this->rc->config->get("calendar_itip_$prop", $p[$prop]);
}
}
return $p;
} }
/** /**