Skip to content

Commit ffc89f0

Browse files
sergeytolkachyovsergeytolkachyov
committed
v.2.3.0
1 parent 3be0135 commit ffc89f0

File tree

211 files changed

+1144
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+1144
-314
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.idea
22
.phing
3-
.packages
3+
.packages
4+
node_modules
5+
package-lock.json

‎com_swjprojects/admin/config.xml

+5
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@
6565
<option value="100">J100</option>
6666
<option value="0">JALL</option>
6767
</field>
68+
<field name="userkeys_layout" type="componentlayout"
69+
label="COM_SWJPROJECTS_PARAMS_USERKEYS_LAYOUT"
70+
extension="com_swjprojects"
71+
view="userkeys"
72+
class="form-select"/>
6873
<field name="jupdate_cachetimeout" type="integer"
6974
label="COM_SWJPROJECTS_PARAMS_JUPDATE_CACHETIMEOUT"
7075
description="COM_SWJPROJECTS_PARAMS_JUPDATE_CACHETIMEOUT_DESC"

‎com_swjprojects/admin/forms/key.xml

+6
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@
8282
maxlength="255"
8383
size="40"
8484
class="col-12"/>
85+
<field name="domain" type="url"
86+
label="COM_SWJPROJECTS_DOMAIN"
87+
description="COM_SWJPROJECTS_DOMAIN_DESC"
88+
filter="url"
89+
validate="url"
90+
/>
8591
</fieldset>
8692
<fieldset name="plugins">
8793
<fields name="plugins"/>

‎com_swjprojects/admin/language/en-GB/com_swjprojects.ini

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; @package SW JProjects
2-
; @version 2.2.1
2+
; @version 2.3.0
33
; @author Sergey Tolkachyov
44
; @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
55
; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -250,6 +250,7 @@ COM_SWJPROJECTS_PARAMS_VERSION_LAYOUT = "Version page layout"
250250
COM_SWJPROJECTS_PARAMS_DOCUMENTATION_LIMIT = "Documentation list limit"
251251
COM_SWJPROJECTS_PARAMS_DOCUMENTATION_LAYOUT = "Documentation list layout"
252252
COM_SWJPROJECTS_PARAMS_DOCUMENT_LAYOUT = "Document page layout"
253+
COM_SWJPROJECTS_PARAMS_USERKEYS_LAYOUT = "User keys layout"
253254
COM_SWJPROJECTS_PARAMS_JUPDATE_CACHETIMEOUT = "Caching Joomla Update Server (in hours)"
254255
COM_SWJPROJECTS_PARAMS_JUPDATE_CACHETIMEOUT_DESC = "For what period (in hours) to cache xml update files"
255256
COM_SWJPROJECTS_PARAMS_DUPLICATES_PROTECTION = "Duplicates protection"
@@ -285,6 +286,7 @@ JGLOBAL_NOINDEX_NOFOLLOW="noindex, nofollow"
285286

286287
COM_SWJPROJECTS_FIELD_ORDERING_DESC="Select the order in which you want query results presented"
287288
COM_SWJPROJECTS_FIELD_ORDERING_LABEL="Ordering"
288-
COM_SWJPROJECTS_FIELD_ORDERING_ORDERING="Ordering"
289+
COM_SWJPROJECTS_FIELD_ORDERING_ORDERING="Ordering in Joomla"
289290

290-
COM_SWJPROJECTS_FIELD_ORDERING_LABEL="Order Results"
291+
COM_SWJPROJECTS_DOMAIN = "Domain"
292+
COM_SWJPROJECTS_DOMAIN_DESC = "Specify the domain for which the license key was generated"

‎com_swjprojects/admin/language/en-GB/com_swjprojects.sys.ini

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; @package SW JProjects
2-
; @version 2.2.1
2+
; @version 2.3.0
33
; @author Sergey Tolkachyov
44
; @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
55
; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -55,4 +55,10 @@ JFIELD_META_IMAGE_DESC = "The image to be displayed in the Image meta tag of the
5555
JFIELD_META_IMAGE_LABEL = "Meta Image"
5656

5757
COM_SWJPROJECTS_VIEW_JCHANGELOG = "Changelog URL"
58-
COM_SWJPROJECTS_VIEW_JCHANGELOG_DESCRIPTION = "Changelog URL XML"
58+
COM_SWJPROJECTS_VIEW_JCHANGELOG_DESCRIPTION = "Changelog URL XML"
59+
60+
COM_SWJPROJECTS_USER_KEYS = "User keys"
61+
COM_SWJPROJECTS_VIEW_USER_KEYS = "User keys"
62+
COM_SWJPROJECTS_VIEW_USER_KEYS_DESCRIPTION = "List of user's license keys"
63+
COM_SWJPROJECTS_PARAMS_USERKEYS_LIMIT = "User keys limit"
64+
COM_SWJPROJECTS_VIEW_USER_KEYS_DEFAULT_OPTION = "Default from component"

