gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment Vacation.php, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Tue Apr 6 12:14:21 CEST 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv26720/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
Modified Files:
Vacation.php
Log Message:
Import code that was misplaced in the controller.
Index: Vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Vacation.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Vacation.php 6 Apr 2010 08:55:29 -0000 1.1
+++ Vacation.php 6 Apr 2010 10:14:19 -0000 1.2
@@ -90,6 +90,19 @@
'.' . "\r\n" .
';' . "\r\n" .
'}' . "\r\n";
+
+ $this->_response = sprintf(
+ _("I am out of office until %s.\r\n").
+ _("In urgent cases, please contact Mrs. <vacation replacement>\r\n\r\n").
+ _("email: <email address of vacation replacement>\r\n").
+ _("phone: +49 711 1111 11\r\n").
+ _("fax.: +49 711 1111 12\r\n\r\n").
+ _("Yours sincerely,\r\n").
+ _("-- \r\n").
+ _("<enter your name and email address here>"),
+ strftime(_('%x'))
+ );
+
parent::__construct($script);
}
@@ -122,6 +135,10 @@
*/
public function getResendAfter()
{
+ //@todo: Should be placed into a validate method.
+ if ($this->_resend_after < 1) {
+ $this->_resend_after = 7;
+ }
return $this->_resend_after;
}
More information about the commits
mailing list