From c24e96843d95f688caac73f4a02f6152bda860c9 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 2 Nov 2006 12:10:39 +0000
Subject: [PATCH] Fixed password change acls & messages

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4998 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/personal/password/changed.tpl  | 4 ----
 plugins/personal/password/main.inc     | 8 +++++++-
 plugins/personal/password/password.tpl | 3 ---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/personal/password/changed.tpl b/plugins/personal/password/changed.tpl
index 375519fed..b74ea4059 100644
--- a/plugins/personal/password/changed.tpl
+++ b/plugins/personal/password/changed.tpl
@@ -1,7 +1,3 @@
-<div class="plugtop">
-  <img class="center" alt="" src="{$headimage}" align="middle">{t}Change password{/t}
-</div>
-
 <p>
  <b>{t}You've successfully changed your password. Remember to change all programms configured to use it as well.{/t}</b>
 </p>
diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc
index 6ea7333c2..0d21e6d13 100644
--- a/plugins/personal/password/main.inc
+++ b/plugins/personal/password/main.inc
@@ -18,10 +18,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+$display = "";
 if (!$remove_lock){
 
   /* Assign headline image */
-  $smarty->assign ('headimage', get_template_path('images/password.png'));
+  $smarty->assign ('headimage',"");
   $display= "";
 
   $password_ACLS = $ui->get_permissions($ui->dn,"users/password");
@@ -74,8 +75,10 @@ if (!$remove_lock){
       }
 
       if (count ($message) != 0){
+
         /* Show error message and continue editing */
         show_errors($message);
+
       } else {
 
         /* Passed quality check, just try to change the password now */
@@ -117,5 +120,8 @@ if (!$remove_lock){
   }
 }
 
+$display = print_header(get_template_path('images/password.png'),_("Change password"), "").$display;
+
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
diff --git a/plugins/personal/password/password.tpl b/plugins/personal/password/password.tpl
index ef813db5e..bf299e1e4 100644
--- a/plugins/personal/password/password.tpl
+++ b/plugins/personal/password/password.tpl
@@ -1,6 +1,3 @@
-<div class="plugtop">
-  <img alt="" src="{$headimage}" align=middle>{t}Change password{/t}
-</div>
 
 <p>
   {t}To change your personal password use the fields below. The changes take effect immediately. Please memorize the new password, because you wouldn't be able to login without it.{/t}
-- 
2.30.2