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

responsive self service

This commit is contained in:
Roland Gruber 2015-08-04 18:41:12 +00:00
parent 22bbbe05db
commit a2f5dae6b3
5 changed files with 94 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lam/lib/baseModule.inc
View File

@ -1412,9 +1412,10 @@ abstract class baseModule {
if (!$isTextArea && !in_array($name, $readOnlyFields)) { if (!$isTextArea && !in_array($name, $readOnlyFields)) {
$field = new htmlInputField(get_class($this) . '_' . $name, $value); $field = new htmlInputField(get_class($this) . '_' . $name, $value);
$field->setRequired($required); $field->setRequired($required);
$field->setFieldSize(null);
} }
elseif ($isTextArea && !in_array($name, $readOnlyFields)) { elseif ($isTextArea && !in_array($name, $readOnlyFields)) {
$field = new htmlInputTextarea(get_class($this) . '_' . $name, $value, 30, 3); $field = new htmlInputTextarea(get_class($this) . '_' . $name, $value, null, null);
} }
else { else {
if (!$isTextArea) { if (!$isTextArea) {
@ -1426,9 +1427,10 @@ abstract class baseModule {
$field = new htmlOutputText($value, false); $field = new htmlOutputText($value, false);
} }
} }
$container[$name] = new htmlTableRow(array( $row = new htmlResponsiveRow();
new htmlOutputText($this->getSelfServiceLabel($name, $label)), $field $row->add(new htmlOutputText($this->getSelfServiceLabel($name, $label)), 12, 6, 6, 'tabletPlus-align-right mobile-align-left');
)); $row->add($field, 12, 6, 6, 'tabletPlus-align-left');
$container[$name] = $row;
} }
/** /**
@ -1610,7 +1612,7 @@ abstract class baseModule {
* @param array $attributes attributes of LDAP account * @param array $attributes attributes of LDAP account
* @param boolean $passwordChangeOnly indicates that the user is only allowed to change his password and no LDAP content is readable * @param boolean $passwordChangeOnly indicates that the user is only allowed to change his password and no LDAP content is readable
* @param array $readOnlyFields list of read-only fields * @param array $readOnlyFields list of read-only fields
* @return array list of meta HTML elements (field name => htmlTableRow) * @return array list of meta HTML elements (field name => htmlResponsiveRow)
* *
* @see htmlElement * @see htmlElement
*/ */

8
lam/lib/html.inc
View File

