From dce71f1d357f5c7fcb689a5190d98e077f4dbe32 Mon Sep 17 00:00:00 2001 From: aB0t Date: Mon, 4 Mar 2024 17:40:18 +0200 Subject: [PATCH] Update on v3.2.0-beta2 (beta for next version) Here's an update on the current version, which includes changes towards the next release still in beta. --- admin/controllers/admin_views.php | 2 +- admin/controllers/compiler.php | 2 +- admin/controllers/custom_codes.php | 2 +- admin/controllers/dynamic_gets.php | 2 +- admin/controllers/fields.php | 2 +- admin/controllers/joomla_components.php | 2 +- admin/controllers/joomla_plugins.php | 4 ++-- admin/controllers/powers.php | 2 +- admin/controllers/validation_rules.php | 2 +- admin/helpers/componentbuilder.php | 6 +++--- admin/models/ajax.php | 2 +- admin/sql/install.mysql.utf8.sql | 2 +- admin/views/get_snippets/tmpl/default.php | 2 +- .../import_language_translations/tmpl/default.php | 2 +- admin/views/search/tmpl/default.php | 2 +- .../VDM.Joomla/src/Utilities/Component/Helper.php | 10 +++++----- site/helpers/componentbuilder.php | 6 +++--- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 08723fbca..eaf9bb448 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -127,7 +127,7 @@ class ComponentbuilderControllerAdmin_views extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=admin_views', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=admin_views', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 0feb51f5b..78397effe 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -534,7 +534,7 @@ class ComponentbuilderControllerCompiler extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=compiler', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php index ddaf9a8c2..bb9b3342d 100644 --- a/admin/controllers/custom_codes.php +++ b/admin/controllers/custom_codes.php @@ -127,7 +127,7 @@ class ComponentbuilderControllerCustom_codes extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=custom_codes', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=custom_codes', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 9627cae1a..0e2c670d7 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -127,7 +127,7 @@ class ComponentbuilderControllerDynamic_gets extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=dynamic_gets', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=dynamic_gets', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 3b0fb5834..adf182fc1 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -127,7 +127,7 @@ class ComponentbuilderControllerFields extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=fields', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=fields', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index e7a8dc482..931c2b6b4 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -128,7 +128,7 @@ class ComponentbuilderControllerJoomla_components extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/joomla_plugins.php b/admin/controllers/joomla_plugins.php index 335952211..c0898b160 100644 --- a/admin/controllers/joomla_plugins.php +++ b/admin/controllers/joomla_plugins.php @@ -62,7 +62,7 @@ class ComponentbuilderControllerJoomla_plugins extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion @@ -102,7 +102,7 @@ class ComponentbuilderControllerJoomla_plugins extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_GET_BOILERPLATE_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/powers.php b/admin/controllers/powers.php index bcdb9abce..3253462eb 100644 --- a/admin/controllers/powers.php +++ b/admin/controllers/powers.php @@ -63,7 +63,7 @@ class ComponentbuilderControllerPowers extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=powers', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=powers', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/controllers/validation_rules.php b/admin/controllers/validation_rules.php index f44bd870c..86943676c 100644 --- a/admin/controllers/validation_rules.php +++ b/admin/controllers/validation_rules.php @@ -127,7 +127,7 @@ class ComponentbuilderControllerValidation_rules extends AdminController // check if user has the right $user = Factory::getUser(); // set page redirect - $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=validation_rules', false); + $redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=validation_rules', false); // set massage $message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE'); // check if this user has the right to run expansion diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 584307c22..5b38dff39 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -2161,7 +2161,7 @@ abstract class ComponentbuilderHelper } } // return found content - return str_replace('[[[ROOT-URL]]]', JURI::root(), $target['html']); + return str_replace('[[[ROOT-URL]]]', Uri::root(), $target['html']); } } return $default; @@ -3311,7 +3311,7 @@ abstract class ComponentbuilderHelper $script['view'][] = PHP_EOL . ""; $script['view'][] = ""; $script['view'][] = PHP_EOL . "
"; - $script['view'][] = "
\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">"; + $script['view'][] = "\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">"; $script['view'][] = ""; $script['view'][] = PHP_EOL . self::_t(1) . "sidebar)) : ?>"; $script['view'][] = self::_t(2) . "
"; @@ -5161,7 +5161,7 @@ abstract class ComponentbuilderHelper // set the edit link if ($jRoute) { - return JRoute::_("index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref); + return \JRoute::_("index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref); } return "index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref; } diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 8d960ebaf..3b4b4334d 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -335,7 +335,7 @@ class ComponentbuilderModelAjax extends ListModel else { // download link of the latest version - $download = "https://git.vdm.dev/api/v1/repos/joomla/Component-Builder/archive/" . $tags[0]->name . ".zip?access_token=" . $token; + $download = "https://git.vdm.dev/api/v1/repos/joomla/Component-Builder/archive/" . $tags[0]->name . ".zip"; return ['notice' => '' . Text::_('COM_COMPONENTBUILDER_OUT_OF_DATE') . '! ' . Text::_('COM_COMPONENTBUILDER_DOWNLOAD_UPDATE') . '!']; diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 33014b607..dddd4761c 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -2041,7 +2041,7 @@ INSERT INTO `#__componentbuilder_site_view` (`id`, `add_css_document`, `add_css` -- INSERT INTO `#__componentbuilder_dynamic_get` (`id`, `add_php_after_getitem`, `add_php_before_getitem`, `add_php_after_getitems`, `add_php_before_getitems`, `add_php_getlistquery`, `php_after_getitem`, `php_before_getitem`, `php_before_getitems`, `php_getlistquery`, `php_after_getitems`, `pagination`, `addcalculation`, `db_selection`, `db_table_main`, `filter`, `getcustom`, `gettype`, `global`, `join_db_table`, `join_view_table`, `main_source`, `name`, `order`, `php_calculation`, `php_custom_get`, `view_selection`, `view_table_main`, `where`, `php_router_parse`, `group`, `params`, `published`, `version`, `hits`, `ordering`, `guid`) VALUES -(36, '', '', 1, '', '', '', '', '', '', 'CQkvLyBkbyBhIHF1aWNrIGJ1aWxkIG9mIGFsbCBlZGl0IGxpbmtzIGxpbmtzDQoJCWlmIChpc3NldCgkaXRlbXMpICYmICRpdGVtcykNCgkJew0KCQkJZm9yZWFjaCAoJGl0ZW1zIGFzICRuciA9PiAmJGl0ZW0pDQoJCQl7DQoJCQkJJGNhbkRvID0gW1tbQ29tcG9uZW50XV1dSGVscGVyOjpnZXRBY3Rpb25zKCdsb29rJywkaXRlbSwnbG9va3MnKTsNCgkJCQlpZiAoJGNhbkRvLT5nZXQoJ2xvb2suZWRpdCcpKQ0KCQkJCXsNCgkJCQkJJGl0ZW0tPmVkaXRMaW5rID0gJzxiciAvPjxiciAvPjxhIGNsYXNzPSJ1ay1idXR0b24gdWstYnV0dG9uLXByaW1hcnkgdWstd2lkdGgtMS0xIiBocmVmPSInOw0KCQkJCQkkaXRlbS0+ZWRpdExpbmsgLj0gSlJvdXRlOjpfKCdpbmRleC5waHA/b3B0aW9uPWNvbV9bW1tjb21wb25lbnRdXV0mdmlldz1sb29rJnRhc2s9bG9vay5lZGl0JmlkPScgLiAkaXRlbS0+aWQpOw0KCQkJCQkkaXRlbS0+ZWRpdExpbmsgLj0gJyI+PGkgY2xhc3M9InVrLWljb24tcGVuY2lsIj48L2k+PHNwYW4gY2xhc3M9InVrLWhpZGRlbi1zbWFsbCI+JzsNCgkJCQkJJGl0ZW0tPmVkaXRMaW5rIC49IFRleHQ6Ol8oJ0VkaXQgTG9vaycpOw0KCQkJCQkkaXRlbS0+ZWRpdExpbmsgLj0gJzwvc3Bhbj48L2E+JzsNCgkJCQl9DQoJCQkJZWxzZQ0KCQkJCXsNCgkJCQkJJGl0ZW0tPmVkaXRMaW5rID0gJyc7DQoJCQkJfQ0KCQkJfQ0KCQl9', 1, '', '', '', '', '', 2, '', '', '', 1, 'Looks', '{\"order0\":{\"table_key\":\"a.name\",\"direction\":\"ASC\"}}', '', '', 'a.*', 109, '{\"where0\":{\"table_key\":\"a.published\",\"operator\":\"1\",\"value_key\":\"1\"}}', '', '', '', 1, 12, '', 13, '32b3ae7d-8aa8-47f1-ab2e-30076ddaa029'), +(36, '', '', 1, '', '', '', '', '', '', 'CQkvLyBkbyBhIHF1aWNrIGJ1aWxkIG9mIGFsbCBlZGl0IGxpbmtzIGxpbmtzDQoJCWlmIChpc3NldCgkaXRlbXMpICYmICRpdGVtcykNCgkJew0KCQkJZm9yZWFjaCAoJGl0ZW1zIGFzICRuciA9PiAmJGl0ZW0pDQoJCQl7DQoJCQkJJGNhbkRvID0gW1tbQ29tcG9uZW50XV1dSGVscGVyOjpnZXRBY3Rpb25zKCdsb29rJywkaXRlbSwnbG9va3MnKTsNCgkJCQlpZiAoJGNhbkRvLT5nZXQoJ2xvb2suZWRpdCcpKQ0KCQkJCXsNCgkJCQkJJGl0ZW0tPmVkaXRMaW5rID0gJzxiciAvPjxiciAvPjxhIGNsYXNzPSJ1ay1idXR0b24gdWstYnV0dG9uLXByaW1hcnkgdWstd2lkdGgtMS0xIiBocmVmPSInOw0KCQkJCQkkaXRlbS0+ZWRpdExpbmsgLj0gXEpSb3V0ZTo6XygnaW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnZpZXc9bG9vayZ0YXNrPWxvb2suZWRpdCZpZD0nIC4gJGl0ZW0tPmlkKTsNCgkJCQkJJGl0ZW0tPmVkaXRMaW5rIC49ICciPjxpIGNsYXNzPSJ1ay1pY29uLXBlbmNpbCI+PC9pPjxzcGFuIGNsYXNzPSJ1ay1oaWRkZW4tc21hbGwiPic7DQoJCQkJCSRpdGVtLT5lZGl0TGluayAuPSBUZXh0OjpfKCdFZGl0IExvb2snKTsNCgkJCQkJJGl0ZW0tPmVkaXRMaW5rIC49ICc8L3NwYW4+PC9hPic7DQoJCQkJfQ0KCQkJCWVsc2UNCgkJCQl7DQoJCQkJCSRpdGVtLT5lZGl0TGluayA9ICcnOw0KCQkJCX0NCgkJCX0NCgkJfQ==', 1, '', '', '', '', '', 2, '', '', '', 1, 'Looks', '{\"order0\":{\"table_key\":\"a.name\",\"direction\":\"ASC\"}}', '', '', 'a.*', 109, '{\"where0\":{\"table_key\":\"a.published\",\"operator\":\"1\",\"value_key\":\"1\"}}', '', '', '', 1, 12, '', 13, '32b3ae7d-8aa8-47f1-ab2e-30076ddaa029'), (39, '', '', '', '', '', '', '', '', '', '', 1, '', '', '', '{\"filter0\":{\"filter_type\":\"1\",\"state_key\":\"id\",\"operator\":\"1\",\"table_key\":\"a.id\"}}', '', 1, '', '', '', 1, 'Looking', '', '', '', 'a.id AS id\r\na.name AS name\r\na.alias AS alias\r\na.description AS description\r\na.add AS add\r\na.email AS email\r\na.mobile_phone AS mobile_phone\r\na.dateofbirth AS dateofbirth\r\na.image AS image\r\na.website AS website\r\na.published AS published\r\na.hits AS hits\r\na.created_by AS created_by', 109, '', '', '', '', 1, 8, '', '', '98e6ea56-0911-4d89-b1f4-8f0bb1e4aa5a'); -- diff --git a/admin/views/get_snippets/tmpl/default.php b/admin/views/get_snippets/tmpl/default.php index 9c896eb35..e997c5562 100644 --- a/admin/views/get_snippets/tmpl/default.php +++ b/admin/views/get_snippets/tmpl/default.php @@ -36,7 +36,7 @@ Html::_('behavior.keepalive'); } - + diff --git a/admin/views/import_language_translations/tmpl/default.php b/admin/views/import_language_translations/tmpl/default.php index b335fdfba..6b9158ea8 100644 --- a/admin/views/import_language_translations/tmpl/default.php +++ b/admin/views/import_language_translations/tmpl/default.php @@ -140,7 +140,7 @@ jQuery(document).ready(function($) {
-
+ sidebar)) : ?> diff --git a/admin/views/search/tmpl/default.php b/admin/views/search/tmpl/default.php index cb4860f38..8ff6d21cf 100644 --- a/admin/views/search/tmpl/default.php +++ b/admin/views/search/tmpl/default.php @@ -58,7 +58,7 @@ $search_value = $this->form->getField('search_value');
form): ?> -