From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 16 Nov 2006 06:04:39 +0000 (+0000)
Subject: Fixed userPassword change
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5538f2771cbe2fb35236e44b6803ea09245ca0f9;p=gosa.git

Fixed userPassword change
Fixed acls for user mail.


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

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 5d56063f9..ce9b646cc 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -210,7 +210,6 @@ class userManagement extends plugin
       $acl = $this->ui->get_permissions($dn, "users/password");
       $cacl= $this->ui->get_permissions($dn, "users/user");
 
-
       if (preg_match('/w/', $acl) || preg_match('/c/', $cacl)){
 
         /* Check input and feed errors into 'message' */
@@ -402,6 +401,7 @@ class userManagement extends plugin
 
           /* In case of new users, ask for a password, skip this for templates */
           if (($set_pass || $this->usertab->password_change_needed()) && !$this->is_template){
+            $this->dn = $this->usertab->dn;
             return($smarty->fetch(get_template_path('password.tpl', TRUE)));
           }
 
diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 327f90690..a2d259968 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -520,16 +520,16 @@ class mailAccount extends plugin
 
 
     if (!preg_match("/L/", $this->gosaMailDeliveryMode)) {
-      $smarty->assign("drop_own_mails", "checked");
+      $smarty->assign("only_local", "checked");
     } else {
-      $smarty->assign("drop_own_mails", "");
+      $smarty->assign("only_local", "");
     }
 
     $types = array(
           "V"=>"use_vacation",
           "S"=>"use_spam_filter",
           "R"=>"use_mailsize_limit",
-          "I"=>"only_local",
+          "I"=>"drop_own_mails",
           "C"=>"own_script");
 
     /* Fill checkboxes */
@@ -652,11 +652,11 @@ class mailAccount extends plugin
       $tmp= preg_replace("/[^a-z]/i","",$this->gosaMailDeliveryMode);
 
 
-      /* Handle delivery flags */ 
+      /* Handle delivery flags */
       if($this->acl_is_writeable("gosaMailDeliveryModeL")){
-        if(!preg_match("/L/",$tmp) && !isset($_POST['drop_own_mails'])){
+        if(!preg_match("/L/",$tmp) && !isset($_POST['only_local'])){
           $tmp.="L";
-        }elseif(preg_match("/L/",$tmp) && isset($_POST['drop_own_mails'])){
+        }elseif(preg_match("/L/",$tmp) && isset($_POST['only_local'])){
           $tmp = preg_replace("/L/","",$tmp);
         }
       }
@@ -666,7 +666,7 @@ class mailAccount extends plugin
           "S"   => "use_spam_filter",
           "V"   => "use_vacation",
           "C"   => "own_script",
-          "I"   => "only_local");
+          "I"   => "drop_own_mails");
 
       foreach($opts as $flag => $post){
         if($this->acl_is_writeable("gosaMailDeliveryMode".$flag)){
@@ -1020,7 +1020,7 @@ class mailAccount extends plugin
             "gosaMailDeliveryModeV"     =>  _("Add vacation information"),  // This is flag of gosaMailDeliveryMode
             "gosaVacationMessage"       =>  _("Vacation message"),
 
-            "gosaMailDeliveryModes"     =>  _("Use spam filter"),           // This is flag of gosaMailDeliveryMode
+            "gosaMailDeliveryModeS"     =>  _("Use spam filter"),           // This is flag of gosaMailDeliveryMode
             "gosaSpamSortLevel"         =>  _("Spam level"),
             "gosaSpamMailbox"           =>  _("Spam mail box"),
 
@@ -1029,7 +1029,7 @@ class mailAccount extends plugin
 
             "gosaMailForwardingAddress" =>  _("Forwarding address"),
             "gosaMailDeliveryModeL"     =>  _("Local delivery"),            // This is flag of gosaMailDeliveryMode
-            "gosaMailDeliveryModeI"     =>  _("Only insider delivery"),     // This is flag of gosaMailDeliveryMode
+            "gosaMailDeliveryModeI"     =>  _("No delivery to own mailbox "),     // This is flag of gosaMailDeliveryMode
             "gosaMailAlternateAddress"  =>  _("Mail alternative addresses"),
 
             "gosaMailForwardingAddress" =>  _("Forwarding address"),
diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index deb737ffa..157f739b3 100644
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -93,7 +93,7 @@
    &nbsp;
   </td>
   <td style="vertical-align:top;">
-{render acl=$gosaMailDeliveryModesACL}
+{render acl=$gosaMailDeliveryModeSACL}
    <input type=checkbox name="use_spam_filter" value="1" {$use_spam_filter} title="{t}Select if you want to filter this mails through spamassassin{/t}">
 {/render}
  <label for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</label>