@ -955,6 +955,10 @@ class htmlButton extends htmlElement {
elseif ($this->iconClass == null) { elseif ($this->iconClass == null) {
$classList[] = 'smallPadding'; $classList[] = 'smallPadding';
} }
// button with text and icon
else {
$classList[] = 'margin5';
}
if (sizeof($classList) > 0) { if (sizeof($classList) > 0) {
$class = ' class="' . implode(' ', $classList) . '"'; $class = ' class="' . implode(' ', $classList) . '"';
} }
@ -2215,8 +2219,8 @@ class htmlInputTextarea extends htmlElement {
if (isset($values[$this->name])) { if (isset($values[$this->name])) {
$this->value = implode("\r\n", $values[$this->name]); $this->value = implode("\r\n", $values[$this->name]);
} }
$colCount = ' cols="' . $this->colCount . '"'; $colCount = ($this->colCount != null) ? ' cols="' . $this->colCount . '"' : '';
$rowCount = ' rows="' . $this->rowCount . '"'; $rowCount = ($this->rowCount != null) ? ' rows="' . $this->rowCount . '"' : '';
$tabindexValue = ' tabindex="' . $tabindex . '"'; $tabindexValue = ' tabindex="' . $tabindex . '"';
$tabindex++; $tabindex++;
$disabled = ''; $disabled = '';

131
lam/lib/modules/windowsUser.inc
View File

@ -33,7 +33,7 @@ $Id$
* @package modules * @package modules
*/ */
class windowsUser extends baseModule implements passwordService { class windowsUser extends baseModule implements passwordService {
/** initial account flags */ /** initial account flags */
const DEFAULT_ACCOUNT_CONTROL = 0x00000200; const DEFAULT_ACCOUNT_CONTROL = 0x00000200;
/** password never expires */ /** password never expires */
@ -44,7 +44,7 @@ class windowsUser extends baseModule implements passwordService {
const AC_ACCOUNT_DISABLED = 0x00000002; const AC_ACCOUNT_DISABLED = 0x00000002;
/** currently locked out, read only flag */ /** currently locked out, read only flag */
const AC_LOCKED_OUT = 0x00000010; const AC_LOCKED_OUT = 0x00000010;
/** current group of names list */ /** current group of names list */
private $groupList = array(); private $groupList = array();
/** original group of names list */ /** original group of names list */
@ -55,11 +55,11 @@ class windowsUser extends baseModule implements passwordService {
private $pwdLastSet = null; private $pwdLastSet = null;
/** clear text password */ /** clear text password */
private $clearTextPassword; private $clearTextPassword;
/** /**
* Returns true if this module can manage accounts of the current type, otherwise false. * Returns true if this module can manage accounts of the current type, otherwise false.
* *
* @return boolean true if module fits * @return boolean true if module fits
*/ */
public function can_manage() { public function can_manage() {
@ -70,7 +70,7 @@ class windowsUser extends baseModule implements passwordService {
* Returns meta data that is interpreted by parent class * Returns meta data that is interpreted by parent class
* *
* @return array array with meta data * @return array array with meta data
* *
* @see baseModule::get_metaData() * @see baseModule::get_metaData()
*/ */
public function get_metaData() { public function get_metaData() {
@ -569,7 +569,7 @@ class windowsUser extends baseModule implements passwordService {
$return['config_options']['all'] = $configContainer; $return['config_options']['all'] = $configContainer;
return $return; return $return;
} }
/** /**
* Initializes the module after it became part of an accountContainer * Initializes the module after it became part of an accountContainer
* *
@ -620,7 +620,7 @@ class windowsUser extends baseModule implements passwordService {
$this->messages['msSFU30Name'][0] = array('ERROR', _('NIS name'), _('NIS name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); $this->messages['msSFU30Name'][0] = array('ERROR', _('NIS name'), _('NIS name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
$this->messages['msSFU30Name'][1] = array('ERROR', _('Account %s:') . ' windowsUser_msSFU30Name', _('NIS name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); $this->messages['msSFU30Name'][1] = array('ERROR', _('Account %s:') . ' windowsUser_msSFU30Name', _('NIS name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'));
} }
/** /**
* This function loads all needed LDAP attributes. * This function loads all needed LDAP attributes.
* *
@ -638,8 +638,8 @@ class windowsUser extends baseModule implements passwordService {
$this->groupList = $this->groupList_orig; $this->groupList = $this->groupList_orig;
} }
/** /**
* Returns a list of modifications which have to be made to the LDAP account. * Returns a list of modifications which have to be made to the LDAP account.
* *
@ -661,7 +661,7 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Returns the HTML meta data for the main account page. * Returns the HTML meta data for the main account page.
* *
* @return htmlElement HTML meta data * @return htmlElement HTML meta data
*/ */
public function display_html_attributes() { public function display_html_attributes() {
@ -719,7 +719,7 @@ class windowsUser extends baseModule implements passwordService {
$this->addMultiValueInputTextField($containerLeft, 'otherTelephone', _('Other telephone numbers')); $this->addMultiValueInputTextField($containerLeft, 'otherTelephone', _('Other telephone numbers'));
$this->addSimpleInputTextField($containerLeft, 'wWWHomePage', _('Web site')); $this->addSimpleInputTextField($containerLeft, 'wWWHomePage', _('Web site'));
$this->addMultiValueInputTextField($containerLeft, 'url', _('Other web sites')); $this->addMultiValueInputTextField($containerLeft, 'url', _('Other web sites'));
$containerLeft->addElement(new htmlSubTitle(_('Options')), true); $containerLeft->addElement(new htmlSubTitle(_('Options')), true);
// locked out // locked out
$containerLeft->addElement(new htmlOutputText(_("Account is locked"))); $containerLeft->addElement(new htmlOutputText(_("Account is locked")));
@ -748,7 +748,7 @@ class windowsUser extends baseModule implements passwordService {
// require smartcard // require smartcard
$requireCard = windowsUser::isSmartCardRequired($this->attributes); $requireCard = windowsUser::isSmartCardRequired($this->attributes);
$containerLeft->addElement(new htmlTableExtendedInputCheckbox('requireCard', $requireCard, _("Require smartcard"), 'requireCard'), true); $containerLeft->addElement(new htmlTableExtendedInputCheckbox('requireCard', $requireCard, _("Require smartcard"), 'requireCard'), true);
$containerLeft->addElement(new htmlSubTitle(_('User profile')), true); $containerLeft->addElement(new htmlSubTitle(_('User profile')), true);
// profile path // profile path
$this->addSimpleInputTextField($containerLeft, 'profilePath', _('Profile path')); $this->addSimpleInputTextField($containerLeft, 'profilePath', _('Profile path'));
@ -766,7 +766,7 @@ class windowsUser extends baseModule implements passwordService {
$containerLeft->addElement(new htmlTableExtendedSelect('homeDrive', $drives, $selected, _('Home drive'), 'homeDrive'), true); $containerLeft->addElement(new htmlTableExtendedSelect('homeDrive', $drives, $selected, _('Home drive'), 'homeDrive'), true);
// home directory // home directory
$this->addSimpleInputTextField($containerLeft, 'homeDirectory', _('Home directory')); $this->addSimpleInputTextField($containerLeft, 'homeDirectory', _('Home directory'));
// NIS attributes // NIS attributes
if (!$this->isBooleanConfigOptionSet('windowsUser_hidemsSFU30Name', true) || !$this->isBooleanConfigOptionSet('windowsUser_hidemsSFU30NisDomain', true)) { if (!$this->isBooleanConfigOptionSet('windowsUser_hidemsSFU30Name', true) || !$this->isBooleanConfigOptionSet('windowsUser_hidemsSFU30NisDomain', true)) {
$containerLeft->addElement(new htmlSubTitle(_('NIS')), true); $containerLeft->addElement(new htmlSubTitle(_('NIS')), true);
@ -777,9 +777,9 @@ class windowsUser extends baseModule implements passwordService {
$this->addSimpleInputTextField($containerLeft, 'msSFU30NisDomain', _('NIS domain')); $this->addSimpleInputTextField($containerLeft, 'msSFU30NisDomain', _('NIS domain'));
} }
} }
$containerLeft->addElement(new htmlEqualWidth(array('streetAddress', 'cn')), true); $containerLeft->addElement(new htmlEqualWidth(array('streetAddress', 'cn')), true);
$containerRight = new htmlTable(); $containerRight = new htmlTable();
$containerRight->alignment = htmlElement::ALIGN_TOP; $containerRight->alignment = htmlElement::ALIGN_TOP;
$containerRight->addElement(new htmlSubTitle(_('Groups')), true); $containerRight->addElement(new htmlSubTitle(_('Groups')), true);
@ -796,7 +796,7 @@ class windowsUser extends baseModule implements passwordService {
$groupsList->addElement(new htmlOutputText('<br>', false)); $groupsList->addElement(new htmlOutputText('<br>', false));
} }
$containerRight->addElement($groupsList); $containerRight->addElement($groupsList);
$container = new htmlTable(); $container = new htmlTable();
$container->addElement($containerLeft); $container->addElement($containerLeft);
$container->addElement(new htmlSpacer('40px', null)); $container->addElement(new htmlSpacer('40px', null));
@ -901,7 +901,7 @@ class windowsUser extends baseModule implements passwordService {
$otherMailbox = str_replace($wildcard, $_POST[$postKey], $otherMailbox); $otherMailbox = str_replace($wildcard, $_POST[$postKey], $otherMailbox);
} }
} }
} }
} }
// other telephones // other telephones
$this->processMultiValueInputTextField('otherTelephone', $return, 'telephone'); $this->processMultiValueInputTextField('otherTelephone', $return, 'telephone');
@ -1013,10 +1013,10 @@ class windowsUser extends baseModule implements passwordService {
if (!$this->isBooleanConfigOptionSet('windowsUser_hidemsSFU30Name', true)) { if (!$this->isBooleanConfigOptionSet('windowsUser_hidemsSFU30Name', true)) {
$this->attributes['msSFU30NisDomain'][0] = $_POST['msSFU30NisDomain']; $this->attributes['msSFU30NisDomain'][0] = $_POST['msSFU30NisDomain'];
} }
return $return; return $return;
} }
/** /**
* Displays the group selection. * Displays the group selection.
* *
@ -1027,7 +1027,7 @@ class windowsUser extends baseModule implements passwordService {
$groups = $this->findGroups(); $groups = $this->findGroups();
// sort by DN // sort by DN
usort($groups, 'compareDN'); usort($groups, 'compareDN');
$groupContainer = new htmlTable(); $groupContainer = new htmlTable();
$groupContainer->alignment = htmlElement::ALIGN_TOP; $groupContainer->alignment = htmlElement::ALIGN_TOP;
$groupContainer->addElement(new htmlSubTitle(_("Groups")), true); $groupContainer->addElement(new htmlSubTitle(_("Groups")), true);
@ -1035,7 +1035,7 @@ class windowsUser extends baseModule implements passwordService {
$groupContainer->addElement(new htmlOutputText('')); $groupContainer->addElement(new htmlOutputText(''));
$groupContainer->addElement(new htmlOutputText(_("Available groups"))); $groupContainer->addElement(new htmlOutputText(_("Available groups")));
$groupContainer->addNewLine(); $groupContainer->addNewLine();
$selectedGroups = array(); $selectedGroups = array();
// sort by DN // sort by DN
usort($this->groupList, 'compareDN'); usort($this->groupList, 'compareDN');
@ -1050,7 +1050,7 @@ class windowsUser extends baseModule implements passwordService {
$availableGroups[getAbstractDN($dn)] = $dn; $availableGroups[getAbstractDN($dn)] = $dn;
} }
} }
$remGroupSelect = new htmlSelect('removegroups', $selectedGroups, null, 15); $remGroupSelect = new htmlSelect('removegroups', $selectedGroups, null, 15);
$remGroupSelect->setMultiSelect(true); $remGroupSelect->setMultiSelect(true);
$remGroupSelect->setTransformSingleSelect(false); $remGroupSelect->setTransformSingleSelect(false);
@ -1101,7 +1101,7 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Runs the postmodify actions. * Runs the postmodify actions.
* *
* @see baseModule::postModifyActions() * @see baseModule::postModifyActions()
* *
* @param boolean $newAccount * @param boolean $newAccount
@ -1154,7 +1154,7 @@ class windowsUser extends baseModule implements passwordService {
} }
return $messages; return $messages;
} }
/** /**
* In this function the LDAP account is built up. * In this function the LDAP account is built up.
* *
@ -1468,7 +1468,7 @@ class windowsUser extends baseModule implements passwordService {
} }
return $errors; return $errors;
} }
/** /**
* This function executes one post upload action. * This function executes one post upload action.
* *
@ -1583,7 +1583,7 @@ class windowsUser extends baseModule implements passwordService {
); );
} }
} }
/** /**
* Returns a list of possible PDF entries for this account. * Returns a list of possible PDF entries for this account.
* *
@ -1652,7 +1652,7 @@ class windowsUser extends baseModule implements passwordService {
} }
return $return; return $return;
} }
/** /**
* Returns a list of elements for the account profiles. * Returns a list of elements for the account profiles.
* *
@ -1676,7 +1676,7 @@ class windowsUser extends baseModule implements passwordService {
$return->addElement($groupSelect, true); $return->addElement($groupSelect, true);
return $return; return $return;
} }
/** /**
* Loads the values of an account profile into internal variables. * Loads the values of an account profile into internal variables.
* *
@ -1711,23 +1711,22 @@ class windowsUser extends baseModule implements passwordService {
* @param array $attributes attributes of LDAP account * @param array $attributes attributes of LDAP account
* @param boolean $passwordChangeOnly indicates that the user is only allowed to change his password and no LDAP content is readable * @param boolean $passwordChangeOnly indicates that the user is only allowed to change his password and no LDAP content is readable
* @param array $readOnlyFields list of read-only fields * @param array $readOnlyFields list of read-only fields
* @return array list of meta HTML elements (field name => htmlTableRow) * @return array list of meta HTML elements (field name => htmlResponsiveRow)
*/ */
function getSelfServiceOptions($fields, $attributes, $passwordChangeOnly, $readOnlyFields) { function getSelfServiceOptions($fields, $attributes, $passwordChangeOnly, $readOnlyFields) {
$return = array(); $return = array();
if (in_array('unicodePwd', $fields)) { if (in_array('unicodePwd', $fields)) {
$pwdTable = new htmlTable(); $row = new htmlResponsiveRow();
$pwdTable->colspan = 3; $pwd1 = new htmlResponsiveInputField($this->getSelfServiceLabel('unicodePwd', _('New password')), 'windowsUser_unicodePwd');
$pwd1 = new htmlTableExtendedInputField($this->getSelfServiceLabel('unicodePwd', _('New password')), 'windowsUser_unicodePwd');
$pwd1->setIsPassword(true, true); $pwd1->setIsPassword(true, true);
$pwdTable->addElement($pwd1, true); $pwd1->setFieldSize(null);
$pwd2 = new htmlTableExtendedInputField(_('Reenter password'), 'windowsUser_unicodePwd2'); $row->add($pwd1, 12);
$pwd2 = new htmlResponsiveInputField(_('Reenter password'), 'windowsUser_unicodePwd2');
$pwd2->setIsPassword(true); $pwd2->setIsPassword(true);
$pwd2->setFieldSize(null);
$pwd2->setSameValueFieldID('windowsUser_unicodePwd'); $pwd2->setSameValueFieldID('windowsUser_unicodePwd');
$pwdTable->addElement($pwd2); $row->add($pwd2, 12);
$return['unicodePwd'] = new htmlTableRow(array( $return['unicodePwd'] = $row;
$pwdTable
));
} }
if ($passwordChangeOnly) { if ($passwordChangeOnly) {
return $return; // only password fields as long no LDAP content can be read return $return; // only password fields as long no LDAP content can be read
@ -1755,7 +1754,7 @@ class windowsUser extends baseModule implements passwordService {
* <br>del: array of attributes to remove * <br>del: array of attributes to remove
* <br>mod: array of attributes to modify * <br>mod: array of attributes to modify
* <br>info: array of values with informational value (e.g. to be used later by pre/postModify actions) * <br>info: array of values with informational value (e.g. to be used later by pre/postModify actions)
* *
* Calling this method does not require the existence of an enclosing {@link accountContainer}. * Calling this method does not require the existence of an enclosing {@link accountContainer}.
* *
* @param string $fields input fields * @param string $fields input fields
@ -1813,11 +1812,11 @@ class windowsUser extends baseModule implements passwordService {
$this->checkSimpleSelfServiceTextField($return, 'postalCode', $attributes, $fields, $readOnlyFields, 'postalCode'); $this->checkSimpleSelfServiceTextField($return, 'postalCode', $attributes, $fields, $readOnlyFields, 'postalCode');
return $return; return $return;
} }
/** /**
* Sets the user password in self service. * Sets the user password in self service.
* Since the change requires the old password we need to run ldapmodify for this task. * Since the change requires the old password we need to run ldapmodify for this task.
* *
* Enter description here ... * Enter description here ...
* @param array $return return value for checkSelfServiceOptions() (used to add message if any) * @param array $return return value for checkSelfServiceOptions() (used to add message if any)
* @param array $attributes LDAP attributes * @param array $attributes LDAP attributes
@ -1835,20 +1834,20 @@ class windowsUser extends baseModule implements passwordService {
$ldif .= "add: unicodePwd\n"; $ldif .= "add: unicodePwd\n";
$ldif .= "unicodePwd:: " . base64_encode($newPasswordVal) . "\n"; $ldif .= "unicodePwd:: " . base64_encode($newPasswordVal) . "\n";
$ldif .= "-\n"; $ldif .= "-\n";
$serverURL = $_SESSION['selfServiceProfile']->serverURL; $serverURL = $_SESSION['selfServiceProfile']->serverURL;
$tls = ''; $tls = '';
if ($_SESSION['selfServiceProfile']->useTLS) { if ($_SESSION['selfServiceProfile']->useTLS) {
$tls = ' -ZZ '; $tls = ' -ZZ ';
} }
$cmd = "/usr/bin/ldapmodify -H " . $serverURL . $tls . " -D " . escapeshellarg($dn) . " -x -w " . escapeshellarg($oldPassword); $cmd = "/usr/bin/ldapmodify -H " . $serverURL . $tls . " -D " . escapeshellarg($dn) . " -x -w " . escapeshellarg($oldPassword);
$descriptorspec = array( $descriptorspec = array(
0 => array("pipe", "r"), // stdin 0 => array("pipe", "r"), // stdin
1 => array("pipe", "w"), // stout 1 => array("pipe", "w"), // stout
2 => array("pipe", "w") // sterr 2 => array("pipe", "w") // sterr
); );
$process = proc_open($cmd, $descriptorspec, $pipes); $process = proc_open($cmd, $descriptorspec, $pipes);
if (is_resource($process)) { if (is_resource($process)) {
fwrite($pipes[0], $ldif); fwrite($pipes[0], $ldif);
} }
@ -1884,14 +1883,14 @@ class windowsUser extends baseModule implements passwordService {
return; return;
} }
else { else {
// update session password for next page load // update session password for next page load
$_SESSION['selfService_clientPasswordNew'] = $_POST['windowsUser_unicodePwd']; $_SESSION['selfService_clientPasswordNew'] = $_POST['windowsUser_unicodePwd'];
} }
} }
/** /**
* This method specifies if a module manages password attributes. The module alias will * This method specifies if a module manages password attributes. The module alias will
* then appear as option in the GUI. * then appear as option in the GUI.
* <br>If the module only wants to get notified about password changes then return false. * <br>If the module only wants to get notified about password changes then return false.
* *
* @return boolean true if this module manages password attributes * @return boolean true if this module manages password attributes
@ -1902,7 +1901,7 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Specifies if this module supports to force that a user must change his password on next login. * Specifies if this module supports to force that a user must change his password on next login.
* *
* @return boolean force password change supported * @return boolean force password change supported
*/ */
public function supportsForcePasswordChange() { public function supportsForcePasswordChange() {
@ -1947,10 +1946,10 @@ class windowsUser extends baseModule implements passwordService {
$this->clearTextPassword = $password; $this->clearTextPassword = $password;
return array(); return array();
} }
/** /**
* Creates the LDAP password value. * Creates the LDAP password value.
* *
* @param String $password password * @param String $password password
*/ */
public static function pwdAttributeValue($password) { public static function pwdAttributeValue($password) {
@ -1959,8 +1958,8 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Returns if the account is currently deactivated. * Returns if the account is currently deactivated.
* *
* @param array $attrs LDAP attributes * @param array $attrs LDAP attributes
* @return boolean is deactivated * @return boolean is deactivated
*/ */
public static function isDeactivated($attrs) { public static function isDeactivated($attrs) {
@ -1973,7 +1972,7 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Sets if the account is currently deactivated. * Sets if the account is currently deactivated.
* *
* @param boolean $deactivated is deactivated * @param boolean $deactivated is deactivated
* @param array $attrs LDAP attributes to modify (default $this->attributes) * @param array $attrs LDAP attributes to modify (default $this->attributes)
*/ */
@ -1997,8 +1996,8 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Returns if the account is currently locked out. * Returns if the account is currently locked out.
* *
* @param array $attrs LDAP attributes * @param array $attrs LDAP attributes
* @return boolean is locked out * @return boolean is locked out
*/ */
private static function isLockedOut($attrs) { private static function isLockedOut($attrs) {
@ -2011,7 +2010,7 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Unlocks the account. * Unlocks the account.
* *
* @param array $attrs LDAP attributes to modify * @param array $attrs LDAP attributes to modify
*/ */
public static function unlock(&$attrs) { public static function unlock(&$attrs) {
@ -2026,8 +2025,8 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Returns if the account requires a smartcard to login. * Returns if the account requires a smartcard to login.
* *
* @param array $attrs LDAP attributes * @param array $attrs LDAP attributes
* @return boolean requires a smartcard * @return boolean requires a smartcard
*/ */
public static function isSmartCardRequired($attrs) { public static function isSmartCardRequired($attrs) {
@ -2040,7 +2039,7 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Sets if the account requires a smartcard to login. * Sets if the account requires a smartcard to login.
* *
* @param array $attrs LDAP attributes to modify * @param array $attrs LDAP attributes to modify
* @param boolean $requireCard requires a smartcard * @param boolean $requireCard requires a smartcard
*/ */
@ -2061,8 +2060,8 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Returns if the account never expires. * Returns if the account never expires.
* *
* @param array $attrs LDAP attributes * @param array $attrs LDAP attributes
* @return boolean never expires * @return boolean never expires
*/ */
public static function isNeverExpiring($attrs) { public static function isNeverExpiring($attrs) {
@ -2075,7 +2074,7 @@ class windowsUser extends baseModule implements passwordService {
/** /**
* Sets if the account never expires. * Sets if the account never expires.
* *
* @param array $attrs LDAP attributes to modify * @param array $attrs LDAP attributes to modify
* @param boolean $neverExpires never expires * @param boolean $neverExpires never expires
*/ */
@ -2115,10 +2114,10 @@ class windowsUser extends baseModule implements passwordService {
$this->groupCache = $return; $this->groupCache = $return;
return $return; return $return;
} }
/** /**
* Gets the list of possible domains from the config setting. * Gets the list of possible domains from the config setting.
* *
* @return array domain list * @return array domain list
*/ */
private function getDomains() { private function getDomains() {
@ -2133,7 +2132,7 @@ class windowsUser extends baseModule implements passwordService {
} }
return array_values(array_unique($domains)); return array_values(array_unique($domains));
} }
} }
?> ?>

28
lam/lib/selfService.inc
View File

@ -92,7 +92,7 @@ function getSelfServiceFieldSettings($scope) {
* @param array $attributes LDAP attributes (attribute names in lower case) * @param array $attributes LDAP attributes (attribute names in lower case)
* @param boolean $passwordChangeOnly indicates that the user is only allowed to change his password and no LDAP content is readable * @param boolean $passwordChangeOnly indicates that the user is only allowed to change his password and no LDAP content is readable
* @param array $readOnlyFields list of read-only fields * @param array $readOnlyFields list of read-only fields
* @return array meta HTML code (array(<moduleName> => htmlTableRow)) * @return array meta HTML code (array(<moduleName> => htmlResponsiveRow))
*/ */
function getSelfServiceOptions($scope, $fields, $attributes, $passwordChangeOnly, $readOnlyFields) { function getSelfServiceOptions($scope, $fields, $attributes, $passwordChangeOnly, $readOnlyFields) {
$return = array(); $return = array();
@ -287,7 +287,7 @@ function checkSelfServiceSettings($scope, &$options, &$profile) {
/** /**
* Returns if script runs inside self service. * Returns if script runs inside self service.
* *
* @return boolean is self service * @return boolean is self service
*/ */
function isSelfService() { function isSelfService() {
@ -304,7 +304,7 @@ class selfServiceProfile {
/** server address */ /** server address */
public $serverURL; public $serverURL;
/** use TLS */ /** use TLS */
public $useTLS; public $useTLS;
@ -316,25 +316,25 @@ class selfServiceProfile {
/** LDAP password */ /** LDAP password */
public $LDAPPassword; public $LDAPPassword;
/** use bind user also for read/modify operations */ /** use bind user also for read/modify operations */
public $useForAllOperations; public $useForAllOperations;
/** LDAP search attribute */ /** LDAP search attribute */
public $searchAttribute; public $searchAttribute;
/** HTTP authentication */ /** HTTP authentication */
public $httpAuthentication; public $httpAuthentication;
/** header for self service pages */ /** header for self service pages */
public $pageHeader; public $pageHeader;
/** list of additional CSS links (separated by \n) */ /** list of additional CSS links (separated by \n) */
public $additionalCSS; public $additionalCSS;
/** describing text for user login */ /** describing text for user login */
public $loginCaption; public $loginCaption;
/** label for password input */ /** label for password input */
public $passwordLabel; public $passwordLabel;
@ -343,7 +343,7 @@ class selfServiceProfile {
/** additional LDAP filter for accounts */ /** additional LDAP filter for accounts */
public $additionalLDAPFilter; public $additionalLDAPFilter;
/** describing text for self service main page */ /** describing text for self service main page */
public $mainPageText; public $mainPageText;
@ -355,23 +355,23 @@ class selfServiceProfile {
* *
*/ */
public $inputFields; public $inputFields;
/** /**
* List of fields that are set in read-only mode. * List of fields that are set in read-only mode.
*/ */
public $readOnlyFields; public $readOnlyFields;
/** List of override values for field labels: array(<field ID> => label) */ /** List of override values for field labels: array(<field ID> => label) */
public $relabelFields; public $relabelFields;
/** configuration settings of modules */ /** configuration settings of modules */
public $moduleSettings; public $moduleSettings;
/** language for self service */ /** language for self service */
public $language = 'en_GB.utf8'; public $language = 'en_GB.utf8';
/** disallow user to change language */ /** disallow user to change language */
public $enforceLanguage = false; public $enforceLanguage = false;
public $followReferrals = 0; public $followReferrals = 0;
/** /**

3
lam/style/500_layout.css
View File

@ -3,7 +3,7 @@ $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) 2003 Leonhard Walchshaeusl Copyright (C) 2003 Leonhard Walchshaeusl
Copyright (C) 2005 - 2014 Roland Gruber Copyright (C) 2005 - 2015 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
@ -41,6 +41,7 @@ body {
body.selfservice { body.selfservice {
padding: 10px; padding: 10px;
background: #fffde2;
} }
.defaultBackground { .defaultBackground {