From 521ed43a2001f720ad22053bfc14ccaa6f92448b Mon Sep 17 00:00:00 2001 From: nosolored Date: Wed, 16 Nov 2016 17:39:10 +0100 Subject: [PATCH 1/4] Allow erase video-conference records that do not have session recording --- plugin/bbb/lib/bbb.lib.php | 49 +++++++++++++++++++++++++++++++++----- plugin/bbb/listing.tpl | 2 ++ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php index ca61f0508d..e6d4fc6989 100755 --- a/plugin/bbb/lib/bbb.lib.php +++ b/plugin/bbb/lib/bbb.lib.php @@ -722,12 +722,36 @@ class bbb $actionLinks = $this->getActionLinks($meetingDB, $record, $isGlobal, $isAdminReport); $item['show_links'] = $recordLink; - } else { - $actionLinks = $this->getActionLinks($meetingDB, []); + $item['action_links'] = implode(PHP_EOL, $actionLinks); + }else{ + $isVisible = $meetingDB['visibility'] != 0; + $linkVisibility = $isVisible + ? Display::url( + Display::return_icon('visible.png', get_lang('MakeInvisible')), + $this->unPublishUrl($meetingDB) + ) + : Display::url( + Display::return_icon('invisible.png', get_lang('MakeVisible')), + $this->publishUrl($meetingDB) + ); + $links = []; + + if (!$isAdminReport) { + $links[] = Display::url( + Display::return_icon('delete.png', get_lang('Delete')), + $this->deleteRecordUrl($meetingDB) + ); + $links[] = $linkVisibility; + } else { + $links[] = Display::url( + Display::return_icon('course_home.png', get_lang('GoToCourse')), + $this->getListingUrl() + ); + } + $item['show_links'] = get_lang('NoRecording'); + $item['action_links'] = implode(PHP_EOL, $links); } - $item['action_links'] = implode(PHP_EOL, $actionLinks); - $item['created_at'] = api_convert_and_format_date($meetingDB['created_at']); // created_at $meetingDB['created_at'] = $item['created_at']; //avoid overwrite in array_merge() below @@ -1291,9 +1315,22 @@ class bbb $links = []; if (empty($recordInfo)) { - $links[] = $linkVisibility; + if (!$isAdminReport) { + $links[] = Display::url( + Display::return_icon('delete.png', get_lang('Delete')), + $this->deleteRecordUrl($meetingInfo) + ); + $links[] = $linkVisibility; + + return $links; + } else { + $links[] = Display::url( + Display::return_icon('course_home.png', get_lang('GoToCourse')), + $this->getListingUrl() + ); - return $links; + return $links; + } } if (!$isGlobal) { diff --git a/plugin/bbb/listing.tpl b/plugin/bbb/listing.tpl index 078f6ec023..2517e94f04 100755 --- a/plugin/bbb/listing.tpl +++ b/plugin/bbb/listing.tpl @@ -56,6 +56,8 @@ {% if meeting.record == 1 %} {# Record list #} {{ meeting.show_links }} + {% else %} + {{ 'NoRecording'|get_lang }} {% endif %} From fed51da5cc0b21ea892060bf738110baec5caa33 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 19 Apr 2017 10:46:00 -0500 Subject: [PATCH 2/4] Removing duplicated code in BBB plugin #1502 --- plugin/bbb/admin.tpl | 2 ++ plugin/bbb/lib/bbb.lib.php | 32 +++++--------------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/plugin/bbb/admin.tpl b/plugin/bbb/admin.tpl index 4cc82c8702..49c5129ce7 100644 --- a/plugin/bbb/admin.tpl +++ b/plugin/bbb/admin.tpl @@ -30,6 +30,8 @@ {% if meeting.record == 1 %} {# Record list #} {{ meeting.show_links }} + {% else %} + {{ 'NoRecording'|get_lang }} {% endif %} {{ meeting.course ?: '-' }} diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php index e6d4fc6989..aecf1a7c28 100755 --- a/plugin/bbb/lib/bbb.lib.php +++ b/plugin/bbb/lib/bbb.lib.php @@ -722,36 +722,14 @@ class bbb $actionLinks = $this->getActionLinks($meetingDB, $record, $isGlobal, $isAdminReport); $item['show_links'] = $recordLink; - $item['action_links'] = implode(PHP_EOL, $actionLinks); - }else{ - $isVisible = $meetingDB['visibility'] != 0; - $linkVisibility = $isVisible - ? Display::url( - Display::return_icon('visible.png', get_lang('MakeInvisible')), - $this->unPublishUrl($meetingDB) - ) - : Display::url( - Display::return_icon('invisible.png', get_lang('MakeVisible')), - $this->publishUrl($meetingDB) - ); - $links = []; - - if (!$isAdminReport) { - $links[] = Display::url( - Display::return_icon('delete.png', get_lang('Delete')), - $this->deleteRecordUrl($meetingDB) - ); - $links[] = $linkVisibility; - } else { - $links[] = Display::url( - Display::return_icon('course_home.png', get_lang('GoToCourse')), - $this->getListingUrl() - ); - } + } else { + $actionLinks = $this->getActionLinks($meetingDB, [], $isGlobal, $isAdminReport); + $item['show_links'] = get_lang('NoRecording'); - $item['action_links'] = implode(PHP_EOL, $links); } + $item['action_links'] = implode(PHP_EOL, $actionLinks); + $item['created_at'] = api_convert_and_format_date($meetingDB['created_at']); // created_at $meetingDB['created_at'] = $item['created_at']; //avoid overwrite in array_merge() below From b37413797ba4e6f6afa5df1e5cab5b16c0698d4e Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 19 Apr 2017 10:58:31 -0500 Subject: [PATCH 3/4] Remove participants from BBB room #1502 --- plugin/bbb/lib/bbb.lib.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php index aecf1a7c28..96a55a39be 100755 --- a/plugin/bbb/lib/bbb.lib.php +++ b/plugin/bbb/lib/bbb.lib.php @@ -983,6 +983,11 @@ class bbb $result = $this->api->deleteRecordingsWithXmlResponseArray($recordingParams); if (!empty($result) && isset($result['deleted']) && $result['deleted'] === 'true') { + Database::delete( + 'plugin_bbb_room', + array('meeting_id = ?' => array($id)) + ); + Database::delete( $this->table, array('id = ?' => array($id)) From f5a8f94596f6910eee6d3145ee0b37f43a073516 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 19 Apr 2017 11:35:52 -0500 Subject: [PATCH 4/4] Fix BBB language variables #1502 --- plugin/bbb/admin.tpl | 6 +++--- plugin/bbb/lib/bbb.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/bbb/admin.tpl b/plugin/bbb/admin.tpl index 49c5129ce7..5c00eb6d98 100644 --- a/plugin/bbb/admin.tpl +++ b/plugin/bbb/admin.tpl @@ -21,9 +21,9 @@ {% endif %} {% if meeting.status == 1 %} - {{ 'MeetingOpened'|get_lang }} + {{ 'MeetingOpened'|get_plugin_lang('BBBPlugin') }} {% else %} - {{ 'MeetingClosed'|get_lang }} + {{ 'MeetingClosed'|get_plugin_lang('BBBPlugin') }} {% endif %} @@ -31,7 +31,7 @@ {# Record list #} {{ meeting.show_links }} {% else %} - {{ 'NoRecording'|get_lang }} + {{ 'NoRecording'|get_plugin_lang('BBBPlugin') }} {% endif %} {{ meeting.course ?: '-' }} diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php index 96a55a39be..9f62cdf51f 100755 --- a/plugin/bbb/lib/bbb.lib.php +++ b/plugin/bbb/lib/bbb.lib.php @@ -1318,7 +1318,7 @@ class bbb if (!$isGlobal) { $links[] = Display::url( - Display::return_icon('link.gif', get_lang('CopyToLinkTool')), + Display::return_icon('link.gif', get_lang('UrlMeetingToShare')), $this->copyToRecordToLinkTool($meetingInfo) ); $links[] = Display::url(