Skip to content

Commit

Permalink
Merge pull request #6 from jibon57/v2.0.3
Browse files Browse the repository at this point in the history 
front-end item add feature
  • Loading branch information
@jibon57
jibon57 authored Aug 11, 2018
2 parents 91bef6c + b6f36e4 commit e111134
Show file tree
Hide file tree
Showing 85 changed files with 6,044 additions and 738 deletions.
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ https://www.hoicoimasti.com/products/8-joomla-extension/9-bigbluebutton-extensio
2) Unlimited Events.
3) Pull recordings.
4) Joomla standard component with module. So, you can use in menu or any module position.
5) More...
5) Items can be add from both backend & frontend
6) Calendar view for showing events in one calendat.
7) More....

How to use this extension?

Expand Down
39 changes: 29 additions & 10 deletions packages/com_bigbluebutton/admin/access.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,28 @@
<action name="event.resent_email" title="COM_BIGBLUEBUTTON_EVENT_RESENT_EMAIL_BUTTON_ACCESS" description="COM_BIGBLUEBUTTON_EVENT_RESENT_EMAIL_BUTTON_ACCESS_DESC" />
<action name="event.access" title="COM_BIGBLUEBUTTON_EVENTS_ACCESS" description="COM_BIGBLUEBUTTON_EVENTS_ACCESS_DESC" />
<action name="event.batch" title="COM_BIGBLUEBUTTON_EVENTS_BATCH_USE" description="COM_BIGBLUEBUTTON_EVENTS_BATCH_USE_DESC" />
<action name="event.create" title="COM_BIGBLUEBUTTON_EVENTS_CREATE" description="COM_BIGBLUEBUTTON_EVENTS_CREATE_DESC" />
<action name="event.dashboard_add" title="COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD" description="COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD_DESC" />
<action name="event.dashboard_list" title="COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST" description="COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST_DESC" />
<action name="event.edit.state" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_STATE" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_STATE_DESC" />
<action name="event.delete" title="COM_BIGBLUEBUTTON_EVENTS_DELETE" description="COM_BIGBLUEBUTTON_EVENTS_DELETE_DESC" />
<action name="event.edit" title="COM_BIGBLUEBUTTON_EVENTS_EDIT" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_DESC" />
<action name="event.edit.created_by" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_BY" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_BY_DESC" />
<action name="event.edit.created" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_DATE" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_DATE_DESC" />
<action name="event.edit.own" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_OWN" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_OWN_DESC" />
<action name="event.export" title="COM_BIGBLUEBUTTON_EVENTS_EXPORT" description="COM_BIGBLUEBUTTON_EVENTS_EXPORT_DESC" />
<action name="event.import" title="COM_BIGBLUEBUTTON_EVENTS_IMPORT" description="COM_BIGBLUEBUTTON_EVENTS_IMPORT_DESC" />
<action name="event.submenu" title="COM_BIGBLUEBUTTON_EVENTS_SUBMENU" description="COM_BIGBLUEBUTTON_EVENTS_SUBMENU_DESC" />
<action name="meeting.access" title="COM_BIGBLUEBUTTON_MEETINGS_ACCESS" description="COM_BIGBLUEBUTTON_MEETINGS_ACCESS_DESC" />
<action name="meeting.batch" title="COM_BIGBLUEBUTTON_MEETINGS_BATCH_USE" description="COM_BIGBLUEBUTTON_MEETINGS_BATCH_USE_DESC" />
<action name="meeting.create" title="COM_BIGBLUEBUTTON_MEETINGS_CREATE" description="COM_BIGBLUEBUTTON_MEETINGS_CREATE_DESC" />
<action name="meeting.dashboard_add" title="COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD" description="COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD_DESC" />
<action name="meeting.dashboard_list" title="COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST" description="COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST_DESC" />
<action name="meeting.delete" title="COM_BIGBLUEBUTTON_MEETINGS_DELETE" description="COM_BIGBLUEBUTTON_MEETINGS_DELETE_DESC" />
<action name="meeting.edit" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_DESC" />
<action name="meeting.edit.created_by" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_BY" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_BY_DESC" />
<action name="meeting.edit.created" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_DATE" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_DATE_DESC" />
<action name="meeting.edit.own" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_OWN" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_OWN_DESC" />
<action name="meeting.edit.state" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_STATE" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_STATE_DESC" />
<action name="meeting.export" title="COM_BIGBLUEBUTTON_MEETINGS_EXPORT" description="COM_BIGBLUEBUTTON_MEETINGS_EXPORT_DESC" />
<action name="meeting.import" title="COM_BIGBLUEBUTTON_MEETINGS_IMPORT" description="COM_BIGBLUEBUTTON_MEETINGS_IMPORT_DESC" />
<action name="meeting.submenu" title="COM_BIGBLUEBUTTON_MEETINGS_SUBMENU" description="COM_BIGBLUEBUTTON_MEETINGS_SUBMENU_DESC" />
Expand All @@ -36,16 +48,23 @@
<action name="recording.submenu" title="COM_BIGBLUEBUTTON_RECORDING_SUBMENU" description="COM_BIGBLUEBUTTON_RECORDING_SUBMENU_DESC" />
</section>
<section name="meeting">
<action name="core.create" title="COM_BIGBLUEBUTTON_MEETINGS_CREATE" description="COM_BIGBLUEBUTTON_MEETINGS_CREATE_DESC" />
<action name="core.edit" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_DESC" />
<action name="core.edit.own" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_OWN" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_OWN_DESC" />
<action name="core.delete" title="COM_BIGBLUEBUTTON_MEETINGS_DELETE" description="COM_BIGBLUEBUTTON_MEETINGS_DELETE_DESC" />
<action name="meeting.edit" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_DESC" />
<action name="meeting.edit.own" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_OWN" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_OWN_DESC" />
<action name="meeting.edit.state" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_STATE" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_STATE_DESC" />
<action name="meeting.edit.created_by" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_BY" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_BY_DESC" />
<action name="meeting.edit.created" title="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_DATE" description="COM_BIGBLUEBUTTON_MEETINGS_EDIT_CREATED_DATE_DESC" />
<action name="meeting.create" title="COM_BIGBLUEBUTTON_MEETINGS_CREATE" description="COM_BIGBLUEBUTTON_MEETINGS_CREATE_DESC" />
<action name="meeting.delete" title="COM_BIGBLUEBUTTON_MEETINGS_DELETE" description="COM_BIGBLUEBUTTON_MEETINGS_DELETE_DESC" />
<action name="meeting.access" title="COM_BIGBLUEBUTTON_MEETINGS_ACCESS" description="COM_BIGBLUEBUTTON_MEETINGS_ACCESS_DESC" />
</section>
<section name="event">
<action name="core.create" title="COM_BIGBLUEBUTTON_EVENTS_CREATE" description="COM_BIGBLUEBUTTON_EVENTS_CREATE_DESC" />
<action name="core.edit" title="COM_BIGBLUEBUTTON_EVENTS_EDIT" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_DESC" />
<action name="core.edit.own" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_OWN" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_OWN_DESC" />
<action name="event.edit.state" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_STATE" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_STATE_DESC" />
<action name="core.delete" title="COM_BIGBLUEBUTTON_EVENTS_DELETE" description="COM_BIGBLUEBUTTON_EVENTS_DELETE_DESC" />
<action name="event.edit" title="COM_BIGBLUEBUTTON_EVENTS_EDIT" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_DESC" />
<action name="event.edit.own" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_OWN" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_OWN_DESC" />
<action name="core.edit.state" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_STATE" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_STATE_DESC" />
<action name="event.edit.created_by" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_BY" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_BY_DESC" />
<action name="event.edit.created" title="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_DATE" description="COM_BIGBLUEBUTTON_EVENTS_EDIT_CREATED_DATE_DESC" />
<action name="event.create" title="COM_BIGBLUEBUTTON_EVENTS_CREATE" description="COM_BIGBLUEBUTTON_EVENTS_CREATE_DESC" />
<action name="event.delete" title="COM_BIGBLUEBUTTON_EVENTS_DELETE" description="COM_BIGBLUEBUTTON_EVENTS_DELETE_DESC" />
<action name="event.access" title="COM_BIGBLUEBUTTON_EVENTS_ACCESS" description="COM_BIGBLUEBUTTON_EVENTS_ACCESS_DESC" />
</section>
</access>
17 changes: 12 additions & 5 deletions packages/com_bigbluebutton/admin/controllers/event.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected function allowAdd($data = array())
return false;
}
// In the absense of better information, revert to the component permissions.
return parent::allowAdd($data);
return JFactory::getUser()->authorise('event.create', $this->option);
}

