From ef53932390e779130acc79344ba467c163e33c39 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 14 Sep 2009 10:00:15 +0000
Subject: [PATCH] Updated domain policy summary

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14248 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../samba/personal/samba/class_sambaAccount.inc  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index 8cf6e687c..58b94b965 100644
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -729,6 +729,7 @@ class sambaAccount extends plugin
       }
     }
     $smarty->assign("additional_info_PwdMustChange",$additional_info_PwdMustChange);
+    $smarty->assign("no_expiry",$this->no_expiry);
 
     /* Show main page */
     $smarty->assign("multiple_support",$this->multiple_support_active);
@@ -995,9 +996,18 @@ class sambaAccount extends plugin
       "\n<tr><td>"._("Last password update").":          </td><td>".$sambaPwdLastSet."</td></tr>".
       "\n<tr><td>"._("Last logon").":                    </td><td>".$sambaLogonTime."</td></tr>".
       "\n<tr><td>"._("Last logoff").":                   </td><td>".$sambaLogoffTime."</td></tr>".
-      "\n<tr><td>"._("Automatic logoff").":              </td><td>".$sambaKickoffTime."</td></tr>".
-      "\n<tr><td>"._("Password expires").":              </td><td>".$sambaPwdMustChange."</td></tr>".
-      "\n<tr><td>"._("Password change available").":     </td><td>".$sambaPwdCanChange."</td></tr>".
+      "\n<tr><td>"._("Automatic logoff").":              </td><td>".$sambaKickoffTime."</td></tr>";
+
+      if($this->no_expiry){
+        $str .= "\n<tr><td>"._("Password expires").":              </td><td>"._("No")."</td></tr>";
+        $str .= "\n<tr><td colspan='2'><font color='gray'>".
+          sprintf(_("The password would expire on %s, but the password expiry is disabled."),$sambaPwdMustChange).
+          "</font></td></tr>";
+      }else{
+        $str .= "\n<tr><td>"._("Password expires").":              </td><td>".$sambaPwdMustChange."</td></tr>";
+      }
+    
+      $str .= "\n<tr><td>"._("Password change available").":     </td><td>".$sambaPwdCanChange."</td></tr>".
       "\n</table>";
       "\n</div>";
     return($str);
-- 
2.30.2