Sfoglia il codice sorgente

Added cidreq() in URL calls in bbb plugin - refs #6486

Yannick Warnier 11 anni fa
parent
commit
20de4abd9e
1 ha cambiato i file con 7 aggiunte e 8 eliminazioni
  1. 7 8
      plugin/bbb/lib/bbb.lib.php

+ 7 - 8
plugin/bbb/lib/bbb.lib.php

@@ -246,14 +246,14 @@ class bbb {
         foreach ($meeting_list as $meeting_db) {
         foreach ($meeting_list as $meeting_db) {
             $meeting_bbb = $this->get_meeting_info(array('meetingId' => $meeting_db['id'], 'password' => $pass));
             $meeting_bbb = $this->get_meeting_info(array('meetingId' => $meeting_db['id'], 'password' => $pass));
 
 
-            $meeting_bbb['end_url'] = api_get_self().'?action=end&id='.$meeting_db['id'];
+            $meeting_bbb['end_url'] = api_get_self().'?'.api_get_cidreq().'&action=end&id='.$meeting_db['id'];
 
 
             if ((string)$meeting_bbb['returncode'] == 'FAILED') {
             if ((string)$meeting_bbb['returncode'] == 'FAILED') {
                 if ($meeting_db['status'] == 1 && $this->is_teacher()) {
                 if ($meeting_db['status'] == 1 && $this->is_teacher()) {
                     $this->end_meeting($meeting_db['id']);
                     $this->end_meeting($meeting_db['id']);
                 }
                 }
             } else {
             } else {
-                $meeting_bbb['add_to_calendar_url'] = api_get_self().'?action=add_to_calendar&id='.$meeting_db['id'].'&start='.api_strtotime($meeting_db['created_at']);
+                $meeting_bbb['add_to_calendar_url'] = api_get_self().'?'.api_get_cidreq().'&action=add_to_calendar&id='.$meeting_db['id'].'&start='.api_strtotime($meeting_db['created_at']);
             }
             }
 
 
             $record_array = array();
             $record_array = array();
@@ -278,9 +278,9 @@ class bbb {
                             if (is_array($record) && isset($record['recordId'])) {
                             if (is_array($record) && isset($record['recordId'])) {
                                 $url = Display::url(get_lang('ViewRecord'), $record['playbackFormatUrl'], array('target' => '_blank'));
                                 $url = Display::url(get_lang('ViewRecord'), $record['playbackFormatUrl'], array('target' => '_blank'));
                                 if ($this->is_teacher()) {
                                 if ($this->is_teacher()) {
-                                    $url .= Display::url(Display::return_icon('link.gif',get_lang('CopyToLinkTool')), api_get_self().'?action=copy_record_to_link_tool&id='.$meeting_db['id'].'&record_id='.$record['recordId']);
-                                    $url .= Display::url(Display::return_icon('agenda.png',get_lang('AddToCalendar')), api_get_self().'?action=add_to_calendar&id='.$meeting_db['id'].'&start='.api_strtotime($meeting_db['created_at']).'&url='.$record['playbackFormatUrl']);
-                                    $url .= Display::url(Display::return_icon('delete.png',get_lang('Delete')), api_get_self().'?action=delete_record&id='.$record['recordId']);
+                                    $url .= Display::url(Display::return_icon('link.gif',get_lang('CopyToLinkTool')), api_get_self().'?'.api_get_cidreq().'&action=copy_record_to_link_tool&id='.$meeting_db['id'].'&record_id='.$record['recordId']);
+                                    $url .= Display::url(Display::return_icon('agenda.png',get_lang('AddToCalendar')), api_get_self().'?'.api_get_cidreq().'&action=add_to_calendar&id='.$meeting_db['id'].'&start='.api_strtotime($meeting_db['created_at']).'&url='.$record['playbackFormatUrl']);
+                                    $url .= Display::url(Display::return_icon('delete.png',get_lang('Delete')), api_get_self().'?'.api_get_cidreq().'&action=delete_record&id='.$record['recordId']);
                                 }
                                 }
                                 //$url .= api_get_self().'?action=publish&id='.$record['recordID'];
                                 //$url .= api_get_self().'?action=publish&id='.$record['recordID'];
                                 $count++;
                                 $count++;
@@ -316,8 +316,8 @@ class bbb {
             $item['created_at'] = api_convert_and_format_date($meeting_db['created_at']);
             $item['created_at'] = api_convert_and_format_date($meeting_db['created_at']);
             //created_at
             //created_at
 
 
-            $item['publish_url'] = api_get_self().'?action=publish&id='.$meeting_db['id'];
-            $item['unpublish_url'] = api_get_self().'?action=unpublish&id='.$meeting_db['id'];
+            $item['publish_url'] = api_get_self().'?'.api_get_cidreq().'&action=publish&id='.$meeting_db['id'];
+            $item['unpublish_url'] = api_get_self().'?'.api_get_cidreq().'&action=unpublish&id='.$meeting_db['id'];
 
 
             if ($meeting_db['status'] == 1) {
             if ($meeting_db['status'] == 1) {
                 $joinParams = array(
                 $joinParams = array(
@@ -442,7 +442,6 @@ class bbb {
         $records =  BigBlueButtonBN::getRecordingsArray($id, $this->url, $this->salt);
         $records =  BigBlueButtonBN::getRecordingsArray($id, $this->url, $this->salt);
         if (!empty($records)) {
         if (!empty($records)) {
             foreach ($records as $record) {
             foreach ($records as $record) {
-error_log($record['recordID']);
                 if ($record['recordID'] == $record_id) {
                 if ($record['recordID'] == $record_id) {
                     if (is_array($record) && isset($record['recordID']) && isset($record['playbacks'])) {
                     if (is_array($record) && isset($record['recordID']) && isset($record['playbacks'])) {
                         foreach ($record['playbacks'] as $item) {
                         foreach ($record['playbacks'] as $item) {