Updated several classes.

[gosa.git] / plugins / personal / generic / main.inc

diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index 732086a20053df3dd9148f760cd69bbebcbbc982..81b90229036d00c9f9598bc995847c40c7154625 100644 (file)
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -43,7 +43,7 @@ if (!$remove_lock){
   }
 
   /* Enter edit mode? */
-  if (isset($_POST['edit'])){
+  if ((isset($_POST['edit'])) && (!isset( $_SESSION['edit']))){
 
     /* Check locking */
     if (($username= get_lock($ui->dn)) != ""){
@@ -109,6 +109,7 @@ if (!$remove_lock){
 
     $user->acl= "#none#";
     del_lock ($ui->dn);
+    sess_del ('user');
   }
 
   /* save changes to LDAP and disable edit mode */
@@ -122,16 +123,19 @@ if (!$remove_lock){
       $user->save ();
       gosa_log ("User/generic object'".$ui->dn."' has been saved");
       $user->acl= "#none#";
+      $editacl= get_module_permission($acl, "user", $ui->dn);
       del_lock ($ui->dn);
       sess_del ('edit');
 
-      /* Save object */
-      $_SESSION['user']= $user;
-
       /* Need to reset the password? */
       if($user->password_change_needed()){
+        /* Save object */
+        $_SESSION['user']= $user;
+
         $display.= $smarty->fetch(get_template_path('password.tpl', TRUE));
         return ($display);
+      } else {
+       sess_del ('user');
       }
 
     } else {
@@ -155,10 +159,9 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-      $display.="<script language='javascript'>";
 
       $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
              "\"> ".$ui->dn."&nbsp;";
@@ -171,9 +174,10 @@ if (!$remove_lock){
       } else {
         $str= _("Edit");
         $fn = "edit";
-        $info= "<img class\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
+        $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
                "\"> ".$ui->dn."&nbsp;";
       }
+
       if ($fn == "edit" && isset($editacl) && $editacl != "#none#"){
         $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\"> ".
                 _("Click the 'Edit' button below to change informations in this dialog");