diff --git a/README.md b/README.md index 9af7f85..ba2f015 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Joomla Members Manager (JMM) +# Members Manager (JMM) [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Members-Manager.svg)](https://github.com/vdm-io/Joomla-Members-Manager/releases) ![Members Manager image](https://raw.githubusercontent.com/vdm-io/Joomla-Members-Manager/master/admin/assets/images/vdm-component.jpg "The Members Manager") @@ -13,38 +13,38 @@ 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 September, 2015 -+ *Last Build*: 11th July, 2018 ++ *Last Build*: 25th July, 2018 + *Version*: 1.0.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time -**74 Hours** or **9 Eight Hour Days** (actual time the author saved - +**103 Hours** or **13 Eight Hour Days** (actual time the author saved - 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*: **26591** -+ *File count*: **244** -+ *Folder count*: **67** ++ *Line count*: **36982** ++ *File count*: **264** ++ *Folder count*: **69** -**49 Hours** or **6 Eight Hour Days** (the actual time the author spent) +**68 Hours** or **8 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @19hours** = codingtime / 4; -> **planning @11hours** = codingtime / 7; -> **mapping @7hours** = codingtime / 10; -> **office @12hours** = codingtime / 6;) +> **debugging @26hours** = codingtime / 4; +> **planning @15hours** = codingtime / 7; +> **mapping @10hours** = codingtime / 10; +> **office @17hours** = codingtime / 6;) -**123 Hours** or **15 Eight Hour Days** +**171 Hours** or **21 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **3 weeks** or **0.6 months** +Project duration: **4.2 weeks** or **0.9 months** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/README.txt b/admin/README.txt index 9af7f85..ba2f015 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -1,4 +1,4 @@ -# Joomla Members Manager (JMM) +# Members Manager (JMM) [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Members-Manager.svg)](https://github.com/vdm-io/Joomla-Members-Manager/releases) ![Members Manager image](https://raw.githubusercontent.com/vdm-io/Joomla-Members-Manager/master/admin/assets/images/vdm-component.jpg "The Members Manager") @@ -13,38 +13,38 @@ 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 September, 2015 -+ *Last Build*: 11th July, 2018 ++ *Last Build*: 25th July, 2018 + *Version*: 1.0.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html ## Build Time -**74 Hours** or **9 Eight Hour Days** (actual time the author saved - +**103 Hours** or **13 Eight Hour Days** (actual time the author saved - 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*: **26591** -+ *File count*: **244** -+ *Folder count*: **67** ++ *Line count*: **36982** ++ *File count*: **264** ++ *Folder count*: **69** -**49 Hours** or **6 Eight Hour Days** (the actual time the author spent) +**68 Hours** or **8 Eight Hour Days** (the actual time the author spent) > (with the following break down: -> **debugging @19hours** = codingtime / 4; -> **planning @11hours** = codingtime / 7; -> **mapping @7hours** = codingtime / 10; -> **office @12hours** = codingtime / 6;) +> **debugging @26hours** = codingtime / 4; +> **planning @15hours** = codingtime / 7; +> **mapping @10hours** = codingtime / 10; +> **office @17hours** = codingtime / 6;) -**123 Hours** or **15 Eight Hour Days** +**171 Hours** or **21 Eight Hour Days** (a total of the realistic time frame for this project) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.) -Project duration: **3 weeks** or **0.6 months** +Project duration: **4.2 weeks** or **0.9 months** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/access.xml b/admin/access.xml index 8faabb5..972a27d 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -35,19 +35,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,6 +135,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index fe3c047..0ec57f5 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/member.css b/admin/assets/css/member.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/member.css +++ b/admin/assets/css/member.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/members.css b/admin/assets/css/members.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/members.css +++ b/admin/assets/css/members.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/region.css b/admin/assets/css/region.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/region.css +++ b/admin/assets/css/region.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/regions.css b/admin/assets/css/regions.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/regions.css +++ b/admin/assets/css/regions.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/type.css b/admin/assets/css/type.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/type.css +++ b/admin/assets/css/type.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/css/types.css b/admin/assets/css/types.css index 7ad2d20..026520f 100644 --- a/admin/assets/css/types.css +++ b/admin/assets/css/types.css @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 714113e..f6daf95 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controller.php b/admin/controller.php index 271a777..d6ecc7f 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 7a2c343..88290cd 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -55,7 +55,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy { $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $fieldValue = $jinput->get('field', NULL, 'WORD'); - $valueValue = $jinput->get('value', NULL, 'WORD'); + $valueValue = $jinput->get('value', NULL, 'STRING'); if($fieldValue && $valueValue && $user->id != 0) { $result = $this->getModel('ajax')->checkUnique($fieldValue, $valueValue); @@ -132,9 +132,10 @@ class MembersmanagerControllerAjax extends JControllerLegacy { $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idValue = $jinput->get('id', NULL, 'INT'); - if($idValue && $user->id != 0) + $shownameValue = $jinput->get('showname', NULL, 'INT'); + if($idValue && $shownameValue && $user->id != 0) { - $result = $this->getModel('ajax')->getUser($idValue); + $result = $this->getModel('ajax')->getUser($idValue, $shownameValue); } else { diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 86037a3..fdcd840 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/country.php b/admin/controllers/country.php index c354ff3..330e24b 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 2cabd74..a827213 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 9256dc5..9760765 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 296e736..b3b31ee 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/member.php b/admin/controllers/member.php index 0b691ec..196d5ce 100644 --- a/admin/controllers/member.php +++ b/admin/controllers/member.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/members.php b/admin/controllers/members.php index 9aca64f..ff204d7 100644 --- a/admin/controllers/members.php +++ b/admin/controllers/members.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/region.php b/admin/controllers/region.php index 9bc57a3..c52d562 100644 --- a/admin/controllers/region.php +++ b/admin/controllers/region.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/regions.php b/admin/controllers/regions.php index 292ec9a..a28a251 100644 --- a/admin/controllers/regions.php +++ b/admin/controllers/regions.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/type.php b/admin/controllers/type.php index dcb4293..6149e03 100644 --- a/admin/controllers/type.php +++ b/admin/controllers/type.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/controllers/types.php b/admin/controllers/types.php index 0311a81..1412760 100644 --- a/admin/controllers/types.php +++ b/admin/controllers/types.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index bc8644c..4c1d712 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index eaf634f..97a7807 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/helpers/membersmanager.php b/admin/helpers/membersmanager.php index 8193675..a96dd2b 100644 --- a/admin/helpers/membersmanager.php +++ b/admin/helpers/membersmanager.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -311,6 +311,135 @@ abstract class MembersmanagerHelper } return $options; } + + /** + * Get the html/link of the image + * + * @param object $item The item to get image for + * @param string $target The target in the item to use + * @param string $name The name target in item to use + * @param string $filelink The file link + * + * @return string image html/link + * + */ + public static function getImageLink(&$item, $target, $name = 'name', $filelink = null, $html = true) + { + // check that we have a value + if (isset($item->{$target}) && MembersmanagerHelper::checkString($item->{$target})) + { + // load the file link path if not set + if (!$filelink) + { + $filelink = self::getFolderPath('url'); + } + // set image link + if (strpos($item->{$target}, '_') !== false) + { + $extention = explode('_', $item->{$target}); + $actualName = self::safeString($target, 'w'); + if (strpos($item->{$target}, 'VDM') !== false) + { + $fileNameArray = explode('VDM', $item->{$target}); + if (isset($fileNameArray[1]) && MembersmanagerHelper::checkString($fileNameArray[1])) + { + $actualName = $fileNameArray[1]; + } + } + // check if we have the extention + if (isset($extention[2])) + { + // set the link + $link = $filelink . $item->{$target} . '.' . $extention[2]; + // return ready html + if ($html) + { + return '' . $actualName . ' ' . $item->{$name} . ''; + } + // return just the link + else + { + return $link; + } + } + } + } + return false; + } + + /** + * Get the edit button + * + * @param int $item The item to edit + * @param string $view The type of item to edit + * @param string $views The list view controller name + * @param string $ref The return path + * @param string $headsup The message to show on click of button + * + * @return string On success the full html edit button + * + */ + public static function getEditButton(&$item, $view, $views, $ref = '', $headsup = 'COM_MEMBERSMANAGER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE') + { + // check that we have the ID + if (self::checkObject($item) && isset($item->id)) + { + $id = (int) $item->id; + // check if the checked_out is available + if (isset($item->checked_out)) + { + $checked_out = (int) $item->checked_out; + } + } + elseif (self::checkArray($item) && isset($item['id'])) + { + $id = (int) $item['id']; + // check if the checked_out is available + if (isset($item['checked_out'])) + { + $checked_out = (int) $item['checked_out']; + } + } + elseif (is_numeric($item)) + { + $id = (int) $item; + } + // check ID + if (isset($id) && $id > 0) + { + // can edit + if (JFactory::getUser()->authorise($view.'.edit', 'com_membersmanager.'.$view.'.' . (int) $id)) + { + // set the edit link + $edit = "index.php?option=com_membersmanager&view=".$views."&task=".$view.".edit&id=".$id.$ref; + // set the link title + $title = self::safeString(JText::_('COM_MEMBERSMANAGER_EDIT').' '.$view, 'W'); + // check that there is a check message + if (self::checkString($headsup)) + { + $href = 'onclick="UIkit.modal.confirm(\''.JText::_($headsup).'\', function(){ window.location.href = \'' . $edit . '\' })" href="javascript:void(0)"'; + } + else + { + $href = 'href="' . $edit . '"'; + } + // check if it is checked out + if (isset($checked_out) && $checked_out > 0) + { + // is this user the one who checked it out + if ($checked_out == JFactory::getUser()->id) + { + return ' '; + } + return ' '; + } + // return normal edit link + return ' '; + } + } + return ''; + } + /** * Load the Component xml manifest. **/ @@ -960,16 +1089,16 @@ abstract class MembersmanagerHelper { if ($external) { - if ($name = self::getVar(null, $val, $id, $name, '=', $table)) + if ($_name = self::getVar(null, $val, $id, $name, '=', $table)) { - $names[] = $name; + $names[] = $_name; } } else { - if ($name = self::getVar($table, $val, $id, $name)) + if ($_name = self::getVar($table, $val, $id, $name)) { - $names[] = $name; + $names[] = $_name; } } } @@ -1691,7 +1820,7 @@ abstract class MembersmanagerHelper * * @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) { @@ -1720,7 +1849,16 @@ abstract class MembersmanagerHelper $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') { diff --git a/admin/language/en-GB/en-GB.com_membersmanager.ini b/admin/language/en-GB/en-GB.com_membersmanager.ini index 4eb9aab..cd5782f 100644 --- a/admin/language/en-GB/en-GB.com_membersmanager.ini +++ b/admin/language/en-GB/en-GB.com_membersmanager.ini @@ -3,9 +3,11 @@ COM_MEMBERSMANAGER_ADD_NAME="Add Name" COM_MEMBERSMANAGER_ADD_ONE_OF_THESE_PLACEHOLDERS_IN_TEXT_FOR_CUSTOM_DOWNLOAD_PLACEMENT="Add one of these placeholders in text for custom download placement" COM_MEMBERSMANAGER_ADD_USERNAME="Add username" COM_MEMBERSMANAGER_ALLOWED_IMAGE_FORMATS_ARE_NOT_SET_IN_THE_GLOBAL_SETTINGS_PLEASE_NOTIFY_YOUR_SYSTEM_ADMINISTRATOR="Allowed image formats are not set in the global settings, please notify your system administrator." +COM_MEMBERSMANAGER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE="All unsaved work on this page will be lost, are you sure you want to continue?" COM_MEMBERSMANAGER_ARCHIVED="Archived" COM_MEMBERSMANAGER_AUTHOR="Author" COM_MEMBERSMANAGER_BACK="Back" +COM_MEMBERSMANAGER_BSB_IS_ALREADY_IN_USE_PLEASE_TRY_ANOTHER="%s is already in use, please try another!" COM_MEMBERSMANAGER_CLOSE="Close" COM_MEMBERSMANAGER_CLOSE_NEW="Close & New" COM_MEMBERSMANAGER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat" @@ -110,7 +112,7 @@ COM_MEMBERSMANAGER_COUNTRIES_N_ITEMS_UNFEATURED_1="%s Country unfeatured." COM_MEMBERSMANAGER_COUNTRIES_N_ITEMS_UNPUBLISHED="%s Countries unpublished." COM_MEMBERSMANAGER_COUNTRIES_N_ITEMS_UNPUBLISHED_1="%s Country unpublished." COM_MEMBERSMANAGER_COUNTRIES_SUBMENU="Countries Submenu" -COM_MEMBERSMANAGER_COUNTRIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the country" +COM_MEMBERSMANAGER_COUNTRIES_SUBMENU_DESC="Allows the users in this group to submenu of country" COM_MEMBERSMANAGER_COUNTRY="Country" COM_MEMBERSMANAGER_COUNTRY_ALIAS="Alias" COM_MEMBERSMANAGER_COUNTRY_ALIAS_HINT="Auto-generated from name" @@ -201,7 +203,7 @@ COM_MEMBERSMANAGER_CURRENCIES_N_ITEMS_UNFEATURED_1="%s Currency unfeatured." COM_MEMBERSMANAGER_CURRENCIES_N_ITEMS_UNPUBLISHED="%s Currencies unpublished." COM_MEMBERSMANAGER_CURRENCIES_N_ITEMS_UNPUBLISHED_1="%s Currency unpublished." COM_MEMBERSMANAGER_CURRENCIES_SUBMENU="Currencies Submenu" -COM_MEMBERSMANAGER_CURRENCIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the currency" +COM_MEMBERSMANAGER_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency" COM_MEMBERSMANAGER_CURRENCY="Currency" COM_MEMBERSMANAGER_CURRENCY_ALIAS="Alias" COM_MEMBERSMANAGER_CURRENCY_ALIAS_HINT="Auto-generated from name" @@ -289,6 +291,7 @@ COM_MEMBERSMANAGER_ERROR_USER_NOT_UPDATED="Error - User Not Updated" COM_MEMBERSMANAGER_EXPORT_DATA="Export Data" COM_MEMBERSMANAGER_EXPORT_DATA_DESC=" Allows users in this group to export data." COM_MEMBERSMANAGER_EXPORT_FAILED="Export Failed" +COM_MEMBERSMANAGER_GREAT_SS_IS_AVAILABLE="Great, %s(%s) is available!" COM_MEMBERSMANAGER_HELP_MANAGER="Help" COM_MEMBERSMANAGER_IMPORT_CONTINUE="Continue" COM_MEMBERSMANAGER_IMPORT_DATA="Import Data" @@ -340,7 +343,39 @@ COM_MEMBERSMANAGER_MAIN_MEMBER="Main Member" COM_MEMBERSMANAGER_MEMBER="Member" COM_MEMBERSMANAGER_MEMBERS="Members" COM_MEMBERSMANAGER_MEMBERS_ACCESS="Members Access" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_ACCOUNT="Members Access Account" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_ACCOUNT_DESC="Allows the users in this group to access account of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_CITY="Members Access City" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_CITY_DESC="Allows the users in this group to access city of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_COUNTRY="Members Access Country" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_COUNTRY_DESC="Allows the users in this group to access country of member" COM_MEMBERSMANAGER_MEMBERS_ACCESS_DESC="Allows the users in this group to access access members" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_EMAIL="Members Access Email" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_EMAIL_DESC="Allows the users in this group to access email of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_LANDLINE_PHONE="Members Access Landline Phone" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_LANDLINE_PHONE_DESC="Allows the users in this group to access landline phone of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MAIN_MEMBER="Members Access Main Member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MAIN_MEMBER_DESC="Allows the users in this group to access main member of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MOBILE_PHONE="Members Access Mobile Phone" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MOBILE_PHONE_DESC="Allows the users in this group to access mobile phone of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_NAME="Members Access Name" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_NAME_DESC="Allows the users in this group to access name of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTAL="Members Access Postal" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTALCODE="Members Access Postalcode" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTALCODE_DESC="Allows the users in this group to access postalcode of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTAL_DESC="Allows the users in this group to access postal of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_REGION="Members Access Region" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_REGION_DESC="Allows the users in this group to access region of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_STREET="Members Access Street" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_STREET_DESC="Allows the users in this group to access street of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TOKEN="Members Access Token" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TOKEN_DESC="Allows the users in this group to access token of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TYPE="Members Access Type" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TYPE_DESC="Allows the users in this group to access type of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_USER="Members Access User" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_USER_DESC="Allows the users in this group to access user of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_WEBSITE="Members Access Website" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_WEBSITE_DESC="Allows the users in this group to access website of member" COM_MEMBERSMANAGER_MEMBERS_BATCH_OPTIONS="Batch process the selected Members" COM_MEMBERSMANAGER_MEMBERS_BATCH_TIP="All changes will be applied to all selected Members" COM_MEMBERSMANAGER_MEMBERS_BATCH_USE="Members Batch Use" @@ -350,17 +385,49 @@ COM_MEMBERSMANAGER_MEMBERS_CREATE_DESC="Allows the users in this group to create COM_MEMBERSMANAGER_MEMBERS_DELETE="Members Delete" COM_MEMBERSMANAGER_MEMBERS_DELETE_DESC="Allows the users in this group to delete delete members" COM_MEMBERSMANAGER_MEMBERS_EDIT="Members Edit" +COM_MEMBERSMANAGER_MEMBERS_EDIT_ACCOUNT="Members Edit Account" +COM_MEMBERSMANAGER_MEMBERS_EDIT_ACCOUNT_DESC="Allows the users in this group to edit account of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_CITY="Members Edit City" +COM_MEMBERSMANAGER_MEMBERS_EDIT_CITY_DESC="Allows the users in this group to edit city of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_COUNTRY="Members Edit Country" +COM_MEMBERSMANAGER_MEMBERS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_BY="Members Edit Created By" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by members" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_DATE="Members Edit Created Date" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created members" COM_MEMBERSMANAGER_MEMBERS_EDIT_DESC="Allows the users in this group to edit the member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_EMAIL="Members Edit Email" +COM_MEMBERSMANAGER_MEMBERS_EDIT_EMAIL_DESC="Allows the users in this group to edit email of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_LANDLINE_PHONE="Members Edit Landline Phone" +COM_MEMBERSMANAGER_MEMBERS_EDIT_LANDLINE_PHONE_DESC="Allows the users in this group to edit landline phone of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MAIN_MEMBER="Members Edit Main Member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MAIN_MEMBER_DESC="Allows the users in this group to edit main member of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MOBILE_PHONE="Members Edit Mobile Phone" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MOBILE_PHONE_DESC="Allows the users in this group to edit mobile phone of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_NAME="Members Edit Name" +COM_MEMBERSMANAGER_MEMBERS_EDIT_NAME_DESC="Allows the users in this group to edit name of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_OWN="Members Edit Own" COM_MEMBERSMANAGER_MEMBERS_EDIT_OWN_DESC="Allows the users in this group to edit edit own members created by them" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTAL="Members Edit Postal" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTALCODE="Members Edit Postalcode" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTALCODE_DESC="Allows the users in this group to edit postalcode of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTAL_DESC="Allows the users in this group to edit postal of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_REGION="Members Edit Region" +COM_MEMBERSMANAGER_MEMBERS_EDIT_REGION_DESC="Allows the users in this group to edit region of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_STATE="Members Edit State" COM_MEMBERSMANAGER_MEMBERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_STREET="Members Edit Street" +COM_MEMBERSMANAGER_MEMBERS_EDIT_STREET_DESC="Allows the users in this group to edit street of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TOKEN="Members Edit Token" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TOKEN_DESC="Allows the users in this group to edit token of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TYPE="Members Edit Type" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TYPE_DESC="Allows the users in this group to edit type of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_USER="Members Edit User" +COM_MEMBERSMANAGER_MEMBERS_EDIT_USER_DESC="Allows the users in this group to edit user of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_VERSION="Members Edit Version" COM_MEMBERSMANAGER_MEMBERS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version members" +COM_MEMBERSMANAGER_MEMBERS_EDIT_WEBSITE="Members Edit Website" +COM_MEMBERSMANAGER_MEMBERS_EDIT_WEBSITE_DESC="Allows the users in this group to edit website of member" COM_MEMBERSMANAGER_MEMBERS_EXPORT="Members Export" COM_MEMBERSMANAGER_MEMBERS_EXPORT_DESC="Allows the users in this group to export export members" COM_MEMBERSMANAGER_MEMBERS_IMPORT="Members Import" @@ -383,7 +450,39 @@ COM_MEMBERSMANAGER_MEMBERS_N_ITEMS_UNFEATURED_1="%s Member unfeatured." COM_MEMBERSMANAGER_MEMBERS_N_ITEMS_UNPUBLISHED="%s Members unpublished." COM_MEMBERSMANAGER_MEMBERS_N_ITEMS_UNPUBLISHED_1="%s Member unpublished." COM_MEMBERSMANAGER_MEMBERS_SUBMENU="Members Submenu" -COM_MEMBERSMANAGER_MEMBERS_SUBMENU_DESC="Allows the users in this group to update the submenu of the member" +COM_MEMBERSMANAGER_MEMBERS_SUBMENU_DESC="Allows the users in this group to submenu of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_ACCOUNT="Members View Account" +COM_MEMBERSMANAGER_MEMBERS_VIEW_ACCOUNT_DESC="Allows the users in this group to view account of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_CITY="Members View City" +COM_MEMBERSMANAGER_MEMBERS_VIEW_CITY_DESC="Allows the users in this group to view city of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_COUNTRY="Members View Country" +COM_MEMBERSMANAGER_MEMBERS_VIEW_COUNTRY_DESC="Allows the users in this group to view country of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_EMAIL="Members View Email" +COM_MEMBERSMANAGER_MEMBERS_VIEW_EMAIL_DESC="Allows the users in this group to view email of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_LANDLINE_PHONE="Members View Landline Phone" +COM_MEMBERSMANAGER_MEMBERS_VIEW_LANDLINE_PHONE_DESC="Allows the users in this group to view landline phone of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MAIN_MEMBER="Members View Main Member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MAIN_MEMBER_DESC="Allows the users in this group to view main member of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MOBILE_PHONE="Members View Mobile Phone" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MOBILE_PHONE_DESC="Allows the users in this group to view mobile phone of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_NAME="Members View Name" +COM_MEMBERSMANAGER_MEMBERS_VIEW_NAME_DESC="Allows the users in this group to view name of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTAL="Members View Postal" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTALCODE="Members View Postalcode" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTALCODE_DESC="Allows the users in this group to view postalcode of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTAL_DESC="Allows the users in this group to view postal of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_REGION="Members View Region" +COM_MEMBERSMANAGER_MEMBERS_VIEW_REGION_DESC="Allows the users in this group to view region of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_STREET="Members View Street" +COM_MEMBERSMANAGER_MEMBERS_VIEW_STREET_DESC="Allows the users in this group to view street of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TOKEN="Members View Token" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TOKEN_DESC="Allows the users in this group to view token of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TYPE="Members View Type" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TYPE_DESC="Allows the users in this group to view type of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_USER="Members View User" +COM_MEMBERSMANAGER_MEMBERS_VIEW_USER_DESC="Allows the users in this group to view user of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_WEBSITE="Members View Website" +COM_MEMBERSMANAGER_MEMBERS_VIEW_WEBSITE_DESC="Allows the users in this group to view website of member" COM_MEMBERSMANAGER_MEMBER_ACCOUNT="Account" COM_MEMBERSMANAGER_MEMBER_ACCOUNT_DESCRIPTION="What Type of Account is this." COM_MEMBERSMANAGER_MEMBER_ACCOUNT_LABEL="Account" @@ -415,6 +514,7 @@ COM_MEMBERSMANAGER_MEMBER_LANDLINE_PHONE_HINT="Landline Phone Here" COM_MEMBERSMANAGER_MEMBER_LANDLINE_PHONE_LABEL="Landline Phone" COM_MEMBERSMANAGER_MEMBER_LANDLINE_PHONE_MESSAGE="Error! Please add landline phone number here." COM_MEMBERSMANAGER_MEMBER_MAIN="Main" +COM_MEMBERSMANAGER_MEMBER_MAIN_LOGIN="Main & Login" COM_MEMBERSMANAGER_MEMBER_MAIN_MEMBER="Main Member" COM_MEMBERSMANAGER_MEMBER_MAIN_MEMBER_DESCRIPTION="Select the main member this sub-member belongs to." COM_MEMBERSMANAGER_MEMBER_MAIN_MEMBER_LABEL="Main Member" @@ -446,6 +546,8 @@ COM_MEMBERSMANAGER_MEMBER_POSTAL_DESCRIPTION="Please add your postal address her COM_MEMBERSMANAGER_MEMBER_POSTAL_HINT="P.O.Box 0000" COM_MEMBERSMANAGER_MEMBER_POSTAL_LABEL="Postal" COM_MEMBERSMANAGER_MEMBER_POSTAL_MESSAGE="Error! Please add postal address here." +COM_MEMBERSMANAGER_MEMBER_PROFILE_ACCESS_SITE="Member Profile (Site) Access" +COM_MEMBERSMANAGER_MEMBER_PROFILE_ACCESS_SITE_DESC=" Allows the users in this group to access site member profile." COM_MEMBERSMANAGER_MEMBER_PROFILE_IMAGE="Profile Image" COM_MEMBERSMANAGER_MEMBER_PROFILE_IMAGE_UPLOADER_DESCRIPTION="


