From 0a318b3d953f20e8d95eb8ffda52d9afa0016f8c Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 27 May 2022 07:52:58 +0200 Subject: [PATCH] Updated with JCB v3.1.0 --- README.md | 8 +++--- admin/README.txt | 8 +++--- admin/controller.php | 3 ++- admin/controllers/ajax.json.php | 5 ++-- admin/controllers/import.php | 5 ++-- admin/controllers/member.php | 5 ++-- admin/controllers/members.php | 5 ++-- admin/controllers/type.php | 5 ++-- admin/controllers/types.php | 5 ++-- admin/helpers/membersmanager.php | 10 ++++--- admin/models/ajax.php | 19 +++++++++++-- admin/models/import.php | 5 ++-- admin/models/member.php | 5 ++-- admin/models/members.php | 5 ++-- admin/models/type.php | 5 ++-- admin/models/types.php | 5 ++-- admin/sql/updates/mysql/2.0.6.sql | 1 + admin/tables/member.php | 3 ++- admin/tables/type.php | 3 ++- admin/views/import/view.html.php | 6 +++-- admin/views/member/view.html.php | 6 +++-- admin/views/members/view.html.php | 6 +++-- admin/views/type/view.html.php | 6 +++-- admin/views/types/view.html.php | 6 +++-- membersmanager.xml | 6 ++--- membersmanager_server.xml | 45 +++++++++++++++++++++---------- script.php | 2 +- site/controller.php | 5 ++-- site/controllers/ajax.json.php | 5 ++-- site/controllers/member.php | 5 ++-- site/helpers/membersmanager.php | 10 ++++--- site/models/ajax.php | 19 +++++++++++-- site/models/cpanel.php | 5 ++-- site/models/member.php | 5 ++-- site/models/members.php | 5 ++-- site/models/profile.php | 5 ++-- site/views/cpanel/view.html.php | 16 ++++++----- site/views/member/view.html.php | 6 +++-- site/views/members/view.html.php | 16 ++++++----- site/views/profile/view.html.php | 16 ++++++----- 40 files changed, 201 insertions(+), 110 deletions(-) create mode 100644 admin/sql/updates/mysql/2.0.6.sql diff --git a/README.md b/README.md index c038527..9886672 100644 --- 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: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) diff --git a/admin/README.txt b/admin/README.txt index c038527..9886672 100644 --- 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: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) diff --git a/admin/controller.php b/admin/controller.php index 5676099..4378360 100644 --- 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 index a2507b0..d4bc223 100644 --- 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 index 90c0095..b8d74e3 100644 --- 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 index c31e55a..e54ac12 100644 --- 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 index c6a7a75..33700bf 100644 --- 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 index 171dbfb..6acab5b 100644 --- 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 index 9f3a391..9353c52 100644 --- 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 index 6e12d29..db8045c 100644 --- a/admin/helpers/membersmanager.php +++ b/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; } } + diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 2436632..6fae354 100644 --- 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 @@ 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])) diff --git a/admin/models/import.php b/admin/models/import.php index fe854c3..a1f3f70 100644 --- 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 index 1835367..a81c6c6 100644 --- 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 index 4b47426..321fcd9 100644 --- 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 index 3b8a18c..3e8c27c 100644 --- 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 index 809f23a..da51294 100644 --- 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 new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/admin/sql/updates/mysql/2.0.6.sql @@ -0,0 +1 @@ + diff --git a/admin/tables/member.php b/admin/tables/member.php index e31d1e3..5b5faf1 100644 --- a/admin/tables/member.php +++ b/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 diff --git a/admin/tables/type.php b/admin/tables/type.php index 4370eea..88326c2 100644 --- a/admin/tables/type.php +++ b/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 diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 9bc8ec0..adea200 100644 --- 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 index 1a1f951..ab32152 100644 --- 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 index 46ec442..124eed2 100644 --- 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 diff --git a/admin/views/type/view.html.php b/admin/views/type/view.html.php index 4f84764..9c65df3 100644 --- a/admin/views/type/view.html.php +++ b/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 diff --git a/admin/views/types/view.html.php b/admin/views/types/view.html.php index 4ee5a99..edae561 100644 --- a/admin/views/types/view.html.php +++ b/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 diff --git a/membersmanager.xml b/membersmanager.xml index 904e8ab..4efb366 100644 --- a/membersmanager.xml +++ b/membersmanager.xml @@ -1,15 +1,15 @@ COM_MEMBERSMANAGER - 2nd March, 2022 + 27th May, 2022 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com https://www.joomlacomponentbuilder.com/ Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 2.0.6 + 2.1.0 Members Manager (v.2.0.6) +

