Made mail plugin w3c conform

Removed acls from main.inc

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

diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index ec5c56522ebdaf64967bf9918e23bc11f344dc31..9ce629b3a4b37b054c5bf131b137656feb98251c 100644 (file)
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -40,7 +40,7 @@
      <td><label for="gosaMailQuota">{t}Quota size{/t}</label></td>
      <td>
 {render acl=$gosaMailQuotaACL}
-      <input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60" {$gosaMailQuotaACL}
+      <input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60" 
                value="{$gosaMailQuota}"> MB
 {/render}
      </td>
@@ -114,11 +114,11 @@
 {/render}
    <br>
 {render acl=$gosaMailDeliveryModeRACL}
-   <input type=checkbox name="use_mailsize_limit" value="1" {$use_mailsize_limit}
+   <input type=checkbox name="use_mailsize_limit" value="1" {$use_mailsize_limit}>
        <label for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</label> 
 {/render}
 {render acl=$gosaMailMaxSizeACL}
-   <input id="gosaMailMaxSize" name="gosaMailMaxSize" size="6" align="middle" maxlength="30" {$gosaMailMaxSizeACL}
+   <input id="gosaMailMaxSize" name="gosaMailMaxSize" size="6" align="middle" maxlength="30"
        value="{$gosaMailMaxSize}"> {t}MB{/t}
 {/render}
   </td>

diff --git a/plugins/personal/mail/main.inc b/plugins/personal/mail/main.inc
index e7c0a7a36cb73cdc23f59e260960e924f38805fa..e51ed01d7619c1a8d14544a3595ddc165ea06e2f 100644 (file)
--- a/plugins/personal/mail/main.inc
+++ b/plugins/personal/mail/main.inc
@@ -30,6 +30,8 @@ if (!$remove_lock){
   /* Create mail object on demand */
   if (!isset($_SESSION['mailAccount']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
     $_SESSION['mailAccount']= new mailAccount ($config, $ui->dn);
+    $_SESSION['mailAccount']->set_acl_base($ui->dn);
+    $_SESSION['mailAccount']->set_acl_category("users");
   }
   $mailAccount= $_SESSION['mailAccount'];
 
@@ -54,16 +56,6 @@ if (!$remove_lock){
     $_SESSION['edit']= TRUE;
   }
 
-  /* Adjust acl's to mode */
-  if (isset($_SESSION['edit'])){
-    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $mailAccount->acl= get_module_permission($acl, "mail", $ui->dn);
-  } else {
-    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $editacl= get_module_permission($acl, "mail", $ui->dn);
-    $mailAccount->acl= "#none#";
-  }
-
   /* save changes to LDAP and disable edit mode */
   if (isset($_POST['edit_finish'])){
 
@@ -74,7 +66,6 @@ if (!$remove_lock){
     if (count ($message) == 0){
       $mailAccount->save ();
       gosa_log ("User/mail object'".$ui->dn."' has been saved");
-      $mailAccount->acl= "#none#";
       del_lock ($ui->dn);
       sess_del ('edit');
 
@@ -109,11 +100,11 @@ if (!$remove_lock){
     } else {
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
              "\"> ".$ui->dn."&nbsp;";
-      if (isset($editacl) && $editacl != "#none#"){
+      
+      $display.= "Add acl check for edit button.";;
         $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png').
             "\"> "._("Click the 'Edit' button below to change informations in this dialog");
         $display.= "<input type=submit name=\"edit\" value=\""._("Edit")."\">\n";
-      }
 
       $display.= "<input type=\"hidden\" name=\"ignore\">\n";
     }