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

added error handler for Ajax call

This commit is contained in:
Roland Gruber 2017-10-25 20:38:39 +02:00
parent fce8908a72
commit 6a3f31aa30
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lam/templates/multiEdit.php
View File

@ -214,7 +214,7 @@ function displayStartPage() {
* *
* @param htmlTable $container container * @param htmlTable $container container
*/ */
function runActions(&$container) { function runActions(htmlTable &$container) {
// LDAP suffix // LDAP suffix
if ($_POST['suffix'] == '-') { if ($_POST['suffix'] == '-') {
$suffix = trim($_POST['otherSuffix']); $suffix = trim($_POST['otherSuffix']);
@ -489,12 +489,36 @@ function dryRun() {
); );
} }
/**
* Error handler
*
* @param int $errno error number
* @param string $errstr error message
* @param string $errfile error file
* @param int $errline error line
*/
function multiEditLdapErrorHandler($errno, $errstr, $errfile, $errline) {
switch ($errno) {
case E_USER_ERROR:
logNewMessage(LOG_ERR, 'Error occured: ' . $errstr);
$_REQUEST['multiEdit_error'] = true;
;
break;
case E_USER_WARNING:
logNewMessage(LOG_WARNING, 'Error occured: ' . $errstr);
$_REQUEST['multiEdit_error'] = true;
;
break;
}
}
/** /**
* Runs the actual modifications. * Runs the actual modifications.
* *
* @return array status * @return array status
*/ */
function doModify() { function doModify() {
set_error_handler('\LAM\TOOLS\MULTI_EDIT\multiEditLdapErrorHandler');
// initial action index // initial action index
if (!isset($_SESSION['multiEdit_status']['index'])) { if (!isset($_SESSION['multiEdit_status']['index'])) {
$_SESSION['multiEdit_status']['index'] = 0; $_SESSION['multiEdit_status']['index'] = 0;
@ -530,7 +554,7 @@ function doModify() {
$success = ldap_modify($_SESSION['ldap']->server(), $dn, array($attr => array($val))); $success = ldap_modify($_SESSION['ldap']->server(), $dn, array($attr => array($val)));
break; break;
} }
if (!$success) { if (!$success || isset($_REQUEST['multiEdit_error'])) {
$msg = new htmlStatusMessage('ERROR', getDefaultLDAPErrorString($_SESSION['ldap']->server())); $msg = new htmlStatusMessage('ERROR', getDefaultLDAPErrorString($_SESSION['ldap']->server()));
$_SESSION['multiEdit_status']['modContent'] .= getMessageHTML($msg); $_SESSION['multiEdit_status']['modContent'] .= getMessageHTML($msg);
} }