WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added password to PDF fields

This commit is contained in:
Roland Gruber 2016-06-19 11:41:47 +02:00
parent 60b57e12f0
commit cfc5aee617
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lam/lib/modules/inetOrgPerson.inc
View File

@ -149,7 +149,7 @@ class inetOrgPerson extends baseModule implements passwordService {
'title', 'telephoneNumber', 'facsimileTelephoneNumber', 'street', 'postOfficeBox', 'postalCode', 'postalAddress', 'title', 'telephoneNumber', 'facsimileTelephoneNumber', 'street', 'postOfficeBox', 'postalCode', 'postalAddress',
'sn', 'userPassword', 'description', 'homePhone', 'pager', 'roomNumber', 'businessCategory', 'l', 'st', 'sn', 'userPassword', 'description', 'homePhone', 'pager', 'roomNumber', 'businessCategory', 'l', 'st',
'physicalDeliveryOfficeName', 'carLicense', 'departmentNumber', 'o', 'employeeNumber', 'initials', 'physicalDeliveryOfficeName', 'carLicense', 'departmentNumber', 'o', 'employeeNumber', 'initials',
'registeredAddress', 'labeledURI', 'ou', 'userCertificate;binary'); 'registeredAddress', 'labeledURI', 'ou', 'userCertificate;binary', 'INFO.userPasswordClearText');
if (!$this->isUnixActive()) { if (!$this->isUnixActive()) {
$return['attributes'][] = 'cn'; $return['attributes'][] = 'cn';
} }
@ -632,12 +632,12 @@ class inetOrgPerson extends baseModule implements passwordService {
} }
if (isLoggedIn()) { if (isLoggedIn()) {
$modules = $_SESSION['config']->get_AccountModules($this->get_scope()); if (!$this->isUnixActive()) {
if (!in_array('posixAccount', $modules)) {
if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideUID')) { if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideUID')) {
$return['PDF_fields']['uid'] = _('User name'); $return['PDF_fields']['uid'] = _('User name');
} }
$return['PDF_fields']['cn'] = _('Common name'); $return['PDF_fields']['cn'] = _('Common name');
$return['PDF_fields']['userPassword'] = _('Password');
} }
} }
// help Entries // help Entries
@ -893,8 +893,7 @@ class inetOrgPerson extends baseModule implements passwordService {
} }
} }
if (!isset($this->attributes['sn'][0]) || ($this->attributes['sn'][0] == '')) return false; if (!isset($this->attributes['sn'][0]) || ($this->attributes['sn'][0] == '')) return false;
$modules = $_SESSION['config']->get_AccountModules($this->get_scope()); if (!$this->isUnixActive()) {
if (!in_array('posixAccount', $modules)) {
if (($this->getAccountContainer()->rdn == 'uid') && !isset($this->attributes['uid'][0])) { if (($this->getAccountContainer()->rdn == 'uid') && !isset($this->attributes['uid'][0])) {
return false; return false;
} }
@ -2009,6 +2008,12 @@ class inetOrgPerson extends baseModule implements passwordService {
$this->addSimplePDFField($return, 'initials', _('Initials')); $this->addSimplePDFField($return, 'initials', _('Initials'));
$this->addSimplePDFField($return, 'labeledURI', _('Web site')); $this->addSimplePDFField($return, 'labeledURI', _('Web site'));
$this->addSimplePDFField($return, 'departmentNumber', _('Department')); $this->addSimplePDFField($return, 'departmentNumber', _('Department'));
if (isset($this->clearTextPassword)) {
$this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->clearTextPassword);
}
else if (isset($this->attributes['INFO.userPasswordClearText'])) {
$this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->attributes['INFO.userPasswordClearText']);
}
return $return; return $return;
} }
@ -3432,8 +3437,7 @@ class inetOrgPerson extends baseModule implements passwordService {
* @return boolean true if this module manages password attributes * @return boolean true if this module manages password attributes
*/ */
public function managesPasswordAttributes() { public function managesPasswordAttributes() {
$modules = $_SESSION['config']->get_AccountModules($this->get_scope()); if (!$this->isUnixActive()) {
if (!in_array('posixAccount', $modules)) {
return !$this->isAdminReadOnly('userPassword'); return !$this->isAdminReadOnly('userPassword');
} }
return false; return false;