From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 5 Oct 2009 06:32:14 +0000 (+0000)
Subject: Additionally show SID of the user in info dialog
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1d7d181882abaaa5ed9ced634dbbc8e29d0a7455;p=gosa.git

Additionally show SID of the user in info dialog


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

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index 86bd9ebdd..a7928ba6a 100644
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -700,7 +700,7 @@ class sambaAccount extends plugin
     /* User attributes 
      */
     $user_attributes = array("sambaBadPasswordTime","sambaPwdLastSet","sambaLogonTime","sambaLogoffTime",
-        "sambaKickoffTime","sambaPwdCanChange","sambaPwdMustChange","sambaBadPasswordCount");
+        "sambaKickoffTime","sambaPwdCanChange","sambaPwdMustChange","sambaBadPasswordCount", "sambaSID");
 
     /* Get samba SID object and parse settings.
      */  
@@ -725,12 +725,16 @@ class sambaAccount extends plugin
     if($this->password_expires){
       $sambaPwdMustChange = $this->sambaPwdMustChange;
     } else {
-      $sambaPwdMustChange= date('d.m.Y', $sambaPwdMustChange);
+      if (is_numeric($sambaPwdMustChange)) {
+        $sambaPwdMustChange= date('d.m.Y', $sambaPwdMustChange);
+      }
     }
     if($this->kickoff_time_set){
       $sambaKickoffTime = $this->sambaKickoffTime;
     } else {
-      $sambaKickoffTime= date('d.m.Y', $sambaKickoffTime);
+      if (is_numeric($sambaKickoffTime)) {
+        $sambaKickoffTime= date('d.m.Y', $sambaKickoffTime);
+      }
     }
     $sambaPwdCanChange = $this->sambaPwdCanChange;
 
@@ -892,6 +896,7 @@ class sambaAccount extends plugin
       "\n<tr><td>"._("Refuse machine password change").":</td><td>".$sambaRefuseMachinePwdChange."</td></tr>".
       "\n<tr><td>&nbsp;</td></tr>". 
       "\n<tr><td><b>"._("User attributes")."</b></td></tr>". 
+      "\n<tr><td>"._("SID").":                           </td><td>".$sambaSID."</td></tr>".
       "\n<tr><td>"._("Last failed login").":             </td><td>".$sambaBadPasswordTime."</td></tr>".
       "\n<tr><td>"._("Logon attempts").":                </td><td>".$sambaBadPasswordCount."</td></tr>".
       "\n<tr><td>"._("Last password update").":          </td><td>".$sambaPwdLastSet."</td></tr>".