/**
Expand All @@ -88,13 +88,20 @@ protected function allowEdit($data = array(), $key = 'id')
$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


// Access check.
$access = ($user->authorise('event.access', 'com_bigbluebutton.event.' . (int) $recordId) && $user->authorise('event.access', 'com_bigbluebutton'));
if (!$access)
{
return false;
}

if ($recordId)
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('core.edit', 'com_bigbluebutton.event.' . (int) $recordId);
$permission = $user->authorise('event.edit', 'com_bigbluebutton.event.' . (int) $recordId);
if (!$permission)
{
if ($user->authorise('core.edit.own', 'com_bigbluebutton.event.' . $recordId))
if ($user->authorise('event.edit.own', 'com_bigbluebutton.event.' . $recordId))
{
// Now test the owner is the user.
$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
Expand All @@ -113,7 +120,7 @@ protected function allowEdit($data = array(), $key = 'id')
// If the owner matches 'me' then allow.
if ($ownerId == $user->id)
{
if ($user->authorise('core.edit.own', 'com_bigbluebutton'))
if ($user->authorise('event.edit.own', 'com_bigbluebutton'))
{
return true;
}
Expand All @@ -123,7 +130,7 @@ protected function allowEdit($data = array(), $key = 'id')
}
}
// Since there is no permission, revert to the component permissions.
return parent::allowEdit($data, $key);
return $user->authorise('event.edit', $this->option);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions packages/com_bigbluebutton/admin/controllers/events.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function importData()
return;
}

function reSendEmail(){
//
}
function reSendEmail(){
}
}
17 changes: 12 additions & 5 deletions packages/com_bigbluebutton/admin/controllers/meeting.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected function allowAdd($data = array())
return false;
}
// In the absense of better information, revert to the component permissions.
return parent::allowAdd($data);
return JFactory::getUser()->authorise('meeting.create', $this->option);
}

/**
Expand All @@ -74,13 +74,20 @@ protected function allowEdit($data = array(), $key = 'id')
$recordId = (int) isset($data[$key]) ? $data[$key] : 0;


// Access check.
$access = ($user->authorise('meeting.access', 'com_bigbluebutton.meeting.' . (int) $recordId) && $user->authorise('meeting.access', 'com_bigbluebutton'));
if (!$access)
{
return false;
}

if ($recordId)
{
// The record has been set. Check the record permissions.
$permission = $user->authorise('core.edit', 'com_bigbluebutton.meeting.' . (int) $recordId);
$permission = $user->authorise('meeting.edit', 'com_bigbluebutton.meeting.' . (int) $recordId);
if (!$permission)
{
if ($user->authorise('core.edit.own', 'com_bigbluebutton.meeting.' . $recordId))
if ($user->authorise('meeting.edit.own', 'com_bigbluebutton.meeting.' . $recordId))
{
// Now test the owner is the user.
$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
Expand All @@ -99,7 +106,7 @@ protected function allowEdit($data = array(), $key = 'id')
// If the owner matches 'me' then allow.
if ($ownerId == $user->id)
{
if ($user->authorise('core.edit.own', 'com_bigbluebutton'))
if ($user->authorise('meeting.edit.own', 'com_bigbluebutton'))
{
return true;
}
Expand All @@ -109,7 +116,7 @@ protected function allowEdit($data = array(), $key = 'id')
}
}
// Since there is no permission, revert to the component permissions.
return parent::allowEdit($data, $key);
return $user->authorise('meeting.edit', $this->option);
}

/**
Expand Down
Loading

0 comments on commit e111134

Please sign in to comment.