Merge pull request #4 from jibon57/v2.0.1

v2.0.1

packages/com_bigbluebutton/admin/helpers/bigbluebutton.php

@@ -1160,7 +1160,7 @@ public static function shorten($string, $length = 40, $addTip = true)
 	*
 	*	@returns string on success
 	**/
-	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
+	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
 		{
@@ -1189,7 +1189,16 @@ public static function safeString($string, $type = 'L', $spacer = '_', $replaceN
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
-			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// remove all and keep only characters
+			if ($keepOnlyCharacters)
+			{
+				$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			}
+			// keep both numbers and characters
+			else
+			{
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+			}
 			// select final adaptations
 			if ($type === 'L' || $type === 'strtolower')
 			{

packages/com_bigbluebutton/admin/language/en-GB/en-GB.com_bigbluebutton.ini

@@ -60,9 +60,9 @@ COM_BIGBLUEBUTTON_EVENTS_BATCH_USE_DESC="Allows users in this group to use batch
 COM_BIGBLUEBUTTON_EVENTS_CREATE="Events Create"
 COM_BIGBLUEBUTTON_EVENTS_CREATE_DESC="Allows the users in this group to create create events"
 COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD="Events Dashboard Add"
-COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the event"
+COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of event"
 COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST="Events Dashboard List"
-COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the event"
+COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of event"
 COM_BIGBLUEBUTTON_EVENTS_DELETE="Events Delete"
 COM_BIGBLUEBUTTON_EVENTS_DELETE_DESC="Allows the users in this group to delete delete events"
 COM_BIGBLUEBUTTON_EVENTS_EDIT="Events Edit"
@@ -93,7 +93,7 @@ COM_BIGBLUEBUTTON_EVENTS_N_ITEMS_UNFEATURED_1="%s event unfeatured."
 COM_BIGBLUEBUTTON_EVENTS_N_ITEMS_UNPUBLISHED="%s events unpublished."
 COM_BIGBLUEBUTTON_EVENTS_N_ITEMS_UNPUBLISHED_1="%s event unpublished."
 COM_BIGBLUEBUTTON_EVENTS_SUBMENU="Events Submenu"
-COM_BIGBLUEBUTTON_EVENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the event"
+COM_BIGBLUEBUTTON_EVENTS_SUBMENU_DESC="Allows the users in this group to submenu of event"
 COM_BIGBLUEBUTTON_EVENT_ALIAS="Alias"
 COM_BIGBLUEBUTTON_EVENT_ALIAS_HINT="Auto-generated from name"
 COM_BIGBLUEBUTTON_EVENT_ALIAS_LABEL="Alias"
@@ -219,9 +219,9 @@ COM_BIGBLUEBUTTON_MEETINGS_BATCH_USE_DESC="Allows users in this group to use bat
 COM_BIGBLUEBUTTON_MEETINGS_CREATE="Meetings Create"
 COM_BIGBLUEBUTTON_MEETINGS_CREATE_DESC="Allows the users in this group to create create meetings"
 COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD="Meetings Dashboard Add"
-COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the meeting"
+COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of meeting"
 COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST="Meetings Dashboard List"
-COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the meeting"
+COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of meeting"
 COM_BIGBLUEBUTTON_MEETINGS_DELETE="Meetings Delete"
 COM_BIGBLUEBUTTON_MEETINGS_DELETE_DESC="Allows the users in this group to delete delete meetings"
 COM_BIGBLUEBUTTON_MEETINGS_EDIT="Meetings Edit"
@@ -250,10 +250,13 @@ COM_BIGBLUEBUTTON_MEETINGS_N_ITEMS_UNFEATURED_1="%s meeting unfeatured."
 COM_BIGBLUEBUTTON_MEETINGS_N_ITEMS_UNPUBLISHED="%s meetings unpublished."
 COM_BIGBLUEBUTTON_MEETINGS_N_ITEMS_UNPUBLISHED_1="%s meeting unpublished."
 COM_BIGBLUEBUTTON_MEETINGS_SUBMENU="Meetings Submenu"
-COM_BIGBLUEBUTTON_MEETINGS_SUBMENU_DESC="Allows the users in this group to update the submenu of the meeting"
+COM_BIGBLUEBUTTON_MEETINGS_SUBMENU_DESC="Allows the users in this group to submenu of meeting"
 COM_BIGBLUEBUTTON_MEETING_ALIAS="Alias"
 COM_BIGBLUEBUTTON_MEETING_ALIAS_HINT="Auto-generated from name"
 COM_BIGBLUEBUTTON_MEETING_ALIAS_LABEL="Alias"
+COM_BIGBLUEBUTTON_MEETING_ASSIGN_TO="Assign To"
+COM_BIGBLUEBUTTON_MEETING_ASSIGN_TO_DESCRIPTION="Assign To"
+COM_BIGBLUEBUTTON_MEETING_ASSIGN_TO_LABEL="Assign To"
 COM_BIGBLUEBUTTON_MEETING_ATTENDEEPW="Attendeepw"
 COM_BIGBLUEBUTTON_MEETING_ATTENDEEPW_DESCRIPTION="Attendee Password"
 COM_BIGBLUEBUTTON_MEETING_ATTENDEEPW_HINT="Attendee Password"
@@ -343,10 +346,10 @@ COM_BIGBLUEBUTTON_RECORDING="Recording"
 COM_BIGBLUEBUTTON_RECORDING_ACCESS="Recording Access"
 COM_BIGBLUEBUTTON_RECORDING_ACCESS_DESC="Allows the users in this group to access Recording"
 COM_BIGBLUEBUTTON_RECORDING_DASHBOARD_LIST="Recording Dashboard List"
-COM_BIGBLUEBUTTON_RECORDING_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Recording"
+COM_BIGBLUEBUTTON_RECORDING_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Recording"
 COM_BIGBLUEBUTTON_RECORDING_DESC="Recording"
 COM_BIGBLUEBUTTON_RECORDING_SUBMENU="Recording Submenu"
-COM_BIGBLUEBUTTON_RECORDING_SUBMENU_DESC="Allows the users in this group to update the submenu of the Recording"
+COM_BIGBLUEBUTTON_RECORDING_SUBMENU_DESC="Allows the users in this group to submenu of Recording"
 COM_BIGBLUEBUTTON_RECORD_DELETED_SUCCESSFULLY="Record deleted successfully"
 COM_BIGBLUEBUTTON_SAVE_SUCCESS="Great! Item successfully saved."
 COM_BIGBLUEBUTTON_SAVE_WARNING="The value already existed so please select another."

packages/com_bigbluebutton/admin/language/en-GB/en-GB.com_bigbluebutton.sys.ini

@@ -13,9 +13,9 @@ COM_BIGBLUEBUTTON_EVENTS_BATCH_USE_DESC="Allows users in this group to use batch
 COM_BIGBLUEBUTTON_EVENTS_CREATE="Events Create"
 COM_BIGBLUEBUTTON_EVENTS_CREATE_DESC="Allows the users in this group to create create events"
 COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD="Events Dashboard Add"
-COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the event"
+COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of event"
 COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST="Events Dashboard List"
-COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the event"
+COM_BIGBLUEBUTTON_EVENTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of event"
 COM_BIGBLUEBUTTON_EVENTS_DELETE="Events Delete"
 COM_BIGBLUEBUTTON_EVENTS_DELETE_DESC="Allows the users in this group to delete delete events"
 COM_BIGBLUEBUTTON_EVENTS_EDIT="Events Edit"
@@ -29,7 +29,7 @@ COM_BIGBLUEBUTTON_EVENTS_EXPORT_DESC="Allows the users in this group to export e
 COM_BIGBLUEBUTTON_EVENTS_IMPORT="Events Import"
 COM_BIGBLUEBUTTON_EVENTS_IMPORT_DESC="Allows the users in this group to import import events"
 COM_BIGBLUEBUTTON_EVENTS_SUBMENU="Events Submenu"
-COM_BIGBLUEBUTTON_EVENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the event"
+COM_BIGBLUEBUTTON_EVENTS_SUBMENU_DESC="Allows the users in this group to submenu of event"
 COM_BIGBLUEBUTTON_EXPORT_DATA="Export Data"
 COM_BIGBLUEBUTTON_EXPORT_DATA_DESC=" Allows users in this group to export data."
 COM_BIGBLUEBUTTON_IMPORT_DATA="Import Data"
@@ -41,9 +41,9 @@ COM_BIGBLUEBUTTON_MEETINGS_BATCH_USE_DESC="Allows users in this group to use bat
 COM_BIGBLUEBUTTON_MEETINGS_CREATE="Meetings Create"
 COM_BIGBLUEBUTTON_MEETINGS_CREATE_DESC="Allows the users in this group to create create meetings"
 COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD="Meetings Dashboard Add"
-COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the meeting"
+COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_ADD_DESC="Allows the users in this group to dashboard add of meeting"
 COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST="Meetings Dashboard List"
-COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the meeting"
+COM_BIGBLUEBUTTON_MEETINGS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of meeting"
 COM_BIGBLUEBUTTON_MEETINGS_DELETE="Meetings Delete"
 COM_BIGBLUEBUTTON_MEETINGS_DELETE_DESC="Allows the users in this group to delete delete meetings"
 COM_BIGBLUEBUTTON_MEETINGS_EDIT="Meetings Edit"
@@ -55,7 +55,7 @@ COM_BIGBLUEBUTTON_MEETINGS_EXPORT_DESC="Allows the users in this group to export
 COM_BIGBLUEBUTTON_MEETINGS_IMPORT="Meetings Import"
 COM_BIGBLUEBUTTON_MEETINGS_IMPORT_DESC="Allows the users in this group to import import meetings"
 COM_BIGBLUEBUTTON_MEETINGS_SUBMENU="Meetings Submenu"
-COM_BIGBLUEBUTTON_MEETINGS_SUBMENU_DESC="Allows the users in this group to update the submenu of the meeting"
+COM_BIGBLUEBUTTON_MEETINGS_SUBMENU_DESC="Allows the users in this group to submenu of meeting"
 COM_BIGBLUEBUTTON_MENU="» BigBlueButton"
 COM_BIGBLUEBUTTON_MENU_EVENTS="Events"
 COM_BIGBLUEBUTTON_MENU_EVENTS_DESC="Events"
@@ -72,8 +72,8 @@ COM_BIGBLUEBUTTON_MENU_RECORDING="Recording"
 COM_BIGBLUEBUTTON_RECORDING_ACCESS="Recording Access"
 COM_BIGBLUEBUTTON_RECORDING_ACCESS_DESC="Allows the users in this group to access Recording"
 COM_BIGBLUEBUTTON_RECORDING_DASHBOARD_LIST="Recording Dashboard List"
-COM_BIGBLUEBUTTON_RECORDING_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Recording"
+COM_BIGBLUEBUTTON_RECORDING_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Recording"
 COM_BIGBLUEBUTTON_RECORDING_SUBMENU="Recording Submenu"
-COM_BIGBLUEBUTTON_RECORDING_SUBMENU_DESC="Allows the users in this group to update the submenu of the Recording"
+COM_BIGBLUEBUTTON_RECORDING_SUBMENU_DESC="Allows the users in this group to submenu of Recording"
 COM_BIGBLUEBUTTON_USE_BATCH="Use Batch"
 COM_BIGBLUEBUTTON_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."

packages/com_bigbluebutton/admin/layouts/meeting/details_left.php

@@ -29,6 +29,7 @@
 	'branding',
 	'copyright',
 	'logo',
+	'assign_to',
 	'join_url'
 );
 

packages/com_bigbluebutton/admin/models/forms/meeting.xml

@@ -186,6 +186,13 @@
 			message="COM_BIGBLUEBUTTON_MEETING_JOIN_URL_MESSAGE"
 			hint="COM_BIGBLUEBUTTON_MEETING_JOIN_URL_HINT"
 		/>
+		<!-- Assign_to Field. Type: User. (joomla) -->
+		<field
+			type="user"
+			name="assign_to"
+			label="COM_BIGBLUEBUTTON_MEETING_ASSIGN_TO_LABEL"
+			description="COM_BIGBLUEBUTTON_MEETING_ASSIGN_TO_DESCRIPTION"
+		/>
 		<!-- Logo Field. Type: Media. (joomla) -->
 		<field
 			type="media"

packages/com_bigbluebutton/admin/sql/install.mysql.utf8.sql

@@ -2,6 +2,7 @@ CREATE TABLE IF NOT EXISTS `#__bigbluebutton_meeting` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`alias` CHAR(64) NOT NULL DEFAULT '',
+	`assign_to` INT(7) NOT NULL DEFAULT 0,
 	`attendeepw` VARCHAR(10) NOT NULL DEFAULT '',
 	`branding` INT(1) NOT NULL DEFAULT 0,
 	`copyright` VARCHAR(50) NULL DEFAULT '',

packages/com_bigbluebutton/admin/sql/updates/mysql/2.0.0.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__bigbluebutton_meeting` ADD `assign_to` INT(7) NOT NULL DEFAULT 0 AFTER `alias`;

packages/com_bigbluebutton/bigbluebutton.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_BIGBLUEBUTTON</name>
-	<creationDate>20th July, 2018</creationDate>
+	<creationDate>2nd August, 2018</creationDate>
 	<author>Jibon L. Costa</author>
 	<authorEmail>jiboncosta57@gmail.com</authorEmail>
 	<authorUrl>https://www.hoicoimasti.com</authorUrl>
 	<copyright>Copyright (C) 2018 Hoicoi Extension. All Rights Reserved</copyright>
 	<license>MIT</license>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
 	<description><![CDATA[
-		<h1>BigBlueButton (v.2.0.0)</h1>
+		<h1>BigBlueButton (v.2.0.1)</h1>
 		<div style="clear: both;"></div>
 		<p>Get BigBlueButton Conference access from Joomla</p>
 		<p>Created by <a href="https://www.hoicoimasti.com" target="_blank">Jibon L. Costa</a><br /><small>Development started 17th July, 2018</small></p>
@@ -98,4 +98,4 @@
 	<updateservers>
 		<server type="extension" enabled="1" element="com_bigbluebutton" name="BigBlueButton">https://raw.githubusercontent.com/jibon57/BigBlueButton_for_Joomla/master/update.xml</server>
 	</updateservers>
-</extension>
+</extension>

packages/com_bigbluebutton/script.php

@@ -124,7 +124,7 @@ function postflight($type, $parent)
 			echo '<a target="_blank" href="https://www.hoicoimasti.com" title="BigBlueButton">
 				<img src="components/com_bigbluebutton/assets/images/vdm-component.png"/>
 				</a>
-				<h3>Upgrade to Version 2.0.0 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.0.1 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }

packages/com_bigbluebutton/site/helpers/bigbluebutton.php

@@ -962,7 +962,7 @@ public static function shorten($string, $length = 40, $addTip = true)
 	*
 	*	@returns string on success
 	**/
-	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
+	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true, $keepOnlyCharacters = true)
 	{
 		if ($replaceNumbers === true)
 		{
@@ -991,7 +991,16 @@ public static function safeString($string, $type = 'L', $spacer = '_', $replaceN
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
-			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// remove all and keep only characters
+			if ($keepOnlyCharacters)
+			{
+				$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			}
+			// keep both numbers and characters
+			else
+			{
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+			}
 			// select final adaptations
 			if ($type === 'L' || $type === 'strtolower')
 			{

packages/com_bigbluebutton/site/models/events.php

@@ -135,9 +135,6 @@ public function getMeeting_idIdMeetingAbca_B($meeting_id)
 		// check if there was data returned
 		if ($db->getNumRows())
 		{
-			// Load the JEvent Dispatcher
-			JPluginHelper::importPlugin('content');
-			$this->_dispatcher = JEventDispatcher::getInstance();
 			return $db->loadObjectList();
 		}
 		return false;

packages/com_bigbluebutton/update.xml

@@ -0,0 +1,36 @@
+<updates>
+	<update>
+		<name>BigBlueButton</name>
+		<description>BigBlueButton Conference access from Joomla</description>
+		<element>com_bigbluebutton</element>
+		<type>component</type>
+		<version>2.0.0</version>
+		<infourl title="BigBlueButton!">https://www.hoicoimasti.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/jibon57/BigBlueButton_for_Joomla/archive/master.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Jibon L. Costa</maintainer>
+		<maintainerurl>https://www.hoicoimasti.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>BigBlueButton</name>
+		<description>BigBlueButton Conference access from Joomla</description>
+		<element>com_bigbluebutton</element>
+		<type>component</type>
+		<version>2.0.1</version>
+		<infourl title="BigBlueButton!">https://www.hoicoimasti.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/jibon57/BigBlueButton_for_Joomla/archive/master.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Jibon L. Costa</maintainer>
+		<maintainerurl>https://www.hoicoimasti.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+</updates>

update.xml

@@ -4,8 +4,8 @@
 		<description>BigBlueButton Conference access from Joomla</description>
 		<element>pkg_bigbluebutton</element>
 		<type>package</type>
-		<version>2.0.0</version>
-		<infourl title="Joomla!">https://github.com/jibon57/BigBlueButton_for_Joomla</infourl>
+		<version>2.0.1</version>
+		<infourl title="BigBlueButton!">https://github.com/jibon57/BigBlueButton_for_Joomla</infourl>
 		<downloads>
 			<downloadurl type="full" format="zip">https://github.com/jibon57/BigBlueButton_for_Joomla/archive/master.zip</downloadurl>
 		</downloads>
@@ -14,8 +14,7 @@
 		</tags>
 		<maintainer>Jibon L. Costa</maintainer>
 		<maintainerurl>https://www.hoicoimasti.com/</maintainerurl>
-		<section>STS</section>
-		<targetplatform name="joomla" version="3.[0123456789]" />
+		<targetplatform name="joomla" version="3.*" />
 		<php_minimum>5.3.10</php_minimum>
 	</update>
 </updates>