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

new type API

This commit is contained in:
Roland Gruber 2017-04-22 11:16:41 +02:00
parent c01e6c242e
commit cc997a625f
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lam/lib/modules/account.inc
View File

@ -4,7 +4,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 - 2006 Tilo Lutz Copyright (C) 2003 - 2006 Tilo Lutz
2005 - 2015 Roland Gruber 2005 - 2017 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
@ -55,9 +55,6 @@ class account extends baseModule {
* @see baseModule::get_metaData() * @see baseModule::get_metaData()
*/ */
function get_metaData() { function get_metaData() {
if (isLoggedIn()) {
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
}
$return = array(); $return = array();
// icon // icon
$return['icon'] = 'uid.png'; $return['icon'] = 'uid.png';
@ -81,9 +78,6 @@ class account extends baseModule {
$return['PDF_fields'] = array( $return['PDF_fields'] = array(
'description' => _('Description') 'description' => _('Description')
); );
if (isLoggedIn() && !in_array('posixAccount', $modules)) {
$return['PDF_fields']['uid'] = _('User name');
}
// help Entries // help Entries
$return['help'] = array ( $return['help'] = array (
'host' => array( 'host' => array(
@ -117,6 +111,18 @@ class account extends baseModule {
return $return; return $return;
} }
/**
* Returns if the Unix module is active for the current account type.
*
* @return bool Unix active
*/
private function isUnixActive() {
if ($this->getAccountContainer() != null) {
return $this->getAccountContainer()->getAccountModule('posixAccount') != null;
}
return false;
}
/** /**
* This function fills the message array. * This function fills the message array.
*/ */
@ -133,8 +139,9 @@ class account extends baseModule {
* @return boolean true if LDAP operation can be done * @return boolean true if LDAP operation can be done
*/ */
function module_complete() { function module_complete() {
$modules = $_SESSION['config']->get_AccountModules($this->get_scope()); if (!$this->isUnixActive() && empty($this->attributes['uid'][0])) {
if (!in_array('posixAccount', $modules) && $this->attributes['uid'][0] == '') return false; return false;
}
return true; return true;
} }
@ -188,8 +195,7 @@ class account extends baseModule {
// Load attributes // Load attributes
$this->attributes['description'][0] = $_POST['description']; $this->attributes['description'][0] = $_POST['description'];
// user name if no posixAccount // user name if no posixAccount
$modules = $_SESSION['config']->get_AccountModules($this->get_scope()); if (!$this->isUnixActive()) {
if (!in_array('posixAccount', $modules)) {
$this->attributes['uid'][0] = $_POST['uid']; $this->attributes['uid'][0] = $_POST['uid'];
if (!get_preg($this->attributes['uid'][0], '!upper')) $errors[] = $this->messages['uid'][2]; if (!get_preg($this->attributes['uid'][0], '!upper')) $errors[] = $this->messages['uid'][2];
if (!get_preg($this->attributes['uid'][0], 'username')) $errors[] = $this->messages['uid'][3]; if (!get_preg($this->attributes['uid'][0], 'username')) $errors[] = $this->messages['uid'][3];
@ -205,8 +211,7 @@ class account extends baseModule {
function display_html_attributes() { function display_html_attributes() {
$container = new htmlTable(); $container = new htmlTable();
// user name if no posixAccount // user name if no posixAccount
$modules = $_SESSION['config']->get_AccountModules($this->get_scope()); if (!$this->isUnixActive()) {
if (!in_array('posixAccount', $modules)) {
$title = _('User name'); $title = _('User name');
if ($this->get_scope()=='host') { if ($this->get_scope()=='host') {
$title = _('Host name'); $title = _('Host name');
@ -219,6 +224,18 @@ class account extends baseModule {
return $container; return $container;
} }
/**
* {@inheritDoc}
* @see baseModule::get_pdfFields()
*/
public function get_pdfFields($typeId) {
$fields = parent::get_pdfFields($typeId);
if (!$this->isUnixActive()) {
$fields['uid'] = _('User name');
}
return $fields;
}
/** /**
* {@inheritDoc} * {@inheritDoc}
* @see baseModule::get_pdfEntries() * @see baseModule::get_pdfEntries()