‎com_swjprojects/admin/language/ru-RU/com_swjprojects.ini

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; @package SW JProjects
2-
; @version 2.2.1
2+
; @version 2.3.0
33
; @author Sergey Tolkachyov
44
; @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
55
; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -250,7 +250,8 @@ COM_SWJPROJECTS_PARAMS_VERSIONS_LAYOUT = "Макет списка версий"
250250
COM_SWJPROJECTS_PARAMS_VERSION_LAYOUT = "Макет страницы версии"
251251
COM_SWJPROJECTS_PARAMS_DOCUMENTATION_LIMIT = "Кол-во документов в списке"
252252
COM_SWJPROJECTS_PARAMS_DOCUMENTATION_LAYOUT = "Макет документации"
253-
COM_SWJPROJECTS_PARAMS_DOCUMENTAT_LAYOUT = "Макет страницы документа"
253+
COM_SWJPROJECTS_PARAMS_DOCUMENT_LAYOUT = "Макет страницы документа"
254+
COM_SWJPROJECTS_PARAMS_USERKEYS_LAYOUT = "Макет списка ключей пользователя"
254255
COM_SWJPROJECTS_PARAMS_JUPDATE_CACHETIMEOUT = "Кэширование сервера обновлений Joomla (в часах)"
255256
COM_SWJPROJECTS_PARAMS_JUPDATE_CACHETIMEOUT_DESC = "На какой период (в часах) кешировать xml файлы обновлений"
256257
COM_SWJPROJECTS_PARAMS_DUPLICATES_PROTECTION = "Защита от дублей страниц"
@@ -286,3 +287,7 @@ JGLOBAL_NOINDEX_NOFOLLOW = "noindex, nofollow"
286287
COM_SWJPROJECTS_FIELD_ORDERING_DESC = "Выберите порядок отображения проектов."
287288
COM_SWJPROJECTS_FIELD_ORDERING_LABEL = "Порядок"
288289
COM_SWJPROJECTS_FIELD_ORDERING_ORDERING = "Порядок в Joomla"
290+
291+
COM_SWJPROJECTS_DOMAIN = "Домен"
292+
COM_SWJPROJECTS_DOMAIN_DESC = "Укажите домен, для которого выдан лицензионный ключ"
293+

‎com_swjprojects/admin/language/ru-RU/com_swjprojects.sys.ini

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; @package SW JProjects
2-
; @version 2.2.1
2+
; @version 2.3.0
33
; @author Sergey Tolkachyov
44
; @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
55
; @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -55,4 +55,9 @@ JFIELD_META_IMAGE_DESC = "Изображение, которое будет вы
5555
JFIELD_META_IMAGE_LABEL = "Мета-тег Image"
5656

5757
COM_SWJPROJECTS_VIEW_JCHANGELOG = "Changelog URL"
58-
COM_SWJPROJECTS_VIEW_JCHANGELOG_DESCRIPTION = "Changelog URL XML"
58+
COM_SWJPROJECTS_VIEW_JCHANGELOG_DESCRIPTION = "Changelog URL XML"
59+
60+
COM_SWJPROJECTS_VIEW_USER_KEYS = "Ключи пользователя"
61+
COM_SWJPROJECTS_VIEW_USER_KEYS_DESCRIPTION = "Список лицензионных ключей пользователя"
62+
COM_SWJPROJECTS_VIEW_USER_KEYS_DEFAULT_OPTION = "По умолчанию из компонента"
63+
COM_SWJPROJECTS_PARAMS_USERKEYS_LIMIT = "Количество ключей в списке"

‎com_swjprojects/admin/services/provider.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<?php
2-
32
/**
43
* @package SW JProjects
54
*
65
* @copyright (C) 2024 Sergey Tolkachyov. <https://web-tolk.ru>
76
* @license GNU General Public License version 2 or later; see LICENSE.txt
87
*/
98

10-
\defined('_JEXEC') or die;
11-
129
use Joomla\CMS\Categories\CategoryFactoryInterface;
1310
use Joomla\CMS\Component\Router\RouterFactoryInterface;
1411
use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
@@ -23,6 +20,8 @@
2320
use Joomla\DI\Container;
2421
use Joomla\DI\ServiceProviderInterface;
2522

23+
defined('_JEXEC') or die;
24+
2625
/**
2726
* The SWJProjects service provider.
2827
*

‎com_swjprojects/admin/sql/install.mysql.utf8.sql

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -82,6 +82,7 @@ CREATE TABLE IF NOT EXISTS `#__swjprojects_keys`
8282
`limit_count` int(11) NOT NULL DEFAULT 0,
8383
`state` tinyint(3) NOT NULL DEFAULT 0,
8484
`plugins` mediumtext,
85+
`domain` text DEFAULT NULl,
8586
PRIMARY KEY `id` (`id`),
8687
KEY `idx_key` (`key`(100)),
8788
KEY `idx_email` (`email`(100)),

‎com_swjprojects/admin/sql/uninstall.mysql.utf8.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.1.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.3.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.5.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.5.1.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.5.5.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.5.7.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.6.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.8.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/1.9.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @package SW JProjects
3-
* @version 2.2.1
3+
* @version 2.3.0
44
* @author Sergey Tolkachyov
55
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
66
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html

‎com_swjprojects/admin/sql/updates/mysql/2.3.0.sql

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* @package SW JProjects
3+
* @version 2.3.0
4+
* @author Sergey Tolkachyov
5+
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
6+
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
7+
* @link https://web-tolk.ru
8+
*/
9+
10+
ALTER TABLE `#__swjprojects_keys` ADD `domain` TEXT DEFAULT NULL AFTER `plugins`;

‎com_swjprojects/admin/src/Controller/CategoriesController.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?php
22
/*
33
* @package SW JProjects
4-
* @version 2.2.1
4+
* @version 2.3.0
55
* @author Sergey Tolkachyov
66
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
77
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
88
* @link https://web-tolk.ru
99
*/
1010
namespace Joomla\Component\SWJProjects\Administrator\Controller;
1111

12-
defined('_JEXEC') or die;
13-
1412
use Joomla\CMS\Language\Text;
1513
use Joomla\CMS\MVC\Controller\AdminController;
16-
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
1714
use Joomla\CMS\Router\Route;
1815
use Joomla\CMS\Session\Session;
16+
use Joomla\Component\SWJProjects\Administrator\Model\CategoryModel;
1917
use function defined;
2018
use function jexit;
2119

20+
defined('_JEXEC') or die;
21+
2222
class CategoriesController extends AdminController
2323
{
2424
/**
@@ -64,7 +64,7 @@ public function rebuild()
6464
* @param string $prefix The class prefix.
6565
* @param array $config The array of possible config values.
6666
*
67-
* @return BaseDatabaseModel|SWJProjectsModelCategory A model object.
67+
* @return CategoryModel A model object.
6868
*
6969
* @since 1.0.0
7070
*/

‎com_swjprojects/admin/src/Controller/CategoryController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/*
33
* @package SW JProjects
4-
* @version 2.2.1
4+
* @version 2.3.0
55
* @author Sergey Tolkachyov
66
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
77
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -10,11 +10,11 @@
1010

1111
namespace Joomla\Component\SWJProjects\Administrator\Controller;
1212

13-
defined('_JEXEC') or die;
14-
1513
use Joomla\CMS\MVC\Controller\FormController;
1614
use function defined;
1715

16+
defined('_JEXEC') or die;
17+
1818
class CategoryController extends FormController
1919
{
2020
/**

‎com_swjprojects/admin/src/Controller/DisplayController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/*
33
* @package SW JProjects
4-
* @version 2.2.1
4+
* @version 2.3.0
55
* @author Sergey Tolkachyov
66
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
77
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -10,8 +10,6 @@
1010

1111
namespace Joomla\Component\SWJProjects\Administrator\Controller;
1212

13-
defined('_JEXEC') or die;
14-
1513
use Joomla\CMS\Component\ComponentHelper;
1614
use Joomla\CMS\Factory;
1715
use Joomla\CMS\Language\Text;
@@ -23,6 +21,8 @@
2321
use Joomla\Registry\Registry;
2422
use function defined;
2523

24+
defined('_JEXEC') or die;
25+
2626
class DisplayController extends BaseController
2727
{
2828
/**

‎com_swjprojects/admin/src/Controller/DocumentController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/*
33
* @package SW JProjects
4-
* @version 2.2.1
4+
* @version 2.3.0
55
* @author Sergey Tolkachyov
66
* @сopyright Copyright (c) 2018 - 2025 Sergey Tolkachyov. All rights reserved.
77
* @license GNU/GPL license: https://www.gnu.org/copyleft/gpl.html
@@ -10,11 +10,11 @@
1010

1111
namespace Joomla\Component\SWJProjects\Administrator\Controller;
1212

13-
defined('_JEXEC') or die;
14-
1513
use Joomla\CMS\MVC\Controller\FormController;
1614
use function defined;
1715

16+
defined('_JEXEC') or die;
17+
1818
class DocumentController extends FormController
1919
{
2020
/**

0 commit comments

Comments
 (0)