From 8269f3707ad481f418330bc495124a3f737c8b76 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Sat, 9 Oct 2010 06:43:45 +0300
Subject: [PATCH] Feature #2099 - UI: Code for showing confirmation or error
 messages have been added.

---
 main/admin/course_request_accepted.php | 11 +++++++++++
 main/admin/course_request_rejected.php | 11 +++++++++++
 main/admin/course_request_review.php   | 13 ++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index 61f62eb9c3..9f2a5d5407 100644
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -39,6 +39,8 @@ require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 
 // Filltering passed to this page parameters.
 $delete_course_request = intval($_GET['delete_course_request']);
+$message = trim(Security::remove_XSS(stripslashes(urldecode($_GET['message']))));
+$is_error_message = !empty($_GET['is_error_message']);
 
 /**
  * Deletion of a course request.
@@ -96,6 +98,15 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
 $tool_name = get_lang('AcceptedCourseRequests');
 Display :: display_header($tool_name);
 
+// Display confirmation or error message.
+if (!empty($message)) {
+    if ($is_error_message) {
+        Display::display_error_message($message);
+    } else {
+        Display::display_normal_message($message);
+    }
+}
+
 // The action bar.
 echo '<div class="actions">';
 echo '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests')).get_lang('ReviewCourseRequests').'</a>';
diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php
index f2790a9649..fae8907ada 100644
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@@ -42,6 +42,8 @@ require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 $accept_course_request = intval($_GET['accept_course_request']);
 $delete_course_request = intval($_GET['delete_course_request']);
 $request_info = intval($_GET['request_info']);
+$message = trim(Security::remove_XSS(stripslashes(urldecode($_GET['message']))));
+$is_error_message = !empty($_GET['is_error_message']);
 
 
 /**
@@ -126,6 +128,15 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
 $tool_name = get_lang('RejectedCourseRequests');
 Display :: display_header($tool_name);
 
+// Display confirmation or error message.
+if (!empty($message)) {
+    if ($is_error_message) {
+        Display::display_error_message($message);
+    } else {
+        Display::display_normal_message($message);
+    }
+}
+
 // The action bar.
 echo '<div class="actions">';
 echo '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests')).get_lang('ReviewCourseRequests').'</a>';
diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index 459f1401b8..3255e753d5 100644
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -42,6 +42,8 @@ $accept_course_request = intval($_GET['accept_course_request']);
 $reject_course_request = intval($_GET['reject_course_request']);
 $request_info = intval($_GET['request_info']);
 $delete_course_request = intval($_GET['delete_course_request']);
+$message = trim(Security::remove_XSS(stripslashes(urldecode($_GET['message']))));
+$is_error_message = !empty($_GET['is_error_message']);
 
 /**
  * Course acceptance and creation.
@@ -61,7 +63,7 @@ if (!empty($accept_course_request)) {
 /**
  * Course rejection
  */
-if (isset($_GET['reject_course_request']) && $_GET['reject_course_request'] != '') {
+if (!empty($reject_course_request)) {
 
     $result = CourseRequestManager::reject_course_request($reject_course_request);
 
@@ -171,6 +173,15 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
 $tool_name = get_lang('ReviewCourseRequests');
 Display :: display_header($tool_name);
 
+// Display confirmation or error message.
+if (!empty($message)) {
+    if ($is_error_message) {
+        Display::display_error_message($message);
+    } else {
+        Display::display_normal_message($message);
+    }
+}
+
 // The action bar.
 echo '<div class="actions">';
 echo '<a href="course_request_accepted.php">'.Display::return_icon('course_request_accepted.gif', get_lang('AcceptedCourseRequests')).get_lang('AcceptedCourseRequests').'</a>';