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

display DN of group of names

This commit is contained in:
Roland Gruber 2018-02-09 20:33:35 +01:00
parent 8b89cfc4db
commit fb364cbeb7
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lam/lib/modules/posixAccount.inc
View File

@ -1587,14 +1587,11 @@ class posixAccount extends baseModule implements passwordService {
$unixContainer->addElement($addSelect, true); $unixContainer->addElement($addSelect, true);
} }
$return->addElement($unixContainer); $return->addElement($unixContainer, true);
$return->addVerticalSpace('3rem');
} }
if (self::areGroupOfNamesActive() && !$this->isBooleanConfigOptionSet('posixAccount_hidegon')) { if (self::areGroupOfNamesActive() && !$this->isBooleanConfigOptionSet('posixAccount_hidegon')) {
if (!$this->isBooleanConfigOptionSet('posixAccount_hideposixGroups')) {
$return->addElement(new htmlSpacer('100px', null));
}
$gons = $this->findGroupOfNames(); $gons = $this->findGroupOfNames();
$gonContainer = new htmlTable(); $gonContainer = new htmlTable();
@ -1608,20 +1605,24 @@ class posixAccount extends baseModule implements passwordService {
$selectedGons = array(); $selectedGons = array();
for ($i = 0; $i < sizeof($this->gonList); $i++) { for ($i = 0; $i < sizeof($this->gonList); $i++) {
if (isset($gons[$this->gonList[$i]])) { if (isset($gons[$this->gonList[$i]])) {
$selectedGons[$gons[$this->gonList[$i]]['cn'][0]] = $this->gonList[$i]; $selectedGons[getAbstractDN($this->gonList[$i])] = $this->gonList[$i];
} }
} }
uksort($selectedGons, 'compareDN');
$availableGons = array(); $availableGons = array();
foreach ($gons as $dn => $attr) { foreach ($gons as $dn => $attr) {
if (!in_array($dn, $this->gonList)) { if (!in_array($dn, $this->gonList)) {
$availableGons[$attr['cn'][0]] = $dn; $availableGons[getAbstractDN($dn)] = $dn;
} }
} }
uksort($availableGons, 'compareDN');
$remGonSelect = new htmlSelect('removegons', $selectedGons, null, 15); $remGonSelect = new htmlSelect('removegons', $selectedGons, null, 15);
$remGonSelect->setMultiSelect(true); $remGonSelect->setMultiSelect(true);
$remGonSelect->setTransformSingleSelect(false); $remGonSelect->setTransformSingleSelect(false);
$remGonSelect->setHasDescriptiveElements(true); $remGonSelect->setHasDescriptiveElements(true);
$remGonSelect->setSortElements(false);
$remGonSelect->setRightToLeftTextDirection(true);
$gonContainer->addElement($remGonSelect); $gonContainer->addElement($remGonSelect);
$buttonGonContainer = new htmlTable(); $buttonGonContainer = new htmlTable();
$buttonGonContainer->addElement(new htmlButton('addgons_button', 'back.gif', true), true); $buttonGonContainer->addElement(new htmlButton('addgons_button', 'back.gif', true), true);
@ -1632,19 +1633,16 @@ class posixAccount extends baseModule implements passwordService {
$addGonSelect->setMultiSelect(true); $addGonSelect->setMultiSelect(true);
$addGonSelect->setHasDescriptiveElements(true); $addGonSelect->setHasDescriptiveElements(true);
$addGonSelect->setTransformSingleSelect(false); $addGonSelect->setTransformSingleSelect(false);
$addGonSelect->setSortElements(false);
$addGonSelect->setRightToLeftTextDirection(true);
$gonContainer->addElement($addGonSelect); $gonContainer->addElement($addGonSelect);
$gonContainer->addNewLine(); $gonContainer->addNewLine();
$return->addElement($gonContainer); $return->addElement($gonContainer, true);
$return->addVerticalSpace('3rem');
} }
$return->addNewLine();
$backGroup = new htmlGroup();
$backGroup->colspan = 10;
$backGroup->addElement(new htmlSpacer(null, '10px'), true);
$backButton = new htmlAccountPageButton(get_class($this), 'attributes', 'back', _('Back')); $backButton = new htmlAccountPageButton(get_class($this), 'attributes', 'back', _('Back'));
$backGroup->addElement($backButton); $return->addElement($backButton);
$return->addElement($backGroup);
return $return; return $return;
} }
@ -1887,15 +1885,16 @@ class posixAccount extends baseModule implements passwordService {
$this->addSimplePDFField($return, 'loginShell', _('Login shell')); $this->addSimplePDFField($return, 'loginShell', _('Login shell'));
$this->addSimplePDFField($return, 'gecos', _('Gecos')); $this->addSimplePDFField($return, 'gecos', _('Gecos'));
if (self::areGroupOfNamesActive()) { if (self::areGroupOfNamesActive()) {
$allGons = $this->findGroupOfNames();
$gons = array(); $gons = array();
for ($i = 0; $i < sizeof($this->gonList); $i++) { for ($i = 0; $i < sizeof($this->gonList); $i++) {
if (isset($allGons[$this->gonList[$i]])) { $gons[] = $this->gonList[$i];
$gons[] = $allGons[$this->gonList[$i]]['cn'][0];
}
} }
natcasesort($gons); usort($gons, 'compareDN');
$this->addPDFKeyValue($return, 'gon', _('Groups of names'), implode(", ", $gons)); $gonCount = sizeof($gons);
for ($i = 0; $i < $gonCount; $i++) {
$gons[$i] = getAbstractDN($gons[$i]);
}
$this->addPDFKeyValue($return, 'gon', _('Groups of names'), $gons, "\n");
} }
if (isset($this->clearTextPassword)) { if (isset($this->clearTextPassword)) {
$this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->clearTextPassword); $this->addPDFKeyValue($return, 'userPassword', _('Password'), $this->clearTextPassword);

4
lam/lib/pdf.inc
View File

@ -3,7 +3,7 @@ namespace LAM\PDF;
/* /*
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) 2003 - 2004 Michael Duergner Copyright (C) 2003 - 2004 Michael Duergner
2003 - 2017 Roland Gruber 2003 - 2018 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
@ -88,7 +88,7 @@ function createModulePDF($accounts, $pdf_structure="default", $font, $returnAsSt
* to create the PDF page. If not submitted the 'default.user' structure definition * to create the PDF page. If not submitted the 'default.user' structure definition
* for the appropriate account type. * for the appropriate account type.
* @param string $font font to use * @param string $font font to use
* @param $returnAsString returns the PDF output as String value instead of writing it to a file * @param boolean $returnAsString returns the PDF output as String value instead of writing it to a file
* @return String PDF file name * @return String PDF file name
*/ */
function createPdf($structure, $accounts, $pdfKeys, $account_type, $font, $returnAsString) { function createPdf($structure, $accounts, $pdfKeys, $account_type, $font, $returnAsString) {