diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
index d76a31871167c034c4be455e8eb5fd909e519c17..a2228e11ec4ce1741d8a1ead6ba27ed482cef64c 100644 (file)
{
var $plHeadline = "Mail";
var $plDescription = "GOsa mail extension.";
{
var $plHeadline = "Mail";
var $plDescription = "GOsa mail extension.";
+ var $view_logged = FALSE;
var $attributes = array(
"mailAddress",
var $attributes = array(
"mailAddress",
var $alternateAddresses = "";
var $forwardingAddresses = "";
var $vacationEnabled = FALSE;
var $alternateAddresses = "";
var $forwardingAddresses = "";
var $vacationEnabled = FALSE;
- var $vacationStart = "";
- var $vacationStop = "";
+ var $vacationStart = 0;
+ var $vacationStop = 0;
var $vacationMessage = "";
var $mailBoxWarnLimitEnabled = FALSE;
var $mailBoxWarnLimitValue = "";
var $vacationMessage = "";
var $mailBoxWarnLimitEnabled = FALSE;
var $mailBoxWarnLimitValue = "";
}
}
}
}
+ // Set vacation start/stop if not set alreasy
+ $this->vacationStart = time();
+ $this->vacationStop = time() + (14 * 60*60*24);
+
// Prepare vacation start/stop time to be initially valid.
// Prepare vacation start/stop time to be initially valid.
- $this->gosaVacationStart= date('d.m.Y', $this->gosaVacationStart);
- $this->gosaVacationStop= date('d.m.Y', $this->gosaVacationStop);
+ $this->vacationStart= date('d.m.Y', $this->vacationStart);
+ $this->vacationStop= date('d.m.Y', $this->vacationStop);
}
}
/* Replace vacation start and end time */
if($this->mailMethod->vacationRangeEnabled()){
if(preg_match("/%start/",$contents)){
/* Replace vacation start and end time */
if($this->mailMethod->vacationRangeEnabled()){
if(preg_match("/%start/",$contents)){
- $contents = preg_replace("/%start/",$this->gosaVacationStart,$contents);
+ $contents = preg_replace("/%start/",$this->vacationStart,$contents);
}
if(preg_match("/%end/",$contents)){
}
if(preg_match("/%end/",$contents)){
- $contents = preg_replace("/%end/",$this->gosaVacationStop,$contents);
+ $contents = preg_replace("/%end/",$this->vacationStop,$contents);
}
}else{
if(preg_match("/%start/",$contents)){
}
}else{
if(preg_match("/%start/",$contents)){
/* Check date strings */
$state= true;
/* Check date strings */
$state= true;
- if ($this->gosaVacationStart == "" || !tests::is_date($this->gosaVacationStart)) {
- $message[]= msgPool::invalid(_("from"),$this->gosaVacationStart);
+ if ($this->vacationStart == "" || !tests::is_date($this->vacationStart)) {
+ $message[]= msgPool::invalid(_("from"),$this->vacationStart);
$state= false;
}
$state= false;
}
- if ($this->gosaVacationStart == "" || !tests::is_date($this->gosaVacationStop)) {
- $message[]= msgPool::invalid(_("to"),$this->gosaVacationStop);
+ if ($this->vacationStart == "" || !tests::is_date($this->vacationStop)) {
+ $message[]= msgPool::invalid(_("to"),$this->vacationStop);
$state= false;
}
#TODO: take care of date format
if ($state) {
$state= false;
}
#TODO: take care of date format
if ($state) {
- list($day, $month, $year)= explode('.', $this->gosaVacationStart);
+ list($day, $month, $year)= explode('.', $this->vacationStart);
$start= mktime(0,0,0,$month, $day, $year);
$start= mktime(0,0,0,$month, $day, $year);
- list($day, $month, $year)= explode('.', $this->gosaVacationStop);
+ list($day, $month, $year)= explode('.', $this->vacationStop);
$stop= mktime(0,0,0,$month, $day, $year);
if($start > $stop){
$message[]= msgPool::invalid(_("Vacation interval"));
$stop= mktime(0,0,0,$month, $day, $year);
if($start > $stop){
$message[]= msgPool::invalid(_("Vacation interval"));
"plSection" => array("personal" => _("My account")),
"plCategory" => array("users"),
"plOptions" => array(),
"plSection" => array("personal" => _("My account")),
"plCategory" => array("users"),
"plOptions" => array(),
- "plProvidedAcls" => array()
+ "plProvidedAcls" => array(
+ "mailAddress" => _("Mail address"),
+ "mailLocation" => _("Mail location"),
+ "quotaUsage" => _("Quota usage"),
+ "quotaSize" => _("Quota size"),
+ "alternateAddresses" => _("Alternate mail addresses"),
+ "forwardingAddresses" => _("Forwarding mail addresses"),
+ "vacationEnabled" => _("Vaction switch"),
+ "vacationStart" => _("Vacation start time"),
+ "vacationStop" => _("Vacation stop time"),
+ "vacationMessage" => _("Vacation message"),
+ "mailBoxWarnLimit" => _("Warn sizelimit"),
+ "mailBoxSendSizelimit" => _("Send sizelimit"),
+ "mailBoxHardSizelimit" => _("Hard sizelimit"),
+ "mailBoxAutomaticRemoval" => _("Automatic mail removal"),
+ )
));
}
}
));
}
}