expiration date placeholder for jobs
This commit is contained in:
parent
b627bc7088
commit
edef026b24
|
@ -8,6 +8,7 @@ March 2016 5.3
|
||||||
-> autoload errors in tree view
|
-> autoload errors in tree view
|
||||||
- LAM Pro:
|
- LAM Pro:
|
||||||
-> Support for LDAP views based on nsview object class
|
-> Support for LDAP views based on nsview object class
|
||||||
|
-> Password notification jobs support to print expiration date in email
|
||||||
|
|
||||||
|
|
||||||
15.12.2015 5.2
|
15.12.2015 5.2
|
||||||
|
|
|
@ -2076,6 +2076,11 @@ mysql> GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
|
||||||
<para>You can enter LDAP attributes as wildcards in the form
|
<para>You can enter LDAP attributes as wildcards in the form
|
||||||
@@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
|
@@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
|
||||||
For the common name it would be "@@cn@@".</para>
|
For the common name it would be "@@cn@@".</para>
|
||||||
|
|
||||||
|
<para>There are also two special wildcards for the expiration date.
|
||||||
|
@@EXPIRE_DATE_DDMMYYYY@@ will print the date as e.g. "31.12.2016".
|
||||||
|
@@EXPIRE_DATE_YYYYMMDD@@ will print the date as e.g.
|
||||||
|
"2016-12-31".</para>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
|
@ -2160,6 +2165,11 @@ mysql> GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
|
||||||
<para>You can enter LDAP attributes as wildcards in the form
|
<para>You can enter LDAP attributes as wildcards in the form
|
||||||
@@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
|
@@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
|
||||||
For the common name it would be "@@cn@@".</para>
|
For the common name it would be "@@cn@@".</para>
|
||||||
|
|
||||||
|
<para>There are also two special wildcards for the expiration date.
|
||||||
|
@@EXPIRE_DATE_DDMMYYYY@@ will print the date as e.g. "31.12.2016".
|
||||||
|
@@EXPIRE_DATE_YYYYMMDD@@ will print the date as e.g.
|
||||||
|
"2016-12-31".</para>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
|
@ -2235,6 +2245,11 @@ mysql> GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
|
||||||
<para>You can enter LDAP attributes as wildcards in the form
|
<para>You can enter LDAP attributes as wildcards in the form
|
||||||
@@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
|
@@ATTRIBUTE_NAME@@. E.g. to add the user's common name use "@@cn@@".
|
||||||
For the common name it would be "@@cn@@".</para>
|
For the common name it would be "@@cn@@".</para>
|
||||||
|
|
||||||
|
<para>There are also two special wildcards for the expiration date.
|
||||||
|
@@EXPIRE_DATE_DDMMYYYY@@ will print the date as e.g. "31.12.2016".
|
||||||
|
@@EXPIRE_DATE_YYYYMMDD@@ will print the date as e.g.
|
||||||
|
"2016-12-31".</para>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
$Id$
|
$Id$
|
||||||
|
|
||||||
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
|
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
|
||||||
Copyright (C) 2009 Roland Gruber
|
Copyright (C) 2009 - 2016 Roland Gruber
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -85,6 +85,8 @@ div.mediaobject img {
|
||||||
|
|
||||||
h1 { color:#253aa3; }
|
h1 { color:#253aa3; }
|
||||||
h2 { color:#000080; font-size:13pt; }
|
h2 { color:#000080; font-size:13pt; }
|
||||||
|
h3 { color:#000080; }
|
||||||
|
h4 { color:#000080; }
|
||||||
|
|
||||||
div.nogrid table {
|
div.nogrid table {
|
||||||
border-width:2px;
|
border-width:2px;
|
||||||
|
|
|
@ -885,7 +885,7 @@ if (interface_exists('\LAM\JOB\Job', false)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// send email
|
// send email
|
||||||
$success = $this->sendMail($options, $jobID, $user);
|
$success = $this->sendMail($options, $jobID, $user, $expireTime);
|
||||||
// update DB if mail was sent successfully
|
// update DB if mail was sent successfully
|
||||||
if ($success) {
|
if ($success) {
|
||||||
$this->setDBLastPwdChangeTime($jobID, $pdo, $user['dn'], $user['shadowlastchange'][0]);
|
$this->setDBLastPwdChangeTime($jobID, $pdo, $user['dn'], $user['shadowlastchange'][0]);
|
||||||
|
|
|
@ -3300,7 +3300,7 @@ if (interface_exists('\LAM\JOB\Job', false)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// send email
|
// send email
|
||||||
$success = $this->sendMail($options, $jobID, $user);
|
$success = $this->sendMail($options, $jobID, $user, $expireTime);
|
||||||
// update DB if mail was sent successfully
|
// update DB if mail was sent successfully
|
||||||
if ($success) {
|
if ($success) {
|
||||||
$this->setDBLastPwdChangeTime($jobID, $pdo, $user['dn'], $user['pwdlastset'][0]);
|
$this->setDBLastPwdChangeTime($jobID, $pdo, $user['dn'], $user['pwdlastset'][0]);
|
||||||
|
|
Loading…
Reference in New Issue