From d6336a0c6f44b2bbf61ac56bad2beb3d570a1e23 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 28 Jun 2011 11:29:47 +0000
Subject: [PATCH] Fixed dialog handling for the user-generic plugin. -Do not
 show an empty page after user properties of the own account were changed.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@20924 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../plugins/personal/generic/class_user.inc   |  2 +-
 gosa-core/plugins/personal/generic/main.inc   | 75 ++++++++++---------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index f6de8cfad..b4224693b 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -110,7 +110,7 @@ class user extends plugin
 
   var $manager = "";
   var $manager_name = "";
-
+  var $passwordClass = NULL;
 
   /* attribute list for save action */
   var $attributes= array("sn", "givenName", "uid", "personalTitle", "academicTitle",
diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index b7cbfc87b..8eaa21235 100644
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -98,7 +98,9 @@ if ( $cleanup ){
               session::set('user',$user);
               $display.=$user->passwordClass->execute();
           } else {
-              session::un_set ('user');
+            $display.= $user->execute ();
+            session::un_set ('user');
+            session::un_set ('edit');
           }
 
       } else {
@@ -117,52 +119,53 @@ if ( $cleanup ){
       }else{
           $display.= $user->execute ();
       }
+  }
 
-      /* Store changes  in session */
-      if (session::is_set('edit')){
-          session::set('user',$user);
-      }
+  /* Store changes  in session */
+  if (session::is_set('edit')){
+      session::set('user',$user);
+  }
 
-      /* Show page footer depending on the mode */
-      if (!$user->cert_dialog && !$user->picture_dialog && !$user->dialog && $user->is_account && empty($lock_msg)){
-          $display.= "<p class=\"plugbottom\">";
+  /* Show page footer depending on the mode */
+  if (!$user->passwordClass && !$user->cert_dialog && !$user->picture_dialog && !$user->dialog && $user->is_account && empty($lock_msg)){
+      $display.= "<p class=\"plugbottom\">";
 
-          /* Are we in edit mode? */
-          if (session::is_set('edit')){
-              $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
-              $display.= "&nbsp;";
-              $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
+      /* Are we in edit mode? */
+      if (session::is_set('edit')){
+          $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
+          $display.= "&nbsp;";
+          $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
 
-              $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
-                  "\"> ".$ui->dn."&nbsp;";
+          $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
+              "\"> ".$ui->dn."&nbsp;";
+      } else {
+          /* 'viewid' may be set by i.e. the phonelist plugin. This
+             means that we want to go back... */
+          if (isset ($viewid)){
+              $str= msgPool::backButton();
+              $fn = "back";
           } else {
-              /* 'viewid' may be set by i.e. the phonelist plugin. This
-                 means that we want to go back... */
-              if (isset ($viewid)){
-                  $str= msgPool::backButton();
-                  $fn = "back";
-              } else {
-                  $str= msgPool::editButton();
-                  $fn = "edit";
-                  $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
-                      "\"> ".$ui->dn."&nbsp;";
-              }
+              $str= msgPool::editButton();
+              $fn = "edit";
+              $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
+                  "\"> ".$ui->dn."&nbsp;";
+          }
 
-              /* Only display edit button if there is at least one attribute editable */
-              if(preg_match("/r/",$ui->get_permissions($ui->dn,"users/user"))){
-                  if ($fn == "edit"){
-                      $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png')."\"> ".
-                          msgPool::clickEditToChange();
-                      $display.= "<input type=submit name=\"$fn\" value=\"$str\">\n";
-                  }
+          /* Only display edit button if there is at least one attribute editable */
+          if(preg_match("/r/",$ui->get_permissions($ui->dn,"users/user"))){
+              if ($fn == "edit"){
+                  $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png')."\"> ".
+                      msgPool::clickEditToChange();
+                  $display.= "<input type=submit name=\"$fn\" value=\"$str\">\n";
               }
-
-              $display.= "<input type=\"hidden\" name=\"ignore\">\n";
           }
-          $display.= "</p>\n";
+
+          $display.= "<input type=\"hidden\" name=\"ignore\">\n";
       }
+      $display.= "</p>\n";
   }
 
+
   /* Page header*/
   $display= print_header(get_template_path('plugins/generic/images/plugin.png'),
       _("Generic user information"), $info).$display;
-- 
2.30.2