From e59c3dcda4e0cd0c5e57ee77f7339f48792bc6de Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 25 Sep 2018 09:03:15 +0200 Subject: [PATCH] Improve feedback when adding users to a session see BT#14871 --- main/inc/lib/sessionmanager.lib.php | 8 ++++++++ main/session/session_import_drh.php | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index cd384fe706..8e5058f1d5 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -6645,6 +6645,14 @@ SQL; $userInfo = api_get_user_info_from_username($data['Username']); $sessionInfo = self::get_session_by_name($data['SessionName']); + if (empty($sessionInfo)) { + Display::addFlash(Display::return_message(get_lang('NoSessionId').' - '.$data['SessionName'], 'warning')); + } + + if (empty($userInfo)) { + Display::addFlash(Display::return_message(get_lang('UserDoesNotExist').' - '.$data['Username'], 'warning')); + } + if (!empty($userInfo) && !empty($sessionInfo)) { $userSessionList[$userInfo['user_id']]['session_list'][] = [ 'session_id' => $sessionInfo['id'], diff --git a/main/session/session_import_drh.php b/main/session/session_import_drh.php index 0bb724055a..9896486113 100644 --- a/main/session/session_import_drh.php +++ b/main/session/session_import_drh.php @@ -57,7 +57,9 @@ if ($form->validate()) { $sendMail, $removeOldRelationships ); - echo Display::return_message($result, 'info', false); + Display::addFlash(Display::return_message($result, 'info', false)); + header('Location: '.api_get_self()); + exit; } else { $error_message = get_lang('NoInputFile'); }