index 23ff9c64e8768c718166dca6ccbf3d434b36104a..ba9e62e2c010668715642a395b94730292695abb 100644 (file)
}
/* Get global filter config */
- if (!is_global("mailfilter")){
+ if (!is_global("gmailfilter")){
$ui= get_userinfo();
$base= get_base_from_people($ui->dn);
- $mailfilter= array( "depselect" => $base,
+ $gmailfilter= array( "depselect" => $base,
"muser" => "",
"regex" => "*");
- register_global("mailfilter", $mailfilter);
+ register_global("gmailfilter", $gmailfilter);
}
/* Load permissions */
/* Do we represent a valid account? */
if (!$this->is_account && $this->parent == NULL){
- $display= "<img src=\"images/stop.png\" align=center> <b>".
+ $display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
_("This 'dn' has no valid mail extensions.")."</b>";
return ($display);
}
$ldap= $this->config->get_ldap_link();
/* Save data */
- $mailfilter= get_global("mailfilter");
+ $gmailfilter= get_global("gmailfilter");
foreach( array("depselect", "muser", "regex") as $type){
if (isset($_POST[$type])){
- $mailfilter[$type]= $_POST[$type];
+ $gmailfilter[$type]= $_POST[$type];
}
}
if (isset($_GET['search'])){
if ($s == "**"){
$s= "*";
}
- $mailfilter['regex']= $s;
+ $gmailfilter['regex']= $s;
}
- register_global("mailfilter", $mailfilter);
+ register_global("gmailfilter", $gmailfilter);
/* Get actual list */
$mailusers= array ();
- if ($mailfilter['regex'] != '*' && $mailfilter['regex'] != ""){
- $regex= $mailfilter['regex'];
+ if ($gmailfilter['regex'] != '*' && $gmailfilter['regex'] != ""){
+ $regex= $gmailfilter['regex'];
$filter= "(|(mail=$regex)(gosaMailAlternateAddress=$regex))";
} else {
$filter= "";
}
- if ($mailfilter['muser'] != ""){
- $user= $mailfilter['muser'];
+ if ($gmailfilter['muser'] != ""){
+ $user= $gmailfilter['muser'];
$filter= "$filter(|(uid=$user)(cn=$user)(givenName=$user)(sn=$user))";
}
}
$acl= array($this->config->current['BASE'] => ":all");
- $res= get_list($acl, "(&(objectClass=gosaMailAccount)$filter)", TRUE, $mailfilter['depselect'], array("sn", "mail", "givenName"), TRUE);
- $ldap->cd($mailfilter['depselect']);
+ $res= get_list($acl, "(&(objectClass=gosaMailAccount)$filter)", TRUE, $gmailfilter['depselect'], array("sn", "mail", "givenName"), TRUE);
+ $ldap->cd($gmailfilter['depselect']);
$ldap->search ("(&(objectClass=gosaMailAccount)$filter)", array("sn", "mail", "givenName"));
error_reporting (0);
while ($attrs= $ldap->fetch()){
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("hint", print_sizelimit_warning());
foreach( array("depselect", "muser", "regex") as $type){
- $smarty->assign("$type", $mailfilter[$type]);
+ $smarty->assign("$type", $gmailfilter[$type]);
}
$smarty->assign("hint", print_sizelimit_warning());
$display.= $smarty->fetch (get_template_path('mail_locals.tpl', TRUE));
}
/* Assemble extra attributes */
- $acl= chkacl($this->acl, "permissions");
+ $perm= chkacl($this->acl, "permissions");
$tmp= "";
$nr= 0;
$count= count($this->imapacl);
foreach($this->imapacl as $user => $acl){
if ($user != "anyone" && $user != "%members%"){
$tmp.= "<tr><td><input name=\"user_$nr\" size=20 maxlength=60 ".
- "value=\"$user\" $acl></td><td><select size=\"1\" name=\"perm_$nr\" $acl>";
+ "value=\"$user\" $perm></td><td><select size=\"1\" name=\"perm_$nr\" $perm>";
foreach ($this->perms as $key => $value){
if ($acl == $key){
$tmp.= "<option value=$key selected>$value</option>";
$tmp.= "</select> ";
if ($nr == $count - 1){
$tmp.= "<input type=submit value=\""._("Add")."\" ".
- "name=\"add_$nr\" $acl>";
+ "name=\"add_$nr\" $perm>";
}
if ($count > 3){
$tmp.= "<input type=submit value=\""._("Remove")."\" ".
- "name=\"del_$nr\" $acl></td></tr>";
+ "name=\"del_$nr\" $perm></td></tr>";
}
}
$this->indexed_user[$nr]= $user;
$smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
}
if (is_numeric($this->gosaMailQuota) && $this->gosaMailQuota != 0){
- $smarty->assign("quotausage", $this->quotaUsage * 100 / $this->gosaMailQuota);
+ $smarty->assign("quotausage", progressbar(($this->quotaUsage * 100)/ $this->gosaMailQuota,100,15,true));
$smarty->assign("quotadefined", "true");
} else {
$smarty->assign("quotadefined", "false");
$message[]= _("Please enter a valid email addres in 'Primary address' field.");
}
$ldap->cd($this->config->current['BASE']);
- $ldap->search ("(&(|(mail=".$this->mail.")(gosaMailAlternateAddress=".
+ $ldap->search ("(&(!(objectClass=gosaUserTemplate))(|(mail=".$this->mail.")(gosaMailAlternateAddress=".
$this->mail."))(!(uid=".$this->cn."))(!(cn=".$this->cn.")))");
if ($ldap->count() != 0){
$message[]= _("The primary address you've entered is already in use.");
if (is_integer(strpos($this->gosaMailDeliveryMode, "reject")) && $this->gosaMailMaxSize == ""){
$message[]= _("You need to set the maximum mail size in order to reject anything.");
}
+
+ if(ord($this->imapacl['anyone'][0])==194){
+ $message[] = _("Please choose valid permission settings. Default permission can't be emtpy.");
+ }
+
+ if(empty($this->gosaMailServer)){
+ $message[] = _("Please select a valid mail server.");
+ }
return ($message);
}