responsive
This commit is contained in:
Roland Gruber
parent
2bc62a34cf
commit
7add41b48e
|
|
@ -1548,7 +1548,7 @@ class posixAccount extends baseModule implements passwordService {
|
|||
* @return htmlElement HTML meta data
|
||||
*/
|
||||
function display_html_attributes() {
|
||||
$return = new htmlTable();
|
||||
$return = new htmlResponsiveRow();
|
||||
$this->checkForInvalidConfiguration($return);
|
||||
$modules = $this->getAccountContainer()->get_type()->getModules();
|
||||
$typeId = $this->getAccountContainer()->get_type()->getId();
|
||||
|
|
@ -1560,7 +1560,7 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$groups[$groupList[$i][1]] = $groupList[$i][0];
|
||||
}
|
||||
if (count($groups)==0) {
|
||||
$return->addElement(new htmlStatusMessage("ERROR", _('No Unix groups found in LDAP! Please create one first.')));
|
||||
$return->add(new htmlStatusMessage("ERROR", _('No Unix groups found in LDAP! Please create one first.')), 12);
|
||||
return $return;
|
||||
}
|
||||
$shelllist = $this->getShells(); // list of all valid shells
|
||||
|
|
@ -1580,8 +1580,7 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$msg = new htmlStatusMessage($this->messages['uid'][5][0],
|
||||
$this->messages['uid'][5][1], $this->messages['uid'][5][2],
|
||||
array(htmlspecialchars($users[$firstSuggestion])));
|
||||
$msg->colspan = 10;
|
||||
$return->addElement($msg, true);
|
||||
$return->add($msg, 12);
|
||||
}
|
||||
}
|
||||
elseif ($this->getAccountContainer()->getAccountModule('windowsUser') != null) {
|
||||
|
|
@ -1621,87 +1620,100 @@ class posixAccount extends baseModule implements passwordService {
|
|||
}
|
||||
|
||||
$userName = '';
|
||||
if (isset($this->attributes['uid'][0])) $userName = $this->attributes['uid'][0];
|
||||
if (isset($this->attributes['uid'][0])) {
|
||||
$userName = $this->attributes['uid'][0];
|
||||
}
|
||||
$uidLabel = _("User name");
|
||||
if ($this->get_scope() == 'host') {
|
||||
$uidLabel = _("Host name");
|
||||
}
|
||||
$uidInput = new htmlTableExtendedInputField($uidLabel, 'uid', $userName, 'uid');
|
||||
$uidInput = new htmlResponsiveInputField($uidLabel, 'uid', $userName, 'uid');
|
||||
$uidInput->setRequired(true);
|
||||
$uidInput->setFieldMaxLength(100);
|
||||
$return->addElement($uidInput, true);
|
||||
$return->add($uidInput, 12);
|
||||
if ($this->manageCn($modules)) {
|
||||
$this->addMultiValueInputTextField($return, 'cn', _("Common name"));
|
||||
}
|
||||
$uidNumber = '';
|
||||
if (isset($this->attributes['uidNumber'][0])) $uidNumber = $this->attributes['uidNumber'][0];
|
||||
$uidNumberInput = new htmlTableExtendedInputField(_('UID number'), 'uidNumber', $uidNumber, 'uidNumber');
|
||||
if (isset($this->attributes['uidNumber'][0])) {
|
||||
$uidNumber = $this->attributes['uidNumber'][0];
|
||||
}
|
||||
$uidNumberInput = new htmlResponsiveInputField(_('UID number'), 'uidNumber', $uidNumber, 'uidNumber');
|
||||
$uidNumberInput->setFieldMaxLength(20);
|
||||
$uidNumberInput->setValidationRule(htmlElement::VALIDATE_NUMERIC);
|
||||
$return->addElement($uidNumberInput, true);
|
||||
$return->add($uidNumberInput, 12);
|
||||
if (!$this->isBooleanConfigOptionSet('posixAccount_' . $typeId . '_hidegecos')) {
|
||||
$gecos = '';
|
||||
if (isset($this->attributes['gecos'][0])) $gecos = $this->attributes['gecos'][0];
|
||||
$return->addElement(new htmlTableExtendedInputField(_('Gecos'), 'gecos', $gecos, 'gecos'), true);
|
||||
if (isset($this->attributes['gecos'][0])) {
|
||||
$gecos = $this->attributes['gecos'][0];
|
||||
}
|
||||
$return->add(new htmlResponsiveInputField(_('Gecos'), 'gecos', $gecos, 'gecos'), 12);
|
||||
}
|
||||
$primaryGroup = array();
|
||||
if (isset($this->attributes['gidNumber'][0])) {
|
||||
$primaryGroup[] = $this->attributes['gidNumber'][0];
|
||||
}
|
||||
$gidNumberSelect = new htmlTableExtendedSelect('gidNumber', $groups, $primaryGroup, _('Primary group'), 'gidNumber');
|
||||
$gidNumberSelect = new htmlResponsiveSelect('gidNumber', $groups, $primaryGroup, _('Primary group'), 'gidNumber');
|
||||
$gidNumberSelect->setHasDescriptiveElements(true);
|
||||
$return->addElement($gidNumberSelect, true);
|
||||
$return->add($gidNumberSelect, 12);
|
||||
|
||||
if ($this->get_scope()=='user') {
|
||||
// additional groups
|
||||
if (!$this->isBooleanConfigOptionSet('posixAccount_' . $typeId . '_hidegon') || !$this->isBooleanConfigOptionSet('posixAccount_' . $typeId . '_hideposixGroups')) {
|
||||
$return->addElement(new htmlOutputText(_('Additional groups')));
|
||||
$return->addElement(new htmlAccountPageButton(get_class($this), 'group', 'open', _('Edit groups')));
|
||||
$return->addElement(new htmlHelpLink('addgroup'), true);
|
||||
$return->addLabel(new htmlOutputText(_('Additional groups')));
|
||||
$additionalGroups = new htmlGroup();
|
||||
$additionalGroups->addElement(new htmlAccountPageButton(get_class($this), 'group', 'open', _('Edit groups')));
|
||||
$additionalGroups->addElement(new htmlHelpLink('addgroup'));
|
||||
$return->addField($additionalGroups);
|
||||
}
|
||||
// home directory
|
||||
$homeDir = isset($this->attributes[$homeDirAttr][0]) ? $this->attributes[$homeDirAttr][0] : '';
|
||||
$homedirInput = new htmlTableExtendedInputField(_('Home directory'), 'homeDirectory', $homeDir, 'homeDirectory');
|
||||
$homedirInput = new htmlResponsiveInputField(_('Home directory'), 'homeDirectory', $homeDir, 'homeDirectory');
|
||||
$homedirInput->setRequired(true);
|
||||
$return->addElement($homedirInput, true);
|
||||
$return->add($homedirInput, 12);
|
||||
if (($_SESSION['config']->get_scriptPath() != null) && ($_SESSION['config']->get_scriptPath() != '')) {
|
||||
if ($this->getAccountContainer()->isNewAccount) {
|
||||
// get list of lamdaemon servers
|
||||
$lamdaemonServers = explode(";", $_SESSION['config']->get_scriptServers());
|
||||
for ($i = 0; $i < sizeof($lamdaemonServers); $i++) {
|
||||
$temp = explode(":", $lamdaemonServers[$i]);
|
||||
if (isset($temp[1])) $lamdaemonServers[$i] = $temp[1];
|
||||
else $lamdaemonServers[$i] = $temp[0];
|
||||
if (isset($temp[1])) {
|
||||
$lamdaemonServers[$i] = $temp[1];
|
||||
}
|
||||
else {
|
||||
$lamdaemonServers[$i] = $temp[0];
|
||||
}
|
||||
}
|
||||
$homeDirLabel = new htmlOutputText(_('Create home directory'));
|
||||
$homeDirLabel->alignment = htmlElement::ALIGN_TOP;
|
||||
$return->addElement($homeDirLabel);
|
||||
$return->addLabel($homeDirLabel);
|
||||
$homeServerContainer = new htmlTable();
|
||||
for ($h = 0; $h < sizeof($lamdaemonServers); $h++) {
|
||||
$homeServerContainer->addElement(new htmlTableExtendedInputCheckbox('createhomedir_' . $h, in_array($lamdaemonServers[$h], $this->lamdaemonServers), $lamdaemonServers[$h], null, false), true);
|
||||
$homeServerContainer->addElement(new htmlTableExtendedInputCheckbox('createhomedir_' . $h, in_array($lamdaemonServers[$h], $this->lamdaemonServers), $lamdaemonServers[$h], null, false));
|
||||
if ($h === 0) {
|
||||
$homeDirHelp = new htmlHelpLink('createhomedir');
|
||||
$homeServerContainer->addElement($homeDirHelp);
|
||||
}
|
||||
$homeServerContainer->addNewLine();
|
||||
}
|
||||
$return->addElement($homeServerContainer);
|
||||
$homeDirHelp = new htmlHelpLink('createhomedir');
|
||||
$homeDirHelp->alignment = htmlElement::ALIGN_TOP;
|
||||
$return->addElement($homeDirHelp, true);
|
||||
$return->addField($homeServerContainer);
|
||||
}
|
||||
else {
|
||||
$return->addElement(new htmlOutputText(''));
|
||||
$return->addElement(new htmlAccountPageButton(get_class($this), 'homedir', 'open', _('Check home directories')), true);
|
||||
$return->addLabel(new htmlOutputText(' ', false));
|
||||
$return->addField(new htmlAccountPageButton(get_class($this), 'homedir', 'open', _('Check home directories')));
|
||||
}
|
||||
}
|
||||
$selectedShell = array();
|
||||
if (isset($this->attributes['loginShell'][0])) {
|
||||
$selectedShell = array($this->attributes['loginShell'][0]);
|
||||
}
|
||||
$return->addElement(new htmlTableExtendedSelect('loginShell', $shelllist, $selectedShell, _('Login shell'), 'loginShell'), true);
|
||||
$return->add(new htmlResponsiveSelect('loginShell', $shelllist, $selectedShell, _('Login shell'), 'loginShell'), 12);
|
||||
}
|
||||
// password buttons
|
||||
if (checkIfWriteAccessIsAllowed($this->get_scope())
|
||||
&& isset($this->attributes[$this->getPasswordAttrName($modules)][0])
|
||||
&& $this->isPasswordManaged()) {
|
||||
$return->addElement(new htmlOutputText(_('Password')));
|
||||
$pwdContainer = new htmlTable();
|
||||
$return->addLabel(new htmlOutputText(_('Password')));
|
||||
$pwdContainer = new htmlGroup();
|
||||
if (pwd_is_enabled($this->attributes[$this->getPasswordAttrName($modules)][0])) {
|
||||
$pwdContainer->addElement(new htmlButton('lockPassword', _('Lock password')));
|
||||
}
|
||||
|
|
@ -1709,20 +1721,18 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$pwdContainer->addElement(new htmlButton('unlockPassword', _('Unlock password')));
|
||||
}
|
||||
$pwdContainer->addElement(new htmlButton('removePassword', _('Remove password')));
|
||||
$pwdContainer->colspan = 2;
|
||||
$return->addElement($pwdContainer, true);
|
||||
$return->addField($pwdContainer);
|
||||
}
|
||||
// remove button
|
||||
if ($this->isOptional($modules) && !$this->skipObjectClass()) {
|
||||
$return->addElement(new htmlSpacer(null, '20px'), true);
|
||||
$return->addVerticalSpacer('2rem');
|
||||
$remButton = new htmlButton('remObjectClass', _('Remove Unix extension'));
|
||||
$remButton->colspan = 5;
|
||||
$return->addElement($remButton, true);
|
||||
$return->add($remButton, 12, 12, 12, 'text-center');
|
||||
}
|
||||
}
|
||||
else {
|
||||
// add button
|
||||
$return->addElement(new htmlButton('addObjectClass', _('Add Unix extension')));
|
||||
$return->add(new htmlButton('addObjectClass', _('Add Unix extension')), 12);
|
||||
}
|
||||
return $return;
|
||||
}
|
||||
|
|
@ -1730,9 +1740,9 @@ class posixAccount extends baseModule implements passwordService {
|
|||
/**
|
||||
* Checks if the configuration is valid and prints an error if not.
|
||||
*
|
||||
* @param htmlTable $content content area
|
||||
* @param htmlResponsiveRow $content content area
|
||||
*/
|
||||
private function checkForInvalidConfiguration(htmlTable $content) {
|
||||
private function checkForInvalidConfiguration(htmlResponsiveRow $content) {
|
||||
$typeId = $this->getAccountContainer()->get_type()->getId();
|
||||
if ($this->get_scope() == 'user') {
|
||||
$generatorOption = 'posixAccount_' . $typeId . '_uidGeneratorUsers';
|
||||
|
|
@ -1742,8 +1752,7 @@ class posixAccount extends baseModule implements passwordService {
|
|||
}
|
||||
if (empty($this->moduleSettings[$generatorOption])) {
|
||||
$message = new htmlStatusMessage('ERROR', _('Invalid configuration detected. Please edit your server profile (module settings) and fill all required fields.'));
|
||||
$message->colspan = 5;
|
||||
$content->addElement($message, true);
|
||||
$content->add($message, 12);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1771,7 +1780,7 @@ class posixAccount extends baseModule implements passwordService {
|
|||
* @return htmlElement meta HTML code
|
||||
*/
|
||||
function display_html_group() {
|
||||
$return = new htmlTable();
|
||||
$return = new htmlResponsiveRow();
|
||||
$modules = $this->getAccountContainer()->get_type()->getModules();
|
||||
$typeId = $this->getAccountContainer()->get_type()->getId();
|
||||
$showUnix = !$this->isBooleanConfigOptionSet('posixAccount_' . $typeId . '_hideposixGroups');
|
||||
|
|
@ -1820,8 +1829,8 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$unixContainer->addElement($addSelect, true);
|
||||
}
|
||||
|
||||
$return->addElement($unixContainer, true);
|
||||
$return->addVerticalSpace('3rem');
|
||||
$return->add($unixContainer, 12);
|
||||
$return->addVerticalSpacer('3rem');
|
||||
}
|
||||
|
||||
$showGon = self::areGroupOfNamesActive() && !$this->isBooleanConfigOptionSet('posixAccount_' . $typeId . '_hidegon');
|
||||
|
|
@ -1871,8 +1880,8 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$addGonSelect->setRightToLeftTextDirection(true);
|
||||
$gonContainer->addElement($addGonSelect);
|
||||
$gonContainer->addNewLine();
|
||||
$return->addElement($gonContainer, true);
|
||||
$return->addVerticalSpace('3rem');
|
||||
$return->add($gonContainer, 12);
|
||||
$return->addVerticalSpacer('3rem');
|
||||
}
|
||||
|
||||
$showGonSync = $showGon && !$autoSyncGon;
|
||||
|
|
@ -1880,11 +1889,9 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$moduleList = $this->getAccountContainer()->get_type()->getModules();
|
||||
$showWindowsSync = $this->isWindows($moduleList);
|
||||
if ($showUnixSync && ($showGonSync || $showWindowsSync)) {
|
||||
$return->addElement(new htmlSubTitle(_('Sync groups')), true);
|
||||
$syncOptionTable = new htmlTable();
|
||||
$syncOptionTable->addElement(new htmlTableExtendedInputCheckbox('syncDeleteGroups', true, _('Delete non-matching entries')), true);
|
||||
$return->addElement($syncOptionTable, true);
|
||||
$return->addVerticalSpace('1rem');
|
||||
$return->add(new htmlSubTitle(_('Sync groups')), 12);
|
||||
$return->add(new htmlResponsiveInputCheckbox('syncDeleteGroups', true, _('Delete non-matching entries')), 12);
|
||||
$return->addVerticalSpacer('1rem');
|
||||
if ($showGonSync) {
|
||||
$syncButtons = new htmlGroup();
|
||||
$u2gonButton = new htmlAccountPageButton(get_class($this), 'group', 'syncU2GON', _('Sync Unix to group of names'));
|
||||
|
|
@ -1894,7 +1901,7 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$gon2uButton = new htmlAccountPageButton(get_class($this), 'group', 'syncGON2U', _('Sync group of names to Unix'));
|
||||
$gon2uButton->setIconClass('groupButton');
|
||||
$syncButtons->addElement($gon2uButton);
|
||||
$return->addElement($syncButtons);
|
||||
$return->add($syncButtons, 12, 12, 12, 'text-center');
|
||||
if ($showWindowsSync) {
|
||||
$syncButtons->addElement(new htmlSpacer('2rem', null));
|
||||
}
|
||||
|
|
@ -1904,14 +1911,13 @@ class posixAccount extends baseModule implements passwordService {
|
|||
$gon2uButton = new htmlAccountPageButton(get_class($this), 'group', 'syncWin2U', _('Sync Windows to Unix'));
|
||||
$gon2uButton->setIconClass('sambaButton');
|
||||
$syncButtons->addElement($gon2uButton);
|
||||
$return->addElement($syncButtons);
|
||||
$return->add($syncButtons, 12, 12, 12, 'text-center');
|
||||
}
|
||||
$return->addNewLine();
|
||||
$return->addVerticalSpace('3rem');
|
||||
}
|
||||
|
||||
$return->addVerticalSpacer('2rem');
|
||||
$backButton = new htmlAccountPageButton(get_class($this), 'attributes', 'back', _('Back'));
|
||||
$return->addElement($backButton);
|
||||
$return->add($backButton, 12);
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
|
@ -1923,13 +1929,10 @@ class posixAccount extends baseModule implements passwordService {
|
|||
function display_html_homedir() {
|
||||
$modules = $this->getAccountContainer()->get_type()->getModules();
|
||||
$homeDirAttr = $this->getHomedirAttrName($modules);
|
||||
$return = new htmlTable();
|
||||
$return->addElement(new htmlOutputText(_('Home directory')));
|
||||
$return->addElement(new htmlSpacer('5px', null));
|
||||
$return->addElement(new htmlOutputText($this->attributes[$homeDirAttr][0]), true);
|
||||
$return->addElement(new htmlSpacer(null, '10px'), true);
|
||||
$homeServerContainer = new htmlTable();
|
||||
$homeServerContainer->colspan = 5;
|
||||
$return = new htmlResponsiveRow();
|
||||
$return->addLabel(new htmlOutputText(_('Home directory')));
|
||||
$return->addField(new htmlOutputText($this->attributes[$homeDirAttr][0]));
|
||||
$return->addVerticalSpacer('2rem');
|
||||
// get list of lamdaemon servers
|
||||
$lamdaemonServers = explode(";", $_SESSION['config']->get_scriptServers());
|
||||
for ($i = 0; $i < sizeof($lamdaemonServers); $i++) {
|
||||
|
|
@ -1955,18 +1958,20 @@ class posixAccount extends baseModule implements passwordService {
|
|||
if (!empty($result)) {
|
||||
$returnValue = trim($result);
|
||||
if ($returnValue == 'ok') {
|
||||
$homeServerContainer->addElement(new htmlOutputText($label));
|
||||
$homeServerContainer->addElement(new htmlSpacer('5px', null));
|
||||
$homeServerContainer->addElement(new htmlImage('../../graphics/pass.png', 16, 16));
|
||||
$homeServerContainer->addElement(new htmlSpacer('5px', null));
|
||||
$homeServerContainer->addElement(new htmlAccountPageButton(get_class($this), 'homedir', 'delete_' . $i, _('Delete')));
|
||||
$return->addLabel(new htmlOutputText($label));
|
||||
$okGroup = new htmlGroup();
|
||||
$okGroup->addElement(new htmlImage('../../graphics/pass.png', 16, 16));
|
||||
$okGroup->addElement(new htmlSpacer('5px', null));
|
||||
$okGroup->addElement(new htmlAccountPageButton(get_class($this), 'homedir', 'delete_' . $i, _('Delete')));
|
||||
$return->addField($okGroup);
|
||||
}
|
||||
elseif ($returnValue == 'missing') {
|
||||
$homeServerContainer->addElement(new htmlOutputText($label));
|
||||
$homeServerContainer->addElement(new htmlSpacer('5px', null));
|
||||
$homeServerContainer->addElement(new htmlImage('../../graphics/fail.png', 16, 16));
|
||||
$homeServerContainer->addElement(new htmlSpacer('5px', null));
|
||||
$homeServerContainer->addElement(new htmlAccountPageButton(get_class($this), 'homedir', 'create_' . $i, _('Create')));
|
||||
$return->addLabel(new htmlOutputText($label));
|
||||
$failGroup = new htmlGroup();
|
||||
$failGroup->addElement(new htmlImage('../../graphics/fail.png', 16, 16));
|
||||
$failGroup->addElement(new htmlSpacer('5px', null));
|
||||
$failGroup->addElement(new htmlAccountPageButton(get_class($this), 'homedir', 'create_' . $i, _('Create')));
|
||||
$return->addField($failGroup);
|
||||
}
|
||||
elseif (trim($returnValue) != '') {
|
||||
$messageParams = explode(",", $returnValue);
|
||||
|
|
@ -1979,15 +1984,12 @@ class posixAccount extends baseModule implements passwordService {
|
|||
else {
|
||||
$message = new htmlStatusMessage('WARN', htmlspecialchars($messageParams[0]));
|
||||
}
|
||||
$message->colspan = 5;
|
||||
$homeServerContainer->addElement($message, true);
|
||||
$return->add($message, 12);
|
||||
}
|
||||
$homeServerContainer->addNewLine();
|
||||
}
|
||||
}
|
||||
$return->addElement($homeServerContainer, true);
|
||||
$return->addElement(new htmlSpacer(null, '10px'), true);
|
||||
$return->addElement(new htmlAccountPageButton(get_class($this), 'attributes', 'back', _('Back')));
|
||||
$return->addVerticalSpacer('2rem');
|
||||
$return->add(new htmlAccountPageButton(get_class($this), 'attributes', 'back', _('Back')), 12, 12, 12, 'text-center');
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -273,13 +273,27 @@ class shadowAccount extends baseModule implements passwordService {
|
|||
function process_attributes() {
|
||||
if (isset($_POST['form_subpage_shadowAccount_attributes_remObjectClass'])) {
|
||||
$this->attributes['objectClass'] = array_delete(array('shadowAccount'), $this->attributes['objectClass']);
|
||||
if (isset($this->attributes['shadowMin'])) unset($this->attributes['shadowMin']);
|
||||
if (isset($this->attributes['shadowMax'])) unset($this->attributes['shadowMax']);
|
||||
if (isset($this->attributes['shadowWarning'])) unset($this->attributes['shadowWarning']);
|
||||
if (isset($this->attributes['shadowInactive'])) unset($this->attributes['shadowInactive']);
|
||||
if (isset($this->attributes['shadowLastChange'])) unset($this->attributes['shadowLastChange']);
|
||||
if (isset($this->attributes['shadowExpire'])) unset($this->attributes['shadowExpire']);
|
||||
if (isset($this->attributes['shadowFlag'])) unset($this->attributes['shadowFlag']);
|
||||
if (isset($this->attributes['shadowMin'])) {
|
||||
unset($this->attributes['shadowMin']);
|
||||
}
|
||||
if (isset($this->attributes['shadowMax'])) {
|
||||
unset($this->attributes['shadowMax']);
|
||||
}
|
||||
if (isset($this->attributes['shadowWarning'])) {
|
||||
unset($this->attributes['shadowWarning']);
|
||||
}
|
||||
if (isset($this->attributes['shadowInactive'])) {
|
||||
unset($this->attributes['shadowInactive']);
|
||||
}
|
||||
if (isset($this->attributes['shadowLastChange'])) {
|
||||
unset($this->attributes['shadowLastChange']);
|
||||
}
|
||||
if (isset($this->attributes['shadowExpire'])) {
|
||||
unset($this->attributes['shadowExpire']);
|
||||
}
|
||||
if (isset($this->attributes['shadowFlag'])) {
|
||||
unset($this->attributes['shadowFlag']);
|
||||
}
|
||||
return array();
|
||||
}
|
||||
if (!in_array('shadowAccount', $this->attributes['objectClass'])) {
|
||||
|
|
@ -291,11 +305,21 @@ class shadowAccount extends baseModule implements passwordService {
|
|||
$this->attributes['shadowMax'][0] = $_POST['shadowMax'];
|
||||
$this->attributes['shadowWarning'][0] = $_POST['shadowWarning'];
|
||||
$this->attributes['shadowInactive'][0] = $_POST['shadowInactive'];
|
||||
if ( !get_preg($this->attributes['shadowMin'][0], 'digit')) $errors[] = $this->messages['shadowMin'][0];
|
||||
if ( !get_preg($this->attributes['shadowMax'][0], 'digit')) $errors[] = $this->messages['shadowMax'][0];
|
||||
if ( $this->attributes['shadowMin'][0] > $this->attributes['shadowMax'][0]) $errors[] = $this->messages['shadow_cmp'][0];
|
||||
if ( !get_preg($this->attributes['shadowInactive'][0], 'digit2')) $errors[] = $this->messages['inactive'][0];
|
||||
if ( !get_preg($this->attributes['shadowWarning'][0], 'digit')) $errors[] = $this->messages['shadowWarning'][0];
|
||||
if ( !get_preg($this->attributes['shadowMin'][0], 'digit')) {
|
||||
$errors[] = $this->messages['shadowMin'][0];
|
||||
}
|
||||
if ( !get_preg($this->attributes['shadowMax'][0], 'digit')) {
|
||||
$errors[] = $this->messages['shadowMax'][0];
|
||||
}
|
||||
if ( $this->attributes['shadowMin'][0] > $this->attributes['shadowMax'][0]) {
|
||||
$errors[] = $this->messages['shadow_cmp'][0];
|
||||
}
|
||||
if ( !get_preg($this->attributes['shadowInactive'][0], 'digit2')) {
|
||||
$errors[] = $this->messages['inactive'][0];
|
||||
}
|
||||
if ( !get_preg($this->attributes['shadowWarning'][0], 'digit')) {
|
||||
$errors[] = $this->messages['shadowWarning'][0];
|
||||
}
|
||||
if (isset($_POST['form_subpage_shadowAccount_attributes_expirePassword']) && isset($this->attributes['shadowMax'][0]) && ($this->attributes['shadowMax'][0] != 0)) {
|
||||
$this->attributes['shadowLastChange'][0] = intval(time()/3600/24) - $this->attributes['shadowMax'][0] - 1;
|
||||
}
|
||||
|
|
@ -311,41 +335,19 @@ class shadowAccount extends baseModule implements passwordService {
|
|||
if (isset($_POST['form_subpage_shadowAccount_attributes_addObjectClass'])) {
|
||||
$this->attributes['objectClass'][] = 'shadowAccount';
|
||||
}
|
||||
$return = new htmlTable();
|
||||
$return = new htmlResponsiveRow();
|
||||
if (in_array('shadowAccount', $this->attributes['objectClass'])) {
|
||||
$shWarning = '';
|
||||
if (isset($this->attributes['shadowWarning'][0])) {
|
||||
$shWarning = $this->attributes['shadowWarning'][0];
|
||||
}
|
||||
$pwdWarnInput = new htmlTableExtendedInputField(_('Password warning'), 'shadowWarning', $shWarning, 'shadowWarning');
|
||||
$pwdWarnInput->setFieldMaxLength(4);
|
||||
$pwdWarnInput->setFieldSize(5);
|
||||
$pwdWarnInput = $this->addSimpleInputTextField($return, 'shadowWarning', _('Password warning'));
|
||||
$pwdWarnInput->setValidationRule(htmlElement::VALIDATE_NUMERIC);
|
||||
$return->addElement($pwdWarnInput, true);
|
||||
|
||||
$shPwdExpiration = '';
|
||||
if (isset($this->attributes['shadowInactive'][0])) $shPwdExpiration = $this->attributes['shadowInactive'][0];
|
||||
$pwdExpInput = new htmlTableExtendedInputField(_('Password expiration'), 'shadowInactive', $shPwdExpiration, 'shadowInactive');
|
||||
$pwdExpInput->setFieldMaxLength(4);
|
||||
$pwdExpInput->setFieldSize(5);
|
||||
$pwdExpInput = $this->addSimpleInputTextField($return, 'shadowInactive', _('Password expiration'));
|
||||
$pwdExpInput->setValidationRule(htmlElement::VALIDATE_NUMERIC);
|
||||
$return->addElement($pwdExpInput, true);
|
||||
|
||||
$shMinAge = '';
|
||||
if (isset($this->attributes['shadowMin'][0])) $shMinAge = $this->attributes['shadowMin'][0];
|
||||
$minAgeInput = new htmlTableExtendedInputField(_('Minimum password age'), 'shadowMin', $shMinAge, 'shadowMin');
|
||||
$minAgeInput->setFieldMaxLength(5);
|
||||
$minAgeInput->setFieldSize(5);
|
||||
$minAgeInput = $this->addSimpleInputTextField($return, 'shadowMin', _('Minimum password age'));
|
||||
$minAgeInput->setValidationRule(htmlElement::VALIDATE_NUMERIC);
|
||||
$return->addElement($minAgeInput, true);
|
||||
|
||||
$shMaxAge = '';
|
||||
if (isset($this->attributes['shadowMax'][0])) $shMaxAge = $this->attributes['shadowMax'][0];
|
||||
$maxAgeInput = new htmlTableExtendedInputField(_('Maximum password age'), 'shadowMax', $shMaxAge, 'shadowMax');
|
||||
$maxAgeInput->setFieldMaxLength(5);
|
||||
$maxAgeInput->setFieldSize(5);
|
||||
$maxAgeInput = $this->addSimpleInputTextField($return, 'shadowMax', _('Maximum password age'));
|
||||
$maxAgeInput->setValidationRule(htmlElement::VALIDATE_NUMERIC);
|
||||
$return->addElement($maxAgeInput, true);
|
||||
|
||||
$expirationDate = " - ";
|
||||
if (isset($this->attributes['shadowExpire'][0])) {
|
||||
|
|
@ -353,36 +355,35 @@ class shadowAccount extends baseModule implements passwordService {
|
|||
$date = new DateTime('@' . $shAccExpirationDate*3600*24, new DateTimeZone('UTC'));
|
||||
$expirationDate = $date->format('d.m.Y');
|
||||
}
|
||||
$return->addElement(new htmlOutputText(_('Account expiration date')));
|
||||
$expireTable = new htmlTable();
|
||||
$return->addLabel(new htmlOutputText(_('Account expiration date')));
|
||||
$expireTable = new htmlGroup();
|
||||
$expireTable->addElement(new htmlOutputText($expirationDate, false));
|
||||
$expireTable->addElement(new htmlAccountPageButton('shadowAccount', 'expire', 'open', 'edit.png', true, _('Change')));
|
||||
$return->addElement($expireTable);
|
||||
$return->addElement(new htmlHelpLink('shadowExpire'), true);
|
||||
$expireTable->addElement(new htmlHelpLink('shadowExpire'), true);
|
||||
$return->addField($expireTable);
|
||||
|
||||
$pwdChangeDate = " - ";
|
||||
if (isset($this->attributes['shadowLastChange'][0])) {
|
||||
$shPwdChangeDate = $this->attributes['shadowLastChange'][0];
|
||||
$date = new DateTime('@' . $shPwdChangeDate*3600*24, new DateTimeZone('UTC'));
|
||||
$pwdChangeDate = $date->format('d.m.Y');
|
||||
}
|
||||
$return->addElement(new htmlOutputText(_('Last password change')));
|
||||
$pwdChangeTable = new htmlTable();
|
||||
$pwdChangeTable->addElement(new htmlOutputText($pwdChangeDate, false));
|
||||
$pwdChangeTable->addElement(new htmlAccountPageButton('shadowAccount', 'pwdChange', 'open', 'edit.png', true, _('Change')));
|
||||
if (isset($this->attributes['shadowMax'][0]) && ($this->attributes['shadowMax'][0] != '')) {
|
||||
$pwdChangeTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'expirePassword', _('Force password change')));
|
||||
}
|
||||
$return->addElement($pwdChangeTable);
|
||||
$return->addElement(new htmlHelpLink('shadowLastChange'), true);
|
||||
$pwdChangeDate = " - ";
|
||||
if (isset($this->attributes['shadowLastChange'][0])) {
|
||||
$shPwdChangeDate = $this->attributes['shadowLastChange'][0];
|
||||
$date = new DateTime('@' . $shPwdChangeDate*3600*24, new DateTimeZone('UTC'));
|
||||
$pwdChangeDate = $date->format('d.m.Y');
|
||||
}
|
||||
$return->addLabel(new htmlOutputText(_('Last password change')));
|
||||
$pwdChangeTable = new htmlGroup();
|
||||
$pwdChangeTable->addElement(new htmlOutputText($pwdChangeDate, false));
|
||||
$pwdChangeTable->addElement(new htmlAccountPageButton('shadowAccount', 'pwdChange', 'open', 'edit.png', true, _('Change')));
|
||||
if (isset($this->attributes['shadowMax'][0]) && ($this->attributes['shadowMax'][0] != '')) {
|
||||
$pwdChangeTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'expirePassword', _('Force password change')));
|
||||
}
|
||||
$pwdChangeTable->addElement(new htmlHelpLink('shadowLastChange'), true);
|
||||
$return->addField($pwdChangeTable);
|
||||
|
||||
$return->addElement(new htmlOutputText(''), true);
|
||||
$return->addVerticalSpacer('2rem');
|
||||
$remButton = new htmlAccountPageButton('shadowAccount', 'attributes', 'remObjectClass', _('Remove Shadow account extension'));
|
||||
$remButton->colspan = 4;
|
||||
$return->addElement($remButton);
|
||||
$return->add($remButton, 12, 12, 12, 'text-center');
|
||||
}
|
||||
else {
|
||||
$return->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'addObjectClass', _('Add Shadow account extension')));
|
||||
$return->add(new htmlAccountPageButton('shadowAccount', 'attributes', 'addObjectClass', _('Add Shadow account extension')), 12);
|
||||
}
|
||||
return $return;
|
||||
}
|
||||
|
|
@ -454,46 +455,59 @@ class shadowAccount extends baseModule implements passwordService {
|
|||
* @return array meta HTML code
|
||||
*/
|
||||
function display_html_expire() {
|
||||
$return = new htmlTable();
|
||||
$shAccExpirationDate = time()/(3600*24) + 365;
|
||||
$return = new htmlResponsiveRow();
|
||||
$shAccExpirationDate = time() / (3600 * 24) + 365;
|
||||
if (isset($this->attributes['shadowExpire'][0])) {
|
||||
$shAccExpirationDate = $this->attributes['shadowExpire'][0];
|
||||
}
|
||||
$date = new DateTime('@' . $shAccExpirationDate*3600*24, new DateTimeZone('UTC'));
|
||||
for ( $i=1; $i<=31; $i++ ) $mday[] = $i;
|
||||
for ( $i=1; $i<=12; $i++ ) $mon[] = $i;
|
||||
for ( $i=2003; $i<=2050; $i++ ) $year[] = $i;
|
||||
$return->addElement(new htmlOutputText(_('Account expiration date')));
|
||||
$expTable = new htmlTable();
|
||||
$expTable->addElement(new htmlSelect('shadowExpire_day', $mday, array($date->format('j'))));
|
||||
$expTable->addElement(new htmlSelect('shadowExpire_mon', $mon, array($date->format('n'))));
|
||||
$expTable->addElement(new htmlSelect('shadowExpire_yea', $year, array($date->format('Y'))));
|
||||
$return->addElement($expTable);
|
||||
$return->addElement(new htmlHelpLink('shadowExpire'), true);
|
||||
for ( $i=1; $i<=31; $i++ ) {
|
||||
$mday[] = $i;
|
||||
}
|
||||
for ( $i=1; $i<=12; $i++ ) {
|
||||
$mon[] = $i;
|
||||
}
|
||||
for ( $i=2003; $i<=2050; $i++ ) {
|
||||
$year[] = $i;
|
||||
}
|
||||
$return->addLabel(new htmlOutputText(_('Account expiration date')));
|
||||
$expTable = new htmlGroup();
|
||||
$daySelect = new htmlSelect('shadowExpire_day', $mday, array($date->format('j')));
|
||||
$daySelect->setWidth('3rem');
|
||||
$expTable->addElement($daySelect);
|
||||
$monthSelect = new htmlSelect('shadowExpire_mon', $mon, array($date->format('n')));
|
||||
$monthSelect->setWidth('3rem');
|
||||
$expTable->addElement($monthSelect);
|
||||
$yearSelect = new htmlSelect('shadowExpire_yea', $year, array($date->format('Y')));
|
||||
$yearSelect->setWidth('5rem');
|
||||
$expTable->addElement($yearSelect);
|
||||
$expTable->addElement(new htmlHelpLink('shadowExpire'), true);
|
||||
$return->addField($expTable);
|
||||
if ($this->getAccountContainer()->getAccountModule('sambaSamAccount') != null) {
|
||||
$return->addElement(new htmlTableExtendedInputCheckbox('syncSamba', false, _('Set also for Samba 3')), true);
|
||||
$return->add(new htmlResponsiveInputCheckbox('syncSamba', false, _('Set also for Samba 3')), 12);
|
||||
}
|
||||
if ($this->getAccountContainer()->getAccountModule('windowsUser') != null) {
|
||||
$return->addElement(new htmlTableExtendedInputCheckbox('syncWindows', false, _('Set also for Windows')), true);
|
||||
$return->add(new htmlResponsiveInputCheckbox('syncWindows', false, _('Set also for Windows')), 12);
|
||||
}
|
||||
if ($this->getAccountContainer()->getAccountModule('heimdalKerberos') != null) {
|
||||
$return->addElement(new htmlTableExtendedInputCheckbox('syncHeimdal', false, _('Set also for Kerberos')), true);
|
||||
$return->add(new htmlResponsiveInputCheckbox('syncHeimdal', false, _('Set also for Kerberos')), 12);
|
||||
}
|
||||
if ($this->getAccountContainer()->getAccountModule('mitKerberos') != null) {
|
||||
$return->addElement(new htmlTableExtendedInputCheckbox('syncMIT', false, _('Set also for Kerberos')), true);
|
||||
$return->add(new htmlResponsiveInputCheckbox('syncMIT', false, _('Set also for Kerberos')), 12);
|
||||
}
|
||||
if ($this->getAccountContainer()->getAccountModule('mitKerberosStructural') != null) {
|
||||
$return->addElement(new htmlTableExtendedInputCheckbox('syncMITStructural', false, _('Set also for Kerberos')), true);
|
||||
$return->add(new htmlResponsiveInputCheckbox('syncMITStructural', false, _('Set also for Kerberos')), 12);
|
||||
}
|
||||
$return->addElement(new htmlSpacer(null, '10px'), true);
|
||||
$buttonTable = new htmlTable();
|
||||
$return->addVerticalSpacer('2rem');
|
||||
$buttonTable = new htmlGroup();
|
||||
$buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'change', _('Change')));
|
||||
if (isset($this->attributes['shadowExpire'][0])) {
|
||||
$buttonTable->addElement(new htmlSpacer('0.5rem', null));
|
||||
$buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'del', _('Remove')));
|
||||
}
|
||||
$buttonTable->addElement(new htmlSpacer('0.5rem', null));
|
||||
$buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'back', _('Cancel')));
|
||||
$buttonTable->colspan=3;
|
||||
$return->addElement($buttonTable);
|
||||
$return->add($buttonTable, 12, 12, 12, 'text-center');
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
|
@ -522,31 +536,44 @@ class shadowAccount extends baseModule implements passwordService {
|
|||
* @return array meta HTML code
|
||||
*/
|
||||
function display_html_pwdChange() {
|
||||
$return = new htmlTable();
|
||||
$return = new htmlResponsiveRow();
|
||||
$shLastChange = time()/(3600*24);
|
||||
if (isset($this->attributes['shadowLastChange'][0])) {
|
||||
$shLastChange = $this->attributes['shadowLastChange'][0];
|
||||
}
|
||||
$date = new DateTime('@' . $shLastChange*3600*24, new DateTimeZone('UTC'));
|
||||
for ( $i=1; $i<=31; $i++ ) $mday[] = $i;
|
||||
for ( $i=1; $i<=12; $i++ ) $mon[] = $i;
|
||||
for ( $i=2003; $i<=2050; $i++ ) $year[] = $i;
|
||||
$return->addElement(new htmlOutputText(_('Last password change')));
|
||||
$table = new htmlTable();
|
||||
$table->addElement(new htmlSelect('shadowLastChange_day', $mday, array($date->format('j'))));
|
||||
$table->addElement(new htmlSelect('shadowLastChange_mon', $mon, array($date->format('n'))));
|
||||
$table->addElement(new htmlSelect('shadowLastChange_yea', $year, array($date->format('Y'))));
|
||||
$return->addElement($table);
|
||||
$return->addElement(new htmlHelpLink('shadowLastChange'), true);
|
||||
$return->addElement(new htmlSpacer(null, '10px'), true);
|
||||
$buttonTable = new htmlTable();
|
||||
for ( $i=1; $i<=31; $i++ ) {
|
||||
$mday[] = $i;
|
||||
}
|
||||
for ( $i=1; $i<=12; $i++ ) {
|
||||
$mon[] = $i;
|
||||
}
|
||||
for ( $i=2003; $i<=2050; $i++ ) {
|
||||
$year[] = $i;
|
||||
}
|
||||
$return->addLabel(new htmlOutputText(_('Last password change')));
|
||||
$table = new htmlGroup();
|
||||
$daySelect = new htmlSelect('shadowLastChange_day', $mday, array($date->format('j')));
|
||||
$daySelect->setWidth('3rem');
|
||||
$table->addElement($daySelect);
|
||||
$monthSelect = new htmlSelect('shadowLastChange_mon', $mon, array($date->format('n')));
|
||||
$monthSelect->setWidth('3rem');
|
||||
$table->addElement($monthSelect);
|
||||
$yearSelect = new htmlSelect('shadowLastChange_yea', $year, array($date->format('Y')));
|
||||
$yearSelect->setWidth('5rem');
|
||||
$table->addElement($yearSelect);
|
||||
$table->addElement(new htmlHelpLink('shadowLastChange'), true);
|
||||
$return->addField($table);
|
||||
$return->addVerticalSpacer('2rem');
|
||||
$buttonTable = new htmlGroup();
|
||||
$buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'changePwdChange', _('Change')));
|
||||
if (isset($this->attributes['shadowLastChange'][0])) {
|
||||
$buttonTable->addElement(new htmlSpacer('0.5rem', null));
|
||||
$buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'delPwdChange', _('Remove')));
|
||||
}
|
||||
$buttonTable->addElement(new htmlSpacer('0.5rem', null));
|
||||
$buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'back', _('Cancel')));
|
||||
$buttonTable->colspan = 3;
|
||||
$return->addElement($buttonTable);
|
||||
$return->add($buttonTable, 12, 12, 12, 'text-center');
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue