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-26 19:01:57 +02:00
parent 1a16b3cd5b
commit c51918907e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lam/lib/types/group.inc
View File

@ -46,8 +46,8 @@ class group extends baseType {
parent::__construct($type); parent::__construct($type);
$this->LABEL_CREATE_ANOTHER_ACCOUNT = _('Create another group'); $this->LABEL_CREATE_ANOTHER_ACCOUNT = _('Create another group');
$this->LABEL_BACK_TO_ACCOUNT_LIST = _('Back to group list'); $this->LABEL_BACK_TO_ACCOUNT_LIST = _('Back to group list');
if (isset($_SESSION['config'])) { if ($this->getType() != null) {
$modules = $_SESSION['config']->get_AccountModules('group'); $modules = $this->getType()->getModules();
if (in_array('organizationalRole', $modules)) { if (in_array('organizationalRole', $modules)) {
$this->LABEL_CREATE_ANOTHER_ACCOUNT = _('Create another role'); $this->LABEL_CREATE_ANOTHER_ACCOUNT = _('Create another role');
$this->LABEL_BACK_TO_ACCOUNT_LIST = _('Back to role list'); $this->LABEL_BACK_TO_ACCOUNT_LIST = _('Back to role list');
@ -61,8 +61,8 @@ class group extends baseType {
* @return string alias name * @return string alias name
*/ */
function getAlias() { function getAlias() {
if (isLoggedIn() && isset($_SESSION['config'])) { if ($this->getType() != null) {
$modules = $_SESSION['config']->get_AccountModules('group'); $modules = $this->getType()->getModules();
if (in_array('organizationalRole', $modules)) { if (in_array('organizationalRole', $modules)) {
return _('Roles'); return _('Roles');
} }
@ -114,8 +114,8 @@ class group extends baseType {
"roleOccupant" => _("Role member DNs"), "roleOccupant" => _("Role member DNs"),
"uniqueMember" => _("Group member DNs"), "uniqueMember" => _("Group member DNs"),
); );
if (!empty($_SESSION['config'])) { if ($this->getType() != null) {
$modules = $_SESSION['config']->get_AccountModules('group'); $modules = $this->getType()->getModules();
if (in_array('organizationalRole', $modules)) { if (in_array('organizationalRole', $modules)) {
$return['cn'] = _('Role name'); $return['cn'] = _('Role name');
} }
@ -245,7 +245,7 @@ class lamGroupList extends lamList {
'error_noneFound' => _("No groups found!"), 'error_noneFound' => _("No groups found!"),
'newEntry' => _("New group"), 'newEntry' => _("New group"),
'deleteEntry' => _("Delete selected groups")); 'deleteEntry' => _("Delete selected groups"));
$modules = $_SESSION['config']->get_AccountModules('group'); $modules = $this->type->getModules();
if (in_array('organizationalRole', $modules)) { if (in_array('organizationalRole', $modules)) {
$this->labels = array( $this->labels = array(
'nav' => _("Role count: %s"), 'nav' => _("Role count: %s"),

12
lam/lib/types/user.inc
View File

@ -884,7 +884,7 @@ class lamUserList extends lamList {
for ($i = 0; $i < $entryCount; $i++) { for ($i = 0; $i < $entryCount; $i++) {
$unixAvailable = self::isUnixAvailable($this->entries[$i]); $unixAvailable = self::isUnixAvailable($this->entries[$i]);
$sambaAvailable = self::isSambaAvailable($this->entries[$i]); $sambaAvailable = self::isSambaAvailable($this->entries[$i]);
$ppolicyAvailable = self::isPPolicyAvailable($this->entries[$i]); $ppolicyAvailable = $this->isPPolicyAvailable($this->entries[$i]);
$windowsAvailable = self::isWindowsAvailable($this->entries[$i]); $windowsAvailable = self::isWindowsAvailable($this->entries[$i]);
$unixLocked = self::isUnixLocked($this->entries[$i]); $unixLocked = self::isUnixLocked($this->entries[$i]);
$sambaLocked = self::isSambaLocked($this->entries[$i]); $sambaLocked = self::isSambaLocked($this->entries[$i]);
@ -931,7 +931,7 @@ class lamUserList extends lamList {
// check status // check status
$unixAvailable = self::isUnixAvailable($attrs); $unixAvailable = self::isUnixAvailable($attrs);
$sambaAvailable = self::isSambaAvailable($attrs); $sambaAvailable = self::isSambaAvailable($attrs);
$ppolicyAvailable = self::isPPolicyAvailable($attrs); $ppolicyAvailable = $this->isPPolicyAvailable($attrs);
$windowsAvailable = self::isWindowsAvailable($attrs); $windowsAvailable = self::isWindowsAvailable($attrs);
$unixLocked = self::isUnixLocked($attrs); $unixLocked = self::isUnixLocked($attrs);
$sambaLocked = self::isSambaLocked($attrs); $sambaLocked = self::isSambaLocked($attrs);
@ -1049,8 +1049,8 @@ class lamUserList extends lamList {
* @param array $attrs LDAP attributes * @param array $attrs LDAP attributes
* @return boolean PPolicy part exists * @return boolean PPolicy part exists
*/ */
public static function isPPolicyAvailable(&$attrs) { public function isPPolicyAvailable(&$attrs) {
return in_array('ppolicyUser', $_SESSION['config']->get_AccountModules('user')); return in_array('ppolicyUser', $this->type->getModules());
} }
/** /**
@ -1089,8 +1089,8 @@ class lamUserList extends lamList {
* @param array $attrs LDAP attributes * @param array $attrs LDAP attributes
* @return boolean 389ds available * @return boolean 389ds available
*/ */
public static function is389dsAvailable(&$attrs) { public function is389dsAvailable(&$attrs) {
return in_array('locking389ds', $_SESSION['config']->get_AccountModules('user')); return in_array('locking389ds', $this->type->getModules());
} }
/** /**