From a1dfb02a20ad59dd4c5970ab42716500862551ee Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Fri, 21 Jun 2019 12:05:07 +0200
Subject: [PATCH] Minor - fix PHP warning + default values

---
 main/exercise/exercise.class.php       |  4 ++--
 plugin/studentfollowup/my_students.php | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
index 7e2c8c4938..1cc91940ce 100755
--- a/main/exercise/exercise.class.php
+++ b/main/exercise/exercise.class.php
@@ -8596,7 +8596,7 @@ class Exercise
             'results_disabled',
             null,
             get_lang('ExerciseRankingMode'),
-            '6',
+            RESULT_DISABLE_RANKING,
             ['id' => 'result_disabled_6']
         );
 
@@ -8613,7 +8613,7 @@ class Exercise
             'radio',
             'results_disabled',
             null,
-            get_lang('ExerciseShowOnlyGlobalScoreAndCorrectAnswersAndRankingMode'),
+            get_lang('ExerciseAutoEvaluationAndRankingMode'),
             RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER_AND_RANKING,
             ['id' => 'result_disabled_8']
         );
diff --git a/plugin/studentfollowup/my_students.php b/plugin/studentfollowup/my_students.php
index 1b2a6febc4..f751cb9bcf 100644
--- a/plugin/studentfollowup/my_students.php
+++ b/plugin/studentfollowup/my_students.php
@@ -11,8 +11,8 @@ api_block_anonymous_users();
 $plugin = StudentFollowUpPlugin::create();
 
 $currentUserId = api_get_user_id();
-$currentPage = isset($_GET['page']) ? (int) $_GET['page'] : 1;
-$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : '';
+$currentPage = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : 1;
+$keyword = isset($_REQUEST['keyword']) ? Security::remove_XSS($_REQUEST['keyword']) : '';
 $sessionId = isset($_REQUEST['session_id']) ? (int) $_REQUEST['session_id'] : 0;
 $selectedTag = isset($_REQUEST['tag']) ? Security::remove_XSS($_REQUEST['tag']) : '';
 
@@ -81,9 +81,9 @@ if (!empty($userList) || $isAdmin) {
     ;
 
     if (!empty($keyword)) {
-        $keyword = explode(' ', $keyword);
-        if (is_array($keyword)) {
-            foreach ($keyword as $key) {
+        $keywordToArray = explode(' ', $keyword);
+        if (is_array($keywordToArray)) {
+            foreach ($keywordToArray as $key) {
                 $key = trim($key);
                 if (empty($key)) {
                     continue;
@@ -124,7 +124,6 @@ if (!empty($userList) || $isAdmin) {
     $tagList = [];
     foreach ($tags as $tag) {
         $itemTags = $tag['tags'];
-        //var_dump($itemTags);
         foreach ($itemTags as $itemTag) {
             if (in_array($itemTag, array_keys($tagList))) {
                 $tagList[$itemTag]++;
@@ -182,7 +181,13 @@ if (!empty($tagList)) {
 
 $form->addButtonSearch(get_lang('Search'));
 
-$form->setDefaults(['session_id' => $sessionId]);
+$defaults = [
+    'session_id' => $sessionId,
+    'keyword' => $keyword,
+    'tag' => $selectedTag,
+];
+
+$form->setDefaults($defaults);
 
 $tpl = new Template($plugin->get_lang('plugin_title'));
 $tpl->assign('users', $items);