GuraySun/Members-Manager
1
0
Fork 0
forked from joomla/Members-Manager
Code Pull Requests Activity

update

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2022-03-03 04:58:38 +02:00
parent f21fdc5b3f
commit 4925167de0
Signed by untrusted user: Llewellyn
GPG Key ID: EFC0C720A240551C
182 changed files with 20498 additions and 19401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -13,20 +13,20 @@ Watch this [tutorial](https://youtu.be/lkE0ZiSWufg) to see how.
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Members Manager](https://www.joomlacomponentbuilder.com/) + *Name*: [Members Manager](https://www.joomlacomponentbuilder.com/)
+ *First Build*: 6th July, 2018 + *First Build*: 6th July, 2018
+ *Last Build*: 8th February, 2021 + *Last Build*: 2nd March, 2022
+ *Version*: 2.0.x + *Version*: 2.0.x
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
## Build Time ## Build Time
**136 Hours** or **17 Eight Hour Days** (actual time the author saved - **137 Hours** or **17 Eight Hour Days** (actual time the author saved -
due to [Automated Component Builder](http://joomlacomponentbuilder.com)) 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**, > (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.) > never making one mistake or taking any coffee break.)
+ *Line count*: **48925** + *Line count*: **48989**
+ *File count*: **259** + *File count*: **259**
+ *Folder count*: **70** + *Folder count*: **70**
@ -34,11 +34,11 @@ due to [Automated Component Builder](http://joomlacomponentbuilder.com))
> (with the following break down: > (with the following break down:
> **debugging @34hours** = codingtime / 4; > **debugging @34hours** = codingtime / 4;
> **planning @19hours** = codingtime / 7; > **planning @20hours** = codingtime / 7;
> **mapping @14hours** = codingtime / 10; > **mapping @14hours** = codingtime / 10;
> **office @23hours** = codingtime / 6;) > **office @23hours** = codingtime / 6;)
**226 Hours** or **28 Eight Hour Days** **227 Hours** or **28 Eight Hour Days**
(a total of the realistic time frame for this project) (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**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,

10
admin/README.txt
View File

@ -13,20 +13,20 @@ Watch this [tutorial](https://youtu.be/lkE0ZiSWufg) to see how.
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Members Manager](https://www.joomlacomponentbuilder.com/) + *Name*: [Members Manager](https://www.joomlacomponentbuilder.com/)
+ *First Build*: 6th July, 2018 + *First Build*: 6th July, 2018
+ *Last Build*: 8th February, 2021 + *Last Build*: 2nd March, 2022
+ *Version*: 2.0.x + *Version*: 2.0.x
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
## Build Time ## Build Time
**136 Hours** or **17 Eight Hour Days** (actual time the author saved - **137 Hours** or **17 Eight Hour Days** (actual time the author saved -
due to [Automated Component Builder](http://joomlacomponentbuilder.com)) 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**, > (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.) > never making one mistake or taking any coffee break.)
+ *Line count*: **48925** + *Line count*: **48989**
+ *File count*: **259** + *File count*: **259**
+ *Folder count*: **70** + *Folder count*: **70**
@ -34,11 +34,11 @@ due to [Automated Component Builder](http://joomlacomponentbuilder.com))
> (with the following break down: > (with the following break down:
> **debugging @34hours** = codingtime / 4; > **debugging @34hours** = codingtime / 4;
> **planning @19hours** = codingtime / 7; > **planning @20hours** = codingtime / 7;
> **mapping @14hours** = codingtime / 10; > **mapping @14hours** = codingtime / 10;
> **office @23hours** = codingtime / 6;) > **office @23hours** = codingtime / 6;)
**226 Hours** or **28 Eight Hour Days** **227 Hours** or **28 Eight Hour Days**
(a total of the realistic time frame for this project) (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**, > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,

8
admin/config.xml
View File

@ -56,8 +56,8 @@
required="true" required="true"
multiple="false" multiple="false"
/> />
<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) --> <!-- Spacer_hr_1 Field. Type: Spacer. A None Database Field. (joomla) -->
<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" /> <field type="spacer" name="spacer_hr_1" hr="true" class="spacer_hr_1" />
<!-- Placeholder_prefix Field. Type: Text. (joomla) --> <!-- Placeholder_prefix Field. Type: Text. (joomla) -->
<field <field
type="text" type="text"
@ -73,8 +73,8 @@
hint="COM_MEMBERSMANAGER_CONFIG_PLACEHOLDER_PREFIX_HINT" hint="COM_MEMBERSMANAGER_CONFIG_PLACEHOLDER_PREFIX_HINT"
autocomplete="on" autocomplete="on"
/> />
<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) --> <!-- Spacer_hr_2 Field. Type: Spacer. A None Database Field. (joomla) -->
<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" /> <field type="spacer" name="spacer_hr_2" hr="true" class="spacer_hr_2" />
<field name="autorTitle" <field name="autorTitle"
type="spacer" type="spacer"
label="COM_MEMBERSMANAGER_CONFIG_AUTHOR" label="COM_MEMBERSMANAGER_CONFIG_AUTHOR"

83
admin/controllers/ajax.json.php
View File

@ -25,8 +25,10 @@ class MembersmanagerControllerAjax extends JControllerLegacy
parent::__construct($config); parent::__construct($config);
// make sure all json stuff are set // make sure all json stuff are set
JFactory::getDocument()->setMimeEncoding( 'application/json' ); JFactory::getDocument()->setMimeEncoding( 'application/json' );
JResponse::setHeader('Content-Disposition','attachment;filename="getajax.json"'); // get the application
JResponse::setHeader("Access-Control-Allow-Origin", "*"); $app = JFactory::getApplication();
$app->setHeader('Content-Disposition','attachment;filename="getajax.json"');
$app->setHeader('Access-Control-Allow-Origin', '*');
// load the tasks // load the tasks
$this->registerTask('checkUnique', 'ajax'); $this->registerTask('checkUnique', 'ajax');
$this->registerTask('getPlaceHolders', 'ajax'); $this->registerTask('getPlaceHolders', 'ajax');
@ -39,20 +41,26 @@ class MembersmanagerControllerAjax extends JControllerLegacy
public function ajax() public function ajax()
{ {
// get the user for later use
$user = JFactory::getUser(); $user = JFactory::getUser();
// get the input values
$jinput = JFactory::getApplication()->input; $jinput = JFactory::getApplication()->input;
// check if we should return raw
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
// return to a callback function
$callback = $jinput->get('callback', null, 'CMD');
// Check Token! // Check Token!
$token = JSession::getFormToken(); $token = JSession::getFormToken();
$call_token = $jinput->get('token', 0, 'ALNUM'); $call_token = $jinput->get('token', 0, 'ALNUM');
if($jinput->get($token, 0, 'ALNUM') || $token === $call_token) if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
{ {
// get the task
$task = $this->getTask(); $task = $this->getTask();
switch($task) switch($task)
{ {
case 'checkUnique': case 'checkUnique':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$fieldValue = $jinput->get('field', NULL, 'WORD'); $fieldValue = $jinput->get('field', NULL, 'WORD');
$valueValue = $jinput->get('value', NULL, 'STRING'); $valueValue = $jinput->get('value', NULL, 'STRING');
if($fieldValue && $user->id != 0 && $valueValue) if($fieldValue && $user->id != 0 && $valueValue)
@ -63,7 +71,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -78,10 +86,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -91,7 +103,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getPlaceHolders': case 'getPlaceHolders':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$getTypeValue = $jinput->get('getType', NULL, 'WORD'); $getTypeValue = $jinput->get('getType', NULL, 'WORD');
if($getTypeValue && $user->id != 0) if($getTypeValue && $user->id != 0)
{ {
@ -101,7 +112,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -116,10 +127,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -129,7 +144,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getAnyPlaceHolders': case 'getAnyPlaceHolders':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$getTypeValue = $jinput->get('getType', NULL, 'WORD'); $getTypeValue = $jinput->get('getType', NULL, 'WORD');
if($getTypeValue && $user->id != 0) if($getTypeValue && $user->id != 0)
{ {
@ -139,7 +153,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -154,10 +168,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -167,7 +185,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'uploadfile': case 'uploadfile':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$targetValue = $jinput->get('target', NULL, 'WORD'); $targetValue = $jinput->get('target', NULL, 'WORD');
$typeValue = $jinput->get('type', NULL, 'WORD'); $typeValue = $jinput->get('type', NULL, 'WORD');
if($targetValue && $user->id != 0 && $typeValue) if($targetValue && $user->id != 0 && $typeValue)
@ -178,7 +195,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -193,10 +210,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -206,7 +227,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'removeFile': case 'removeFile':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$filenameValue = $jinput->get('filename', NULL, 'CMD'); $filenameValue = $jinput->get('filename', NULL, 'CMD');
$targetValue = $jinput->get('target', NULL, 'WORD'); $targetValue = $jinput->get('target', NULL, 'WORD');
$flushValue = $jinput->get('flush', NULL, 'INT'); $flushValue = $jinput->get('flush', NULL, 'INT');
@ -219,7 +239,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -234,10 +254,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -247,7 +271,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getUserDetails': case 'getUserDetails':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$userValue = $jinput->get('user', NULL, 'INT'); $userValue = $jinput->get('user', NULL, 'INT');
if($userValue && $user->id != 0) if($userValue && $user->id != 0)
{ {
@ -257,7 +280,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -272,10 +295,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -285,7 +312,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getChartImageLink': case 'getChartImageLink':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$chartValue = $jinput->get('chart', NULL, 'STRING'); $chartValue = $jinput->get('chart', NULL, 'STRING');
if($chartValue && $user->id != 0) if($chartValue && $user->id != 0)
{ {
@ -295,7 +321,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -310,10 +336,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -324,10 +354,15 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
else else
{ {
if($callback = $jinput->get('callback', null, 'CMD')) // return to a callback function
if($callback)
{ {
echo $callback."(".json_encode(false).");"; echo $callback."(".json_encode(false).");";
} }
elseif($returnRaw)
{
echo json_encode(false);
}
else else
{ {
echo "(".json_encode(false).");"; echo "(".json_encode(false).");";

19
admin/helpers/membersmanager.php
View File

@ -20,6 +20,8 @@ use Joomla\Utilities\ArrayHelper;
use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\IOFactory;
use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
/** /**
* Membersmanager component helper. * Membersmanager component helper.
@ -1967,11 +1969,10 @@ abstract class MembersmanagerHelper
self::$params = JComponentHelper::getParams('com_membersmanager'); self::$params = JComponentHelper::getParams('com_membersmanager');
} }
$folderPath = self::$params->get($target, $default); $folderPath = self::$params->get($target, $default);
jimport('joomla.filesystem.folder');
// create the folder if it does not exist // create the folder if it does not exist
if ($createIfNotSet && !JFolder::exists($folderPath)) if ($createIfNotSet && !Folder::exists($folderPath))
{ {
JFolder::create($folderPath); Folder::create($folderPath);
} }
// return the url // return the url
if ('url' === $type) if ('url' === $type)
@ -2853,7 +2854,10 @@ abstract class MembersmanagerHelper
self::$companyDetails[$method][$f.'company_doc_footer'.$b] = $doc_footer; self::$companyDetails[$method][$f.'company_doc_footer'.$b] = $doc_footer;
} }
// check branding options // check branding options
if (method_exists(__CLASS__, 'triggerPlugin'))
{
self::triggerPlugin('membersmanagerBrandingOverride', 'onGetCompanyDetails', array(&self::$companyDetails[$method], $f, $b)); self::triggerPlugin('membersmanagerBrandingOverride', 'onGetCompanyDetails', array(&self::$companyDetails[$method], $f, $b));
}
// if object is called for // if object is called for
if ('object' == $method) if ('object' == $method)
{ {
@ -8268,12 +8272,12 @@ abstract class MembersmanagerHelper
$filePath = $path . '/' . $name . '.php'; $filePath = $path . '/' . $name . '.php';
$fullPathModel = $fullPathModels . '/' . $name . '.php'; $fullPathModel = $fullPathModels . '/' . $name . '.php';
// check if it exists // check if it exists
if (JFile::exists($filePath)) if (File::exists($filePath))
{ {
// get the file // get the file
require_once $filePath; require_once $filePath;
} }
elseif (JFile::exists($fullPathModel)) elseif (File::exists($fullPathModel))
{ {
// get the file // get the file
require_once $fullPathModel; require_once $fullPathModel;
@ -9094,9 +9098,8 @@ abstract class MembersmanagerHelper
{ {
// Prep the path a little // Prep the path a little
$path = '/'. trim(str_replace('//', '/', $path), '/'); $path = '/'. trim(str_replace('//', '/', $path), '/');
jimport('joomla.filesystem.folder'); // Check if folder exist
/// Check if folder exist if (!Folder::exists($path))
if (!JFolder::exists($path))
{ {
// Lock key. // Lock key.
self::$mediumCryptKey = 'none'; self::$mediumCryptKey = 'none';

4
admin/membersmanager.php
View File

@ -13,7 +13,7 @@
// No direct access to this file // No direct access to this file
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHtml::_('behavior.tabstate');
// Access check. // Access check.
if (!JFactory::getUser()->authorise('core.manage', 'com_membersmanager')) if (!JFactory::getUser()->authorise('core.manage', 'com_membersmanager'))
@ -30,7 +30,7 @@ $document->addScript('components/com_membersmanager/assets/js/admin.js');
JLoader::register('MembersmanagerHelper', __DIR__ . '/helpers/membersmanager.php'); JLoader::register('MembersmanagerHelper', __DIR__ . '/helpers/membersmanager.php');
JLoader::register('JHtmlBatch_', __DIR__ . '/helpers/html/batch_.php'); JLoader::register('JHtmlBatch_', __DIR__ . '/helpers/html/batch_.php');
// Triger the Global Admin Event // Trigger the Global Admin Event
MembersmanagerHelper::globalEvent($document); MembersmanagerHelper::globalEvent($document);
// Get an instance of the controller prefixed by Membersmanager // Get an instance of the controller prefixed by Membersmanager

2
admin/models/forms/member.xml
View File

@ -102,8 +102,6 @@
maxlength="150" maxlength="150"
description="COM_MEMBERSMANAGER_MEMBER_NAME_DESCRIPTION" description="COM_MEMBERSMANAGER_MEMBER_NAME_DESCRIPTION"
class="text_area" class="text_area"
readonly="false"
disabled="false"
required="true" required="true"
filter="STRING" filter="STRING"
message="COM_MEMBERSMANAGER_MEMBER_NAME_MESSAGE" message="COM_MEMBERSMANAGER_MEMBER_NAME_MESSAGE"

2
admin/models/forms/type.xml
View File

@ -102,8 +102,6 @@
maxlength="150" maxlength="150"
description="COM_MEMBERSMANAGER_TYPE_NAME_DESCRIPTION" description="COM_MEMBERSMANAGER_TYPE_NAME_DESCRIPTION"
class="text_area" class="text_area"
readonly="false"
disabled="false"
required="true" required="true"
filter="STRING" filter="STRING"
message="COM_MEMBERSMANAGER_TYPE_NAME_MESSAGE" message="COM_MEMBERSMANAGER_TYPE_NAME_MESSAGE"

8
admin/models/import.php
View File

@ -13,6 +13,8 @@
// No direct access to this file // No direct access to this file
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
use Joomla\Utilities\ArrayHelper; use Joomla\Utilities\ArrayHelper;
use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\IOFactory;
@ -223,7 +225,7 @@ class MembersmanagerModelImport extends JModelLegacy
// Move uploaded file // Move uploaded file
jimport('joomla.filesystem.file'); jimport('joomla.filesystem.file');
$p_file = JFile::upload($tmp_src, $tmp_dest, $this->use_streams, $this->allow_unsafe, $this->safeFileOptions); $p_file = File::upload($tmp_src, $tmp_dest, $this->use_streams, $this->allow_unsafe, $this->safeFileOptions);
// Was the package downloaded? // Was the package downloaded?
if (!$p_file) if (!$p_file)
@ -401,12 +403,12 @@ class MembersmanagerModelImport extends JModelLegacy
// Is the package file a valid file? // Is the package file a valid file?
if (is_file($package)) if (is_file($package))
{ {
JFile::delete($package); File::delete($package);
} }
elseif (is_file(JPath::clean($package))) elseif (is_file(JPath::clean($package)))
{ {
// It might also be just a base filename // It might also be just a base filename
JFile::delete(JPath::clean($package)); File::delete(JPath::clean($package));
} }
} }

8
admin/models/member.php
View File

@ -183,12 +183,6 @@ class MembersmanagerModelMember extends JModelAdmin
// set the username // set the username
$item->username = $member->username; $item->username = $member->username;
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_membersmanager.member');
}
} }
return $item; return $item;
@ -898,7 +892,7 @@ class MembersmanagerModelMember extends JModelAdmin
*/ */
public function getScript() public function getScript()
{ {
return 'administrator/components/com_membersmanager/models/forms/member.js'; return 'media/com_membersmanager/js/member.js';
} }
/** /**

14
admin/models/members.php
View File

@ -296,7 +296,7 @@ class MembersmanagerModelMembers extends JModelList
*/ */
public function getItems() public function getItems()
{ {
// check in items // Check in items
$this->checkInNow(); $this->checkInNow();
// load parent items // load parent items
@ -994,17 +994,19 @@ class MembersmanagerModelMembers extends JModelList
// Get a db connection. // Get a db connection.
$db = JFactory::getDbo(); $db = JFactory::getDbo();
// reset query // Reset query.
$query = $db->getQuery(true); $query = $db->getQuery(true);
$query->select('*'); $query->select('*');
$query->from($db->quoteName('#__membersmanager_member')); $query->from($db->quoteName('#__membersmanager_member'));
$db->setQuery($query); // Only select items that are checked out.
$query->where($db->quoteName('checked_out') . '!=0');
$db->setQuery($query, 0, 1);
$db->execute(); $db->execute();
if ($db->getNumRows()) if ($db->getNumRows())
{ {
// Get Yesterdays date // Get Yesterdays date.
$date = JFactory::getDate()->modify($time)->toSql(); $date = JFactory::getDate()->modify($time)->toSql();
// reset query // Reset query.
$query = $db->getQuery(true); $query = $db->getQuery(true);
// Fields to update. // Fields to update.
@ -1019,7 +1021,7 @@ class MembersmanagerModelMembers extends JModelList
$db->quoteName('checked_out_time') . '<\''.$date.'\'' $db->quoteName('checked_out_time') . '<\''.$date.'\''
); );
// Check table // Check table.
$query->update($db->quoteName('#__membersmanager_member'))->set($fields)->where($conditions); $query->update($db->quoteName('#__membersmanager_member'))->set($fields)->where($conditions);
$db->setQuery($query); $db->setQuery($query);

8
admin/models/type.php
View File

@ -154,12 +154,6 @@ class MembersmanagerModelType extends JModelAdmin
// JSON Decode groups_access. // JSON Decode groups_access.
$item->groups_access = json_decode($item->groups_access,true); $item->groups_access = json_decode($item->groups_access,true);
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_membersmanager.type');
}
} }
return $item; return $item;
@ -459,7 +453,7 @@ class MembersmanagerModelType extends JModelAdmin
*/ */
public function getScript() public function getScript()
{ {
return 'administrator/components/com_membersmanager/models/forms/type.js'; return 'media/com_membersmanager/js/type.js';
} }
/** /**

14
admin/models/types.php
View File

@ -156,7 +156,7 @@ class MembersmanagerModelTypes extends JModelList
*/ */
public function getItems() public function getItems()
{ {
// check in items // Check in items
$this->checkInNow(); $this->checkInNow();
// load parent items // load parent items
@ -510,17 +510,19 @@ class MembersmanagerModelTypes extends JModelList
// Get a db connection. // Get a db connection.
$db = JFactory::getDbo(); $db = JFactory::getDbo();
// reset query // Reset query.
$query = $db->getQuery(true); $query = $db->getQuery(true);
$query->select('*'); $query->select('*');
$query->from($db->quoteName('#__membersmanager_type')); $query->from($db->quoteName('#__membersmanager_type'));
$db->setQuery($query); // Only select items that are checked out.
$query->where($db->quoteName('checked_out') . '!=0');
$db->setQuery($query, 0, 1);
$db->execute(); $db->execute();
if ($db->getNumRows()) if ($db->getNumRows())
{ {
// Get Yesterdays date // Get Yesterdays date.
$date = JFactory::getDate()->modify($time)->toSql(); $date = JFactory::getDate()->modify($time)->toSql();
// reset query // Reset query.
$query = $db->getQuery(true); $query = $db->getQuery(true);
// Fields to update. // Fields to update.
@ -535,7 +537,7 @@ class MembersmanagerModelTypes extends JModelList
$db->quoteName('checked_out_time') . '<\''.$date.'\'' $db->quoteName('checked_out_time') . '<\''.$date.'\''
); );
// Check table // Check table.
$query->update($db->quoteName('#__membersmanager_type'))->set($fields)->where($conditions); $query->update($db->quoteName('#__membersmanager_type'))->set($fields)->where($conditions);
$db->setQuery($query); $db->setQuery($query);

4
admin/sql/install.mysql.utf8.sql
View File

@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `#__membersmanager_member` (
`user` INT(11) NOT NULL DEFAULT 0, `user` INT(11) NOT NULL DEFAULT 0,
`useremail` VARCHAR(255) NOT NULL DEFAULT '', `useremail` VARCHAR(255) NOT NULL DEFAULT '',
`username` VARCHAR(255) NOT NULL DEFAULT '', `username` VARCHAR(255) NOT NULL DEFAULT '',
`params` text NOT NULL, `params` text NULL,
`published` TINYINT(3) NOT NULL DEFAULT 1, `published` TINYINT(3) NOT NULL DEFAULT 1,
`created_by` INT(10) unsigned NOT NULL DEFAULT 0, `created_by` INT(10) unsigned NOT NULL DEFAULT 0,
`modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS `#__membersmanager_type` (
`name` VARCHAR(255) NOT NULL DEFAULT '', `name` VARCHAR(255) NOT NULL DEFAULT '',
`type` TEXT NOT NULL, `type` TEXT NOT NULL,
`view_relationship` TEXT NOT NULL, `view_relationship` TEXT NOT NULL,
`params` text NOT NULL, `params` text NULL,
`published` TINYINT(3) NOT NULL DEFAULT 1, `published` TINYINT(3) NOT NULL DEFAULT 1,
`created_by` INT(10) unsigned NOT NULL DEFAULT 0, `created_by` INT(10) unsigned NOT NULL DEFAULT 0,
`modified_by` INT(10) unsigned NOT NULL DEFAULT 0, `modified_by` INT(10) unsigned NOT NULL DEFAULT 0,

2
admin/tables/type.php
View File

@ -324,7 +324,7 @@ class MembersmanagerTableType extends JTable
$this->alias = $this->name; $this->alias = $this->name;
} }
$this->alias = JApplication::stringURLSafe($this->alias); $this->alias = JApplicationHelper::stringURLSafe($this->alias);
if (trim(str_replace('-', '', $this->alias)) == '') if (trim(str_replace('-', '', $this->alias)) == '')
{ {

6
admin/views/import/view.html.php
View File

@ -85,10 +85,10 @@ class MembersmanagerViewImport extends JViewLegacy
} }
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('import'); $this->help_url = MembersmanagerHelper::getHelpUrl('import');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
} }
} }

3
admin/views/member/tmpl/edit.php
View File

@ -14,8 +14,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidator');
JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select'); JHtml::_('formbehavior.chosen', 'select');
JHtml::_('behavior.keepalive'); JHtml::_('behavior.keepalive');
$componentParams = $this->params; // will be removed just use $this->params instead $componentParams = $this->params; // will be removed just use $this->params instead

6
admin/views/member/view.html.php
View File

@ -150,10 +150,10 @@ class MembersmanagerViewMember extends JViewLegacy
} }
JToolbarHelper::divider(); JToolbarHelper::divider();
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('member'); $this->help_url = MembersmanagerHelper::getHelpUrl('member');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
} }

1
admin/views/members/tmpl/default.php
View File

@ -13,7 +13,6 @@
// No direct access to this file // No direct access to this file
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.multiselect'); JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init'); JHtml::_('dropdown.init');
JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_MEMBERSMANAGER_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_MEMBERSMANAGER_FILTER_SELECT_ACCESS') . ' -'));

6
admin/views/members/view.html.php
View File

@ -152,10 +152,10 @@ class MembersmanagerViewMembers extends JViewLegacy
} }
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('members'); $this->help_url = MembersmanagerHelper::getHelpUrl('members');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
// add the options comp button // add the options comp button

3
admin/views/type/tmpl/edit.php
View File

@ -14,8 +14,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidator');
JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select'); JHtml::_('formbehavior.chosen', 'select');
JHtml::_('behavior.keepalive'); JHtml::_('behavior.keepalive');
$componentParams = $this->params; // will be removed just use $this->params instead $componentParams = $this->params; // will be removed just use $this->params instead

6
admin/views/type/view.html.php
View File

@ -150,10 +150,10 @@ class MembersmanagerViewType extends JViewLegacy
} }
JToolbarHelper::divider(); JToolbarHelper::divider();
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('type'); $this->help_url = MembersmanagerHelper::getHelpUrl('type');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
} }

1
admin/views/types/tmpl/default.php
View File

@ -13,7 +13,6 @@
// No direct access to this file // No direct access to this file
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.multiselect'); JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init'); JHtml::_('dropdown.init');
JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_MEMBERSMANAGER_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_MEMBERSMANAGER_FILTER_SELECT_ACCESS') . ' -'));

6
admin/views/types/view.html.php
View File

@ -152,10 +152,10 @@ class MembersmanagerViewTypes extends JViewLegacy
} }
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('types'); $this->help_url = MembersmanagerHelper::getHelpUrl('types');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
// add the options comp button // add the options comp button

7
media/js/marked.js
View File

File diff suppressed because one or more lines are too long

0
admin/models/forms/member.js → media/js/member.js
View File

0
admin/models/forms/type.js → media/js/type.js
View File

4387
media/uikit-v3/css/uikit-rtl.css
View File

File diff suppressed because it is too large Load Diff

2
media/uikit-v3/css/uikit-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

4381
media/uikit-v3/css/uikit.css
View File

File diff suppressed because it is too large Load Diff

2
media/uikit-v3/css/uikit.min.css vendored
View File

File diff suppressed because one or more lines are too long

15
media/uikit-v3/js/uikit-icons.js
View File

@ -1,10 +1,10 @@
/*! UIkit 3.1.2 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */ /*! UIkit 3.6.22 | https://www.getuikit.com | (c) 2014 - 2021 YOOtheme | MIT License */
(function (global, factory) { (function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define('uikiticons', factory) : typeof define === 'function' && define.amd ? define('uikiticons', factory) :
(global = global || self, global.UIkitIcons = factory()); (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.UIkitIcons = factory());
}(this, function () { 'use strict'; }(this, (function () { 'use strict';
function plugin(UIkit) { function plugin(UIkit) {
@ -48,8 +48,10 @@
"credit-card": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"4.5\" width=\"17\" height=\"12\"/><rect x=\"1\" y=\"7\" width=\"18\" height=\"3\"/></svg>", "credit-card": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"4.5\" width=\"17\" height=\"12\"/><rect x=\"1\" y=\"7\" width=\"18\" height=\"3\"/></svg>",
"database": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><ellipse fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"4.64\" rx=\"7.5\" ry=\"3.14\"/><path fill=\"none\" stroke=\"#000\" d=\"M17.5,8.11 C17.5,9.85 14.14,11.25 10,11.25 C5.86,11.25 2.5,9.84 2.5,8.11\"/><path fill=\"none\" stroke=\"#000\" d=\"M17.5,11.25 C17.5,12.99 14.14,14.39 10,14.39 C5.86,14.39 2.5,12.98 2.5,11.25\"/><path fill=\"none\" stroke=\"#000\" d=\"M17.49,4.64 L17.5,14.36 C17.5,16.1 14.14,17.5 10,17.5 C5.86,17.5 2.5,16.09 2.5,14.36 L2.5,4.64\"/></svg>", "database": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><ellipse fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"4.64\" rx=\"7.5\" ry=\"3.14\"/><path fill=\"none\" stroke=\"#000\" d=\"M17.5,8.11 C17.5,9.85 14.14,11.25 10,11.25 C5.86,11.25 2.5,9.84 2.5,8.11\"/><path fill=\"none\" stroke=\"#000\" d=\"M17.5,11.25 C17.5,12.99 14.14,14.39 10,14.39 C5.86,14.39 2.5,12.98 2.5,11.25\"/><path fill=\"none\" stroke=\"#000\" d=\"M17.49,4.64 L17.5,14.36 C17.5,16.1 14.14,17.5 10,17.5 C5.86,17.5 2.5,16.09 2.5,14.36 L2.5,4.64\"/></svg>",
"desktop": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"8\" y=\"15\" width=\"1\" height=\"2\"/><rect x=\"11\" y=\"15\" width=\"1\" height=\"2\"/><rect x=\"5\" y=\"16\" width=\"10\" height=\"1\"/><rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"3.5\" width=\"17\" height=\"11\"/></svg>", "desktop": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"8\" y=\"15\" width=\"1\" height=\"2\"/><rect x=\"11\" y=\"15\" width=\"1\" height=\"2\"/><rect x=\"5\" y=\"16\" width=\"10\" height=\"1\"/><rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"3.5\" width=\"17\" height=\"11\"/></svg>",
"discord": "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 20 20\"><path d=\"M16.074,4.361a14.243,14.243,0,0,0-3.61-1.134,10.61,10.61,0,0,0-.463.96,13.219,13.219,0,0,0-4,0,10.138,10.138,0,0,0-.468-.96A14.206,14.206,0,0,0,3.919,4.364,15.146,15.146,0,0,0,1.324,14.5a14.435,14.435,0,0,0,4.428,2.269A10.982,10.982,0,0,0,6.7,15.21a9.294,9.294,0,0,1-1.494-.727c.125-.093.248-.19.366-.289a10.212,10.212,0,0,0,8.854,0c.119.1.242.2.366.289a9.274,9.274,0,0,1-1.5.728,10.8,10.8,0,0,0,.948,1.562,14.419,14.419,0,0,0,4.431-2.27A15.128,15.128,0,0,0,16.074,4.361Zm-8.981,8.1a1.7,1.7,0,0,1-1.573-1.79A1.689,1.689,0,0,1,7.093,8.881a1.679,1.679,0,0,1,1.573,1.791A1.687,1.687,0,0,1,7.093,12.462Zm5.814,0a1.7,1.7,0,0,1-1.573-1.79,1.689,1.689,0,0,1,1.573-1.791,1.679,1.679,0,0,1,1.573,1.791A1.688,1.688,0,0,1,12.907,12.462Z\"/></svg>",
"download": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polyline fill=\"none\" stroke=\"#000\" points=\"14,10 9.5,14.5 5,10\"/><rect x=\"3\" y=\"17\" width=\"13\" height=\"1\"/><line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"13.91\" x2=\"9.5\" y2=\"3\"/></svg>", "download": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polyline fill=\"none\" stroke=\"#000\" points=\"14,10 9.5,14.5 5,10\"/><rect x=\"3\" y=\"17\" width=\"13\" height=\"1\"/><line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"13.91\" x2=\"9.5\" y2=\"3\"/></svg>",
"dribbble": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M1.3,8.9c0,0,5,0.1,8.6-1c1.4-0.4,2.6-0.9,4-1.9 c1.4-1.1,2.5-2.5,2.5-2.5\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M3.9,16.6c0,0,1.7-2.8,3.5-4.2 c1.8-1.3,4-2,5.7-2.2C16,10,19,10.6,19,10.6\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M6.9,1.6c0,0,3.3,4.6,4.2,6.8 c0.4,0.9,1.3,3.1,1.9,5.2c0.6,2,0.9,4.4,0.9,4.4\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" cx=\"10\" cy=\"10\" r=\"9\"/></svg>", "dribbble": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M1.3,8.9c0,0,5,0.1,8.6-1c1.4-0.4,2.6-0.9,4-1.9 c1.4-1.1,2.5-2.5,2.5-2.5\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M3.9,16.6c0,0,1.7-2.8,3.5-4.2 c1.8-1.3,4-2,5.7-2.2C16,10,19,10.6,19,10.6\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M6.9,1.6c0,0,3.3,4.6,4.2,6.8 c0.4,0.9,1.3,3.1,1.9,5.2c0.6,2,0.9,4.4,0.9,4.4\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" cx=\"10\" cy=\"10\" r=\"9\"/></svg>",
"etsy": "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 20 20\"><path d=\"M8,4.26C8,4.07,8,4,8.31,4h4.46c.79,0,1.22.67,1.53,1.91l.25,1h.76c.14-2.82.26-4,.26-4S13.65,3,12.52,3H6.81L3.75,2.92v.84l1,.2c.73.11.9.27,1,1,0,0,.06,2,.06,5.17s-.06,5.14-.06,5.14c0,.59-.23.81-1,.94l-1,.2v.84l3.06-.1h5.11c1.15,0,3.82.1,3.82.1,0-.7.45-3.88.51-4.22h-.73l-.76,1.69a2.25,2.25,0,0,1-2.45,1.47H9.4c-1,0-1.44-.4-1.44-1.24V10.44s2.16,0,2.86.06c.55,0,.85.19,1.06,1l.23,1H13L12.9,9.94,13,7.41h-.85l-.28,1.13c-.16.74-.28.84-1,1-1,.1-2.89.09-2.89.09Z\"/></svg>",
"expand": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"13 2 18 2 18 7 17 7 17 3 13 3\"/><polygon points=\"2 13 3 13 3 17 7 17 7 18 2 18\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M11,9 L17,3\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M3,17 L9,11\"/></svg>", "expand": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"13 2 18 2 18 7 17 7 17 3 13 3\"/><polygon points=\"2 13 3 13 3 17 7 17 7 18 2 18\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M11,9 L17,3\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M3,17 L9,11\"/></svg>",
"facebook": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z\"/></svg>", "facebook": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z\"/></svg>",
"file-edit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" d=\"M18.65,1.68 C18.41,1.45 18.109,1.33 17.81,1.33 C17.499,1.33 17.209,1.45 16.98,1.68 L8.92,9.76 L8,12.33 L10.55,11.41 L18.651,3.34 C19.12,2.87 19.12,2.15 18.65,1.68 L18.65,1.68 L18.65,1.68 Z\"/><polyline fill=\"none\" stroke=\"#000\" points=\"16.5 8.482 16.5 18.5 3.5 18.5 3.5 1.5 14.211 1.5\"/></svg>", "file-edit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" d=\"M18.65,1.68 C18.41,1.45 18.109,1.33 17.81,1.33 C17.499,1.33 17.209,1.45 16.98,1.68 L8.92,9.76 L8,12.33 L10.55,11.41 L18.651,3.34 C19.12,2.87 19.12,2.15 18.65,1.68 L18.65,1.68 L18.65,1.68 Z\"/><polyline fill=\"none\" stroke=\"#000\" points=\"16.5 8.482 16.5 18.5 3.5 18.5 3.5 1.5 14.211 1.5\"/></svg>",
@ -62,11 +64,10 @@
"foursquare": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M15.23,2 C15.96,2 16.4,2.41 16.5,2.86 C16.57,3.15 16.56,3.44 16.51,3.73 C16.46,4.04 14.86,11.72 14.75,12.03 C14.56,12.56 14.16,12.82 13.61,12.83 C13.03,12.84 11.09,12.51 10.69,13 C10.38,13.38 7.79,16.39 6.81,17.53 C6.61,17.76 6.4,17.96 6.08,17.99 C5.68,18.04 5.29,17.87 5.17,17.45 C5.12,17.28 5.1,17.09 5.1,16.91 C5.1,12.4 4.86,7.81 5.11,3.31 C5.17,2.5 5.81,2.12 6.53,2 L15.23,2 L15.23,2 Z M9.76,11.42 C9.94,11.19 10.17,11.1 10.45,11.1 L12.86,11.1 C13.12,11.1 13.31,10.94 13.36,10.69 C13.37,10.64 13.62,9.41 13.74,8.83 C13.81,8.52 13.53,8.28 13.27,8.28 C12.35,8.29 11.42,8.28 10.5,8.28 C9.84,8.28 9.83,7.69 9.82,7.21 C9.8,6.85 10.13,6.55 10.5,6.55 C11.59,6.56 12.67,6.55 13.76,6.55 C14.03,6.55 14.23,6.4 14.28,6.14 C14.34,5.87 14.67,4.29 14.67,4.29 C14.67,4.29 14.82,3.74 14.19,3.74 L7.34,3.74 C7,3.75 6.84,4.02 6.84,4.33 C6.84,7.58 6.85,14.95 6.85,14.99 C6.87,15 8.89,12.51 9.76,11.42 L9.76,11.42 Z\"/></svg>", "foursquare": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M15.23,2 C15.96,2 16.4,2.41 16.5,2.86 C16.57,3.15 16.56,3.44 16.51,3.73 C16.46,4.04 14.86,11.72 14.75,12.03 C14.56,12.56 14.16,12.82 13.61,12.83 C13.03,12.84 11.09,12.51 10.69,13 C10.38,13.38 7.79,16.39 6.81,17.53 C6.61,17.76 6.4,17.96 6.08,17.99 C5.68,18.04 5.29,17.87 5.17,17.45 C5.12,17.28 5.1,17.09 5.1,16.91 C5.1,12.4 4.86,7.81 5.11,3.31 C5.17,2.5 5.81,2.12 6.53,2 L15.23,2 L15.23,2 Z M9.76,11.42 C9.94,11.19 10.17,11.1 10.45,11.1 L12.86,11.1 C13.12,11.1 13.31,10.94 13.36,10.69 C13.37,10.64 13.62,9.41 13.74,8.83 C13.81,8.52 13.53,8.28 13.27,8.28 C12.35,8.29 11.42,8.28 10.5,8.28 C9.84,8.28 9.83,7.69 9.82,7.21 C9.8,6.85 10.13,6.55 10.5,6.55 C11.59,6.56 12.67,6.55 13.76,6.55 C14.03,6.55 14.23,6.4 14.28,6.14 C14.34,5.87 14.67,4.29 14.67,4.29 C14.67,4.29 14.82,3.74 14.19,3.74 L7.34,3.74 C7,3.75 6.84,4.02 6.84,4.33 C6.84,7.58 6.85,14.95 6.85,14.99 C6.87,15 8.89,12.51 9.76,11.42 L9.76,11.42 Z\"/></svg>",
"future": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polyline points=\"19 2 18 2 18 6 14 6 14 7 19 7 19 2\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M18,6.548 C16.709,3.29 13.354,1 9.6,1 C4.6,1 0.6,5 0.6,10 C0.6,15 4.6,19 9.6,19 C14.6,19 18.6,15 18.6,10\"/><rect x=\"9\" y=\"4\" width=\"1\" height=\"7\"/><path d=\"M13.018,14.197 L9.445,10.625\" fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\"/></svg>", "future": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polyline points=\"19 2 18 2 18 6 14 6 14 7 19 7 19 2\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M18,6.548 C16.709,3.29 13.354,1 9.6,1 C4.6,1 0.6,5 0.6,10 C0.6,15 4.6,19 9.6,19 C14.6,19 18.6,15 18.6,10\"/><rect x=\"9\" y=\"4\" width=\"1\" height=\"7\"/><path d=\"M13.018,14.197 L9.445,10.625\" fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\"/></svg>",
"git-branch": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"3\" r=\"2\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14\" cy=\"6\" r=\"2\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"17\" r=\"2\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M14,8 C14,10.41 12.43,10.87 10.56,11.25 C9.09,11.54 7,12.06 7,15 L7,5\"/></svg>", "git-branch": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"3\" r=\"2\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14\" cy=\"6\" r=\"2\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"17\" r=\"2\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M14,8 C14,10.41 12.43,10.87 10.56,11.25 C9.09,11.54 7,12.06 7,15 L7,5\"/></svg>",
"git-fork": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"5.79\" cy=\"2.79\" r=\"1.79\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14.19\" cy=\"2.79\" r=\"1.79\"/><ellipse fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"10.03\" cy=\"16.79\" rx=\"1.79\" ry=\"1.79\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M5.79,4.57 L5.79,6.56 C5.79,9.19 10.03,10.22 10.03,13.31 C10.03,14.86 10.04,14.55 10.04,14.55 C10.04,14.37 10.04,14.86 10.04,13.31 C10.04,10.22 14.2,9.19 14.2,6.56 L14.2,4.57\"/></svg>", "git-fork": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"5.79\" cy=\"2.79\" r=\"1.79\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14.19\" cy=\"2.79\" r=\"1.79\"/><circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"10.03\" cy=\"16.79\" r=\"1.79\"/><path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M5.79,4.57 L5.79,6.56 C5.79,9.19 10.03,10.22 10.03,13.31 C10.03,14.86 10.04,14.55 10.04,14.55 C10.04,14.37 10.04,14.86 10.04,13.31 C10.04,10.22 14.2,9.19 14.2,6.56 L14.2,4.57\"/></svg>",
"github-alt": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M10,0.5 C4.75,0.5 0.5,4.76 0.5,10.01 C0.5,15.26 4.75,19.51 10,19.51 C15.24,19.51 19.5,15.26 19.5,10.01 C19.5,4.76 15.25,0.5 10,0.5 L10,0.5 Z M12.81,17.69 C12.81,17.69 12.81,17.7 12.79,17.69 C12.47,17.75 12.35,17.59 12.35,17.36 L12.35,16.17 C12.35,15.45 12.09,14.92 11.58,14.56 C12.2,14.51 12.77,14.39 13.26,14.21 C13.87,13.98 14.36,13.69 14.74,13.29 C15.42,12.59 15.76,11.55 15.76,10.17 C15.76,9.25 15.45,8.46 14.83,7.8 C15.1,7.08 15.07,6.29 14.75,5.44 L14.51,5.42 C14.34,5.4 14.06,5.46 13.67,5.61 C13.25,5.78 12.79,6.03 12.31,6.35 C11.55,6.16 10.81,6.05 10.09,6.05 C9.36,6.05 8.61,6.15 7.88,6.35 C7.28,5.96 6.75,5.68 6.26,5.54 C6.07,5.47 5.9,5.44 5.78,5.44 L5.42,5.44 C5.06,6.29 5.04,7.08 5.32,7.8 C4.7,8.46 4.4,9.25 4.4,10.17 C4.4,11.94 4.96,13.16 6.08,13.84 C6.53,14.13 7.05,14.32 7.69,14.43 C8.03,14.5 8.32,14.54 8.55,14.55 C8.07,14.89 7.82,15.42 7.82,16.16 L7.82,17.51 C7.8,17.69 7.7,17.8 7.51,17.8 C4.21,16.74 1.82,13.65 1.82,10.01 C1.82,5.5 5.49,1.83 10,1.83 C14.5,1.83 18.17,5.5 18.17,10.01 C18.18,13.53 15.94,16.54 12.81,17.69 L12.81,17.69 Z\"/></svg>", "github-alt": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M10,0.5 C4.75,0.5 0.5,4.76 0.5,10.01 C0.5,15.26 4.75,19.51 10,19.51 C15.24,19.51 19.5,15.26 19.5,10.01 C19.5,4.76 15.25,0.5 10,0.5 L10,0.5 Z M12.81,17.69 C12.81,17.69 12.81,17.7 12.79,17.69 C12.47,17.75 12.35,17.59 12.35,17.36 L12.35,16.17 C12.35,15.45 12.09,14.92 11.58,14.56 C12.2,14.51 12.77,14.39 13.26,14.21 C13.87,13.98 14.36,13.69 14.74,13.29 C15.42,12.59 15.76,11.55 15.76,10.17 C15.76,9.25 15.45,8.46 14.83,7.8 C15.1,7.08 15.07,6.29 14.75,5.44 L14.51,5.42 C14.34,5.4 14.06,5.46 13.67,5.61 C13.25,5.78 12.79,6.03 12.31,6.35 C11.55,6.16 10.81,6.05 10.09,6.05 C9.36,6.05 8.61,6.15 7.88,6.35 C7.28,5.96 6.75,5.68 6.26,5.54 C6.07,5.47 5.9,5.44 5.78,5.44 L5.42,5.44 C5.06,6.29 5.04,7.08 5.32,7.8 C4.7,8.46 4.4,9.25 4.4,10.17 C4.4,11.94 4.96,13.16 6.08,13.84 C6.53,14.13 7.05,14.32 7.69,14.43 C8.03,14.5 8.32,14.54 8.55,14.55 C8.07,14.89 7.82,15.42 7.82,16.16 L7.82,17.51 C7.8,17.69 7.7,17.8 7.51,17.8 C4.21,16.74 1.82,13.65 1.82,10.01 C1.82,5.5 5.49,1.83 10,1.83 C14.5,1.83 18.17,5.5 18.17,10.01 C18.18,13.53 15.94,16.54 12.81,17.69 L12.81,17.69 Z\"/></svg>",
"github": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M10,1 C5.03,1 1,5.03 1,10 C1,13.98 3.58,17.35 7.16,18.54 C7.61,18.62 7.77,18.34 7.77,18.11 C7.77,17.9 7.76,17.33 7.76,16.58 C5.26,17.12 4.73,15.37 4.73,15.37 C4.32,14.33 3.73,14.05 3.73,14.05 C2.91,13.5 3.79,13.5 3.79,13.5 C4.69,13.56 5.17,14.43 5.17,14.43 C5.97,15.8 7.28,15.41 7.79,15.18 C7.87,14.6 8.1,14.2 8.36,13.98 C6.36,13.75 4.26,12.98 4.26,9.53 C4.26,8.55 4.61,7.74 5.19,7.11 C5.1,6.88 4.79,5.97 5.28,4.73 C5.28,4.73 6.04,4.49 7.75,5.65 C8.47,5.45 9.24,5.35 10,5.35 C10.76,5.35 11.53,5.45 12.25,5.65 C13.97,4.48 14.72,4.73 14.72,4.73 C15.21,5.97 14.9,6.88 14.81,7.11 C15.39,7.74 15.73,8.54 15.73,9.53 C15.73,12.99 13.63,13.75 11.62,13.97 C11.94,14.25 12.23,14.8 12.23,15.64 C12.23,16.84 12.22,17.81 12.22,18.11 C12.22,18.35 12.38,18.63 12.84,18.54 C16.42,17.35 19,13.98 19,10 C19,5.03 14.97,1 10,1 L10,1 Z\"/></svg>", "github": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M10,1 C5.03,1 1,5.03 1,10 C1,13.98 3.58,17.35 7.16,18.54 C7.61,18.62 7.77,18.34 7.77,18.11 C7.77,17.9 7.76,17.33 7.76,16.58 C5.26,17.12 4.73,15.37 4.73,15.37 C4.32,14.33 3.73,14.05 3.73,14.05 C2.91,13.5 3.79,13.5 3.79,13.5 C4.69,13.56 5.17,14.43 5.17,14.43 C5.97,15.8 7.28,15.41 7.79,15.18 C7.87,14.6 8.1,14.2 8.36,13.98 C6.36,13.75 4.26,12.98 4.26,9.53 C4.26,8.55 4.61,7.74 5.19,7.11 C5.1,6.88 4.79,5.97 5.28,4.73 C5.28,4.73 6.04,4.49 7.75,5.65 C8.47,5.45 9.24,5.35 10,5.35 C10.76,5.35 11.53,5.45 12.25,5.65 C13.97,4.48 14.72,4.73 14.72,4.73 C15.21,5.97 14.9,6.88 14.81,7.11 C15.39,7.74 15.73,8.54 15.73,9.53 C15.73,12.99 13.63,13.75 11.62,13.97 C11.94,14.25 12.23,14.8 12.23,15.64 C12.23,16.84 12.22,17.81 12.22,18.11 C12.22,18.35 12.38,18.63 12.84,18.54 C16.42,17.35 19,13.98 19,10 C19,5.03 14.97,1 10,1 L10,1 Z\"/></svg>",
"gitter": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"3.5\" y=\"1\" width=\"1.531\" height=\"11.471\"/><rect x=\"7.324\" y=\"4.059\" width=\"1.529\" height=\"15.294\"/><rect x=\"11.148\" y=\"4.059\" width=\"1.527\" height=\"15.294\"/><rect x=\"14.971\" y=\"4.059\" width=\"1.529\" height=\"8.412\"/></svg>", "gitter": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"3.5\" y=\"1\" width=\"1.531\" height=\"11.471\"/><rect x=\"7.324\" y=\"4.059\" width=\"1.529\" height=\"15.294\"/><rect x=\"11.148\" y=\"4.059\" width=\"1.527\" height=\"15.294\"/><rect x=\"14.971\" y=\"4.059\" width=\"1.529\" height=\"8.412\"/></svg>",
"google-plus": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M12.9,9c0,2.7-0.6,5-3.2,6.3c-3.7,1.8-8.1,0.2-9.4-3.6C-1.1,7.6,1.9,3.3,6.1,3c1.7-0.1,3.2,0.3,4.6,1.3 c0.1,0.1,0.3,0.2,0.4,0.4c-0.5,0.5-1.2,1-1.7,1.6c-1-0.8-2.1-1.1-3.5-0.9C5,5.6,4.2,6,3.6,6.7c-1.3,1.3-1.5,3.4-0.5,5 c1,1.7,2.6,2.3,4.6,1.9c1.4-0.3,2.4-1.2,2.6-2.6H6.9V9H12.9z\"/><polygon points=\"20,9 20,11 18,11 18,13 16,13 16,11 14,11 14,9 16,9 16,7 18,7 18,9\"/></svg>",
"google": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M17.86,9.09 C18.46,12.12 17.14,16.05 13.81,17.56 C9.45,19.53 4.13,17.68 2.47,12.87 C0.68,7.68 4.22,2.42 9.5,2.03 C11.57,1.88 13.42,2.37 15.05,3.65 C15.22,3.78 15.37,3.93 15.61,4.14 C14.9,4.81 14.23,5.45 13.5,6.14 C12.27,5.08 10.84,4.72 9.28,4.98 C8.12,5.17 7.16,5.76 6.37,6.63 C4.88,8.27 4.62,10.86 5.76,12.82 C6.95,14.87 9.17,15.8 11.57,15.25 C13.27,14.87 14.76,13.33 14.89,11.75 L10.51,11.75 L10.51,9.09 L17.86,9.09 L17.86,9.09 Z\"/></svg>", "google": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M17.86,9.09 C18.46,12.12 17.14,16.05 13.81,17.56 C9.45,19.53 4.13,17.68 2.47,12.87 C0.68,7.68 4.22,2.42 9.5,2.03 C11.57,1.88 13.42,2.37 15.05,3.65 C15.22,3.78 15.37,3.93 15.61,4.14 C14.9,4.81 14.23,5.45 13.5,6.14 C12.27,5.08 10.84,4.72 9.28,4.98 C8.12,5.17 7.16,5.76 6.37,6.63 C4.88,8.27 4.62,10.86 5.76,12.82 C6.95,14.87 9.17,15.8 11.57,15.25 C13.27,14.87 14.76,13.33 14.89,11.75 L10.51,11.75 L10.51,9.09 L17.86,9.09 L17.86,9.09 Z\"/></svg>",
"grid": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"2\" y=\"2\" width=\"3\" height=\"3\"/><rect x=\"8\" y=\"2\" width=\"3\" height=\"3\"/><rect x=\"14\" y=\"2\" width=\"3\" height=\"3\"/><rect x=\"2\" y=\"8\" width=\"3\" height=\"3\"/><rect x=\"8\" y=\"8\" width=\"3\" height=\"3\"/><rect x=\"14\" y=\"8\" width=\"3\" height=\"3\"/><rect x=\"2\" y=\"14\" width=\"3\" height=\"3\"/><rect x=\"8\" y=\"14\" width=\"3\" height=\"3\"/><rect x=\"14\" y=\"14\" width=\"3\" height=\"3\"/></svg>", "grid": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"2\" y=\"2\" width=\"3\" height=\"3\"/><rect x=\"8\" y=\"2\" width=\"3\" height=\"3\"/><rect x=\"14\" y=\"2\" width=\"3\" height=\"3\"/><rect x=\"2\" y=\"8\" width=\"3\" height=\"3\"/><rect x=\"8\" y=\"8\" width=\"3\" height=\"3\"/><rect x=\"14\" y=\"8\" width=\"3\" height=\"3\"/><rect x=\"2\" y=\"14\" width=\"3\" height=\"3\"/><rect x=\"8\" y=\"14\" width=\"3\" height=\"3\"/><rect x=\"14\" y=\"14\" width=\"3\" height=\"3\"/></svg>",
"happy": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><circle cx=\"13\" cy=\"7\" r=\"1\"/><circle cx=\"7\" cy=\"7\" r=\"1\"/><circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10\" r=\"8.5\"/><path fill=\"none\" stroke=\"#000\" d=\"M14.6,11.4 C13.9,13.3 12.1,14.5 10,14.5 C7.9,14.5 6.1,13.3 5.4,11.4\"/></svg>", "happy": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><circle cx=\"13\" cy=\"7\" r=\"1\"/><circle cx=\"7\" cy=\"7\" r=\"1\"/><circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10\" r=\"8.5\"/><path fill=\"none\" stroke=\"#000\" d=\"M14.6,11.4 C13.9,13.3 12.1,14.5 10,14.5 C7.9,14.5 6.1,13.3 5.4,11.4\"/></svg>",
@ -130,6 +131,7 @@
"tablet": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" d=\"M5,18.5 C4.2,18.5 3.5,17.8 3.5,17 L3.5,3 C3.5,2.2 4.2,1.5 5,1.5 L16,1.5 C16.8,1.5 17.5,2.2 17.5,3 L17.5,17 C17.5,17.8 16.8,18.5 16,18.5 L5,18.5 L5,18.5 L5,18.5 Z\"/><circle cx=\"10.5\" cy=\"16.3\" r=\".8\"/></svg>", "tablet": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" d=\"M5,18.5 C4.2,18.5 3.5,17.8 3.5,17 L3.5,3 C3.5,2.2 4.2,1.5 5,1.5 L16,1.5 C16.8,1.5 17.5,2.2 17.5,3 L17.5,17 C17.5,17.8 16.8,18.5 16,18.5 L5,18.5 L5,18.5 L5,18.5 Z\"/><circle cx=\"10.5\" cy=\"16.3\" r=\".8\"/></svg>",
"tag": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17.5,3.71 L17.5,7.72 C17.5,7.96 17.4,8.2 17.21,8.39 L8.39,17.2 C7.99,17.6 7.33,17.6 6.93,17.2 L2.8,13.07 C2.4,12.67 2.4,12.01 2.8,11.61 L11.61,2.8 C11.81,2.6 12.08,2.5 12.34,2.5 L16.19,2.5 C16.52,2.5 16.86,2.63 17.11,2.88 C17.35,3.11 17.48,3.4 17.5,3.71 L17.5,3.71 Z\"/><circle cx=\"14\" cy=\"6\" r=\"1\"/></svg>", "tag": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17.5,3.71 L17.5,7.72 C17.5,7.96 17.4,8.2 17.21,8.39 L8.39,17.2 C7.99,17.6 7.33,17.6 6.93,17.2 L2.8,13.07 C2.4,12.67 2.4,12.01 2.8,11.61 L11.61,2.8 C11.81,2.6 12.08,2.5 12.34,2.5 L16.19,2.5 C16.52,2.5 16.86,2.63 17.11,2.88 C17.35,3.11 17.48,3.4 17.5,3.71 L17.5,3.71 Z\"/><circle cx=\"14\" cy=\"6\" r=\"1\"/></svg>",
"thumbnails": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"3.5\" width=\"5\" height=\"5\"/><rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"3.5\" width=\"5\" height=\"5\"/><rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"11.5\" width=\"5\" height=\"5\"/><rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"11.5\" width=\"5\" height=\"5\"/></svg>", "thumbnails": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"3.5\" width=\"5\" height=\"5\"/><rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"3.5\" width=\"5\" height=\"5\"/><rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"11.5\" width=\"5\" height=\"5\"/><rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"11.5\" width=\"5\" height=\"5\"/></svg>",
"tiktok": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M17.24,6V8.82a6.79,6.79,0,0,1-4-1.28v5.81A5.26,5.26,0,1,1,8,8.1a4.36,4.36,0,0,1,.72.05v2.9A2.57,2.57,0,0,0,7.64,11a2.4,2.4,0,1,0,2.77,2.38V2h2.86a4,4,0,0,0,1.84,3.38A4,4,0,0,0,17.24,6Z\"/></svg>",
"trash": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polyline fill=\"none\" stroke=\"#000\" points=\"6.5 3 6.5 1.5 13.5 1.5 13.5 3\"/><polyline fill=\"none\" stroke=\"#000\" points=\"4.5 4 4.5 18.5 15.5 18.5 15.5 4\"/><rect x=\"8\" y=\"7\" width=\"1\" height=\"9\"/><rect x=\"11\" y=\"7\" width=\"1\" height=\"9\"/><rect x=\"2\" y=\"3\" width=\"16\" height=\"1\"/></svg>", "trash": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polyline fill=\"none\" stroke=\"#000\" points=\"6.5 3 6.5 1.5 13.5 1.5 13.5 3\"/><polyline fill=\"none\" stroke=\"#000\" points=\"4.5 4 4.5 18.5 15.5 18.5 15.5 4\"/><rect x=\"8\" y=\"7\" width=\"1\" height=\"9\"/><rect x=\"11\" y=\"7\" width=\"1\" height=\"9\"/><rect x=\"2\" y=\"3\" width=\"16\" height=\"1\"/></svg>",
"triangle-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"5 7 15 7 10 12\"/></svg>", "triangle-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"5 7 15 7 10 12\"/></svg>",
"triangle-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"12 5 7 10 12 15\"/></svg>", "triangle-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"12 5 7 10 12 15\"/></svg>",
@ -138,6 +140,7 @@
"tripadvisor": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M19.021,7.866C19.256,6.862,20,5.854,20,5.854h-3.346C14.781,4.641,12.504,4,9.98,4C7.363,4,4.999,4.651,3.135,5.876H0\tc0,0,0.738,0.987,0.976,1.988c-0.611,0.837-0.973,1.852-0.973,2.964c0,2.763,2.249,5.009,5.011,5.009\tc1.576,0,2.976-0.737,3.901-1.879l1.063,1.599l1.075-1.615c0.475,0.611,1.1,1.111,1.838,1.451c1.213,0.547,2.574,0.612,3.825,0.15\tc2.589-0.963,3.913-3.852,2.964-6.439c-0.175-0.463-0.4-0.876-0.675-1.238H19.021z M16.38,14.594\tc-1.002,0.371-2.088,0.328-3.06-0.119c-0.688-0.317-1.252-0.817-1.657-1.438c-0.164-0.25-0.313-0.52-0.417-0.811\tc-0.124-0.328-0.186-0.668-0.217-1.014c-0.063-0.689,0.037-1.396,0.339-2.043c0.448-0.971,1.251-1.71,2.25-2.079\tc2.075-0.765,4.375,0.3,5.14,2.366c0.762,2.066-0.301,4.37-2.363,5.134L16.38,14.594L16.38,14.594z M8.322,13.066\tc-0.72,1.059-1.935,1.76-3.309,1.76c-2.207,0-4.001-1.797-4.001-3.996c0-2.203,1.795-4.002,4.001-4.002\tc2.204,0,3.999,1.8,3.999,4.002c0,0.137-0.024,0.261-0.04,0.396c-0.067,0.678-0.284,1.313-0.648,1.853v-0.013H8.322z M2.472,10.775\tc0,1.367,1.112,2.479,2.476,2.479c1.363,0,2.472-1.11,2.472-2.479c0-1.359-1.11-2.468-2.472-2.468\tC3.584,8.306,2.473,9.416,2.472,10.775L2.472,10.775z M12.514,10.775c0,1.367,1.104,2.479,2.471,2.479\tc1.363,0,2.474-1.108,2.474-2.479c0-1.359-1.11-2.468-2.474-2.468c-1.364,0-2.477,1.109-2.477,2.468H12.514z M3.324,10.775\tc0-0.893,0.726-1.618,1.614-1.618c0.889,0,1.625,0.727,1.625,1.618c0,0.898-0.725,1.627-1.625,1.627\tc-0.901,0-1.625-0.729-1.625-1.627H3.324z M13.354,10.775c0-0.893,0.726-1.618,1.627-1.618c0.886,0,1.61,0.727,1.61,1.618\tc0,0.898-0.726,1.627-1.626,1.627s-1.625-0.729-1.625-1.627H13.354z M9.977,4.875c1.798,0,3.425,0.324,4.849,0.968\tc-0.535,0.015-1.061,0.108-1.586,0.3c-1.264,0.463-2.264,1.388-2.815,2.604c-0.262,0.551-0.398,1.133-0.448,1.72\tC9.79,7.905,7.677,5.873,5.076,5.82C6.501,5.208,8.153,4.875,9.94,4.875H9.977z\"/></svg>", "tripadvisor": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M19.021,7.866C19.256,6.862,20,5.854,20,5.854h-3.346C14.781,4.641,12.504,4,9.98,4C7.363,4,4.999,4.651,3.135,5.876H0\tc0,0,0.738,0.987,0.976,1.988c-0.611,0.837-0.973,1.852-0.973,2.964c0,2.763,2.249,5.009,5.011,5.009\tc1.576,0,2.976-0.737,3.901-1.879l1.063,1.599l1.075-1.615c0.475,0.611,1.1,1.111,1.838,1.451c1.213,0.547,2.574,0.612,3.825,0.15\tc2.589-0.963,3.913-3.852,2.964-6.439c-0.175-0.463-0.4-0.876-0.675-1.238H19.021z M16.38,14.594\tc-1.002,0.371-2.088,0.328-3.06-0.119c-0.688-0.317-1.252-0.817-1.657-1.438c-0.164-0.25-0.313-0.52-0.417-0.811\tc-0.124-0.328-0.186-0.668-0.217-1.014c-0.063-0.689,0.037-1.396,0.339-2.043c0.448-0.971,1.251-1.71,2.25-2.079\tc2.075-0.765,4.375,0.3,5.14,2.366c0.762,2.066-0.301,4.37-2.363,5.134L16.38,14.594L16.38,14.594z M8.322,13.066\tc-0.72,1.059-1.935,1.76-3.309,1.76c-2.207,0-4.001-1.797-4.001-3.996c0-2.203,1.795-4.002,4.001-4.002\tc2.204,0,3.999,1.8,3.999,4.002c0,0.137-0.024,0.261-0.04,0.396c-0.067,0.678-0.284,1.313-0.648,1.853v-0.013H8.322z M2.472,10.775\tc0,1.367,1.112,2.479,2.476,2.479c1.363,0,2.472-1.11,2.472-2.479c0-1.359-1.11-2.468-2.472-2.468\tC3.584,8.306,2.473,9.416,2.472,10.775L2.472,10.775z M12.514,10.775c0,1.367,1.104,2.479,2.471,2.479\tc1.363,0,2.474-1.108,2.474-2.479c0-1.359-1.11-2.468-2.474-2.468c-1.364,0-2.477,1.109-2.477,2.468H12.514z M3.324,10.775\tc0-0.893,0.726-1.618,1.614-1.618c0.889,0,1.625,0.727,1.625,1.618c0,0.898-0.725,1.627-1.625,1.627\tc-0.901,0-1.625-0.729-1.625-1.627H3.324z M13.354,10.775c0-0.893,0.726-1.618,1.627-1.618c0.886,0,1.61,0.727,1.61,1.618\tc0,0.898-0.726,1.627-1.626,1.627s-1.625-0.729-1.625-1.627H13.354z M9.977,4.875c1.798,0,3.425,0.324,4.849,0.968\tc-0.535,0.015-1.061,0.108-1.586,0.3c-1.264,0.463-2.264,1.388-2.815,2.604c-0.262,0.551-0.398,1.133-0.448,1.72\tC9.79,7.905,7.677,5.873,5.076,5.82C6.501,5.208,8.153,4.875,9.94,4.875H9.977z\"/></svg>",
"tumblr": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M6.885,8.598c0,0,0,3.393,0,4.996c0,0.282,0,0.66,0.094,0.942c0.377,1.509,1.131,2.545,2.545,3.11 c1.319,0.472,2.356,0.472,3.676,0c0.565-0.188,1.132-0.659,1.132-0.659l-0.849-2.263c0,0-1.036,0.378-1.603,0.283 c-0.565-0.094-1.226-0.66-1.226-1.508c0-1.603,0-4.902,0-4.902h2.828V5.771h-2.828V2H8.205c0,0-0.094,0.66-0.188,0.942 C7.828,3.791,7.262,4.733,6.603,5.394C5.848,6.147,5,6.43,5,6.43v2.168H6.885z\"/></svg>", "tumblr": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M6.885,8.598c0,0,0,3.393,0,4.996c0,0.282,0,0.66,0.094,0.942c0.377,1.509,1.131,2.545,2.545,3.11 c1.319,0.472,2.356,0.472,3.676,0c0.565-0.188,1.132-0.659,1.132-0.659l-0.849-2.263c0,0-1.036,0.378-1.603,0.283 c-0.565-0.094-1.226-0.66-1.226-1.508c0-1.603,0-4.902,0-4.902h2.828V5.771h-2.828V2H8.205c0,0-0.094,0.66-0.188,0.942 C7.828,3.791,7.262,4.733,6.603,5.394C5.848,6.147,5,6.43,5,6.43v2.168H6.885z\"/></svg>",
"tv": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"7\" y=\"16\" width=\"6\" height=\"1\"/><rect fill=\"none\" stroke=\"#000\" x=\".5\" y=\"3.5\" width=\"19\" height=\"11\"/></svg>", "tv": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect x=\"7\" y=\"16\" width=\"6\" height=\"1\"/><rect fill=\"none\" stroke=\"#000\" x=\".5\" y=\"3.5\" width=\"19\" height=\"11\"/></svg>",
"twitch": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M5.23,1,2,4.23V15.85H5.88v3.23L9.1,15.85h2.59L17.5,10V1Zm11,8.4L13.62,12H11L8.78,14.24V12H5.88V2.29H16.21Z\"/><rect x=\"12.98\" y=\"4.55\" width=\"1.29\" height=\"3.88\"/><rect x=\"9.43\" y=\"4.55\" width=\"1.29\" height=\"3.88\"/></svg>",
"twitter": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74\"/></svg>", "twitter": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74\"/></svg>",
"uikit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"14.4,3.1 11.3,5.1 15,7.3 15,12.9 10,15.7 5,12.9 5,8.5 2,6.8 2,14.8 9.9,19.5 18,14.8 18,5.3\"/><polygon points=\"9.8,4.2 6.7,2.4 9.8,0.4 12.9,2.3\"/></svg>", "uikit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><polygon points=\"14.4,3.1 11.3,5.1 15,7.3 15,12.9 10,15.7 5,12.9 5,8.5 2,6.8 2,14.8 9.9,19.5 18,14.8 18,5.3\"/><polygon points=\"9.8,4.2 6.7,2.4 9.8,0.4 12.9,2.3\"/></svg>",
"unlock": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"8.5\" width=\"13\" height=\"10\"/><path fill=\"none\" stroke=\"#000\" d=\"M6.5,8.5 L6.5,4.9 C6.5,3 8.1,1.5 10,1.5 C11.9,1.5 13.5,3 13.5,4.9\"/></svg>", "unlock": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"8.5\" width=\"13\" height=\"10\"/><path fill=\"none\" stroke=\"#000\" d=\"M6.5,8.5 L6.5,4.9 C6.5,3 8.1,1.5 10,1.5 C11.9,1.5 13.5,3 13.5,4.9\"/></svg>",
@ -163,4 +166,4 @@
return plugin; return plugin;
})); })));

4
media/uikit-v3/js/uikit-icons.min.js vendored
View File

File diff suppressed because one or more lines are too long

7005
media/uikit-v3/js/uikit.js
View File

File diff suppressed because it is too large Load Diff

4
media/uikit-v3/js/uikit.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
membersmanager.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2" method="upgrade"> <extension type="component" version="4" method="upgrade">
<name>COM_MEMBERSMANAGER</name> <name>COM_MEMBERSMANAGER</name>
<creationDate>8th February, 2021</creationDate> <creationDate>2nd March, 2022</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail> <authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
<authorUrl>https://www.joomlacomponentbuilder.com/</authorUrl> <authorUrl>https://www.joomlacomponentbuilder.com/</authorUrl>

45
script.php
View File

@ -13,7 +13,10 @@
// No direct access to this file // No direct access to this file
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHTML::_('behavior.modal'); use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
use Joomla\CMS\Installer\Adapter\ComponentAdapter;
JHTML::_('bootstrap.renderModal');
/** /**
* Script File of Membersmanager Component * Script File of Membersmanager Component
@ -25,23 +28,23 @@ class com_membersmanagerInstallerScript
* *
* @param JAdapterInstance $parent The object responsible for running this script * @param JAdapterInstance $parent The object responsible for running this script
*/ */
public function __construct(JAdapterInstance $parent) {} public function __construct(ComponentAdapter $parent) {}
/** /**
* Called on installation * Called on installation
* *
* @param JAdapterInstance $parent The object responsible for running this script * @param ComponentAdapter $parent The object responsible for running this script
* *
* @return boolean True on success * @return boolean True on success
*/ */
public function install(JAdapterInstance $parent) {} public function install(ComponentAdapter $parent) {}
/** /**
* Called on uninstallation * Called on uninstallation
* *
* @param JAdapterInstance $parent The object responsible for running this script * @param ComponentAdapter $parent The object responsible for running this script
*/ */
public function uninstall(JAdapterInstance $parent) public function uninstall(ComponentAdapter $parent)
{ {
// Get Application object // Get Application object
$app = JFactory::getApplication(); $app = JFactory::getApplication();
@ -509,21 +512,21 @@ class com_membersmanagerInstallerScript
/** /**
* Called on update * Called on update
* *
* @param JAdapterInstance $parent The object responsible for running this script * @param ComponentAdapter $parent The object responsible for running this script
* *
* @return boolean True on success * @return boolean True on success
*/ */
public function update(JAdapterInstance $parent){} public function update(ComponentAdapter $parent){}
/** /**
* Called before any type of action * Called before any type of action
* *
* @param string $type Which action is happening (install|uninstall|discover_install|update) * @param string $type Which action is happening (install|uninstall|discover_install|update)
* @param JAdapterInstance $parent The object responsible for running this script * @param ComponentAdapter $parent The object responsible for running this script
* *
* @return boolean True on success * @return boolean True on success
*/ */
public function preflight($type, JAdapterInstance $parent) public function preflight($type, ComponentAdapter $parent)
{ {
// get application // get application
$app = JFactory::getApplication(); $app = JFactory::getApplication();
@ -548,12 +551,12 @@ class com_membersmanagerInstallerScript
{ {
} }
// check if the PHPExcel stuff is still around // check if the PHPExcel stuff is still around
if (JFile::exists(JPATH_ADMINISTRATOR . '/components/com_membersmanager/helpers/PHPExcel.php')) if (File::exists(JPATH_ADMINISTRATOR . '/components/com_membersmanager/helpers/PHPExcel.php'))
{ {
// We need to remove this old PHPExcel folder // We need to remove this old PHPExcel folder
$this->removeFolder(JPATH_ADMINISTRATOR . '/components/com_membersmanager/helpers/PHPExcel'); $this->removeFolder(JPATH_ADMINISTRATOR . '/components/com_membersmanager/helpers/PHPExcel');
// We need to remove this old PHPExcel file // We need to remove this old PHPExcel file
JFile::delete(JPATH_ADMINISTRATOR . '/components/com_membersmanager/helpers/PHPExcel.php'); File::delete(JPATH_ADMINISTRATOR . '/components/com_membersmanager/helpers/PHPExcel.php');
} }
return true; return true;
} }
@ -562,11 +565,11 @@ class com_membersmanagerInstallerScript
* Called after any type of action * Called after any type of action
* *
* @param string $type Which action is happening (install|uninstall|discover_install|update) * @param string $type Which action is happening (install|uninstall|discover_install|update)
* @param JAdapterInstance $parent The object responsible for running this script * @param ComponentAdapter $parent The object responsible for running this script
* *
* @return boolean True on success * @return boolean True on success
*/ */
public function postflight($type, JAdapterInstance $parent) public function postflight($type, ComponentAdapter $parent)
{ {
// get application // get application
$app = JFactory::getApplication(); $app = JFactory::getApplication();
@ -618,7 +621,7 @@ class com_membersmanagerInstallerScript
$db->setQuery($query); $db->setQuery($query);
$allDone = $db->execute(); $allDone = $db->execute();
// Install the global extenstion params. // Install the global extension params.
$query = $db->getQuery(true); $query = $db->getQuery(true);
// Field to update. // Field to update.
$fields = array( $fields = array(
@ -874,7 +877,7 @@ class com_membersmanagerInstallerScript
*/ */
protected function removeFolder($dir, $ignore = false) protected function removeFolder($dir, $ignore = false)
{ {
if (JFolder::exists($dir)) if (Folder::exists($dir))
{ {
$it = new RecursiveDirectoryIterator($dir); $it = new RecursiveDirectoryIterator($dir);
$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST); $it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
@ -904,7 +907,7 @@ class com_membersmanagerInstallerScript
{ {
continue; continue;
} }
JFolder::delete($file_dir); Folder::delete($file_dir);
} }
else else
{ {
@ -923,13 +926,13 @@ class com_membersmanagerInstallerScript
{ {
continue; continue;
} }
JFile::delete($file_dir); File::delete($file_dir);
} }
} }
// delete the root folder if not ignore found // delete the root folder if not ignore found
if (!$this->checkArray($ignore)) if (!$this->checkArray($ignore))
{ {
return JFolder::delete($dir); return Folder::delete($dir);
} }
return true; return true;
} }
@ -975,7 +978,7 @@ class com_membersmanagerInstallerScript
$installer = $parent->getParent(); $installer = $parent->getParent();
$installPath = $installer->getPath('source'); $installPath = $installer->getPath('source');
// get all the folders // get all the folders
$folders = JFolder::folders($installPath); $folders = Folder::folders($installPath);
// check if we have folders we may want to copy // check if we have folders we may want to copy
$doNotCopy = array('media','admin','site'); // Joomla already deals with these $doNotCopy = array('media','admin','site'); // Joomla already deals with these
if (count((array) $folders) > 1) if (count((array) $folders) > 1)
@ -990,7 +993,7 @@ class com_membersmanagerInstallerScript
// set the destination path // set the destination path
$dest = JPATH_ROOT.'/'.$folder; $dest = JPATH_ROOT.'/'.$folder;
// now try to copy the folder // now try to copy the folder
if (!JFolder::copy($src, $dest, '', true)) if (!Folder::copy($src, $dest, '', true))
{ {
$app->enqueueMessage('Could not copy '.$folder.' folder into place, please make sure destination is writable!', 'error'); $app->enqueueMessage('Could not copy '.$folder.' folder into place, please make sure destination is writable!', 'error');
} }

111
site/controllers/ajax.json.php
View File

@ -25,8 +25,10 @@ class MembersmanagerControllerAjax extends JControllerLegacy
parent::__construct($config); parent::__construct($config);
// make sure all json stuff are set // make sure all json stuff are set
JFactory::getDocument()->setMimeEncoding( 'application/json' ); JFactory::getDocument()->setMimeEncoding( 'application/json' );
JResponse::setHeader('Content-Disposition','attachment;filename="getajax.json"'); // get the application
JResponse::setHeader("Access-Control-Allow-Origin", "*"); $app = JFactory::getApplication();
$app->setHeader('Content-Disposition','attachment;filename="getajax.json"');
$app->setHeader('Access-Control-Allow-Origin', '*');
// load the tasks // load the tasks
$this->registerTask('checkUnique', 'ajax'); $this->registerTask('checkUnique', 'ajax');
$this->registerTask('getPlaceHolders', 'ajax'); $this->registerTask('getPlaceHolders', 'ajax');
@ -42,20 +44,26 @@ class MembersmanagerControllerAjax extends JControllerLegacy
public function ajax() public function ajax()
{ {
// get the user for later use
$user = JFactory::getUser(); $user = JFactory::getUser();
// get the input values
$jinput = JFactory::getApplication()->input; $jinput = JFactory::getApplication()->input;
// check if we should return raw
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
// return to a callback function
$callback = $jinput->get('callback', null, 'CMD');
// Check Token! // Check Token!
$token = JSession::getFormToken(); $token = JSession::getFormToken();
$call_token = $jinput->get('token', 0, 'ALNUM'); $call_token = $jinput->get('token', 0, 'ALNUM');
if($jinput->get($token, 0, 'ALNUM') || $token === $call_token) if($jinput->get($token, 0, 'ALNUM') || $token === $call_token)
{ {
// get the task
$task = $this->getTask(); $task = $this->getTask();
switch($task) switch($task)
{ {
case 'checkUnique': case 'checkUnique':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$fieldValue = $jinput->get('field', NULL, 'WORD'); $fieldValue = $jinput->get('field', NULL, 'WORD');
$valueValue = $jinput->get('value', NULL, 'STRING'); $valueValue = $jinput->get('value', NULL, 'STRING');
if($fieldValue && $user->id != 0 && $valueValue) if($fieldValue && $user->id != 0 && $valueValue)
@ -66,7 +74,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -81,10 +89,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -94,7 +106,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getPlaceHolders': case 'getPlaceHolders':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$getTypeValue = $jinput->get('getType', NULL, 'WORD'); $getTypeValue = $jinput->get('getType', NULL, 'WORD');
if($getTypeValue && $user->id != 0) if($getTypeValue && $user->id != 0)
{ {
@ -104,7 +115,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -119,10 +130,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -132,7 +147,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getAnyPlaceHolders': case 'getAnyPlaceHolders':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$getTypeValue = $jinput->get('getType', NULL, 'WORD'); $getTypeValue = $jinput->get('getType', NULL, 'WORD');
if($getTypeValue && $user->id != 0) if($getTypeValue && $user->id != 0)
{ {
@ -142,7 +156,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -157,10 +171,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -170,7 +188,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'uploadfile': case 'uploadfile':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$targetValue = $jinput->get('target', NULL, 'WORD'); $targetValue = $jinput->get('target', NULL, 'WORD');
$typeValue = $jinput->get('type', NULL, 'WORD'); $typeValue = $jinput->get('type', NULL, 'WORD');
if($targetValue && $user->id != 0 && $typeValue) if($targetValue && $user->id != 0 && $typeValue)
@ -181,7 +198,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -196,10 +213,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -209,7 +230,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'removeFile': case 'removeFile':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$filenameValue = $jinput->get('filename', NULL, 'CMD'); $filenameValue = $jinput->get('filename', NULL, 'CMD');
$targetValue = $jinput->get('target', NULL, 'WORD'); $targetValue = $jinput->get('target', NULL, 'WORD');
$flushValue = $jinput->get('flush', NULL, 'INT'); $flushValue = $jinput->get('flush', NULL, 'INT');
@ -222,7 +242,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -237,10 +257,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -250,7 +274,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getUserDetails': case 'getUserDetails':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$userValue = $jinput->get('user', NULL, 'INT'); $userValue = $jinput->get('user', NULL, 'INT');
if($userValue && $user->id != 0) if($userValue && $user->id != 0)
{ {
@ -260,7 +283,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -275,10 +298,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -288,7 +315,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getChartImageLink': case 'getChartImageLink':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$chartValue = $jinput->get('chart', NULL, 'STRING'); $chartValue = $jinput->get('chart', NULL, 'STRING');
if($chartValue && $user->id != 0) if($chartValue && $user->id != 0)
{ {
@ -298,7 +324,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -313,10 +339,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -326,7 +356,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'searchMembers': case 'searchMembers':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$searchValue = $jinput->get('search', NULL, 'STRING'); $searchValue = $jinput->get('search', NULL, 'STRING');
if($searchValue && $user->id != 0) if($searchValue && $user->id != 0)
{ {
@ -336,7 +365,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -351,10 +380,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -364,7 +397,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getReport': case 'getReport':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$sleutelValue = $jinput->get('sleutel', NULL, 'STRING'); $sleutelValue = $jinput->get('sleutel', NULL, 'STRING');
if($sleutelValue && $user->id != 0) if($sleutelValue && $user->id != 0)
{ {
@ -374,7 +406,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -389,10 +421,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -402,7 +438,6 @@ class MembersmanagerControllerAjax extends JControllerLegacy
case 'getListMessages': case 'getListMessages':
try try
{ {
$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
$sleutelValue = $jinput->get('sleutel', NULL, 'STRING'); $sleutelValue = $jinput->get('sleutel', NULL, 'STRING');
if($sleutelValue && $user->id != 0) if($sleutelValue && $user->id != 0)
{ {
@ -412,7 +447,7 @@ class MembersmanagerControllerAjax extends JControllerLegacy
{ {
$result = false; $result = false;
} }
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback . "(".json_encode($result).");"; echo $callback . "(".json_encode($result).");";
} }
@ -427,10 +462,14 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
catch(Exception $e) catch(Exception $e)
{ {
if($callback = $jinput->get('callback', null, 'CMD')) if($callback)
{ {
echo $callback."(".json_encode($e).");"; echo $callback."(".json_encode($e).");";
} }
elseif($returnRaw)
{
echo json_encode($e);
}
else else
{ {
echo "(".json_encode($e).");"; echo "(".json_encode($e).");";
@ -441,10 +480,16 @@ class MembersmanagerControllerAjax extends JControllerLegacy
} }
else else
{ {
if($callback = $jinput->get('callback', null, 'CMD')) // return to a callback function
if($callback)
{ {
echo $callback."(".json_encode(false).");"; echo $callback."(".json_encode(false).");";
} }
// return raw
elseif($returnRaw)
{
echo json_encode(false);
}
else else
{ {
echo "(".json_encode(false).");"; echo "(".json_encode(false).");";

19
site/helpers/membersmanager.php
View File

@ -17,6 +17,8 @@ use Joomla\CMS\Language\Language;
use Joomla\Registry\Registry; use Joomla\Registry\Registry;
use Joomla\String\StringHelper; use Joomla\String\StringHelper;
use Joomla\Utilities\ArrayHelper; use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Filesystem\File;
use Joomla\CMS\Filesystem\Folder;
/** /**
* Membersmanager component helper * Membersmanager component helper
@ -1964,11 +1966,10 @@ abstract class MembersmanagerHelper
self::$params = JComponentHelper::getParams('com_membersmanager'); self::$params = JComponentHelper::getParams('com_membersmanager');
} }
$folderPath = self::$params->get($target, $default); $folderPath = self::$params->get($target, $default);
jimport('joomla.filesystem.folder');
// create the folder if it does not exist // create the folder if it does not exist
if ($createIfNotSet && !JFolder::exists($folderPath)) if ($createIfNotSet && !Folder::exists($folderPath))
{ {
JFolder::create($folderPath); Folder::create($folderPath);
} }
// return the url // return the url
if ('url' === $type) if ('url' === $type)
@ -2850,7 +2851,10 @@ abstract class MembersmanagerHelper
self::$companyDetails[$method][$f.'company_doc_footer'.$b] = $doc_footer; self::$companyDetails[$method][$f.'company_doc_footer'.$b] = $doc_footer;
} }
// check branding options // check branding options
if (method_exists(__CLASS__, 'triggerPlugin'))
{
self::triggerPlugin('membersmanagerBrandingOverride', 'onGetCompanyDetails', array(&self::$companyDetails[$method], $f, $b)); self::triggerPlugin('membersmanagerBrandingOverride', 'onGetCompanyDetails', array(&self::$companyDetails[$method], $f, $b));
}
// if object is called for // if object is called for
if ('object' == $method) if ('object' == $method)
{ {
@ -7348,12 +7352,12 @@ abstract class MembersmanagerHelper
$filePath = $path . '/' . $name . '.php'; $filePath = $path . '/' . $name . '.php';
$fullPathModel = $fullPathModels . '/' . $name . '.php'; $fullPathModel = $fullPathModels . '/' . $name . '.php';
// check if it exists // check if it exists
if (JFile::exists($filePath)) if (File::exists($filePath))
{ {
// get the file // get the file
require_once $filePath; require_once $filePath;
} }
elseif (JFile::exists($fullPathModel)) elseif (File::exists($fullPathModel))
{ {
// get the file // get the file
require_once $fullPathModel; require_once $fullPathModel;
@ -8851,9 +8855,8 @@ abstract class MembersmanagerHelper
{ {
// Prep the path a little // Prep the path a little
$path = '/'. trim(str_replace('//', '/', $path), '/'); $path = '/'. trim(str_replace('//', '/', $path), '/');
jimport('joomla.filesystem.folder'); // Check if folder exist
/// Check if folder exist if (!Folder::exists($path))
if (!JFolder::exists($path))
{ {
// Lock key. // Lock key.
self::$mediumCryptKey = 'none'; self::$mediumCryptKey = 'none';

4
site/membersmanager.php
View File

@ -13,7 +13,7 @@
// No direct access to this file // No direct access to this file
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHtml::_('behavior.tabstate');
// Set the component css/js // Set the component css/js
$document = JFactory::getDocument(); $document = JFactory::getDocument();
@ -24,7 +24,7 @@ $document->addScript('components/com_membersmanager/assets/js/site.js');
JLoader::register('MembersmanagerHelper', __DIR__ . '/helpers/membersmanager.php'); JLoader::register('MembersmanagerHelper', __DIR__ . '/helpers/membersmanager.php');
JLoader::register('MembersmanagerHelperRoute', __DIR__ . '/helpers/route.php'); JLoader::register('MembersmanagerHelperRoute', __DIR__ . '/helpers/route.php');
// Triger the Global Site Event // Trigger the Global Site Event
MembersmanagerHelper::globalEvent($document); MembersmanagerHelper::globalEvent($document);
// Get an instance of the controller prefixed by Membersmanager // Get an instance of the controller prefixed by Membersmanager

2
site/models/forms/member.xml
View File

@ -102,8 +102,6 @@
maxlength="150" maxlength="150"
description="COM_MEMBERSMANAGER_MEMBER_NAME_DESCRIPTION" description="COM_MEMBERSMANAGER_MEMBER_NAME_DESCRIPTION"
class="text_area" class="text_area"
readonly="false"
disabled="false"
required="true" required="true"
filter="STRING" filter="STRING"
message="COM_MEMBERSMANAGER_MEMBER_NAME_MESSAGE" message="COM_MEMBERSMANAGER_MEMBER_NAME_MESSAGE"

8
site/models/member.php
View File

@ -183,12 +183,6 @@ class MembersmanagerModelMember extends JModelAdmin
// set the username // set the username
$item->username = $member->username; $item->username = $member->username;
} }
if (!empty($item->id))
{
$item->tags = new JHelperTags;
$item->tags->getTagIds($item->id, 'com_membersmanager.member');
}
} }
return $item; return $item;
@ -898,7 +892,7 @@ class MembersmanagerModelMember extends JModelAdmin
*/ */
public function getScript() public function getScript()
{ {
return 'administrator/components/com_membersmanager/models/forms/member.js'; return 'media/com_membersmanager/js/member.js';
} }
/** /**

2
site/router.php
View File

@ -52,7 +52,7 @@ class MembersmanagerRouter extends JComponentRouterBase
{ {
$view = $query['view']; $view = $query['view'];
if (empty($query['Itemid'])) if (empty($query['Itemid']) && !(isset($view) && isset($query['id']) && ($view === 'member' || $view === 'members' || $view === 'cpanel' || $view === 'profile')))
{ {
$segments[] = $query['view']; $segments[] = $query['view'];
} }

6
site/views/cpanel/view.html.php
View File

@ -176,10 +176,10 @@ class MembersmanagerViewCpanel extends JViewLegacy
{ {
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('cpanel'); $this->help_url = MembersmanagerHelper::getHelpUrl('cpanel');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
// now initiate the toolbar // now initiate the toolbar
$this->toolbar = JToolbar::getInstance(); $this->toolbar = JToolbar::getInstance();

5
site/views/member/tmpl/edit.php
View File

@ -14,12 +14,9 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidator');
JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select'); JHtml::_('formbehavior.chosen', 'select');
JHtml::_('behavior.keepalive'); JHtml::_('behavior.keepalive');
JHtml::_('behavior.tabstate');
JHtml::_('behavior.calendar');
?> ?>
<div class="membersmanager-member"> <div class="membersmanager-member">
<?php echo $this->toolbar->render(); ?> <?php echo $this->toolbar->render(); ?>

6
site/views/member/view.html.php
View File

@ -149,10 +149,10 @@ class MembersmanagerViewMember extends JViewLegacy
} }
JToolbarHelper::divider(); JToolbarHelper::divider();
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('member'); $this->help_url = MembersmanagerHelper::getHelpUrl('member');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
// now initiate the toolbar // now initiate the toolbar
$this->toolbar = JToolbar::getInstance(); $this->toolbar = JToolbar::getInstance();

6
site/views/members/view.html.php
View File

@ -129,10 +129,10 @@ class MembersmanagerViewMembers extends JViewLegacy
{ {
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('members'); $this->help_url = MembersmanagerHelper::getHelpUrl('members');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
// now initiate the toolbar // now initiate the toolbar
$this->toolbar = JToolbar::getInstance(); $this->toolbar = JToolbar::getInstance();

6
site/views/profile/view.html.php
View File

@ -187,10 +187,10 @@ class MembersmanagerViewProfile extends JViewLegacy
{ {
// set help url for this view if found // set help url for this view if found
$help_url = MembersmanagerHelper::getHelpUrl('profile'); $this->help_url = MembersmanagerHelper::getHelpUrl('profile');
if (MembersmanagerHelper::checkString($help_url)) if (MembersmanagerHelper::checkString($this->help_url))
{ {
JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $help_url); JToolbarHelper::help('COM_MEMBERSMANAGER_HELP_MANAGER', false, $this->help_url);
} }
// now initiate the toolbar // now initiate the toolbar
$this->toolbar = JToolbar::getInstance(); $this->toolbar = JToolbar::getInstance();