Made password error messages visible

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

diff --git a/Changelog b/Changelog
index 3f5c0a4b6529e3f67a67cbf0c3f86cc67cbd4763..03acaaffda6d776abbc262b7208124c54bb888d7 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,7 @@ GOsa2 changelog
   - Fixed saving of terminal attribute gotoLpdEnable
   - Avoid reset of several attributes from workstations when not
     inherited from object groups.
+  - Show error messages from password dialog
 
 * gosa 2.5.4
   - Included patch to choose the addressbook base

diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc
index df07d11623bc9e282028dcf0dd2f26f28a0751be..22624f6d7b729eac6b202c2893dccbcd778dd0a5 100644 (file)
--- a/plugins/personal/password/main.inc
+++ b/plugins/personal/password/main.inc
@@ -18,11 +18,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-if (!$remove_lock){
+$display= "";
 
-  /* Assign headline image */
-  $smarty->assign ('headimage', get_template_path('images/password.png'));
-  $display= "";
+if (!$remove_lock){
 
   /* Check for interaction */
   if ($_SERVER["REQUEST_METHOD"] == "POST"){
@@ -115,5 +113,9 @@ if (!$remove_lock){
   }
 }
 
+/* Assign headline image */
+$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 ebd11d35041c7e2b9869f7dd0f5cc09cb069893b..a62a01352ff1adde217c72a780767929a413daf0 100644 (file)
--- a/plugins/personal/password/password.tpl
+++ b/plugins/personal/password/password.tpl
@@ -1,7 +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}
 </p>