From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 14 Jul 2008 11:39:39 +0000 (+0000)
Subject: Updated scalix.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8d6d38513cd2e780700a4e42c2357de0c6f350fa;p=gosa.git

Updated scalix.
-Display edit button if we have read access.
-Fixed ACL handling



git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11623 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc
index 6472d2611..6e2e3f5fb 100644
--- a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc
+++ b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc
@@ -155,7 +155,7 @@ class scalixAccount extends plugin
       "scalixLimitInboundMail", "scalixLimitNotifyUser", "scalixHideUserEntry", "scalixMailboxClass") as $val){
 
       $smarty->assign("$val", $this->$val);
-      $smarty->assign("$val"."ACL", $this->getacl($val));
+      $smarty->assign("$val"."ACL", $this->getacl($val, !session::is_set('edit')));
     }
 
     /* Fill checkboxes */
@@ -241,7 +241,7 @@ class scalixAccount extends plugin
       plugin::save_object();
 
       /* Check if given value is not empty */
-      if ($_POST['email_address'] != ""){
+      if (isset($_POST['email_address']) && !empty($_POST['email_address'])){
         $valid= FALSE;
 
         /* Valid mail address */
diff --git a/gosa-plugins/scalix/personal/scalix/main.inc b/gosa-plugins/scalix/personal/scalix/main.inc
index a18086ab2..4a3ef1d56 100644
--- a/gosa-plugins/scalix/personal/scalix/main.inc
+++ b/gosa-plugins/scalix/personal/scalix/main.inc
@@ -107,7 +107,7 @@ if (!$remove_lock){
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
              "\"> ".$ui->dn."&nbsp;";
 
-      if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/scalix"))){
+      if(preg_match("/r/",$ui->get_permissions($ui->dn,"users/scalixAccount"))){
         $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png')."\"> ".
                 _("Click the 'Edit' button below to change informations in this dialog");