From a6c6ccf124b7162f8de128e9c86584ce34b0c34d Mon Sep 17 00:00:00 2001
From: katagia <katagia>
Date: Fri, 29 Aug 2003 11:21:02 +0000
Subject: [PATCH] fixed readme modified pdf.inc   corrected unix expiredate &
 shell

---
 lam/docs/README.lamdaemon.pl |  2 +-
 lam/lib/pdf.inc              | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lam/docs/README.lamdaemon.pl b/lam/docs/README.lamdaemon.pl
index 53f9c796..65c17d34 100644
--- a/lam/docs/README.lamdaemon.pl
+++ b/lam/docs/README.lamdaemon.pl
@@ -29,7 +29,7 @@ thins to get it work.
    Therefore you should disable logging so the password doesn't
    apear in any logfile
    This can be done by adding the following line:
-   Defaults:$admin !syslog logfile=/dev/null
+   Defaults:$admin !syslog
    
 4. Set up perl
    We need some external perl-modules, Quota and Net::LDAP
diff --git a/lam/lib/pdf.inc b/lam/lib/pdf.inc
index 7f8944e6..8bf069b1 100644
--- a/lam/lib/pdf.inc
+++ b/lam/lib/pdf.inc
@@ -82,16 +82,8 @@ function createUserPDF($accounts) {
 		$pdfFile->Cell(50,5,_("Login Shell(s)") . ":",0,0,"R",0);
 		$text = "";
 		$shells = $account->general_shell;
-		for($j=0;$j<count($shells);$j++) {
-			if($j == 0 || count($shells) == 1) {
-				$text = $shells[$j];
-			}
-			else {
-				$text .= ", " . $shells[$j];
-			}
-		}
 		$pdfFile->setFont("times","B",10);
-		$pdfFile->Cell(50,5,$text,0,1,"L",0);
+		$pdfFile->Cell(50,5,$account->general_shell,0,1,"L",0);
 		$pdfFile->Ln(9);
 		$pdfFile->setFont("arial","B",12);
 // Print Unix settings
@@ -116,7 +108,7 @@ function createUserPDF($accounts) {
 		$pdfFile->setFont("times","",10);
 		$pdfFile->Cell(50,5,_("Password expire") . ":",0,0,"R",0);
 		$pdfFile->setFont("times","B",10);
-		$pdfFile->Cell(50,5,$account->unix_pwdexpire,0,1,"L",0);
+		$pdfFile->Cell(50,5,date('j. F Y' ,$account->unix_pwdexpire),0,1,"L",0);
 		$pdfFile->setFont("times","",10);
 		$pdfFile->Cell(50,5,_("Login at host(s)") . ":",0,0,"R",0);
 		$pdfFile->setFont("times","B",10);