From d646aa5fbc2016e2e3f0a60d44a10a1b1237e5b2 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Tue, 25 Apr 2017 16:41:07 -0500
Subject: [PATCH] Minor - Replace deprecated function calls and unused code
 #scrutinizer

---
 main/admin/add_sessions_to_usergroup.php | 5 ++---
 main/admin/archive_cleanup.php           | 2 +-
 main/admin/configure_inscription.php     | 2 +-
 main/admin/course_category.php           | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/admin/add_sessions_to_usergroup.php b/main/admin/add_sessions_to_usergroup.php
index f463d22656..b68245ab68 100755
--- a/main/admin/add_sessions_to_usergroup.php
+++ b/main/admin/add_sessions_to_usergroup.php
@@ -122,12 +122,11 @@ function search_usergroup_sessions($needle,$type) {
     $xajax_response = new xajaxResponse();
     $return = '';
     if (!empty($needle) && !empty($type)) {
-        if ($type == 'single') {
-        } else if ($type == 'searchbox') {
+        if ($type == 'searchbox') {
             $session_list = SessionManager::get_sessions_list(
                 array('s.name' => array('operator' => 'LIKE', 'value' => "%$needle%"))
             );
-        } else {
+        } elseif ($type != 'single') {
             $session_list = SessionManager::get_sessions_list(
                 array('s.name' => array('operator' => 'LIKE', 'value' => "$needle%"))
             );
diff --git a/main/admin/archive_cleanup.php b/main/admin/archive_cleanup.php
index 8aab357ae8..ae3fe50ef9 100755
--- a/main/admin/archive_cleanup.php
+++ b/main/admin/archive_cleanup.php
@@ -57,6 +57,6 @@ if ($form->validate()) {
 }
 
 Display::display_header(get_lang('ArchiveDirCleanup'));
-Display::display_warning_message(get_lang('ArchiveDirCleanupDescr'));
+echo Display::return_message(get_lang('ArchiveDirCleanupDescr'), 'warning');
 $form->display();
 Display::display_footer();
diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php
index bd43b4651c..debc5260ee 100755
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
@@ -169,7 +169,7 @@ if (api_get_setting('allow_registration') == 'approval') {
 }
 //if openid was not found
 if (!empty($_GET['openid_msg']) && $_GET['openid_msg'] == 'idnotfound') {
-    Display::display_warning_message(get_lang('OpenIDCouldNotBeFoundPleaseRegister'));
+    echo Display::return_message(get_lang('OpenIDCouldNotBeFoundPleaseRegister'), 'warning');
 }
 
 $form = new FormValidator('registration');
diff --git a/main/admin/course_category.php b/main/admin/course_category.php
index 02726c66c1..48a2cb1672 100755
--- a/main/admin/course_category.php
+++ b/main/admin/course_category.php
@@ -124,7 +124,7 @@ if ($action == 'add' || $action == 'edit') {
 } else {
     // If multiple URLs and not main URL, prevent deletion and inform user
     if ($action == 'delete' && api_get_multiple_access_url() && api_get_current_access_url_id() != 1) {
-        Display::display_warning_message(get_lang('CourseCategoriesAreGlobal'));
+        echo Display::return_message(get_lang('CourseCategoriesAreGlobal'), 'warning');
     }
     echo '<div class="actions">';
     $link = null;