diff --git a/lam/templates/multiEdit.php b/lam/templates/multiEdit.php
index 412f8169..42bd20ff 100644
--- a/lam/templates/multiEdit.php
+++ b/lam/templates/multiEdit.php
@@ -17,11 +17,14 @@ use \htmlDiv;
use \htmlJavaScript;
use \htmlLink;
use \htmlInputTextarea;
+use \htmlResponsiveRow;
+use \htmlResponsiveSelect;
+use \htmlResponsiveInputField;
+use \htmlResponsiveTable;
/*
-$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2013 - 2017 Roland Gruber
+ Copyright (C) 2013 - 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
@@ -92,18 +95,16 @@ else {
*/
function displayStartPage() {
// display main page
- include 'main_header.php';
+ include '../lib/adminHeader.inc';
echo '
';
echo "\n");
echo '
';
- include 'main_footer.php';
+ include '../lib/adminFooter.inc';
}
/**
* Runs the dry run and change actions.
*
- * @param htmlTable $container container
+ * @param htmlResponsiveRow $container container
*/
-function runActions(htmlTable &$container) {
+function runActions(htmlResponsiveRow &$container) {
// LDAP suffix
if ($_POST['suffix'] == '-') {
$suffix = trim($_POST['otherSuffix']);
@@ -225,7 +224,7 @@ function runActions(htmlTable &$container) {
if (empty($suffix)) {
$error = new htmlStatusMessage('ERROR', _('LDAP Suffix is invalid!'));
$error->colspan = 5;
- $container->addElement($error);
+ $container->add($error, 12);
return;
}
// LDAP filter
@@ -240,7 +239,7 @@ function runActions(htmlTable &$container) {
if (sizeof($operations) == 0) {
$error = new htmlStatusMessage('ERROR', _('Please specify at least one operation.'));
$error->colspan = 5;
- $container->addElement($error);
+ $container->add($error, 12);
return;
}
$_SESSION['multiEdit_suffix'] = $suffix;
@@ -254,15 +253,15 @@ function runActions(htmlTable &$container) {
jQuery(\'select\').attr(\'disabled\', true);
jQuery(\'button\').attr(\'disabled\', true);
';
- $container->addElement(new htmlJavaScript($jsContent), true);
+ $container->add(new htmlJavaScript($jsContent), 12);
// progress area
- $container->addElement(new htmlSubTitle(_('Progress')), true);
+ $container->add(new htmlSubTitle(_('Progress')), 12);
$progressBarDiv = new htmlDiv('progressBar', '');
$progressBarDiv->colspan = 5;
- $container->addElement($progressBarDiv, true);
+ $container->add($progressBarDiv, 12);
$progressDiv = new htmlDiv('progressArea', '');
$progressDiv->colspan = 5;
- $container->addElement($progressDiv, true);
+ $container->add($progressDiv, 12);
// JS block for AJAX status update
$ajaxBlock = '
jQuery.get(\'multiEdit.php?ajaxStatus\', null, function(data) {handleReply(data);}, \'json\');
@@ -281,7 +280,7 @@ function runActions(htmlTable &$container) {
}
}
';
- $container->addElement(new htmlJavaScript($ajaxBlock), true);
+ $container->add(new htmlJavaScript($ajaxBlock), 12);
}
/**
@@ -392,7 +391,7 @@ function generateActions() {
if (empty($val) && !empty($entry[$attr])) {
$actions[] = array(DEL, $dn, $attr, null);
}
- elseif (!empty($val) && in_array($val, $entry[$attr])) {
+ elseif (!empty($val) && isset($entry[$attr]) && in_array($val, $entry[$attr])) {
$actions[] = array(DEL, $dn, $attr, $val);
}
break;