Fix search course by session - refs BT#9885 #TMI

main/admin/course_list.php

@@ -354,9 +354,18 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
     if (!empty($sessionId)) {
         $sessionList = array();
         $sessionInfo = SessionManager::fetch($sessionId);
-        $sessionList[] = array('id' => $sessionInfo['id'], 'text' => $sessionInfo['name']);
+        $sessionList[$sessionInfo['id']] = $sessionInfo['name'];
     }
-    $sessionFilter->addElement('select_ajax', 'session_name', get_lang('SearchCourseBySession'), null, array('url' => $url, 'defaults' => $sessionList));
+    $sessionFilter->addElement(
+        'select_ajax',
+        'session_name',
+        get_lang('SearchCourseBySession'),
+        null,
+        array(
+            'url' => $url,
+            'defaults' => $sessionList
+        )
+    );
     $courseListUrl = api_get_self();
     $actions = '
     <script>

main/inc/ajax/session.ajax.php

@@ -25,27 +25,32 @@ switch ($action) {
         break;
     case 'search_session':
         if (api_is_platform_admin()) {
-            $results = SessionManager::get_sessions_list(
+            $sessions = SessionManager::get_sessions_list(
-                array('s.name' => array('operator' => 'LIKE', 'value' => "%".$_REQUEST['q']."%"))
+                [
+                    's.name' => [
+                        'operator' => 'LIKE',
+                        'value' => "%" . $_REQUEST['q'] . "%"
+                    ]
+                ]
             );
-            $results2 = array();
+
-            if (!empty($results)) {
+            $list = [
-                foreach ($results as $item) {
+                'items' => []
-                    $item2 = array();
+            ];
-                    foreach ($item as $id => $internal) {
+
-                        if ($id == 'id') {
+            if (empty($sessions)) {
-                            $item2[$id] = $internal;
+                echo json_encode([]);
-                        }
+                break;
-                        if ($id == 'name') {
-                            $item2['text'] = $internal;
-                        }
-                    }
-                    $results2[] = $item2;
-                }
-                echo json_encode($results2);
-            } else {
-                echo json_encode(array());
             }
+
+            foreach ($sessions as $session) {
+                $list['items'][] = [
+                    'id' => $session['id'],
+                    'text' => $session['name']
+                ];
+            }
+
+            echo json_encode($list);
         }
         break;
     case 'search_session_all':