Updated with JCB v3.1.0

README.md

@@ -13,8 +13,8 @@ Watch this [tutorial](https://youtu.be/lkE0ZiSWufg) to see how.
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Members Manager](https://www.joomlacomponentbuilder.com/)
 + *First Build*: 6th July, 2018
-+ *Last Build*: 2nd March, 2022
-+ *Version*: 2.0.x
++ *Last Build*: 27th May, 2022
++ *Version*: 2.1.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -26,8 +26,8 @@ due to [Automated Component Builder](http://joomlacomponentbuilder.com))
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **48989**
-+ *File count*: **259**
++ *Line count*: **49080**
++ *File count*: **260**
 + *Folder count*: **70**
 
 **90 Hours** or **11 Eight Hour Days** (the actual time the author spent)

admin/README.txt

@@ -13,8 +13,8 @@ Watch this [tutorial](https://youtu.be/lkE0ZiSWufg) to see how.
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Members Manager](https://www.joomlacomponentbuilder.com/)
 + *First Build*: 6th July, 2018
-+ *Last Build*: 2nd March, 2022
-+ *Version*: 2.0.x
++ *Last Build*: 27th May, 2022
++ *Version*: 2.1.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -26,8 +26,8 @@ due to [Automated Component Builder](http://joomlacomponentbuilder.com))
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **48989**
-+ *File count*: **259**
++ *Line count*: **49080**
++ *File count*: **260**
 + *Folder count*: **70**
 
 **90 Hours** or **11 Eight Hour Days** (the actual time the author spent)

admin/controller.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
  * General Controller of Membersmanager component
  */
-class MembersmanagerController extends JControllerLegacy
+class MembersmanagerController extends BaseController
 {
 	/**
 	 * Constructor.

admin/controllers/ajax.json.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Ajax Controller
+ * Membersmanager Ajax Base Controller
  */
-class MembersmanagerControllerAjax extends JControllerLegacy
+class MembersmanagerControllerAjax extends BaseController
 {
 	public function __construct($config)
 	{

admin/controllers/import.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Import Controller
+ * Membersmanager Import Base Controller
  */
-class MembersmanagerControllerImport extends JControllerLegacy
+class MembersmanagerControllerImport extends BaseController
 {
 	/**
 	 * Import an spreadsheet.

admin/controllers/member.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Member Controller
+ * Member Form Controller
  */
-class MembersmanagerControllerMember extends JControllerForm
+class MembersmanagerControllerMember extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/members.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Members Controller
+ * Members Admin Controller
  */
-class MembersmanagerControllerMembers extends JControllerAdmin
+class MembersmanagerControllerMembers extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/controllers/type.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Type Controller
+ * Type Form Controller
  */
-class MembersmanagerControllerType extends JControllerForm
+class MembersmanagerControllerType extends FormController
 {
 	/**
 	 * Current or most recently performed task.

admin/controllers/types.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Types Controller
+ * Types Admin Controller
  */
-class MembersmanagerControllerTypes extends JControllerAdmin
+class MembersmanagerControllerTypes extends AdminController
 {
 	/**
 	 * The prefix to use with controller messages.

admin/helpers/membersmanager.php

@@ -5756,12 +5756,12 @@ abstract class MembersmanagerHelper
 	}
 
 	/**
-	 * File Extension to Mimetype
+	 * File Extensions to Mimetypes
 	 * https://gist.github.com/Llewellynvdm/74be373357e131b8775a7582c3de508b
 	 * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
 	 *
 	 * @var     array
-	 **/
+	 */
 	protected static $fileExtensionToMimeType = array(
 		'123'			=> 'application/vnd.lotus-1-2-3',
 		'3dml'			=> 'text/vnd.in3d.3dml',
@@ -6306,6 +6306,7 @@ abstract class MembersmanagerHelper
 		'opf'			=> 'application/oebps-package+xml',
 		'opml'			=> 'text/x-opml',
 		'oprc'			=> 'application/vnd.palm',
+		'opus'			=> 'audio/ogg',
 		'org'			=> 'application/vnd.lotus-organizer',
 		'osf'			=> 'application/vnd.yamaha.openscoreformat',
 		'osfpvg'		=> 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
@@ -6767,7 +6768,7 @@ abstract class MembersmanagerHelper
 		 */		
 
 		// get the extension form file
-		$extension = \strtolower(\pathinfo($file, \PATHINFO_EXTENSION));
+		$extension = strtolower(pathinfo($file, PATHINFO_EXTENSION));
 		// check if we have the extension listed
 		if (isset(self::$fileExtensionToMimeType[$extension]))
 		{
@@ -9143,3 +9144,4 @@ abstract class MembersmanagerHelper
 		return true;
 	}
 }
+

admin/models/ajax.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Ajax Model
+ * Membersmanager Ajax List Model
  */
-class MembersmanagerModelAjax extends JModelList
+class MembersmanagerModelAjax extends ListModel
 {
 	protected $app_params;
 	
@@ -621,8 +622,22 @@ class MembersmanagerModelAjax extends JModelList
 	}
 
 
+	/**
+	 * The view persistence details
+	 *
+	 * @var	array
+	 * @since 1.0.0
+	 */
 	protected $viewid = array();
 
+	/**
+	 * The view details loaded via the session
+	 *
+	 * @input	string  $call    The state key
+	 *
+	 * @return mixed
+	 * @since 1.0.0
+	 */
 	protected function getViewID($call = 'table')
 	{
 		if (!isset($this->viewid[$call]))

admin/models/import.php

@@ -13,15 +13,16 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
 /**
- * Membersmanager Import Model
+ * Membersmanager Import Base Database Model
  */
-class MembersmanagerModelImport extends JModelLegacy
+class MembersmanagerModelImport extends BaseDatabaseModel
 {
 	// set uploading values
 	protected $use_streams = false;

admin/models/member.php

@@ -13,14 +13,15 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Member Model
+ * Membersmanager Member Admin Model
  */
-class MembersmanagerModelMember extends JModelAdmin
+class MembersmanagerModelMember extends AdminModel
 {
 	/**
 	 * The tab layout fields array.

admin/models/members.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Members Model
+ * Members List Model
  */
-class MembersmanagerModelMembers extends JModelList
+class MembersmanagerModelMembers extends ListModel
 {
 	public function __construct($config = array())
 	{

admin/models/type.php

@@ -13,14 +13,15 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Type Model
+ * Membersmanager Type Admin Model
  */
-class MembersmanagerModelType extends JModelAdmin
+class MembersmanagerModelType extends AdminModel
 {
 	/**
 	 * The tab layout fields array.

admin/models/types.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Types Model
+ * Types List Model
  */
-class MembersmanagerModelTypes extends JModelList
+class MembersmanagerModelTypes extends ListModel
 {
 	public function __construct($config = array())
 	{

admin/sql/updates/mysql/2.0.6.sql

@@ -0,0 +1 @@
+

admin/tables/member.php

@@ -13,6 +13,7 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper;
 /**
  * Members Table class
  */
-class MembersmanagerTableMember extends JTable
+class MembersmanagerTableMember extends Table
 {
 	/**
 	 * Ensure the params and metadata in json encoded in the bind method

admin/tables/type.php

@@ -13,6 +13,7 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper;
 /**
  * Types Table class
  */
-class MembersmanagerTableType extends JTable
+class MembersmanagerTableType extends Table
 {
 	/**
 	 * Ensure the params and metadata in json encoded in the bind method

admin/views/import/view.html.php

@@ -13,10 +13,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Membersmanager Import View
+ * Membersmanager Import Html View
  */
-class MembersmanagerViewImport extends JViewLegacy
+class MembersmanagerViewImport extends HtmlView
 {
 	protected $headerList;
 	protected $hasPackage = false;

admin/views/member/view.html.php

@@ -13,10 +13,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Member View class
+ * Member Html View class
  */
-class MembersmanagerViewMember extends JViewLegacy
+class MembersmanagerViewMember extends HtmlView
 {
 	/**
 	 * display method of View

admin/views/members/view.html.php

@@ -13,10 +13,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Membersmanager View class for the Members
+ * Membersmanager Html View class for the Members
  */
-class MembersmanagerViewMembers extends JViewLegacy
+class MembersmanagerViewMembers extends HtmlView
 {
 	/**
 	 * Members view display method

admin/views/type/view.html.php

@@ -13,10 +13,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Type View class
+ * Type Html View class
  */
-class MembersmanagerViewType extends JViewLegacy
+class MembersmanagerViewType extends HtmlView
 {
 	/**
 	 * display method of View

admin/views/types/view.html.php

@@ -13,10 +13,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Membersmanager View class for the Types
+ * Membersmanager Html View class for the Types
  */
-class MembersmanagerViewTypes extends JViewLegacy
+class MembersmanagerViewTypes extends HtmlView
 {
 	/**
 	 * Types view display method

membersmanager.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="4" method="upgrade">
 	<name>COM_MEMBERSMANAGER</name>
-	<creationDate>2nd March, 2022</creationDate>
+	<creationDate>27th May, 2022</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>https://www.joomlacomponentbuilder.com/</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.0.6</version>
+	<version>2.1.0</version>
 	<description><![CDATA[
-		<h1>Members Manager (v.2.0.6)</h1>
+		<h1>Members Manager (v.2.1.0)</h1>
 		<div style="clear: both;"></div>
 		<p>A [Members manager](https://github.com/vdm-io/Joomla-Members-Manager) to use as a base for any kind of project that needs user integration. You can with much ease adapt it using the [JCB package](https://github.com/vdm-io/JCB-Community-Packages/raw/master/JCB_membersManager.zip).
 

membersmanager_server.xml

@@ -7,7 +7,7 @@
 		<version>1.0.3</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -24,7 +24,7 @@
 		<version>1.0.4</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -41,7 +41,7 @@
 		<version>1.0.6</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -58,7 +58,7 @@
 		<version>1.0.7</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -75,7 +75,7 @@
 		<version>1.0.11</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -92,7 +92,7 @@
 		<version>1.0.12</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -109,7 +109,7 @@
 		<version>1.0.13</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -126,7 +126,7 @@
 		<version>2.0.0</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -143,7 +143,7 @@
 		<version>2.0.1</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.1/JMM_v2.0.1.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -160,7 +160,7 @@
 		<version>2.0.2</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -177,7 +177,7 @@
 		<version>2.0.3</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -194,7 +194,7 @@
 		<version>2.0.4</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -211,7 +211,7 @@
 		<version>2.0.5</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -228,7 +228,24 @@
 		<version>2.0.6</version>
 		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>https://www.joomlacomponentbuilder.com/</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Members Manager</name>
+		<description>Members Manager</description>
+		<element>com_membersmanager</element>
+		<type>component</type>
+		<version>2.1.0</version>
+		<infourl title="Members Manager!">https://www.joomlacomponentbuilder.com/</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/joomla/Members-Manager/archive/v2.1.0.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>

script.php

@@ -770,7 +770,7 @@ class com_membersmanagerInstallerScript
 			echo '<a target="_blank" href="https://www.joomlacomponentbuilder.com/" title="Members Manager">
 				<img src="components/com_membersmanager/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.0.6 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.1.0 Was Successful! Let us know if anything is not working as expected.</h3>';
 
 			// Set db if not set already.
 			if (!isset($db))

site/controller.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Component Controller
+ * Membersmanager Component Base Controller
  */
-class MembersmanagerController extends JControllerLegacy
+class MembersmanagerController extends BaseController
 {
 	/**
 	 * Method to display a view.

site/controllers/ajax.json.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Ajax Controller
+ * Membersmanager Ajax Base Controller
  */
-class MembersmanagerControllerAjax extends JControllerLegacy
+class MembersmanagerControllerAjax extends BaseController
 {
 	public function __construct($config)
 	{

site/controllers/member.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Member Controller
+ * Member Form Controller
  */
-class MembersmanagerControllerMember extends JControllerForm
+class MembersmanagerControllerMember extends FormController
 {
 	/**
 	 * Current or most recently performed task.

site/helpers/membersmanager.php

@@ -5753,12 +5753,12 @@ abstract class MembersmanagerHelper
 	}
 
 	/**
-	 * File Extension to Mimetype
+	 * File Extensions to Mimetypes
 	 * https://gist.github.com/Llewellynvdm/74be373357e131b8775a7582c3de508b
 	 * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
 	 *
 	 * @var     array
-	 **/
+	 */
 	protected static $fileExtensionToMimeType = array(
 		'123'			=> 'application/vnd.lotus-1-2-3',
 		'3dml'			=> 'text/vnd.in3d.3dml',
@@ -6303,6 +6303,7 @@ abstract class MembersmanagerHelper
 		'opf'			=> 'application/oebps-package+xml',
 		'opml'			=> 'text/x-opml',
 		'oprc'			=> 'application/vnd.palm',
+		'opus'			=> 'audio/ogg',
 		'org'			=> 'application/vnd.lotus-organizer',
 		'osf'			=> 'application/vnd.yamaha.openscoreformat',
 		'osfpvg'		=> 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
@@ -6764,7 +6765,7 @@ abstract class MembersmanagerHelper
 		 */		
 
 		// get the extension form file
-		$extension = \strtolower(\pathinfo($file, \PATHINFO_EXTENSION));
+		$extension = strtolower(pathinfo($file, PATHINFO_EXTENSION));
 		// check if we have the extension listed
 		if (isset(self::$fileExtensionToMimeType[$extension]))
 		{
@@ -8900,3 +8901,4 @@ abstract class MembersmanagerHelper
 		return true;
 	}
 }
+

site/models/ajax.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Ajax Model
+ * Membersmanager Ajax List Model
  */
-class MembersmanagerModelAjax extends JModelList
+class MembersmanagerModelAjax extends ListModel
 {
 	protected $app_params;
 
@@ -621,8 +622,22 @@ class MembersmanagerModelAjax extends JModelList
 	}
 
 
+	/**
+	 * The view persistence details
+	 *
+	 * @var	array
+	 * @since 1.0.0
+	 */
 	protected $viewid = array();
 
+	/**
+	 * The view details loaded via the session
+	 *
+	 * @input	string  $call    The state key
+	 *
+	 * @return mixed
+	 * @since 1.0.0
+	 */
 	protected function getViewID($call = 'table')
 	{
 		if (!isset($this->viewid[$call]))

site/models/cpanel.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\ItemModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Cpanel Model
+ * Membersmanager Cpanel Item Model
  */
-class MembersmanagerModelCpanel extends JModelItem
+class MembersmanagerModelCpanel extends ItemModel
 {
 	/**
 	 * Model context string.

site/models/member.php

@@ -13,14 +13,15 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Member Model
+ * Membersmanager Member Admin Model
  */
-class MembersmanagerModelMember extends JModelAdmin
+class MembersmanagerModelMember extends AdminModel
 {
 	/**
 	 * The tab layout fields array.

site/models/members.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Model for Members
+ * Membersmanager List Model for Members
  */
-class MembersmanagerModelMembers extends JModelList
+class MembersmanagerModelMembers extends ListModel
 {
 	/**
 	 * Model user data.

site/models/profile.php

@@ -13,12 +13,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\Model\ItemModel;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Membersmanager Profile Model
+ * Membersmanager Profile Item Model
  */
-class MembersmanagerModelProfile extends JModelItem
+class MembersmanagerModelProfile extends ItemModel
 {
 	/**
 	 * Model context string.

site/views/cpanel/view.html.php

@@ -14,10 +14,12 @@
 defined('_JEXEC') or die('Restricted access');
 jimport('joomla.application.module.helper');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Membersmanager View class for the Cpanel
+ * Membersmanager Html View class for the Cpanel
  */
-class MembersmanagerViewCpanel extends JViewLegacy
+class MembersmanagerViewCpanel extends HtmlView
 {
 	// Overwriting JView display method
 	function display($tpl = null)
@@ -133,12 +135,12 @@ class MembersmanagerViewCpanel extends JViewLegacy
 			// The uikit css.
 			if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addStyleSheet(JURI::root(true) .'/media/com_membersmanager/uikit-v2/css/uikit'.$style.$size.'.css', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+				JHtml::_('stylesheet', 'media/com_membersmanager/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']);
 			}
 			// The uikit js.
 			if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v2/js/uikit'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+				JHtml::_('script', 'media/com_membersmanager/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']);
 			}
 		}
 		// Use Uikit Version 3
@@ -147,13 +149,13 @@ class MembersmanagerViewCpanel extends JViewLegacy
 			// The uikit css.
 			if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addStyleSheet(JURI::root(true) .'/media/com_membersmanager/uikit-v3/css/uikit'.$size.'.css', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+				JHtml::_('stylesheet', 'media/com_membersmanager/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']);
 			}
 			// The uikit js.
 			if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v3/js/uikit'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v3/js/uikit-icons'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+				JHtml::_('script', 'media/com_membersmanager/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']);
+				JHtml::_('script', 'media/com_membersmanager/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']);
 			}
 		}
 		if (MembersmanagerHelper::checkArray($this->access_types))

site/views/member/view.html.php

@@ -13,10 +13,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Member View class
+ * Member Html View class
  */
-class MembersmanagerViewMember extends JViewLegacy
+class MembersmanagerViewMember extends HtmlView
 {
 	/**
 	 * display method of View

site/views/members/view.html.php

@@ -13,10 +13,12 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Membersmanager View class for the Members
+ * Membersmanager Html View class for the Members
  */
-class MembersmanagerViewMembers extends JViewLegacy
+class MembersmanagerViewMembers extends HtmlView
 {
 	// Overwriting JView display method
 	function display($tpl = null)
@@ -80,12 +82,12 @@ class MembersmanagerViewMembers extends JViewLegacy
 			// The uikit css.
 			if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addStyleSheet(JURI::root(true) .'/media/com_membersmanager/uikit-v2/css/uikit'.$style.$size.'.css', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+				JHtml::_('stylesheet', 'media/com_membersmanager/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']);
 			}
 			// The uikit js.
 			if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v2/js/uikit'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+				JHtml::_('script', 'media/com_membersmanager/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']);
 			}
 		}
 		// Use Uikit Version 3
@@ -94,13 +96,13 @@ class MembersmanagerViewMembers extends JViewLegacy
 			// The uikit css.
 			if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addStyleSheet(JURI::root(true) .'/media/com_membersmanager/uikit-v3/css/uikit'.$size.'.css', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+				JHtml::_('stylesheet', 'media/com_membersmanager/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']);
 			}
 			// The uikit js.
 			if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v3/js/uikit'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v3/js/uikit-icons'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+				JHtml::_('script', 'media/com_membersmanager/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']);
+				JHtml::_('script', 'media/com_membersmanager/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']);
 			}
 		}
 		// load the meta description

site/views/profile/view.html.php

@@ -14,10 +14,12 @@
 defined('_JEXEC') or die('Restricted access');
 jimport('joomla.application.module.helper');
 
+use Joomla\CMS\MVC\View\HtmlView;
+
 /**
- * Membersmanager View class for the Profile
+ * Membersmanager Html View class for the Profile
  */
-class MembersmanagerViewProfile extends JViewLegacy
+class MembersmanagerViewProfile extends HtmlView
 {
 	// Overwriting JView display method
 	function display($tpl = null)
@@ -99,12 +101,12 @@ class MembersmanagerViewProfile extends JViewLegacy
 			// The uikit css.
 			if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addStyleSheet(JURI::root(true) .'/media/com_membersmanager/uikit-v2/css/uikit'.$style.$size.'.css', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+				JHtml::_('stylesheet', 'media/com_membersmanager/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']);
 			}
 			// The uikit js.
 			if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v2/js/uikit'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+				JHtml::_('script', 'media/com_membersmanager/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']);
 			}
 		}
 		// Use Uikit Version 3
@@ -113,13 +115,13 @@ class MembersmanagerViewProfile extends JViewLegacy
 			// The uikit css.
 			if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addStyleSheet(JURI::root(true) .'/media/com_membersmanager/uikit-v3/css/uikit'.$size.'.css', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+				JHtml::_('stylesheet', 'media/com_membersmanager/uikit-v3/css/uikit'.$size.'.css', ['version' => 'auto']);
 			}
 			// The uikit js.
 			if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 			{
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v3/js/uikit'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
-				$this->document->addScript(JURI::root(true) .'/media/com_membersmanager/uikit-v3/js/uikit-icons'.$size.'.js', (MembersmanagerHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+				JHtml::_('script', 'media/com_membersmanager/uikit-v3/js/uikit'.$size.'.js', ['version' => 'auto']);
+				JHtml::_('script', 'media/com_membersmanager/uikit-v3/js/uikit-icons'.$size.'.js', ['version' => 'auto']);
 			}
 		}