diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index 29f21b8087632f54b3ee7736431b4470b50f0310..5be08f55851775a09c7fd643d8aca6760119ac26 100644 (file)
} else {
$reason = "";
if(!$this->mailMethod->accountCreateable($reason)){
- $display= $this->show_disable_header(msgPool::addFeaturesButton(_("Mail")),$reason ,TRUE,TRUE);
+ $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Mail")),$reason ,TRUE,TRUE);
}else{
- $display= $this->show_disable_header(msgPool::addFeaturesButton(_("Mail")),msgPool::featuresDisabled(_("Mail")));
+ $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Mail")),msgPool::featuresDisabled(_("Mail")));
}
return ($display);
}
if($this->mailAddressSelect instanceOf mailAddressSelect){
$used = array();
$used['mail'] = array_values($this->gosaMailAlternateAddress);
+ $used['mail'] = array_merge($used['mail'], array_values($this->gosaMailForwardingAddress));
$used['mail'][] = $this->mail;
+
+ // Build up blocklist
+ session::set('filterBlacklist', $used);
return($this->mailAddressSelect->execute());
}
$smarty->assign("isModifyableServer", $this->mailMethod->isModifyableServer());
$smarty->assign("mailEqualsCN", $this->mailMethod->mailEqualsCN());
- $SkipWrite = (!isset($this->parent) || !$this->parent) && !session::is_set('edit');
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $transl){
- $smarty->assign("$name"."ACL", $this->getacl($name,$SkipWrite));
+ $smarty->assign("$name"."ACL", $this->getacl($name));
}
foreach($this->attributes as $attr){
$smarty->assign($attr,$this->$attr);
}
foreach ($attrs as $val){
+
+ // We can only replace strings here
+ if(!is_string($obj->$val)) continue;
+
if(preg_match("/dateOfBirth/",$val)){
if($obj->use_dob){
$contents= preg_replace("/%$val/",date("Y-d-m",$obj->dateOfBirth),$contents);