diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc index 1fe8af27..fdbc3bff 100644 --- a/lam/lib/baseModule.inc +++ b/lam/lib/baseModule.inc @@ -4,10 +4,9 @@ use \LAM\PDF\PDFTable; use LAM\TYPES\ConfiguredType; use function LAM\TYPES\getScopeFromTypeId; /* -$Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2003 - 2017 Roland Gruber + Copyright (C) 2003 - 2018 Roland Gruber 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 @@ -171,6 +170,7 @@ abstract class baseModule { // load attributes $attributeNames = array_merge($this->getManagedAttributes($typeId), $this->getManagedHiddenAttributes($typeId)); $attributeNames = array_unique($attributeNames); + $attributeNames = array_values($attributeNames); for ($i = 0; $i < sizeof($attributeNames); $i++) { if (isset($attributes[$attributeNames[$i]])) { $this->attributes[$attributeNames[$i]] = $attributes[$attributeNames[$i]]; diff --git a/lam/lib/security.inc b/lam/lib/security.inc index 5e745d5e..6c16138f 100644 --- a/lam/lib/security.inc +++ b/lam/lib/security.inc @@ -556,10 +556,14 @@ function validateSecurityToken($post = true) { * Adds a hidden input field to the given meta HTML table. * Should be used to add token at the end of table. * - * @param htmlTable|htmlGroup $container table + * @param htmlTable|htmlGroup|htmlResponsiveRow $container table */ function addSecurityTokenToMetaHTML(&$container) { $token = new htmlHiddenInput(getSecurityTokenName(), $_SESSION[getSecurityTokenName()]); + if ($container instanceof htmlResponsiveRow) { + $container->add($token, 12); + return; + } $container->addElement($token, true); } diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php index 51ad58be..2dca066d 100644 --- a/lam/templates/ou_edit.php +++ b/lam/templates/ou_edit.php @@ -1,20 +1,20 @@ '; echo "
"; @@ -158,22 +161,22 @@ display_main($message, $error); */ function display_main($message, $error) { // display main page - include 'main_header.php'; + include '../lib/adminHeader.inc'; echo '