From ab16f19be37ed006f6b1100d81a931a4d54718d6 Mon Sep 17 00:00:00 2001 From: Viettrung Luong Date: Thu, 26 Jun 2014 14:40:28 +0100 Subject: [PATCH 1/6] Removed unused More Meeting Detail link and broken Assign roles button --- renderer.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/renderer.php b/renderer.php index 521f73c..bf65796 100644 --- a/renderer.php +++ b/renderer.php @@ -97,7 +97,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { $param = array('class' => 'aconlabeltitle', 'id' => 'aconmeeturlinfo'); $html .= html_writer::start_tag('div', $param); $param = array('for' => 'lblmeetingurlinfo'); - $html .= html_writer::tag('label', get_string('meetinfo', 'adobeconnect'), $param); + // $html .= html_writer::tag('label', get_string('meetinfo', 'adobeconnect'), $param); $html .= html_writer::end_tag('div'); // Print meeting URL value @@ -105,7 +105,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { $html .= html_writer::start_tag('div', $param); $param = array('target' => '_blank'); // $html .= html_writer::tag('label', $meetingdetail->url, $param); - $html .= html_writer::link($meetingdetail->servermeetinginfo, get_string('meetinfotxt', 'adobeconnect'), $param); + //$html .= html_writer::link($meetingdetail->servermeetinginfo, get_string('meetinfotxt', 'adobeconnect'), $param); $html .= html_writer::end_tag('div'); $html .= html_writer::end_tag('div'); @@ -200,7 +200,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { $html .= html_writer::empty_tag('input', $param); $html .= html_writer::end_tag('div'); - +/* $param = array('class' => 'aconbtnroles'); $html .= html_writer::start_tag('div', $param); $param = array('type'=>'submit', @@ -209,7 +209,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { ); $html .= html_writer::empty_tag('input', $param); $html .= html_writer::end_tag('div'); - +*/ $html .= html_writer::end_tag('div'); @@ -292,4 +292,4 @@ function display_no_groups_message() { $html = html_writer::tag('p', get_string('usergrouprequired', 'adobeconnect')); return $html; } -} \ No newline at end of file +} From efff0c44ad19728e16515f0ed13329cc0246f235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cathal=20O=E2=80=99Riordan?= Date: Thu, 11 May 2017 15:52:48 +0100 Subject: [PATCH 2/6] =?UTF-8?q?identify=20returned=20recordings=20as=20ico?= =?UTF-8?q?n=3D=E2=80=98archive=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locallib.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/locallib.php b/locallib.php index b08bafa..9cecabb 100644 --- a/locallib.php +++ b/locallib.php @@ -634,8 +634,11 @@ function aconnect_get_recordings($aconnect, $folderscoid, $sourcescoid) { if (!is_null($domnode)) { $meetingdetail = $innernodelist->item($x); - // Check if the SCO item is a recording or uploaded document. We only want to display recordings - if (!is_null($meetingdetail->getElementsByTagName('duration')->item(0))) { + // Check if the SCO item is a recording or uploaded document. We only want to display recordings. Recordings are identified as an 'icon' attribute with a value of 'archive' in element, e.g. + + $icontype = $meetingdetail->attributes->getNamedItem('icon'); + + if (!is_null($icontype) && $icontype->nodeValue === 'archive') { $j = (int) $domnode->nodeValue; $value = (!is_null($meetingdetail->getElementsByTagName('name'))) ? @@ -668,8 +671,8 @@ function aconnect_get_recordings($aconnect, $folderscoid, $sourcescoid) { $recordings[$j]->modified = (string) $value; - $value = (!is_null($meetingdetail->getElementsByTagName('duration'))) ? - $meetingdetail->getElementsByTagName('duration')->item(0)->nodeValue : ''; + $value = (!is_null($meetingdetail->attributes->getNamedItem('duration'))) ? + $meetingdetail->attributes->getNamedItem('duration')->nodeValue : ''; $recordings[$j]->duration = (string) $value; From 3f0f68369dce643b3dcd7341bec005242f263ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cathal=20O=E2=80=99Riordan?= Date: Thu, 11 May 2017 15:55:49 +0100 Subject: [PATCH 3/6] version 3.0.0.1 --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index cdf4f4d..41dba8f 100644 --- a/version.php +++ b/version.php @@ -21,9 +21,9 @@ * @copyright (C) 2015 Remote Learner.net Inc http://www.remote-learner.net */ -$plugin->version = 2015111000; +$plugin->version = 2017051100; $plugin->requires = 2015101600; $plugin->cron = 0; $plugin->component = 'mod_adobeconnect'; $plugin->maturity = MATURITY_STABLE; -$plugin->release = '3.0.0.0'; +$plugin->release = '3.0.0.1'; From c7f7e7bf258fab7f9c330d09c2ef9c8170951c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cathal=20O=E2=80=99Riordan?= Date: Thu, 11 May 2017 15:52:48 +0100 Subject: [PATCH 4/6] =?UTF-8?q?identify=20returned=20recordings=20as=20ico?= =?UTF-8?q?n=3D=E2=80=98archive=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locallib.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/locallib.php b/locallib.php index b08bafa..9cecabb 100644 --- a/locallib.php +++ b/locallib.php @@ -634,8 +634,11 @@ function aconnect_get_recordings($aconnect, $folderscoid, $sourcescoid) { if (!is_null($domnode)) { $meetingdetail = $innernodelist->item($x); - // Check if the SCO item is a recording or uploaded document. We only want to display recordings - if (!is_null($meetingdetail->getElementsByTagName('duration')->item(0))) { + // Check if the SCO item is a recording or uploaded document. We only want to display recordings. Recordings are identified as an 'icon' attribute with a value of 'archive' in element, e.g. + + $icontype = $meetingdetail->attributes->getNamedItem('icon'); + + if (!is_null($icontype) && $icontype->nodeValue === 'archive') { $j = (int) $domnode->nodeValue; $value = (!is_null($meetingdetail->getElementsByTagName('name'))) ? @@ -668,8 +671,8 @@ function aconnect_get_recordings($aconnect, $folderscoid, $sourcescoid) { $recordings[$j]->modified = (string) $value; - $value = (!is_null($meetingdetail->getElementsByTagName('duration'))) ? - $meetingdetail->getElementsByTagName('duration')->item(0)->nodeValue : ''; + $value = (!is_null($meetingdetail->attributes->getNamedItem('duration'))) ? + $meetingdetail->attributes->getNamedItem('duration')->nodeValue : ''; $recordings[$j]->duration = (string) $value; From 7834d52aa7690a5583b84098534e8ea60ba83847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cathal=20O=E2=80=99Riordan?= Date: Thu, 11 May 2017 15:55:49 +0100 Subject: [PATCH 5/6] version 3.0.0.1 --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index cdf4f4d..41dba8f 100644 --- a/version.php +++ b/version.php @@ -21,9 +21,9 @@ * @copyright (C) 2015 Remote Learner.net Inc http://www.remote-learner.net */ -$plugin->version = 2015111000; +$plugin->version = 2017051100; $plugin->requires = 2015101600; $plugin->cron = 0; $plugin->component = 'mod_adobeconnect'; $plugin->maturity = MATURITY_STABLE; -$plugin->release = '3.0.0.0'; +$plugin->release = '3.0.0.1'; From 66733e4b2391a67c9dfb84bcd55b1b2dd3482489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cathal=20O=E2=80=99Riordan?= Date: Thu, 11 May 2017 16:05:54 +0100 Subject: [PATCH 6/6] Revert "Removed unused More Meeting Detail link and broken Assign roles button" This reverts commit ab16f19be37ed006f6b1100d81a931a4d54718d6. --- renderer.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/renderer.php b/renderer.php index 705da78..f21009a 100644 --- a/renderer.php +++ b/renderer.php @@ -97,7 +97,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { $param = array('class' => 'aconlabeltitle', 'id' => 'aconmeeturlinfo'); $html .= html_writer::start_tag('div', $param); $param = array('for' => 'lblmeetingurlinfo'); - // $html .= html_writer::tag('label', get_string('meetinfo', 'adobeconnect'), $param); + $html .= html_writer::tag('label', get_string('meetinfo', 'adobeconnect'), $param); $html .= html_writer::end_tag('div'); // Print meeting URL value @@ -105,7 +105,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { $html .= html_writer::start_tag('div', $param); $param = array('target' => '_blank'); // $html .= html_writer::tag('label', $meetingdetail->url, $param); - //$html .= html_writer::link($meetingdetail->servermeetinginfo, get_string('meetinfotxt', 'adobeconnect'), $param); + $html .= html_writer::link($meetingdetail->servermeetinginfo, get_string('meetinfotxt', 'adobeconnect'), $param); $html .= html_writer::end_tag('div'); $html .= html_writer::end_tag('div'); @@ -200,7 +200,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { $html .= html_writer::empty_tag('input', $param); $html .= html_writer::end_tag('div'); -/* + $param = array('class' => 'aconbtnroles'); $html .= html_writer::start_tag('div', $param); $param = array('type'=>'submit', @@ -209,7 +209,7 @@ public function display_meeting_detail ($meetingdetail, $cmid, $groupid = 0) { ); $html .= html_writer::empty_tag('input', $param); $html .= html_writer::end_tag('div'); -*/ + $html .= html_writer::end_tag('div'); @@ -292,4 +292,4 @@ function display_no_groups_message() { $html = html_writer::tag('p', get_string('usergrouprequired', 'adobeconnect')); return $html; } -} +} \ No newline at end of file