Fix webservice to work with plugin prestashop with sessions see BT#11040

Author: jmontoyaa

main/inc/lib/sessionmanager.lib.php

@@ -2574,7 +2574,7 @@ public static function delete_session_category($id_checked, $delete_session = fa
      * @return array An array with all sessions of the platform.
      * @todo   optional course code parameter, optional sorting parameters...
      */
-    public static function get_sessions_list($conditions = array(), $order_by = array())
+    public static function get_sessions_list($conditions = array(), $order_by = array(), $from = null, $to = null)
     {
         $session_table = Database::get_main_table(TABLE_MAIN_SESSION);
         $session_category_table = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY);
@@ -2643,6 +2643,12 @@ public static function get_sessions_list($conditions = array(), $order_by = arra
             }
         }
 
+        if (!is_null($from) && !is_null($to)) {
+            $to = intval($to);
+            $from = intval($from);
+            $sql_query .= "LIMIT $from, $to";
+        }
+
         $sql_result = Database::query($sql_query);
         if (Database::num_rows($sql_result) > 0) {
             while ($result = Database::fetch_array($sql_result)) {

main/webservices/registration.soap.php

@@ -5379,6 +5379,21 @@ function WSUnsuscribeCoursesFromSession($params) {
 
 /** WSListCourses **/
 
+$server->wsdl->addComplexType(
+    'listCourseInput',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string'),
+        'original_course_id_name' => array('name' => 'original_course_id_name', 'type' => 'xsd:string'),
+        'from' => array('name' => 'from', 'type' => 'xsd:int'),
+        'to' => array('name' => 'to', 'type' => 'xsd:int')
+    )
+);
+
+
 $server->wsdl->addComplexType(
     'course',
     'complexType',
@@ -5411,7 +5426,7 @@ function WSUnsuscribeCoursesFromSession($params) {
 
 // Register the method to expose
 $server->register('WSListCourses',                                                  // method name
-    array('secret_key' => 'xsd:string', 'original_course_id_name' => 'xsd:string'), // input parameters
+    array('listCourseInput' => 'tns:listCourseInput'), // input parameters
     array('return' => 'tns:courses'),                                               // output parameters
     'urn:WSRegistration',                                                           // namespace
     'urn:WSRegistration#WSListCourses',                                             // soapaction
@@ -5422,16 +5437,20 @@ function WSUnsuscribeCoursesFromSession($params) {
 
 // define the method WSListCourses
 function WSListCourses($params) {
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return return_error(WS_ERROR_SECRET_KEY);
     }
 
-    $course_field_name = $params['original_course_id_name'];
+    $course_field_name = isset($params['original_course_id_name']) ? $params['original_course_id_name'] : '';
 
     $courses_result = array();
     $category_names = array();
 
-    $courses = CourseManager::get_courses_list();
+    $from = isset($params['from']) ? $params['from'] : null;
+    $to = isset($params['to']) ? $params['to'] : null;
+
+    $courses = CourseManager::get_courses_list($from, $to);
+
     foreach($courses as $course) {
         $course_tmp = array();
         $course_tmp['id'] = $course['id'];
@@ -5441,7 +5460,7 @@ function WSListCourses($params) {
         $course_tmp['visibility'] = $course['visibility'];
 
         // Determining category name
-        if($category_names[$course['category_code']]) {
+        if ($category_names[$course['category_code']]) {
             $course_tmp['category_name'] = $category_names[$course['category_code']];
         } else {
             $category = CourseManager::get_course_category($course['category_code']);
@@ -5455,7 +5474,6 @@ function WSListCourses($params) {
         // Determining external course id
         $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
 
-
         $courses_result[] = $course_tmp;
     }
 
@@ -5534,6 +5552,8 @@ function WSUpdateUserApiKey($params) {
     'all',
     '',
     array(
+        'from'  => array('name' => 'from',  'type' => 'xsd:int'),
+        'to'    => array('name' => 'to',    'type' => 'xsd:int'),
         'date_start'  => array('name' => 'date_start',  'type' => 'xsd:string'),
         'date_end'    => array('name' => 'date_end',    'type' => 'xsd:string'),
         'secret_key'  => array('name' => 'secret_key',  'type' => 'xsd:string')
@@ -5590,8 +5610,9 @@ function WSUpdateUserApiKey($params) {
  * @param array List of parameters (security key, date_start and date_end)
  * @return array Sessions list (id=>[title=>'title',url='http://...',date_start=>'...',date_end=>''])
  */
-function WSListSessions($params) {
-    if(!WSHelperVerifyKey($params)) {
+function WSListSessions($params)
+{
+    if (!WSHelperVerifyKey($params)) {
         return return_error(WS_ERROR_SECRET_KEY);
     }
     $sql_params = array();
@@ -5602,7 +5623,11 @@ function WSListSessions($params) {
     if (!empty($params['date_end'])) {
         $sql_params['s.date_end'] = array('operator' => '<=', 'value' => $params['date_end']);
     }
-    $sessions_list = SessionManager::get_sessions_list($sql_params);
+
+    $from = isset($params['from']) ? $params['from'] : null;
+    $to = isset($params['to']) ? $params['to'] : null;
+    
+    $sessions_list = SessionManager::get_sessions_list($sql_params, null, $from, $to);
     $return_list = array();
     foreach ($sessions_list as $session) {
         $return_list[] = array(