Members Manager (v.2.1.0)

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). diff --git a/membersmanager_server.xml b/membersmanager_server.xml index 4e25eac..cf859c4 100644 --- a/membersmanager_server.xml +++ b/membersmanager_server.xml @@ -7,7 +7,7 @@ 1.0.3 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -24,7 +24,7 @@ 1.0.4 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -41,7 +41,7 @@ 1.0.6 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -58,7 +58,7 @@ 1.0.7 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -75,7 +75,7 @@ 1.0.11 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -92,7 +92,7 @@ 1.0.12 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -109,7 +109,7 @@ 1.0.13 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -126,7 +126,7 @@ 2.0.0 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.0/JMM_v2.0.0.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -143,7 +143,7 @@ 2.0.1 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.1/JMM_v2.0.1.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -160,7 +160,7 @@ 2.0.2 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -177,7 +177,7 @@ 2.0.3 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -194,7 +194,7 @@ 2.0.4 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -211,7 +211,7 @@ 2.0.5 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip stable @@ -228,7 +228,24 @@ 2.0.6 https://www.joomlacomponentbuilder.com/ - https://github.com/vdm-io/Joomla-Members-Manager/releases/download/v2.0.6/JMM_v2.0.6.zip + https://git.vdm.dev/joomla/Members-Manager/archive/v2.0.6.zip + + + stable + + Llewellyn van der Merwe + https://www.joomlacomponentbuilder.com/ + + + + Members Manager + Members Manager + com_membersmanager + component + 2.1.0 + https://www.joomlacomponentbuilder.com/ + + https://git.vdm.dev/joomla/Members-Manager/archive/v2.1.0.zip stable diff --git a/script.php b/script.php index 8a4584f..2a72855 100644 --- a/script.php +++ b/script.php @@ -770,7 +770,7 @@ class com_membersmanagerInstallerScript echo ' -

Upgrade to Version 2.0.6 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.1.0 Was Successful! Let us know if anything is not working as expected.

'; // Set db if not set already. if (!isset($db)) diff --git a/site/controller.php b/site/controller.php index 9b1d3bd..aa3ddfa 100644 --- a/site/controller.php +++ b/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. diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index b3943c3..4827c1e 100644 --- a/site/controllers/ajax.json.php +++ b/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) { diff --git a/site/controllers/member.php b/site/controllers/member.php index 5c1e0c6..3ac2e6f 100644 --- a/site/controllers/member.php +++ b/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. diff --git a/site/helpers/membersmanager.php b/site/helpers/membersmanager.php index 60e9438..e40a3f1 100644 --- a/site/helpers/membersmanager.php +++ b/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; } } + diff --git a/site/models/ajax.php b/site/models/ajax.php index d11ca8d..a96d883 100644 --- a/site/models/ajax.php +++ b/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])) diff --git a/site/models/cpanel.php b/site/models/cpanel.php index 5cabb4c..0ea74ff 100644 --- a/site/models/cpanel.php +++ b/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. diff --git a/site/models/member.php b/site/models/member.php index 1835367..a81c6c6 100644 --- a/site/models/member.php +++ b/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. diff --git a/site/models/members.php b/site/models/members.php index 6040978..57777ee 100644 --- a/site/models/members.php +++ b/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. diff --git a/site/models/profile.php b/site/models/profile.php index 0cd0e32..06b2848 100644 --- a/site/models/profile.php +++ b/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. diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php index 5589291..35d799c 100644 --- a/site/views/cpanel/view.html.php +++ b/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)) diff --git a/site/views/member/view.html.php b/site/views/member/view.html.php index 04a1da6..bdf2461 100644 --- a/site/views/member/view.html.php +++ b/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 diff --git a/site/views/members/view.html.php b/site/views/members/view.html.php index 8a2cf07..69537cd 100644 --- a/site/views/members/view.html.php +++ b/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 diff --git a/site/views/profile/view.html.php b/site/views/profile/view.html.php index aa58a5f..9909e25 100644 --- a/site/views/profile/view.html.php +++ b/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']); } }