Updated class password to handle expired accounts.

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

diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index d3a67be21a700989cd34307ecfbc974b8338b2c3..7006dc7772fdbb561bed6046677dc57684138079 100644 (file)
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -82,6 +82,9 @@ class password extends plugin
     $smarty->assign("proposalEnabled" , $this->proposalEnabled);
     $smarty->assign("proposalSelected" , $this->proposalSelected);
 
+    $smarty->assign("passwordExpired", ldap_expired_account($this->config, $ui->dn, $ui->uid) & POSIX_FORCE_PASSWORD_CHANGE);
+    
+
     if(isset($_POST['proposalSelected'])) $this->proposalSelected = get_post('proposalSelected') == 1;
 
 

diff --git a/gosa-core/plugins/personal/password/nochange.tpl b/gosa-core/plugins/personal/password/nochange.tpl
index 0f175c647d0854424b6b2624b6daf212224771a5..37d97f592028276e1ba454902de0f98e3366a061 100644 (file)
--- a/gosa-core/plugins/personal/password/nochange.tpl
+++ b/gosa-core/plugins/personal/password/nochange.tpl
@@ -1,11 +1,5 @@
-<div class="plugtop">
-  <img class="center" alt="" src="images/error.png" align="middle">{t}Password change not allowed{/t}>
-</div>
-
 <p>
  <b>{t}You have no permission to change your password at this time{/t}</b>
 </p>
 
-<br>
-
 <input type="hidden" name="ignore">

diff --git a/gosa-core/plugins/personal/password/password.tpl b/gosa-core/plugins/personal/password/password.tpl
index ab93bc83ff6ad7c790d954c68db5239755f832b2..5debdd8b6e1769e304d7675b9c6d76335b3eb29f 100644 (file)
--- a/gosa-core/plugins/personal/password/password.tpl
+++ b/gosa-core/plugins/personal/password/password.tpl
@@ -10,6 +10,11 @@
 
 <hr>
 
+{if $passwordExpired}
+    <b><font color='red'>{t}Your Password has expired. Please choose a new password.{/t}</font></b>
+<hr>
+{/if}
+
 {if !$proposalEnabled}
 
   <table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
@@ -79,8 +84,8 @@
       </td>
     </tr>
   </table>
-{/if}
 
+{/if}
 
 <br>