From: <xa...@us...> - 2012-06-05 15:44:57
|
Revision: 41789 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41789&view=rev Author: xavidp Date: 2012-06-05 15:44:46 +0000 (Tue, 05 Jun 2012) Log Message: ----------- [FIX]WYSIWYCA fix: users (anons or other groups) couldn't view recordings without the perm to join meetings and now they can view them without the perm to join the meeting (a common use case for bbb in many scenarios). thanks jonnyb Modified Paths: -------------- branches/9.x/lib/userslib.php branches/9.x/lib/wiki-plugins/wikiplugin_bigbluebutton.php branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl Added Paths: ----------- branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton_view_recordings.tpl Modified: branches/9.x/lib/userslib.php =================================================================== --- branches/9.x/lib/userslib.php 2012-06-05 14:56:48 UTC (rev 41788) +++ branches/9.x/lib/userslib.php 2012-06-05 15:44:46 UTC (rev 41789) @@ -2868,6 +2868,15 @@ 'scope' => 'object', ), array( + 'name' => 'tiki_p_bigbluebutton_view_rec', + 'description' => tra('Can view recordings from past meetings'), + 'level' => 'basic', + 'type' => 'bigbluebutton', + 'admin' => false, + 'prefs' => array('bigbluebutton_feature'), + 'scope' => 'object', + ), + array( 'name' => 'tiki_p_bigbluebutton_join', 'description' => tra('Can join a meeting'), 'level' => 'basic', Modified: branches/9.x/lib/wiki-plugins/wikiplugin_bigbluebutton.php =================================================================== --- branches/9.x/lib/wiki-plugins/wikiplugin_bigbluebutton.php 2012-06-05 14:56:48 UTC (rev 41788) +++ branches/9.x/lib/wiki-plugins/wikiplugin_bigbluebutton.php 2012-06-05 15:44:46 UTC (rev 41789) @@ -117,6 +117,11 @@ $smarty->assign('bbb_recordings', $bigbluebuttonlib->getRecordings($meeting)); return $smarty->fetch('wiki-plugins/wikiplugin_bigbluebutton.tpl'); + + } elseif ( $perms->bigbluebutton_view_rec ) { # Case for anonymous users with the perm to view recordings but not to join meetings + $smarty->assign('bbb_recordings', $bigbluebuttonlib->getRecordings($meeting)); + + return $smarty->fetch('wiki-plugins/wikiplugin_bigbluebutton_view_recordings.tpl'); } } catch (Exception $e) { return WikiParser_PluginOutput::internalError(tr('BigBlueButton misconfigured or unaccessible.')); Modified: branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl =================================================================== --- branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl 2012-06-05 14:56:48 UTC (rev 41788) +++ branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl 2012-06-05 15:44:46 UTC (rev 41789) @@ -37,20 +37,6 @@ <p>{tr}No attendees at this time.{/tr}</p> {/if} - {if $bbb_recordings} - <p>{tr}Current recordings:{/tr}</p> - <ol> - {foreach from=$bbb_recordings item=recording} - <li> - {tr _0=$recording.startTime|tiki_long_date _1=$recording.startTime|tiki_short_time _2=$recording.endTime|tiki_short_time}On %0 from %1 to %2{/tr} - <ul> - {foreach from=$recording.playback key=type item=url} - <a href="{$url|escape}">{$type|escape}</a> - {/foreach} - </ul> - </li> - {/foreach} - </ol> - {/if} + {include file="wiki-plugins/wikiplugin_bigbluebutton_view_recordings.tpl"} </form> Added: branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton_view_recordings.tpl =================================================================== --- branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton_view_recordings.tpl (rev 0) +++ branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton_view_recordings.tpl 2012-06-05 15:44:46 UTC (rev 41789) @@ -0,0 +1,15 @@ + {if $bbb_recordings} + <p>{tr}Current recordings:{/tr}</p> + <ol> + {foreach from=$bbb_recordings item=recording} + <li> + {tr _0=$recording.startTime|tiki_long_date _1=$recording.startTime|tiki_short_time _2=$recording.endTime|tiki_short_time}On %0 from %1 to %2{/tr} + <ul> + {foreach from=$recording.playback key=type item=url} + <a href="{$url|escape}">{$type|escape}</a> + {/foreach} + </ul> + </li> + {/foreach} + </ol> + {/if} \ No newline at end of file Property changes on: branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton_view_recordings.tpl ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |