Updated with JCB v3.1.0

Llewellynvdm · May 27, 2022 · 0a318b3 · 0a318b3
1 parent 4925167
commit 0a318b3
Show file tree

Hide file tree

Showing 40 changed files with 201 additions and 110 deletions.
diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ Watch this [tutorial](https://youtu.be/lkE0ZiSWufg) to see how.
 + *Author*: [Llewellyn van der Merwe](mailto:[email protected])
 + *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)

diff --git a/admin/README.txt b/admin/README.txt
@@ -13,8 +13,8 @@ Watch this [tutorial](https://youtu.be/lkE0ZiSWufg) to see how.
 + *Author*: [Llewellyn van der Merwe](mailto:[email protected])
 + *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)

diff --git a/admin/controller.php b/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.

diff --git a/admin/controllers/ajax.json.php b/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)
 	{

diff --git a/admin/controllers/import.php b/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.

diff --git a/admin/controllers/member.php b/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.

diff --git a/admin/controllers/members.php b/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.

diff --git a/admin/controllers/type.php b/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.

diff --git a/admin/controllers/types.php b/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.

diff --git a/admin/helpers/membersmanager.php b/admin/helpers/membersmanager.php
@@ -5756,12 +5756,12 @@ public static function getCoreName()
 	}
 
 	/**
-	 * 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 @@ public static function getCoreName()
 		'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 @@ public static function mimeType($file)
 		 */		
 
 		// 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 @@ public static function getMediumCryptKey($path)
 		return true;
 	}
 }
+
diff --git a/admin/models/ajax.php b/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 @@ protected function remove($package)
 	}
 
 
+	/**
+	 * 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]))

diff --git a/admin/models/import.php b/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;

diff --git a/admin/models/member.php b/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.

diff --git a/admin/models/members.php b/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())
 	{

diff --git a/admin/models/type.php b/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.

diff --git a/admin/models/types.php b/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())
 	{

diff --git a/admin/sql/updates/mysql/2.0.6.sql b/admin/sql/updates/mysql/2.0.6.sql
@@ -0,0 +1 @@
+
diff --git a/admin/tables/member.php b/admin/tables/member.php
@@ -13,14 +13,15 @@
 // 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;
 
 /**
  * Members Table class
  */
-class MembersmanagerTableMember extends JTable
+class MembersmanagerTableMember extends Table
 {
 	/**
 	 * Ensure the params and metadata in json encoded in the bind method

diff --git a/admin/tables/type.php b/admin/tables/type.php
@@ -13,14 +13,15 @@
 // 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;
 
 /**
  * Types Table class
  */
-class MembersmanagerTableType extends JTable
+class MembersmanagerTableType extends Table
 {
 	/**
 	 * Ensure the params and metadata in json encoded in the bind method

diff --git a/admin/views/import/view.html.php b/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;

diff --git a/admin/views/member/view.html.php b/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

diff --git a/admin/views/members/view.html.php b/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