Upload Your profile image by dropping the file here or selecting the file from your computer


...
" COM_MEMBERSMANAGER_MEMBER_PROFILE_IMAGE_UPLOADER_LABEL="Profile Image" @@ -462,6 +564,11 @@ COM_MEMBERSMANAGER_MEMBER_STREET_LABEL="Street Address" COM_MEMBERSMANAGER_MEMBER_STREET_MESSAGE="Error! Please add street here." COM_MEMBERSMANAGER_MEMBER_SUB="Sub" COM_MEMBERSMANAGER_MEMBER_SUB_LOGIN="Sub & Login" +COM_MEMBERSMANAGER_MEMBER_TOKEN="Token" +COM_MEMBERSMANAGER_MEMBER_TOKEN_DESCRIPTION="Will be auto generated if left empty" +COM_MEMBERSMANAGER_MEMBER_TOKEN_HINT="uniqueValue" +COM_MEMBERSMANAGER_MEMBER_TOKEN_LABEL="TOKEN" +COM_MEMBERSMANAGER_MEMBER_TOKEN_MESSAGE="TOKEN already used!
The token must be a unique value! Please try another." COM_MEMBERSMANAGER_MEMBER_TYPE="Type" COM_MEMBERSMANAGER_MEMBER_TYPE_DESCRIPTION="Select the type" COM_MEMBERSMANAGER_MEMBER_TYPE_LABEL="Type" @@ -475,6 +582,7 @@ COM_MEMBERSMANAGER_MEMBER_WEBSITE_DESCRIPTION="Enter website address" COM_MEMBERSMANAGER_MEMBER_WEBSITE_HINT="http://www.example.com" COM_MEMBERSMANAGER_MEMBER_WEBSITE_LABEL="Website" COM_MEMBERSMANAGER_MEMBER_WEBSITE_MESSAGE="Error! Please add website here." +COM_MEMBERSMANAGER_MOBILE="Mobile" COM_MEMBERSMANAGER_NAME="Name" COM_MEMBERSMANAGER_NEW="New" COM_MEMBERSMANAGER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!" @@ -499,16 +607,16 @@ COM_MEMBERSMANAGER_REGIONS_DELETE="Regions Delete" COM_MEMBERSMANAGER_REGIONS_DELETE_DESC="Allows the users in this group to delete delete regions" COM_MEMBERSMANAGER_REGIONS_EDIT="Regions Edit" COM_MEMBERSMANAGER_REGIONS_EDIT_ALIAS="Regions Edit Alias" -COM_MEMBERSMANAGER_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the region" +COM_MEMBERSMANAGER_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of region" COM_MEMBERSMANAGER_REGIONS_EDIT_COUNTRY="Regions Edit Country" -COM_MEMBERSMANAGER_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to update the edit country of the region" +COM_MEMBERSMANAGER_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of region" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_BY="Regions Edit Created By" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by regions" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_DATE="Regions Edit Created Date" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created regions" COM_MEMBERSMANAGER_REGIONS_EDIT_DESC="Allows the users in this group to edit the region" COM_MEMBERSMANAGER_REGIONS_EDIT_NAME="Regions Edit Name" -COM_MEMBERSMANAGER_REGIONS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the region" +COM_MEMBERSMANAGER_REGIONS_EDIT_NAME_DESC="Allows the users in this group to edit name of region" COM_MEMBERSMANAGER_REGIONS_EDIT_OWN="Regions Edit Own" COM_MEMBERSMANAGER_REGIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own regions created by them" COM_MEMBERSMANAGER_REGIONS_EDIT_STATE="Regions Edit State" @@ -577,6 +685,7 @@ COM_MEMBERSMANAGER_SUBMENU_COUNTRIES="Countries" COM_MEMBERSMANAGER_SUBMENU_CURRENCIES="Currencies" COM_MEMBERSMANAGER_SUBMENU_MEMBERS="Members" COM_MEMBERSMANAGER_SUCCESS="Success" +COM_MEMBERSMANAGER_TEL="Tel" COM_MEMBERSMANAGER_THERE_HAS_BEEN_AN_ERROR="There has been an error." COM_MEMBERSMANAGER_THE_PROFILE_WILL_BE_CROPPED_TO_THIS_SIZE="The profile will be cropped to this size" COM_MEMBERSMANAGER_TRASHED="Trashed" @@ -599,9 +708,9 @@ COM_MEMBERSMANAGER_TYPES_EDIT_CREATED_DATE="Types Edit Created Date" COM_MEMBERSMANAGER_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created types" COM_MEMBERSMANAGER_TYPES_EDIT_DESC="Allows the users in this group to edit the type" COM_MEMBERSMANAGER_TYPES_EDIT_DESCRIPTION="Types Edit Description" -COM_MEMBERSMANAGER_TYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the type" +COM_MEMBERSMANAGER_TYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to edit description of type" COM_MEMBERSMANAGER_TYPES_EDIT_NAME="Types Edit Name" -COM_MEMBERSMANAGER_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the type" +COM_MEMBERSMANAGER_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of type" COM_MEMBERSMANAGER_TYPES_EDIT_OWN="Types Edit Own" COM_MEMBERSMANAGER_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own types created by them" COM_MEMBERSMANAGER_TYPES_EDIT_STATE="Types Edit State" @@ -669,6 +778,7 @@ COM_MEMBERSMANAGER_USER_WAS_CREATED_SUCCESSFULLY_AND_THE_LOGIN_DETAILS_WAS_EMAIL COM_MEMBERSMANAGER_USER_WAS_UPDATED_SUCCESSFULLY="User was updated successfully" COM_MEMBERSMANAGER_USE_BATCH="Use Batch" COM_MEMBERSMANAGER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method." +COM_MEMBERSMANAGER_VALUE_ALREADY_TAKEN_PLEASE_TRY_AGAIN="Value already taken, please try again." COM_MEMBERSMANAGER_VERSION="Version" COM_MEMBERSMANAGER_WARNING_IMPORT_FILE_ERROR="Warning, import file error." COM_MEMBERSMANAGER_WARNING_IMPORT_UPLOAD_ERROR="Warning, import upload error." @@ -676,5 +786,7 @@ COM_MEMBERSMANAGER_WEBSITE="Website" COM_MEMBERSMANAGER_YOU_CAN_NOW_SELECT_BSB_THAT_YOU_JUST_CREATED_FROM_THE_USERS_LIST_IN_THE_ABOVE_FIELD_SIMPLY_CLICK_ON_THE_BLUE_USER_ICON="You can now select %s that you just created from the users list in the above field. Simply click on the blue user icon." COM_MEMBERSMANAGER_YOU_DO_NOT_HAVE_PERMISSION_TO_REMOVE_THIS_FILE="You do not have permission to remove this file." COM_MEMBERSMANAGER_YOU_DO_NOT_HAVE_PERMISSION_TO_UPLOAD_AN="You do not have permission to upload an" +COM_MEMBERSMANAGER__HAS_BEEN_CHECKED_OUT_BY_S="% has been checked out by %s" +MEMBERS_DETAILS="Details" MEMBERS_MEMBER="Member" MEMBERS_PHONE="Phone" \ No newline at end of file diff --git a/admin/language/en-GB/en-GB.com_membersmanager.sys.ini b/admin/language/en-GB/en-GB.com_membersmanager.sys.ini index 87dbc9f..96cdb17 100644 --- a/admin/language/en-GB/en-GB.com_membersmanager.sys.ini +++ b/admin/language/en-GB/en-GB.com_membersmanager.sys.ini @@ -19,7 +19,7 @@ COM_MEMBERSMANAGER_COUNTRIES_EXPORT_DESC="Allows the users in this group to expo COM_MEMBERSMANAGER_COUNTRIES_IMPORT="Countries Import" COM_MEMBERSMANAGER_COUNTRIES_IMPORT_DESC="Allows the users in this group to import import countries" COM_MEMBERSMANAGER_COUNTRIES_SUBMENU="Countries Submenu" -COM_MEMBERSMANAGER_COUNTRIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the country" +COM_MEMBERSMANAGER_COUNTRIES_SUBMENU_DESC="Allows the users in this group to submenu of country" COM_MEMBERSMANAGER_CURRENCIES_ACCESS="Currencies Access" COM_MEMBERSMANAGER_CURRENCIES_ACCESS_DESC="Allows the users in this group to access access currencies" COM_MEMBERSMANAGER_CURRENCIES_BATCH_USE="Currencies Batch Use" @@ -39,7 +39,7 @@ COM_MEMBERSMANAGER_CURRENCIES_EXPORT_DESC="Allows the users in this group to exp COM_MEMBERSMANAGER_CURRENCIES_IMPORT="Currencies Import" COM_MEMBERSMANAGER_CURRENCIES_IMPORT_DESC="Allows the users in this group to import import currencies" COM_MEMBERSMANAGER_CURRENCIES_SUBMENU="Currencies Submenu" -COM_MEMBERSMANAGER_CURRENCIES_SUBMENU_DESC="Allows the users in this group to update the submenu of the currency" +COM_MEMBERSMANAGER_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency" COM_MEMBERSMANAGER_EDIT_CREATED_BY="Edit Created By" COM_MEMBERSMANAGER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by." COM_MEMBERSMANAGER_EDIT_CREATED_DATE="Edit Created Date" @@ -51,7 +51,39 @@ COM_MEMBERSMANAGER_EXPORT_DATA_DESC=" Allows users in this group to export data. COM_MEMBERSMANAGER_IMPORT_DATA="Import Data" COM_MEMBERSMANAGER_IMPORT_DATA_DESC=" Allows users in this group to import data." COM_MEMBERSMANAGER_MEMBERS_ACCESS="Members Access" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_ACCOUNT="Members Access Account" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_ACCOUNT_DESC="Allows the users in this group to access account of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_CITY="Members Access City" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_CITY_DESC="Allows the users in this group to access city of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_COUNTRY="Members Access Country" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_COUNTRY_DESC="Allows the users in this group to access country of member" COM_MEMBERSMANAGER_MEMBERS_ACCESS_DESC="Allows the users in this group to access access members" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_EMAIL="Members Access Email" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_EMAIL_DESC="Allows the users in this group to access email of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_LANDLINE_PHONE="Members Access Landline Phone" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_LANDLINE_PHONE_DESC="Allows the users in this group to access landline phone of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MAIN_MEMBER="Members Access Main Member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MAIN_MEMBER_DESC="Allows the users in this group to access main member of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MOBILE_PHONE="Members Access Mobile Phone" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_MOBILE_PHONE_DESC="Allows the users in this group to access mobile phone of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_NAME="Members Access Name" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_NAME_DESC="Allows the users in this group to access name of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTAL="Members Access Postal" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTALCODE="Members Access Postalcode" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTALCODE_DESC="Allows the users in this group to access postalcode of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_POSTAL_DESC="Allows the users in this group to access postal of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_REGION="Members Access Region" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_REGION_DESC="Allows the users in this group to access region of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_STREET="Members Access Street" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_STREET_DESC="Allows the users in this group to access street of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TOKEN="Members Access Token" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TOKEN_DESC="Allows the users in this group to access token of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TYPE="Members Access Type" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_TYPE_DESC="Allows the users in this group to access type of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_USER="Members Access User" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_USER_DESC="Allows the users in this group to access user of member" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_WEBSITE="Members Access Website" +COM_MEMBERSMANAGER_MEMBERS_ACCESS_WEBSITE_DESC="Allows the users in this group to access website of member" COM_MEMBERSMANAGER_MEMBERS_BATCH_USE="Members Batch Use" COM_MEMBERSMANAGER_MEMBERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch members" COM_MEMBERSMANAGER_MEMBERS_CREATE="Members Create" @@ -59,23 +91,89 @@ COM_MEMBERSMANAGER_MEMBERS_CREATE_DESC="Allows the users in this group to create COM_MEMBERSMANAGER_MEMBERS_DELETE="Members Delete" COM_MEMBERSMANAGER_MEMBERS_DELETE_DESC="Allows the users in this group to delete delete members" COM_MEMBERSMANAGER_MEMBERS_EDIT="Members Edit" +COM_MEMBERSMANAGER_MEMBERS_EDIT_ACCOUNT="Members Edit Account" +COM_MEMBERSMANAGER_MEMBERS_EDIT_ACCOUNT_DESC="Allows the users in this group to edit account of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_CITY="Members Edit City" +COM_MEMBERSMANAGER_MEMBERS_EDIT_CITY_DESC="Allows the users in this group to edit city of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_COUNTRY="Members Edit Country" +COM_MEMBERSMANAGER_MEMBERS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_BY="Members Edit Created By" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by members" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_DATE="Members Edit Created Date" COM_MEMBERSMANAGER_MEMBERS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created members" COM_MEMBERSMANAGER_MEMBERS_EDIT_DESC="Allows the users in this group to edit the member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_EMAIL="Members Edit Email" +COM_MEMBERSMANAGER_MEMBERS_EDIT_EMAIL_DESC="Allows the users in this group to edit email of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_LANDLINE_PHONE="Members Edit Landline Phone" +COM_MEMBERSMANAGER_MEMBERS_EDIT_LANDLINE_PHONE_DESC="Allows the users in this group to edit landline phone of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MAIN_MEMBER="Members Edit Main Member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MAIN_MEMBER_DESC="Allows the users in this group to edit main member of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MOBILE_PHONE="Members Edit Mobile Phone" +COM_MEMBERSMANAGER_MEMBERS_EDIT_MOBILE_PHONE_DESC="Allows the users in this group to edit mobile phone of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_NAME="Members Edit Name" +COM_MEMBERSMANAGER_MEMBERS_EDIT_NAME_DESC="Allows the users in this group to edit name of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_OWN="Members Edit Own" COM_MEMBERSMANAGER_MEMBERS_EDIT_OWN_DESC="Allows the users in this group to edit edit own members created by them" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTAL="Members Edit Postal" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTALCODE="Members Edit Postalcode" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTALCODE_DESC="Allows the users in this group to edit postalcode of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_POSTAL_DESC="Allows the users in this group to edit postal of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_REGION="Members Edit Region" +COM_MEMBERSMANAGER_MEMBERS_EDIT_REGION_DESC="Allows the users in this group to edit region of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_STATE="Members Edit State" COM_MEMBERSMANAGER_MEMBERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_STREET="Members Edit Street" +COM_MEMBERSMANAGER_MEMBERS_EDIT_STREET_DESC="Allows the users in this group to edit street of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TOKEN="Members Edit Token" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TOKEN_DESC="Allows the users in this group to edit token of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TYPE="Members Edit Type" +COM_MEMBERSMANAGER_MEMBERS_EDIT_TYPE_DESC="Allows the users in this group to edit type of member" +COM_MEMBERSMANAGER_MEMBERS_EDIT_USER="Members Edit User" +COM_MEMBERSMANAGER_MEMBERS_EDIT_USER_DESC="Allows the users in this group to edit user of member" COM_MEMBERSMANAGER_MEMBERS_EDIT_VERSION="Members Edit Version" COM_MEMBERSMANAGER_MEMBERS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version members" +COM_MEMBERSMANAGER_MEMBERS_EDIT_WEBSITE="Members Edit Website" +COM_MEMBERSMANAGER_MEMBERS_EDIT_WEBSITE_DESC="Allows the users in this group to edit website of member" COM_MEMBERSMANAGER_MEMBERS_EXPORT="Members Export" COM_MEMBERSMANAGER_MEMBERS_EXPORT_DESC="Allows the users in this group to export export members" COM_MEMBERSMANAGER_MEMBERS_IMPORT="Members Import" COM_MEMBERSMANAGER_MEMBERS_IMPORT_DESC="Allows the users in this group to import import members" COM_MEMBERSMANAGER_MEMBERS_SUBMENU="Members Submenu" -COM_MEMBERSMANAGER_MEMBERS_SUBMENU_DESC="Allows the users in this group to update the submenu of the member" +COM_MEMBERSMANAGER_MEMBERS_SUBMENU_DESC="Allows the users in this group to submenu of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_ACCOUNT="Members View Account" +COM_MEMBERSMANAGER_MEMBERS_VIEW_ACCOUNT_DESC="Allows the users in this group to view account of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_CITY="Members View City" +COM_MEMBERSMANAGER_MEMBERS_VIEW_CITY_DESC="Allows the users in this group to view city of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_COUNTRY="Members View Country" +COM_MEMBERSMANAGER_MEMBERS_VIEW_COUNTRY_DESC="Allows the users in this group to view country of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_EMAIL="Members View Email" +COM_MEMBERSMANAGER_MEMBERS_VIEW_EMAIL_DESC="Allows the users in this group to view email of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_LANDLINE_PHONE="Members View Landline Phone" +COM_MEMBERSMANAGER_MEMBERS_VIEW_LANDLINE_PHONE_DESC="Allows the users in this group to view landline phone of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MAIN_MEMBER="Members View Main Member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MAIN_MEMBER_DESC="Allows the users in this group to view main member of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MOBILE_PHONE="Members View Mobile Phone" +COM_MEMBERSMANAGER_MEMBERS_VIEW_MOBILE_PHONE_DESC="Allows the users in this group to view mobile phone of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_NAME="Members View Name" +COM_MEMBERSMANAGER_MEMBERS_VIEW_NAME_DESC="Allows the users in this group to view name of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTAL="Members View Postal" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTALCODE="Members View Postalcode" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTALCODE_DESC="Allows the users in this group to view postalcode of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_POSTAL_DESC="Allows the users in this group to view postal of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_REGION="Members View Region" +COM_MEMBERSMANAGER_MEMBERS_VIEW_REGION_DESC="Allows the users in this group to view region of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_STREET="Members View Street" +COM_MEMBERSMANAGER_MEMBERS_VIEW_STREET_DESC="Allows the users in this group to view street of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TOKEN="Members View Token" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TOKEN_DESC="Allows the users in this group to view token of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TYPE="Members View Type" +COM_MEMBERSMANAGER_MEMBERS_VIEW_TYPE_DESC="Allows the users in this group to view type of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_USER="Members View User" +COM_MEMBERSMANAGER_MEMBERS_VIEW_USER_DESC="Allows the users in this group to view user of member" +COM_MEMBERSMANAGER_MEMBERS_VIEW_WEBSITE="Members View Website" +COM_MEMBERSMANAGER_MEMBERS_VIEW_WEBSITE_DESC="Allows the users in this group to view website of member" +COM_MEMBERSMANAGER_MEMBER_PROFILE_ACCESS_SITE="Member Profile (Site) Access" +COM_MEMBERSMANAGER_MEMBER_PROFILE_ACCESS_SITE_DESC=" Allows the users in this group to access site member profile." COM_MEMBERSMANAGER_MENU="» Members Manager" COM_MEMBERSMANAGER_REGIONS_ACCESS="Regions Access" COM_MEMBERSMANAGER_REGIONS_ACCESS_DESC="Allows the users in this group to access access regions" @@ -87,16 +185,16 @@ COM_MEMBERSMANAGER_REGIONS_DELETE="Regions Delete" COM_MEMBERSMANAGER_REGIONS_DELETE_DESC="Allows the users in this group to delete delete regions" COM_MEMBERSMANAGER_REGIONS_EDIT="Regions Edit" COM_MEMBERSMANAGER_REGIONS_EDIT_ALIAS="Regions Edit Alias" -COM_MEMBERSMANAGER_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to update the edit alias of the region" +COM_MEMBERSMANAGER_REGIONS_EDIT_ALIAS_DESC="Allows the users in this group to edit alias of region" COM_MEMBERSMANAGER_REGIONS_EDIT_COUNTRY="Regions Edit Country" -COM_MEMBERSMANAGER_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to update the edit country of the region" +COM_MEMBERSMANAGER_REGIONS_EDIT_COUNTRY_DESC="Allows the users in this group to edit country of region" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_BY="Regions Edit Created By" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by regions" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_DATE="Regions Edit Created Date" COM_MEMBERSMANAGER_REGIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created regions" COM_MEMBERSMANAGER_REGIONS_EDIT_DESC="Allows the users in this group to edit the region" COM_MEMBERSMANAGER_REGIONS_EDIT_NAME="Regions Edit Name" -COM_MEMBERSMANAGER_REGIONS_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the region" +COM_MEMBERSMANAGER_REGIONS_EDIT_NAME_DESC="Allows the users in this group to edit name of region" COM_MEMBERSMANAGER_REGIONS_EDIT_OWN="Regions Edit Own" COM_MEMBERSMANAGER_REGIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own regions created by them" COM_MEMBERSMANAGER_REGIONS_EDIT_STATE="Regions Edit State" @@ -120,9 +218,9 @@ COM_MEMBERSMANAGER_TYPES_EDIT_CREATED_DATE="Types Edit Created Date" COM_MEMBERSMANAGER_TYPES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created types" COM_MEMBERSMANAGER_TYPES_EDIT_DESC="Allows the users in this group to edit the type" COM_MEMBERSMANAGER_TYPES_EDIT_DESCRIPTION="Types Edit Description" -COM_MEMBERSMANAGER_TYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the type" +COM_MEMBERSMANAGER_TYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to edit description of type" COM_MEMBERSMANAGER_TYPES_EDIT_NAME="Types Edit Name" -COM_MEMBERSMANAGER_TYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the type" +COM_MEMBERSMANAGER_TYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of type" COM_MEMBERSMANAGER_TYPES_EDIT_OWN="Types Edit Own" COM_MEMBERSMANAGER_TYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own types created by them" COM_MEMBERSMANAGER_TYPES_EDIT_STATE="Types Edit State" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 15d76d4..449555b 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 95c8a74..7f6d92e 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index 2b761a6..3eeddc2 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/country/regions_fullwidth.php b/admin/layouts/country/regions_fullwidth.php index 0127b7a..7db70ed 100644 --- a/admin/layouts/country/regions_fullwidth.php +++ b/admin/layouts/country/regions_fullwidth.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/country/settings_above.php b/admin/layouts/country/settings_above.php index 3bcedd6..86e83d3 100644 --- a/admin/layouts/country/settings_above.php +++ b/admin/layouts/country/settings_above.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/country/settings_left.php b/admin/layouts/country/settings_left.php index b21c4e5..bfbe962 100644 --- a/admin/layouts/country/settings_left.php +++ b/admin/layouts/country/settings_left.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/country/settings_right.php b/admin/layouts/country/settings_right.php index d288b35..d58b520 100644 --- a/admin/layouts/country/settings_right.php +++ b/admin/layouts/country/settings_right.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 3bcedd6..86e83d3 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 2d9d2e3..c2c281c 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 95905b8..ca9e13c 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 95c8a74..7f6d92e 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index 2b761a6..3eeddc2 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/member/details_above.php b/admin/layouts/member/details_above.php new file mode 100644 index 0000000..a8497aa --- /dev/null +++ b/admin/layouts/member/details_above.php @@ -0,0 +1,28 @@ + + * @github Joomla Members Manager + * @copyright Copyright (C) 2015. All Rights Reserved + * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + */ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = array( + 'token', + 'account' +); + +?> +
+ renderField($field); + } ?> +
diff --git a/admin/layouts/member/details_left.php b/admin/layouts/member/details_left.php index c74faa2..eab7dbf 100644 --- a/admin/layouts/member/details_left.php +++ b/admin/layouts/member/details_left.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -16,7 +16,6 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'account', 'type', 'name', 'email', diff --git a/admin/layouts/member/details_right.php b/admin/layouts/member/details_right.php index 92745e9..5568407 100644 --- a/admin/layouts/member/details_right.php +++ b/admin/layouts/member/details_right.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/member/image_fullwidth.php b/admin/layouts/member/image_fullwidth.php index 88ebcbc..0f49f4f 100644 --- a/admin/layouts/member/image_fullwidth.php +++ b/admin/layouts/member/image_fullwidth.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/member/publishing.php b/admin/layouts/member/publishing.php index 95c8a74..7f6d92e 100644 --- a/admin/layouts/member/publishing.php +++ b/admin/layouts/member/publishing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/member/publlshing.php b/admin/layouts/member/publlshing.php index 2b761a6..3eeddc2 100644 --- a/admin/layouts/member/publlshing.php +++ b/admin/layouts/member/publlshing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/region/details_above.php b/admin/layouts/region/details_above.php index 3bcedd6..86e83d3 100644 --- a/admin/layouts/region/details_above.php +++ b/admin/layouts/region/details_above.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/region/details_right.php b/admin/layouts/region/details_right.php index 07ba733..c7e1bff 100644 --- a/admin/layouts/region/details_right.php +++ b/admin/layouts/region/details_right.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/region/publishing.php b/admin/layouts/region/publishing.php index 95c8a74..7f6d92e 100644 --- a/admin/layouts/region/publishing.php +++ b/admin/layouts/region/publishing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/region/publlshing.php b/admin/layouts/region/publlshing.php index 2b761a6..3eeddc2 100644 --- a/admin/layouts/region/publlshing.php +++ b/admin/layouts/region/publlshing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/type/details_above.php b/admin/layouts/type/details_above.php index 3bcedd6..86e83d3 100644 --- a/admin/layouts/type/details_above.php +++ b/admin/layouts/type/details_above.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/type/details_fullwidth.php b/admin/layouts/type/details_fullwidth.php index 2d810b4..bc39ac8 100644 --- a/admin/layouts/type/details_fullwidth.php +++ b/admin/layouts/type/details_fullwidth.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/type/publishing.php b/admin/layouts/type/publishing.php index 95c8a74..7f6d92e 100644 --- a/admin/layouts/type/publishing.php +++ b/admin/layouts/type/publishing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/layouts/type/publlshing.php b/admin/layouts/type/publlshing.php index 2b761a6..3eeddc2 100644 --- a/admin/layouts/type/publlshing.php +++ b/admin/layouts/type/publlshing.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/membersmanager.php b/admin/membersmanager.php index e429c57..8b64941 100644 --- a/admin/membersmanager.php +++ b/admin/membersmanager.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/ajax.php b/admin/models/ajax.php index bc7ce41..d5c861c 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -38,7 +38,7 @@ class MembersmanagerModelAjax extends JModelList // allowed types protected $types = array('image' => 'image'); - + // set some buckets protected $target; protected $targetType; @@ -553,18 +553,54 @@ class MembersmanagerModelAjax extends JModelList return false; } + public function checkUnique($field, $value) { - if ($found = MembersmanagerHelper::getVar('organizer', $value, $field, 'id')) + // Get the database object and a new query object. + $db = \JFactory::getDbo(); + $query = $db->getQuery(true); + + // convert to camel case naming + $valueArray = (array) $this->splitAtUpperCase(trim($value)); + $value = MembersmanagerHelper::safeString(trim(implode(' ', $valueArray), '-'), 'L', '-', false, false); + + $view = $this->getViewID(); + if (isset($view['a_id']) && MembersmanagerHelper::checkString($view['a_view'])) { - $view = $this->getViewID(); - if (!isset($view['a_id']) || $found != $view['a_id']) + // Build the query. + $query->select('COUNT(*)') + ->from('#__membersmanager_' . (string) $view['a_view']) + ->where($db->quoteName($field) . ' = ' . $db->quote($value)); + + // remove this item from the list + if ($view['a_id'] > 0) { - return true; + $query->where($db->quoteName('id') . ' <> ' . (int) $view['a_id']); } + + // Set and query the database. + $db->setQuery($query); + $duplicate = (bool) $db->loadResult(); + + if ($duplicate) + { + return array ( + 'message' => JText::sprintf('COM_MEMBERSMANAGER_BSB_IS_ALREADY_IN_USE_PLEASE_TRY_ANOTHER', $value), + 'status' => 'danger'); + } + return array ( + 'value' => $value, + 'message' => JText::sprintf('COM_MEMBERSMANAGER_GREAT_SS_IS_AVAILABLE', $field, $value), + 'status' => 'success'); } return false; } + + protected function splitAtUpperCase($string) + { + return preg_split('/(?=[A-Z])/', $string, -1, PREG_SPLIT_NO_EMPTY); + } + public function getRegion($country) { @@ -739,7 +775,7 @@ class MembersmanagerModelAjax extends JModelList return false; } - public function getUser($id) + public function getUser($id, $showname = 0) { $user = JFactory::getUser($id); if ($user->id) @@ -748,7 +784,7 @@ class MembersmanagerModelAjax extends JModelList // start the block $fields[] = '
'; - $fields[] = $this->getUserFields($user); + $fields[] = $this->getUserFields($user, false, (2 === (int) $showname)); $view = $this->getKey(); $access = array(1 => 'member.access', 2 => 'other.access'); @@ -779,7 +815,7 @@ class MembersmanagerModelAjax extends JModelList return false; } - protected function getUserFields(&$user, $permission = false) + protected function getUserFields(&$user, $permission = false, $showname = false) { // set read only $readOnly = ' readonly="" class="readonly"'; @@ -790,13 +826,19 @@ class MembersmanagerModelAjax extends JModelList $fields[] = '
'; $readOnly = ' id="vdm_name"'; + } + if($permission || $showname) + { // load name $fields[] = '
'; $fields[] = '
'; $fields[] = '
'; $fields[] = '
'; + } + if($permission) + { $readOnly = ' id="vdm_username"'; } diff --git a/admin/models/countries.php b/admin/models/countries.php index 3478a17..8e53c86 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/country.php b/admin/models/country.php index fbf7030..2a37e5c 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 27f5c5e..f8f86d0 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/currency.php b/admin/models/currency.php index f4116e2..27fa567 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 28fa8b0..0c03843 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index 480a763..da1fa0e 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/fields/mainmembers.php b/admin/models/fields/mainmembers.php index ae5c56d..b559c07 100644 --- a/admin/models/fields/mainmembers.php +++ b/admin/models/fields/mainmembers.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -138,10 +138,10 @@ class JFormFieldMainmembers extends JFormFieldList { $db = JFactory::getDBO(); $query = $db->getQuery(true); -$query->select($db->quoteName(array('a.id','a.user'),array('id','main_member_user'))); +$query->select($db->quoteName(array('a.id','a.user','a.account','a.name','a.email'),array('id','main_member_user','account','name','email'))); $query->from($db->quoteName('#__membersmanager_member', 'a')); $query->where($db->quoteName('a.published') . ' >= 1'); -$query->where($db->quoteName('a.account') . ' = 1'); +$query->where($db->quoteName('a.account') . ' = 1 OR ' . $db->quoteName('a.account') . ' = 2'); $query->order('a.user ASC'); $db->setQuery((string)$query); $items = $db->loadObjectList(); @@ -151,7 +151,14 @@ if ($items) $options[] = JHtml::_('select.option', '', JText::_('COM_MEMBERSMANAGER_SELECT_AN_OPTION')); foreach($items as $item) { - $options[] = JHtml::_('select.option', $item->id, JFactory::getUser((int) $item->main_member_user)->name . ' ' . JFactory::getUser((int) $item->main_member_user)->email); + if ($item->account == 1) + { + $options[] = JHtml::_('select.option', $item->id, JFactory::getUser((int) $item->main_member_user)->name . ' ' . JFactory::getUser((int) $item->main_member_user)->email); + } + else + { + $options[] = JHtml::_('select.option', $item->id, $item->name . ' ' . $item->email); + } } } return $options; diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index 68ec539..896e566 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -51,8 +51,22 @@ return $groups; */ protected function getExcluded() { - // set the groups array -$groups = JComponentHelper::getParams('com_membersmanager')->get('memberuser'); -return $groups; + // To ensure that there is only one record per user +// Get a db connection. +$db = JFactory::getDbo(); +// Create a new query object. +$query = $db->getQuery(true); +// Select all records from the #__membersmanager_member table from user column'. +$query->select($db->quoteName('user')); +$query->from($db->quoteName('#__membersmanager_member')); +$db->setQuery($query); +$db->execute(); +$found = $db->getNumRows(); +if ($found) +{ + // return all users already used + return array_unique($db->loadColumn()); +} +return null; } } diff --git a/admin/models/fields/regions.php b/admin/models/fields/regions.php index 1ed516c..48da475 100644 --- a/admin/models/fields/regions.php +++ b/admin/models/fields/regions.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/fields/types.php b/admin/models/fields/types.php index 14819ce..93a3b76 100644 --- a/admin/models/fields/types.php +++ b/admin/models/fields/types.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index 0045370..f783fe7 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js index 0045370..f783fe7 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/forms/member.js b/admin/models/forms/member.js index b03c504..c3cf4ea 100644 --- a/admin/models/forms/member.js +++ b/admin/models/forms/member.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -17,21 +17,34 @@ jform_vvvvvvxvvy_required = false; // Initial Script jQuery(document).ready(function() { - var account_vvvvvvv = jQuery("#jform_account input[type='radio']:checked").val(); + var account_vvvvvvv = jQuery("#jform_account").val(); vvvvvvv(account_vvvvvvv); - var account_vvvvvvw = jQuery("#jform_account input[type='radio']:checked").val(); + var account_vvvvvvw = jQuery("#jform_account").val(); vvvvvvw(account_vvvvvvw); - var account_vvvvvvx = jQuery("#jform_account input[type='radio']:checked").val(); + var account_vvvvvvx = jQuery("#jform_account").val(); vvvvvvx(account_vvvvvvx); }); // the vvvvvvv function function vvvvvvv(account_vvvvvvv) { - // set the function logic - if (account_vvvvvvv == 1 || account_vvvvvvv == 3) + if (isSet(account_vvvvvvv) && account_vvvvvvv.constructor !== Array) + { + var temp_vvvvvvv = account_vvvvvvv; + var account_vvvvvvv = []; + account_vvvvvvv.push(temp_vvvvvvv); + } + else if (!isSet(account_vvvvvvv)) + { + var account_vvvvvvv = []; + } + var account = account_vvvvvvv.some(account_vvvvvvv_SomeFunc); + + + // set this function logic + if (account) { jQuery('#jform_user').closest('.control-group').show(); if (jform_vvvvvvvvvv_required) @@ -58,11 +71,35 @@ function vvvvvvv(account_vvvvvvv) } } +// the vvvvvvv Some function +function account_vvvvvvv_SomeFunc(account_vvvvvvv) +{ + // set the function logic + if (account_vvvvvvv == 1 || account_vvvvvvv == 4) + { + return true; + } + return false; +} + // the vvvvvvw function function vvvvvvw(account_vvvvvvw) { - // set the function logic - if (account_vvvvvvw == 2) + if (isSet(account_vvvvvvw) && account_vvvvvvw.constructor !== Array) + { + var temp_vvvvvvw = account_vvvvvvw; + var account_vvvvvvw = []; + account_vvvvvvw.push(temp_vvvvvvw); + } + else if (!isSet(account_vvvvvvw)) + { + var account_vvvvvvw = []; + } + var account = account_vvvvvvw.some(account_vvvvvvw_SomeFunc); + + + // set this function logic + if (account) { jQuery('#jform_email').closest('.control-group').show(); if (jform_vvvvvvwvvw_required) @@ -108,11 +145,35 @@ function vvvvvvw(account_vvvvvvw) } } +// the vvvvvvw Some function +function account_vvvvvvw_SomeFunc(account_vvvvvvw) +{ + // set the function logic + if (account_vvvvvvw == 2 || account_vvvvvvw == 3) + { + return true; + } + return false; +} + // the vvvvvvx function function vvvvvvx(account_vvvvvvx) { - // set the function logic - if (account_vvvvvvx == 2 || account_vvvvvvx == 3) + if (isSet(account_vvvvvvx) && account_vvvvvvx.constructor !== Array) + { + var temp_vvvvvvx = account_vvvvvvx; + var account_vvvvvvx = []; + account_vvvvvvx.push(temp_vvvvvvx); + } + else if (!isSet(account_vvvvvvx)) + { + var account_vvvvvvx = []; + } + var account = account_vvvvvvx.some(account_vvvvvvx_SomeFunc); + + + // set this function logic + if (account) { jQuery('#jform_main_member').closest('.control-group').show(); if (jform_vvvvvvxvvy_required) @@ -139,6 +200,17 @@ function vvvvvvx(account_vvvvvvx) } } +// the vvvvvvx Some function +function account_vvvvvvx_SomeFunc(account_vvvvvvx) +{ + // set the function logic + if (account_vvvvvvx == 3 || account_vvvvvvx == 4) + { + return true; + } + return false; +} + // update required fields function updateFieldRequired(name,status) { @@ -178,6 +250,9 @@ function isSet(val) jQuery(document).ready(function($) { + var tokenValue = jQuery('#jform_token').val(); + // check if this token value is used + checkUnique(tokenValue, 'token', 0); // load the profile image if it is set var profile = $('#jform_profile_image').val(); if (profile.length > 20) @@ -317,6 +392,7 @@ function isEmpty(obj) { return true; } + function checkUnique_server(value, field){ var getUrl = JRouter("index.php?option=com_membersmanager&task=ajax.checkUnique&format=json&vdm="+vastDevMod); if(token.length > 0 && value.length > 0 && field.length > 0){ @@ -330,14 +406,31 @@ function checkUnique_server(value, field){ jsonp: 'callback' }); } -function checkUnique(value, field){ - checkUnique_server(value, field).done(function(result) { - if (result) { - // clear values and set notice - jQuery("#jform_"+field).val(''); - jQuery.UIkit.notify({message: field+' is take, please try another.', timeout: 5000, status: 'danger'}); - } - }); +function checkUnique(value, field, show){ + // check that we have a value + if (value.length > 1) { + checkUnique_server(value, field).done(function(result) { + if(result.value && result.message){ + // show notice that functioName is okay + if (show) { + UIkit2.notify({message: result.message, timeout: 5000, status: result.status, pos: 'top-right'}); + } + jQuery('#jform_'+field).val(result.value); + } else if(result.message){ + // show notice that functionName is not okay + if (show) { + UIkit2.notify({message: result.message, timeout: 5000, status: result.status, pos: 'top-right'}); + } + jQuery('#jform_'+field).val(''); + } else { + // set an error that message was not send + if (show) { + UIkit2.notify({message: Joomla.JText._('COM_MEMBERSMANAGER_VALUE_ALREADY_TAKEN_PLEASE_TRY_AGAIN'), timeout: 5000, status: 'danger', pos: 'top-right'}); + } + jQuery('#jform_'+field).val(''); + } + }); + } } // set regions that are on the page @@ -404,13 +497,19 @@ function setRegion(array){ jQuery(document).ready(function($) { - var user_id =$("#jform_user_id").val(); - getUser(user_id); + var user_id = $("#jform_user_id").val(); + var showname = 1; + // check if the user id was found + if (!isSet(user_id)) { + var user_id =$("#jform_user").val(); + var showname = 2; + } + getUser(user_id, showname); }); -function getUser_server(id){ +function getUser_server(id, showname){ var getUrl = JRouter("index.php?option=com_membersmanager&task=ajax.getUser&format=json&vdm="+vastDevMod); - if(token.length > 0 && id > 0){ - var request = 'token='+token+'&id='+id; + if(token.length > 0 && id > 0 && showname > 0){ + var request = 'token='+token+'&id='+id+'&showname='+showname; } return jQuery.ajax({ type: 'GET', @@ -420,8 +519,8 @@ function getUser_server(id){ jsonp: 'callback' }); } -function getUser(id){ - getUser_server(id).done(function(result) { +function getUser(id, showname){ + getUser_server(id, showname).done(function(result) { jQuery('#user_info').remove(); if(result) { loadUser(result); @@ -469,6 +568,10 @@ function setUser_server(id){ function setUser(){ // get the id var id = jQuery("#jform_user_id").val(); + // check if the user id was found + if (!isSet(id)) { + var id = jQuery("#jform_user").val(); + } // get the values userArray['var'] = encodeURIComponent(jQuery("#vdm_name").val()); userArray['uvar'] = encodeURIComponent(jQuery("#vdm_username").val()); @@ -522,8 +625,8 @@ function createUser() { } function loadUser(result){ // first check the system type - var account = jQuery("#jform_account input[type='radio']:checked").val(); - if (1 == account || 3 == account) { - jQuery('#jform_user').closest('.control-group').parent().append(result); + var account = jQuery("#jform_account").val(); + if (1 == account || 4 == account) { + jQuery('#jform_user').closest('.span6').append(result); } } diff --git a/admin/models/forms/member.xml b/admin/models/forms/member.xml index 0444940..56cf7df 100644 --- a/admin/models/forms/member.xml +++ b/admin/models/forms/member.xml @@ -119,24 +119,47 @@ required="false" button="true" /> - + + validate="number" + default="1"> + COM_MEMBERSMANAGER_MEMBER_MAIN_LOGIN + COM_MEMBERSMANAGER_MEMBER_MAIN + + + + + - + - + + + + + + + - - - + - - - - - - diff --git a/admin/models/forms/region.js b/admin/models/forms/region.js index 0045370..f783fe7 100644 --- a/admin/models/forms/region.js +++ b/admin/models/forms/region.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/forms/type.js b/admin/models/forms/type.js index 0045370..f783fe7 100644 --- a/admin/models/forms/type.js +++ b/admin/models/forms/type.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/import.php b/admin/models/import.php index 84fcd4a..4eb8249 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/member.php b/admin/models/member.php index 3ad6220..5a5dbf9 100644 --- a/admin/models/member.php +++ b/admin/models/member.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -201,6 +201,630 @@ class MembersmanagerModelMember extends JModelAdmin // Disable fields while saving. $form->setFieldAttribute('created', 'filter', 'unset'); } + // Modify the form based on Edit User access controls. + if ($id != 0 && (!$user->authorise('member.edit.user', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.user', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('user', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('user', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('user')) + { + // Disable fields while saving. + $form->setFieldAttribute('user', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('user', 'required', 'false'); + } + } + // Modify the from the form based on User access controls. + if ($id != 0 && (!$user->authorise('member.access.user', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.user', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('user'); + } + // Modify the form based on View User access controls. + if ($id != 0 && (!$user->authorise('member.view.user', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.user', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('user', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('user')) + { + // Disable fields while saving. + $form->setFieldAttribute('user', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('user', 'required', 'false'); + } + } + // Modify the form based on Edit Landline Phone access controls. + if ($id != 0 && (!$user->authorise('member.edit.landline_phone', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.landline_phone', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('landline_phone', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('landline_phone', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('landline_phone')) + { + // Disable fields while saving. + $form->setFieldAttribute('landline_phone', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('landline_phone', 'required', 'false'); + } + } + // Modify the from the form based on Landline Phone access controls. + if ($id != 0 && (!$user->authorise('member.access.landline_phone', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.landline_phone', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('landline_phone'); + } + // Modify the form based on View Landline Phone access controls. + if ($id != 0 && (!$user->authorise('member.view.landline_phone', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.landline_phone', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('landline_phone', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('landline_phone')) + { + // Disable fields while saving. + $form->setFieldAttribute('landline_phone', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('landline_phone', 'required', 'false'); + } + } + // Modify the form based on Edit Type access controls. + if ($id != 0 && (!$user->authorise('member.edit.type', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.type', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('type', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('type', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('type')) + { + // Disable fields while saving. + $form->setFieldAttribute('type', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('type', 'required', 'false'); + } + } + // Modify the from the form based on Type access controls. + if ($id != 0 && (!$user->authorise('member.access.type', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.type', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('type'); + } + // Modify the form based on View Type access controls. + if ($id != 0 && (!$user->authorise('member.view.type', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.type', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('type', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('type')) + { + // Disable fields while saving. + $form->setFieldAttribute('type', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('type', 'required', 'false'); + } + } + // Modify the form based on Edit Account access controls. + if ($id != 0 && (!$user->authorise('member.edit.account', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.account', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('account', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('account', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('account')) + { + // Disable fields while saving. + $form->setFieldAttribute('account', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('account', 'required', 'false'); + } + } + // Modify the from the form based on Account access controls. + if ($id != 0 && (!$user->authorise('member.access.account', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.account', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('account'); + } + // Modify the form based on View Account access controls. + if ($id != 0 && (!$user->authorise('member.view.account', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.account', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('account', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('account')) + { + // Disable fields while saving. + $form->setFieldAttribute('account', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('account', 'required', 'false'); + } + } + // Modify the form based on Edit Token access controls. + if ($id != 0 && (!$user->authorise('member.edit.token', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.token', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('token', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('token', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('token')) + { + // Disable fields while saving. + $form->setFieldAttribute('token', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('token', 'required', 'false'); + } + } + // Modify the from the form based on Token access controls. + if ($id != 0 && (!$user->authorise('member.access.token', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.token', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('token'); + } + // Modify the form based on View Token access controls. + if ($id != 0 && (!$user->authorise('member.view.token', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.token', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('token', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('token')) + { + // Disable fields while saving. + $form->setFieldAttribute('token', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('token', 'required', 'false'); + } + } + // Modify the form based on Edit Country access controls. + if ($id != 0 && (!$user->authorise('member.edit.country', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.country', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('country', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('country', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('country')) + { + // Disable fields while saving. + $form->setFieldAttribute('country', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('country', 'required', 'false'); + } + } + // Modify the from the form based on Country access controls. + if ($id != 0 && (!$user->authorise('member.access.country', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.country', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('country'); + } + // Modify the form based on View Country access controls. + if ($id != 0 && (!$user->authorise('member.view.country', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.country', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('country', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('country')) + { + // Disable fields while saving. + $form->setFieldAttribute('country', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('country', 'required', 'false'); + } + } + // Modify the form based on Edit Postalcode access controls. + if ($id != 0 && (!$user->authorise('member.edit.postalcode', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.postalcode', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('postalcode', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('postalcode', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('postalcode')) + { + // Disable fields while saving. + $form->setFieldAttribute('postalcode', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('postalcode', 'required', 'false'); + } + } + // Modify the from the form based on Postalcode access controls. + if ($id != 0 && (!$user->authorise('member.access.postalcode', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.postalcode', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('postalcode'); + } + // Modify the form based on View Postalcode access controls. + if ($id != 0 && (!$user->authorise('member.view.postalcode', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.postalcode', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('postalcode', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('postalcode')) + { + // Disable fields while saving. + $form->setFieldAttribute('postalcode', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('postalcode', 'required', 'false'); + } + } + // Modify the form based on Edit City access controls. + if ($id != 0 && (!$user->authorise('member.edit.city', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.city', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('city', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('city', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('city')) + { + // Disable fields while saving. + $form->setFieldAttribute('city', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('city', 'required', 'false'); + } + } + // Modify the from the form based on City access controls. + if ($id != 0 && (!$user->authorise('member.access.city', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.city', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('city'); + } + // Modify the form based on View City access controls. + if ($id != 0 && (!$user->authorise('member.view.city', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.city', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('city', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('city')) + { + // Disable fields while saving. + $form->setFieldAttribute('city', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('city', 'required', 'false'); + } + } + // Modify the form based on Edit Region access controls. + if ($id != 0 && (!$user->authorise('member.edit.region', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.region', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('region', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('region', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('region')) + { + // Disable fields while saving. + $form->setFieldAttribute('region', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('region', 'required', 'false'); + } + } + // Modify the from the form based on Region access controls. + if ($id != 0 && (!$user->authorise('member.access.region', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.region', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('region'); + } + // Modify the form based on View Region access controls. + if ($id != 0 && (!$user->authorise('member.view.region', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.region', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('region', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('region')) + { + // Disable fields while saving. + $form->setFieldAttribute('region', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('region', 'required', 'false'); + } + } + // Modify the form based on Edit Street access controls. + if ($id != 0 && (!$user->authorise('member.edit.street', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.street', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('street', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('street', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('street')) + { + // Disable fields while saving. + $form->setFieldAttribute('street', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('street', 'required', 'false'); + } + } + // Modify the from the form based on Street access controls. + if ($id != 0 && (!$user->authorise('member.access.street', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.street', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('street'); + } + // Modify the form based on View Street access controls. + if ($id != 0 && (!$user->authorise('member.view.street', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.street', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('street', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('street')) + { + // Disable fields while saving. + $form->setFieldAttribute('street', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('street', 'required', 'false'); + } + } + // Modify the form based on Edit Postal access controls. + if ($id != 0 && (!$user->authorise('member.edit.postal', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.postal', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('postal', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('postal', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('postal')) + { + // Disable fields while saving. + $form->setFieldAttribute('postal', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('postal', 'required', 'false'); + } + } + // Modify the from the form based on Postal access controls. + if ($id != 0 && (!$user->authorise('member.access.postal', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.postal', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('postal'); + } + // Modify the form based on View Postal access controls. + if ($id != 0 && (!$user->authorise('member.view.postal', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.postal', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('postal', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('postal')) + { + // Disable fields while saving. + $form->setFieldAttribute('postal', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('postal', 'required', 'false'); + } + } + // Modify the form based on Edit Mobile Phone access controls. + if ($id != 0 && (!$user->authorise('member.edit.mobile_phone', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.mobile_phone', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('mobile_phone', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('mobile_phone', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('mobile_phone')) + { + // Disable fields while saving. + $form->setFieldAttribute('mobile_phone', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('mobile_phone', 'required', 'false'); + } + } + // Modify the from the form based on Mobile Phone access controls. + if ($id != 0 && (!$user->authorise('member.access.mobile_phone', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.mobile_phone', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('mobile_phone'); + } + // Modify the form based on View Mobile Phone access controls. + if ($id != 0 && (!$user->authorise('member.view.mobile_phone', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.mobile_phone', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('mobile_phone', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('mobile_phone')) + { + // Disable fields while saving. + $form->setFieldAttribute('mobile_phone', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('mobile_phone', 'required', 'false'); + } + } + // Modify the form based on Edit Name access controls. + if ($id != 0 && (!$user->authorise('member.edit.name', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.name', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('name', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('name')) + { + // Disable fields while saving. + $form->setFieldAttribute('name', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name', 'required', 'false'); + } + } + // Modify the from the form based on Name access controls. + if ($id != 0 && (!$user->authorise('member.access.name', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.name', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('name'); + } + // Modify the form based on View Name access controls. + if ($id != 0 && (!$user->authorise('member.view.name', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.name', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('name', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('name')) + { + // Disable fields while saving. + $form->setFieldAttribute('name', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('name', 'required', 'false'); + } + } + // Modify the form based on Edit Website access controls. + if ($id != 0 && (!$user->authorise('member.edit.website', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.website', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('website', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('website', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('website')) + { + // Disable fields while saving. + $form->setFieldAttribute('website', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('website', 'required', 'false'); + } + } + // Modify the from the form based on Website access controls. + if ($id != 0 && (!$user->authorise('member.access.website', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.website', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('website'); + } + // Modify the form based on View Website access controls. + if ($id != 0 && (!$user->authorise('member.view.website', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.website', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('website', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('website')) + { + // Disable fields while saving. + $form->setFieldAttribute('website', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('website', 'required', 'false'); + } + } + // Modify the form based on Edit Email access controls. + if ($id != 0 && (!$user->authorise('member.edit.email', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.email', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('email', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('email', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('email')) + { + // Disable fields while saving. + $form->setFieldAttribute('email', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('email', 'required', 'false'); + } + } + // Modify the from the form based on Email access controls. + if ($id != 0 && (!$user->authorise('member.access.email', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.email', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('email'); + } + // Modify the form based on View Email access controls. + if ($id != 0 && (!$user->authorise('member.view.email', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.email', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('email', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('email')) + { + // Disable fields while saving. + $form->setFieldAttribute('email', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('email', 'required', 'false'); + } + } + // Modify the form based on Edit Main Member access controls. + if ($id != 0 && (!$user->authorise('member.edit.main_member', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.edit.main_member', 'com_membersmanager'))) + { + // Disable fields for display. + $form->setFieldAttribute('main_member', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('main_member', 'readonly', 'true'); + // If there is no value continue. + if (!$form->getValue('main_member')) + { + // Disable fields while saving. + $form->setFieldAttribute('main_member', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('main_member', 'required', 'false'); + } + } + // Modify the from the form based on Main Member access controls. + if ($id != 0 && (!$user->authorise('member.access.main_member', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.access.main_member', 'com_membersmanager'))) + { + // Remove the field + $form->removeField('main_member'); + } + // Modify the form based on View Main Member access controls. + if ($id != 0 && (!$user->authorise('member.view.main_member', 'com_membersmanager.member.' . (int) $id)) + || ($id == 0 && !$user->authorise('member.view.main_member', 'com_membersmanager'))) + { + // Make the field hidded. + $form->setFieldAttribute('main_member', 'type', 'hidden'); + // If there is no value continue. + if (!$form->getValue('main_member')) + { + // Disable fields while saving. + $form->setFieldAttribute('main_member', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('main_member', 'required', 'false'); + } + } // Only load these values if no id is found if (0 == $id) { diff --git a/admin/models/members.php b/admin/models/members.php index bf5c2e8..850d73b 100644 --- a/admin/models/members.php +++ b/admin/models/members.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -34,8 +34,8 @@ class MembersmanagerModelMembers extends JModelList 'a.type','type', 'a.account','account', 'a.country','country', - 'a.region','region', 'a.city','city', + 'a.region','region', 'a.main_member','main_member' ); } @@ -69,12 +69,12 @@ class MembersmanagerModelMembers extends JModelList $country = $this->getUserStateFromRequest($this->context . '.filter.country', 'filter_country'); $this->setState('filter.country', $country); - $region = $this->getUserStateFromRequest($this->context . '.filter.region', 'filter_region'); - $this->setState('filter.region', $region); - $city = $this->getUserStateFromRequest($this->context . '.filter.city', 'filter_city'); $this->setState('filter.city', $city); + $region = $this->getUserStateFromRequest($this->context . '.filter.region', 'filter_region'); + $this->setState('filter.region', $region); + $main_member = $this->getUserStateFromRequest($this->context . '.filter.main_member', 'filter_main_member'); $this->setState('filter.main_member', $main_member); @@ -125,6 +125,16 @@ class MembersmanagerModelMembers extends JModelList continue; } + // Mobile Phone (not-required) + if ($item->mobile_phone) + { + $item->mobile_phone = JText::_('COM_MEMBERSMANAGER_MOBILE') . ': ' . $item->mobile_phone; + } + // Landline Phone + if ($item->landline_phone) + { + $item->landline_phone = JText::_('COM_MEMBERSMANAGER_TEL') . ': ' . $item->landline_phone; + } } } @@ -164,9 +174,10 @@ class MembersmanagerModelMembers extends JModelList if ($name === 'account') { $accountArray = array( - 1 => 'COM_MEMBERSMANAGER_MEMBER_MAIN', - 2 => 'COM_MEMBERSMANAGER_MEMBER_SUB', - 3 => 'COM_MEMBERSMANAGER_MEMBER_SUB_LOGIN' + 1 => 'COM_MEMBERSMANAGER_MEMBER_MAIN_LOGIN', + 2 => 'COM_MEMBERSMANAGER_MEMBER_MAIN', + 3 => 'COM_MEMBERSMANAGER_MEMBER_SUB', + 4 => 'COM_MEMBERSMANAGER_MEMBER_SUB_LOGIN' ); // Now check if value is found in this array if (isset($accountArray[$value]) && MembersmanagerHelper::checkString($accountArray[$value])) @@ -252,7 +263,7 @@ class MembersmanagerModelMembers extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.user LIKE '.$search.' OR g.name LIKE '.$search.' OR a.landline_phone LIKE '.$search.' OR a.type LIKE '.$search.' OR h.name LIKE '.$search.' OR a.account LIKE '.$search.' OR a.country LIKE '.$search.' OR a.region LIKE '.$search.' OR a.city LIKE '.$search.' OR a.postal LIKE '.$search.' OR a.street LIKE '.$search.' OR a.website LIKE '.$search.' OR a.main_member LIKE '.$search.' OR a.email LIKE '.$search.' OR a.name LIKE '.$search.' OR a.postalcode LIKE '.$search.' OR a.mobile_phone LIKE '.$search.')'); + $query->where('(a.user LIKE '.$search.' OR g.name LIKE '.$search.' OR a.landline_phone LIKE '.$search.' OR a.type LIKE '.$search.' OR h.name LIKE '.$search.' OR a.account LIKE '.$search.' OR a.token LIKE '.$search.' OR a.country LIKE '.$search.' OR a.postalcode LIKE '.$search.' OR a.city LIKE '.$search.' OR a.region LIKE '.$search.' OR a.street LIKE '.$search.' OR a.postal LIKE '.$search.' OR a.mobile_phone LIKE '.$search.' OR a.name LIKE '.$search.' OR a.website LIKE '.$search.' OR a.email LIKE '.$search.' OR a.main_member LIKE '.$search.')'); } } @@ -271,16 +282,16 @@ class MembersmanagerModelMembers extends JModelList { $query->where('a.country = ' . $db->quote($db->escape($country))); } - // Filter by region. - if ($region = $this->getState('filter.region')) - { - $query->where('a.region = ' . $db->quote($db->escape($region))); - } // Filter by City. if ($city = $this->getState('filter.city')) { $query->where('a.city = ' . $db->quote($db->escape($city))); } + // Filter by region. + if ($region = $this->getState('filter.region')) + { + $query->where('a.region = ' . $db->quote($db->escape($region))); + } // Filter by main_member. if ($main_member = $this->getState('filter.main_member')) { @@ -356,6 +367,16 @@ class MembersmanagerModelMembers extends JModelList continue; } + // Mobile Phone (not-required) + if ($item->mobile_phone) + { + $item->mobile_phone = JText::_('COM_MEMBERSMANAGER_MOBILE') . ': ' . $item->mobile_phone; + } + // Landline Phone + if ($item->landline_phone) + { + $item->landline_phone = JText::_('COM_MEMBERSMANAGER_TEL') . ': ' . $item->landline_phone; + } if ($mediumkey && !is_numeric($item->profile_image) && $item->profile_image === base64_encode(base64_decode($item->profile_image, true))) { // decrypt profile_image @@ -435,8 +456,8 @@ class MembersmanagerModelMembers extends JModelList $id .= ':' . $this->getState('filter.type'); $id .= ':' . $this->getState('filter.account'); $id .= ':' . $this->getState('filter.country'); - $id .= ':' . $this->getState('filter.region'); $id .= ':' . $this->getState('filter.city'); + $id .= ':' . $this->getState('filter.region'); $id .= ':' . $this->getState('filter.main_member'); return parent::getStoreId($id); diff --git a/admin/models/region.php b/admin/models/region.php index d2ca61d..5ace49b 100644 --- a/admin/models/region.php +++ b/admin/models/region.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -172,6 +172,7 @@ class MembersmanagerModelRegion extends JModelAdmin $form->setFieldAttribute('name', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('name')) { // Disable fields while saving. @@ -188,6 +189,7 @@ class MembersmanagerModelRegion extends JModelAdmin $form->setFieldAttribute('country', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('country', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('country')) { // Disable fields while saving. @@ -204,6 +206,7 @@ class MembersmanagerModelRegion extends JModelAdmin $form->setFieldAttribute('alias', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('alias', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('alias')) { // Disable fields while saving. diff --git a/admin/models/regions.php b/admin/models/regions.php index dcc3929..95f53f7 100644 --- a/admin/models/regions.php +++ b/admin/models/regions.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/models/rules/uniquefield.php b/admin/models/rules/uniquefield.php new file mode 100644 index 0000000..97acef4 --- /dev/null +++ b/admin/models/rules/uniquefield.php @@ -0,0 +1,87 @@ + + * @github Joomla Members Manager + * @copyright Copyright (C) 2015. All Rights Reserved + * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + */ + +// No direct access to this file +defined('JPATH_PLATFORM') or die; + +use Joomla\CMS\Form\Form; +use Joomla\CMS\Form\FormRule; +use Joomla\Registry\Registry; + +/** + * Form Rule (Uniquefield) class for the Joomla Platform. + */ +class JFormRuleUniquefield extends FormRule +{ + /** + * Method to test the field value for uniqueness. + * + * @param \SimpleXMLElement $element The SimpleXMLElement object representing the `` tag for the form field object. + * @param mixed $value The form field value to validate. + * @param string $group The field name group control value. This acts as an array container for the field. + * For example if the field has name="foo" and the group value is set to "bar" then the + * full field name would end up being "bar[foo]". + * @param Registry $input An optional Registry object with the entire data set to validate against the entire form. + * @param Form $form The form object for which the field is being tested. + * + * @return boolean True if the value is valid, false otherwise. + * + * @since 11.1 + */ + public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null) + { + // Get the database object and a new query object. + $db = \JFactory::getDbo(); + $query = $db->getQuery(true); + + // Get the extra field check attribute. + $id = ($input instanceof Registry) ? $input->get('id', null) : null; + + // get the component & table name + $table = ($form instanceof Form) ? $form->getName() : ''; + + // get the column name + $name = (array) $element->attributes()->{'name'}; + $column = (string) trim($name[0]); + + // check that we have a value + if (strlen($table) > 3 && strpos($table, 'membersmanager.') !== false) + { + // now get the table name + $tableArray = explode('.', $table); + // do we have two values + if (count( (array) $tableArray) == 2) + { + // Build the query. + $query->select('COUNT(*)') + ->from('#__membersmanager_' . (string) $tableArray[1]) + ->where($db->quoteName($column) . ' = ' . $db->quote($value)); + + // remove this item from the list + if ($id > 0) + { + $query->where($db->quoteName('id') . ' <> ' . (int) $id); + } + + // Set and query the database. + $db->setQuery($query); + $duplicate = (bool) $db->loadResult(); + + if ($duplicate) + { + return false; + } + } + } + + return true; + } +} diff --git a/admin/models/type.php b/admin/models/type.php index 60a6de2..f6cec62 100644 --- a/admin/models/type.php +++ b/admin/models/type.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -172,6 +172,7 @@ class MembersmanagerModelType extends JModelAdmin $form->setFieldAttribute('name', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('name', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('name')) { // Disable fields while saving. @@ -188,6 +189,7 @@ class MembersmanagerModelType extends JModelAdmin $form->setFieldAttribute('description', 'disabled', 'true'); // Disable fields for display. $form->setFieldAttribute('description', 'readonly', 'true'); + // If there is no value continue. if (!$form->getValue('description')) { // Disable fields while saving. diff --git a/admin/models/types.php b/admin/models/types.php index 1bbe587..dcf9481 100644 --- a/admin/models/types.php +++ b/admin/models/types.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 7d487d8..11f1651 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS `#__membersmanager_member` ( `profile_image` TEXT NOT NULL, `region` INT(11) NOT NULL DEFAULT 0, `street` VARCHAR(255) NOT NULL DEFAULT '', + `token` VARCHAR(255) NOT NULL DEFAULT '', `type` INT(11) NOT NULL DEFAULT 0, `user` INT(11) NOT NULL DEFAULT 0, `website` VARCHAR(255) NOT NULL DEFAULT '', @@ -37,6 +38,7 @@ CREATE TABLE IF NOT EXISTS `#__membersmanager_member` ( KEY `idx_state` (`published`), KEY `idx_user` (`user`), KEY `idx_account` (`account`), + KEY `idx_token` (`token`), KEY `idx_country` (`country`), KEY `idx_region` (`region`), KEY `idx_name` (`name`) @@ -171,6 +173,15 @@ CREATE TABLE IF NOT EXISTS `#__membersmanager_currency` ( KEY `idx_alias` (`alias`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; +-- +-- Dumping data for table `#__membersmanager_region` +-- + +INSERT INTO `#__membersmanager_region` (`id`, `asset_id`, `alias`, `country`, `name`, `params`, `published`, `created_by`, `modified_by`, `created`, `modified`, `checked_out`, `checked_out_time`, `version`, `hits`, `access`, `ordering`) VALUES +(1, 26816, 'khomas', 146, 'Khomas', '', 1, 450, '', '2016-05-17 05:01:46', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', 1, 1), +(2, 26817, 'karas', 146, 'Karas', '', 1, 450, '', '2016-05-17 05:01:57', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', 1, 2), +(3, 33181, 'region', 13, 'Region', '', 1, 450, '', '2016-11-15 04:52:45', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', 1, 3); + -- -- Dumping data for table `#__membersmanager_country` -- diff --git a/admin/sql/updates/mysql/1.0.3.sql b/admin/sql/updates/mysql/1.0.3.sql new file mode 100644 index 0000000..db444ec --- /dev/null +++ b/admin/sql/updates/mysql/1.0.3.sql @@ -0,0 +1,5 @@ +ALTER TABLE `#__membersmanager_member` ADD `email` VARCHAR(255) NOT NULL DEFAULT '' AFTER `country`; + +ALTER TABLE `#__membersmanager_member` ADD `main_member` INT(11) NOT NULL DEFAULT 0 AFTER `email`; + +ALTER TABLE `#__membersmanager_member` ADD `name` VARCHAR(255) NOT NULL DEFAULT '' AFTER `mobile_phone`; diff --git a/admin/sql/updates/mysql/1.0.4.sql b/admin/sql/updates/mysql/1.0.4.sql new file mode 100644 index 0000000..66ce8d3 --- /dev/null +++ b/admin/sql/updates/mysql/1.0.4.sql @@ -0,0 +1 @@ +ALTER TABLE `#__membersmanager_member` ADD `profile_image` TEXT NOT NULL AFTER `postalcode`; diff --git a/admin/sql/updates/mysql/1.0.5.sql b/admin/sql/updates/mysql/1.0.5.sql new file mode 100644 index 0000000..6b2eda7 --- /dev/null +++ b/admin/sql/updates/mysql/1.0.5.sql @@ -0,0 +1 @@ +ALTER TABLE `#__membersmanager_member` ADD `landline_phone` VARCHAR(64) NOT NULL DEFAULT '' AFTER `email`; diff --git a/admin/sql/updates/mysql/1.0.6.sql b/admin/sql/updates/mysql/1.0.6.sql new file mode 100644 index 0000000..eff75cf --- /dev/null +++ b/admin/sql/updates/mysql/1.0.6.sql @@ -0,0 +1 @@ +ALTER TABLE `#__membersmanager_member` ADD `token` VARCHAR(255) NOT NULL DEFAULT '' AFTER `street`; diff --git a/admin/tables/country.php b/admin/tables/country.php index c1a1959..089e60e 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/tables/currency.php b/admin/tables/currency.php index 5ba051b..1b7dac9 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/tables/member.php b/admin/tables/member.php index 9649724..0efe9e3 100644 --- a/admin/tables/member.php +++ b/admin/tables/member.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/tables/region.php b/admin/tables/region.php index 8ed8a64..0172acb 100644 --- a/admin/tables/region.php +++ b/admin/tables/region.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/tables/type.php b/admin/tables/type.php index adda4c3..fc403d9 100644 --- a/admin/tables/type.php +++ b/admin/tables/type.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index e3ba519..e34f282 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index e8d727e..5465e60 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index 101d171..7ce48a8 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index 3f8bb97..5bfd7f0 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index 2f51285..a39ea71 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index c105fb5..5c88474 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index c1c1489..8a5130e 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index 3596c9b..cc1d73c 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index f9c8ac7..9c2ab4d 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php index c62b7a0..5e75f60 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php index 0f746c8..df7bd4d 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php index e0a398e..5543216 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php index 663ae40..bb39d9a 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php index f43804d..81d72ab 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php index 1e7da4a..006e1a6 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index 2f51285..a39ea71 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index 892d54a..4a40561 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index addc189..40352f1 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index e0bbc67..2b550f5 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index c06f9fb..019b66a 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php index a7b5011..cdf6e31 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php index f64e6fe..7c336e6 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 2575b3c..e9a7eb6 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index a22ed27..a1db6fb 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/member/submitbutton.js b/admin/views/member/submitbutton.js index 5d7bfce..31b8007 100644 --- a/admin/views/member/submitbutton.js +++ b/admin/views/member/submitbutton.js @@ -1,9 +1,9 @@ /** - * @package Joomla.Component.Builder + * @package Joomla.Members.Manager * * @created 6th September, 2015 * @author Llewellyn van der Merwe - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ diff --git a/admin/views/member/tmpl/edit.php b/admin/views/member/tmpl/edit.php index 4c00e59..e6ce58e 100644 --- a/admin/views/member/tmpl/edit.php +++ b/admin/views/member/tmpl/edit.php @@ -1,10 +1,10 @@ - * @github Joomla Component Builder + * @github Joomla Members Manager * @copyright Copyright (C) 2015. All Rights Reserved * @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html */ @@ -44,6 +44,7 @@ $componentParams = JComponentHelper::getParams('com_membersmanager');