joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-30 17:13:41 +00:00
Code Packages Releases Activity

Merge branch 'release' into quickicon-improvements

Browse Source
This commit is contained in:
Hannes Papenberg 2019-07-13 15:09:07 +02:00 committed by GitHub
commit a94e953a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
574 changed files with 7515 additions and 8534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -112,4 +112,4 @@ before_test:
test_script:
- cd C:\projects\joomla-cms
- libraries/vendor/bin/phpunit
- libraries/vendor/bin/phpunit --testsuite Unit

76
.drone.yml
View File

@ -26,11 +26,13 @@ steps:
- composer install --no-progress --no-suggest
- name: phpcs
image: php:7.2
image: joomlaprojects/docker-images:php7.2
depends_on: [ composer ]
commands:
- echo $(date)
- ./libraries/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
- ./libraries/vendor/bin/phpcs --config-set installed_paths ../../joomla/cms-coding-standards/lib,../../joomla/coding-standards/Joomla/ExampleRulesets,../../joomla/coding-standards
- ./libraries/vendor/bin/phpcs --config-set php_version 70200
- ./libraries/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php --ignore=libraries/vendor/*,tests/*,build/*,node_modules/*,media/*,libraries/autoload_psr4.php,installation/template/error.php -p --standard=libraries/vendor/joomla/cms-coding-standards/lib/Joomla-CMS .
- echo $(date)
- name: npm
@ -58,14 +60,14 @@ steps:
image: php:7.2
commands:
- php -v
- ./libraries/vendor/bin/phpunit
- ./libraries/vendor/bin/phpunit --testsuite Unit
- name: php73-unit
depends_on: [ phpcs ]
image: php:7.3
commands:
- php -v
- ./libraries/vendor/bin/phpunit
- ./libraries/vendor/bin/phpunit --testsuite Unit
- name: php74-unit
depends_on: [ phpcs ]
@ -73,7 +75,7 @@ steps:
failure: ignore
commands:
- php -v
- ./libraries/vendor/bin/phpunit
- ./libraries/vendor/bin/phpunit --testsuite Unit
- name: php80-unit
depends_on: [ phpcs ]
@ -81,7 +83,67 @@ steps:
failure: ignore
commands:
- php -v
- ./libraries/vendor/bin/phpunit
- ./libraries/vendor/bin/phpunit --testsuite Unit
- name: php72-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.2
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration
- name: php73-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.3
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration
- name: php74-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.4
failure: ignore
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration
- name: php80-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.0
failure: ignore
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration
- name: php72-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php7.2
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
# - name: php73-integration-pgsql
# depends_on: [ npm ]
# image: joomlaprojects/docker-images:php7.3
# commands:
# - php -v
# - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
# - name: php74-integration-pgsql
# depends_on: [ npm ]
# image: joomlaprojects/docker-images:php7.4
# failure: ignore
# commands:
# - php -v
# - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
# - name: php80-integration-pgsql
# depends_on: [ npm ]
# image: joomlaprojects/docker-images:php8.0
# failure: ignore
# commands:
# - php -v
# - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
- name: javascript-cs
depends_on: [ npm ]
@ -194,6 +256,6 @@ services:
---
kind: signature
hmac: 892bc857e92d02296751acb76e231477d3817853f18b7f75ac7abdef0de4e0f6
hmac: 323b3031a2a60c288b1df1f7672d94926925c7615d611138728b3fb347b958ad
...

2
administrator/components/com_actionlogs/Libraries/ActionLogPlugin.php → administrator/components/com_actionlogs/Plugin/ActionLogPlugin.php
View File

@ -7,7 +7,7 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\Component\Actionlogs\Administrator\Libraries;
namespace Joomla\Component\Actionlogs\Administrator\Plugin;
defined('_JEXEC') or die;

2
administrator/components/com_admin/Model/SysinfoModel.php
View File

@ -24,7 +24,7 @@ use Joomla\Registry\Registry;
*
* @since 1.6
*/
class SysInfoModel extends BaseDatabaseModel
class SysinfoModel extends BaseDatabaseModel
{
/**
* Some PHP settings

4
administrator/components/com_admin/View/Sysinfo/HtmlView.php
View File

@ -18,7 +18,7 @@ use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Component\Admin\Administrator\Model\SysInfoModel;
use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
/**
* Sysinfo View class for the Admin component
@ -86,7 +86,7 @@ class HtmlView extends BaseHtmlView
throw new Notallowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
}
/** @var SysInfoModel $model */
/** @var SysinfoModel $model */
$model = $this->getModel();
$this->phpSettings = $model->getPhpSettings();
$this->config = $model->getconfig();

4
administrator/components/com_admin/View/Sysinfo/JsonView.php
View File

@ -16,7 +16,7 @@ use Joomla\CMS\Access\Exception\Notallowed;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\AbstractView;
use Joomla\Component\Admin\Administrator\Model\SysInfoModel;
use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
/**
* Sysinfo View class for the Admin component
@ -64,7 +64,7 @@ class JsonView extends AbstractView
*/
protected function getLayoutData(): array
{
/** @var SysInfoModel $model */
/** @var SysinfoModel $model */
$model = $this->getModel();
return [

4
administrator/components/com_admin/View/Sysinfo/TextView.php
View File

@ -16,7 +16,7 @@ use Joomla\CMS\Access\Exception\Notallowed;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\AbstractView;
use Joomla\Component\Admin\Administrator\Model\SysInfoModel;
use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
/**
* Sysinfo View class for the Admin component
@ -81,7 +81,7 @@ class TextView extends AbstractView
*/
protected function getLayoutData(): array
{
/** @var SysInfoModel $model */
/** @var SysinfoModel $model */
$model = $this->getModel();
return [

1272
administrator/components/com_admin/script.php
View File

File diff suppressed because it is too large Load Diff

26
administrator/components/com_admin/sql/updates/mysql/4.0.0-2016-10-02.sql
View File

@ -1,3 +1,27 @@
ALTER TABLE `#__user_keys` DROP COLUMN `invalid`;
--
-- Insert the new templates into the database. Set as home if the old template is the active one
--
INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
('atum', 'template', 'atum', '', 1, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `params`) VALUES
('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count(`id`) AS count FROM `#__template_styles` WHERE home = '1' AND client_id = 1 AND `template` IN ('isis', 'hathor')) as c) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'),
('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count(`id`) AS count FROM `#__template_styles` WHERE home = '1' AND client_id = 0 AND `template` IN ('protostar', 'beez3')) as c) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}');
--
-- Now we can clean up the old templates
--
DELETE FROM `#__extensions` WHERE `type` = 'template' AND `element` = 'hathor' AND `client_id` = 1;
DELETE FROM `#__template_styles` WHERE `template` = 'hathor' AND `client_id` = 1;
ALTER TABLE `#__user_keys` DROP COLUMN `invalid`;
DELETE FROM `#__extensions` WHERE `type` = 'template' AND `element` = 'isis' AND `client_id` = 1;
DELETE FROM `#__template_styles` WHERE `template` = 'isis' AND `client_id` = 1;
DELETE FROM `#__extensions` WHERE `type` = 'template' AND `element` = 'protostar' AND `client_id` = 0;
DELETE FROM `#__template_styles` WHERE `template` = 'protostar' AND `client_id` = 0;
DELETE FROM `#__extensions` WHERE `type` = 'template' AND `element` = 'beez3' AND `client_id` = 0;
DELETE FROM `#__template_styles` WHERE `template` = 'beez3' AND `client_id` = 0;

2
administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-04-25.sql
View File

@ -1,4 +1,4 @@
INSERT INTO `#__extensions` (name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
('plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
('plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),
('plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0),

4
administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-03.sql
View File

@ -14,5 +14,5 @@ CREATE TABLE IF NOT EXISTS `#__csp` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
('com_csp', 'component', 'com_csp', '', 0, 0, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(0, 'com_csp', 'component', 'com_csp', '', 1, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0);

3
administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-02.sql
View File

@ -1 +1,2 @@
UPDATE `#__extensions` SET `protected` = 1 WHERE `name` = 'plg_extension_namespacemap';
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 0, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0);

6
administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql
View File

@ -13,6 +13,6 @@ CREATE TABLE IF NOT EXISTS `#__template_overrides` (
KEY `idx_extension_id` (`extension_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`, `namespace`) VALUES
(0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0, ''),
(0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, '');
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0),
(0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0);

37
administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql
View File

@ -1,4 +1,5 @@
INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES (506, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0);
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0);
TRUNCATE TABLE `#__finder_filters`;
ALTER TABLE `#__finder_filters` MODIFY `created_by` int(10) unsigned NOT NULL DEFAULT 0;
@ -19,22 +20,22 @@ CREATE TABLE `#__finder_links_terms` (
INDEX `idx_link_term_weight` (`link_id`, `term_id`, `weight`)
) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
DROP TABLE #__finder_links_terms0;
DROP TABLE #__finder_links_terms1;
DROP TABLE #__finder_links_terms2;
DROP TABLE #__finder_links_terms3;
DROP TABLE #__finder_links_terms4;
DROP TABLE #__finder_links_terms5;
DROP TABLE #__finder_links_terms6;
DROP TABLE #__finder_links_terms7;
DROP TABLE #__finder_links_terms8;
DROP TABLE #__finder_links_terms9;
DROP TABLE #__finder_links_termsa;
DROP TABLE #__finder_links_termsb;
DROP TABLE #__finder_links_termsc;
DROP TABLE #__finder_links_termsd;
DROP TABLE #__finder_links_termse;
DROP TABLE #__finder_links_termsf;
DROP TABLE `#__finder_links_terms0`;
DROP TABLE `#__finder_links_terms1`;
DROP TABLE `#__finder_links_terms2`;
DROP TABLE `#__finder_links_terms3`;
DROP TABLE `#__finder_links_terms4`;
DROP TABLE `#__finder_links_terms5`;
DROP TABLE `#__finder_links_terms6`;
DROP TABLE `#__finder_links_terms7`;
DROP TABLE `#__finder_links_terms8`;
DROP TABLE `#__finder_links_terms9`;
DROP TABLE `#__finder_links_termsa`;
DROP TABLE `#__finder_links_termsb`;
DROP TABLE `#__finder_links_termsc`;
DROP TABLE `#__finder_links_termsd`;
DROP TABLE `#__finder_links_termse`;
DROP TABLE `#__finder_links_termsf`;
CREATE TABLE IF NOT EXISTS `#__finder_logging` (
`searchterm` VARCHAR(255) NOT NULL DEFAULT '',
@ -46,7 +47,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_logging` (
INDEX `searchterm` (`searchterm`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
DROP TABLE #__finder_taxonomy;
DROP TABLE `#__finder_taxonomy`;
CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`parent_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',

16
administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-05-07.sql
View File

@ -1,26 +1,26 @@
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(0, 'mod_status_frontend', 'module', 'mod_status_frontend', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
(0, 'mod_status_messages', 'module', 'mod_status_messages', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
(0, 'mod_status_post_installation_messages', 'module', 'mod_status_post_installation_messages', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
(0, 'mod_status_user', 'module', 'mod_status_user', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
(0, 'mod_frontend', 'module', 'mod_frontend', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
(0, 'mod_messages', 'module', 'mod_messages', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
(0, 'mod_post_installation_messages', 'module', 'mod_post_installation_messages', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
(0, 'mod_user', 'module', 'mod_user', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0),
INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
('Frontend Link', '', '', 5, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_frontend', 1, 1, '', 1, '*');
('Frontend Link', '', '', 5, 'status', 0, NULL, NULL, NULL, 1, 'mod_frontend', 1, 1, '', 1, '*');
INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);
INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
('Messages', '', '', 4, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_messages', 3, 1, '', 1, '*');
('Messages', '', '', 4, 'status', 0, NULL, NULL, NULL, 1, 'mod_messages', 3, 1, '', 1, '*');
INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);
INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
('Post Install Messages', '', '', 3, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_post_installation_messages', 3, 1, '', 1, '*');
('Post Install Messages', '', '', 3, 'status', 0, NULL, NULL, NULL, 1, 'mod_post_installation_messages', 3, 1, '', 1, '*');
INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);
INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
('User Status', '', '', 6, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_user', 3, 1, '', 1, '*');
('User Status', '', '', 6, 'status', 0, NULL, NULL, NULL, 1, 'mod_user', 3, 1, '', 1, '*');
INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);

2
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-07-03.sql
View File

@ -1,3 +1,3 @@
INSERT INTO "#__extensions" (name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
('plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
('plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);

26
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-02.sql
View File

@ -1,3 +1,27 @@
ALTER TABLE "#__user_keys" DROP COLUMN "invalid";
--
-- Insert the new templates into the database. Set as home if the old template is the active one
--
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
('atum', 'template', 'atum', '', 1, 1, 1, 0, '{}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
INSERT INTO "#__template_styles" ("template", "client_id", "home", "title", "params") VALUES
('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = 1 AND client_id = 1 AND "template" IN ('isis', 'hathor')) as c) = 0 THEN 0 ELSE 1 END), 'atum - Default', '{}'),
('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = 1 AND client_id = 0 AND "template" IN ('protostar', 'beez3')) as c) = 0 THEN 0 ELSE 1 END), 'cassiopeia - Default', '{}');
--
-- Now we can clean up the old templates
--
DELETE FROM "#__extensions" WHERE "type" = 'template' AND "element" = 'hathor' AND "client_id" = 1;
DELETE FROM "#__template_styles" WHERE "template" = 'hathor' AND "client_id" = 1;
ALTER TABLE "#__user_keys" DROP COLUMN "invalid";
DELETE FROM "#__template_styles" WHERE "template" = 'isis' AND "client_id" = 1;
DELETE FROM "#__extensions" WHERE "type" = 'template' AND "element" = 'isis' AND "client_id" = 1;
DELETE FROM "#__template_styles" WHERE "template" = 'protostar' AND "client_id" = 0;
DELETE FROM "#__extensions" WHERE "type" = 'template' AND "element" = 'protostar' AND "client_id" = 0;
DELETE FROM "#__template_styles" WHERE "template" = 'beez3' AND "client_id" = 0;
DELETE FROM "#__extensions" WHERE "type" = 'template' AND "element" = 'beez3' AND "client_id" = 0;

2
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2016-10-03.sql
View File

@ -1 +1 @@
DELETE FROM "#__extensions" WHERE "name" = "mod_submenu";
DELETE FROM "#__extensions" WHERE "name" = 'mod_submenu';

4
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-04-25.sql
View File

@ -1,5 +1,5 @@
INSERT INTO "#__extensions" (name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
('plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
('plg_media-action_crop', 'plugin', 'crop', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
('plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),
('plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0),;
('plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);

2
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
View File

@ -1,4 +1,4 @@
INSERT INTO "#__extensions" (name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
('plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")

4
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-03.sql
View File

@ -14,5 +14,5 @@ CREATE TABLE IF NOT EXISTS "#__csp" (
PRIMARY KEY ("id")
);
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
('com_csp', 'component', 'com_csp', ' ', 0, 0, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
(0, 'com_csp', 'component', 'com_csp', '', 1, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);

3
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-02.sql
View File

@ -1 +1,2 @@
UPDATE "#__extensions" SET "protected" = 1 WHERE "name" = 'plg_extension_namespacemap';
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
(0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 0, 1, 1, '', '{}', 0, '1970-01-01 00:00:00', 0, 0);

6
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql
View File

@ -13,6 +13,6 @@ CREATE TABLE IF NOT EXISTS "#__template_overrides" (
CREATE INDEX "#__template_overrides_idx_template" ON "#__template_overrides" ("template");
CREATE INDEX "#__template_overrides_idx_extension_id" ON "#__template_overrides" ("extension_id");
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state", "namespace") VALUES
(0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0, ''),
(0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, '');
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
(0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0),
(0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0);

4
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql
View File

@ -1,4 +1,5 @@
INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES (506, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0);
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
(0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0);
TRUNCATE TABLE "#__finder_filters";
ALTER TABLE "#__finder_filters" ALTER COLUMN "created_by" SET DEFAULT 0;
@ -80,7 +81,6 @@ ALTER TABLE "#__finder_terms" ALTER COLUMN "soundex" SET DEFAULT '';
CREATE INDEX "#__finder_terms_idx_stem" on "#__finder_terms" ("stem");
CREATE INDEX "#__finder_terms_idx_language" on "#__finder_terms" ("language");
ALTER TABLE "#__finder_terms" DROP CONSTRAINT "#__finder_terms_idx_term", ADD CONSTRAINT "#__finder_terms_idx_term_language" UNIQUE ("term", "language");
CREATE INDEX "#__finder_terms_idx_language" on "#__finder_terms" ("language");
DROP TABLE IF EXISTS "#__finder_terms_common";
CREATE TABLE "#__finder_terms_common" (

6
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-03.sql
View File

@ -1,3 +1,3 @@
DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_postinstall" AND "menutype" = "main";
DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_redirect" AND "menutype" = "main";
DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_joomlaupdate" AND "menutype" = "main";
DELETE FROM "#__menu" WHERE "link" = 'index.php?option=com_postinstall' AND "menutype" = 'main';
DELETE FROM "#__menu" WHERE "link" = 'index.php?option=com_redirect' AND "menutype" = 'main';
DELETE FROM "#__menu" WHERE "link" = 'index.php?option=com_joomlaupdate' AND "menutype" = 'main';

16
administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-05-07.sql
View File

@ -1,29 +1,29 @@
INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES
(0, 'mod_status_frontend', 'module', 'mod_status_frontend', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
(0, 'mod_status_messages', 'module', 'mod_status_messages', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
(0, 'mod_status_post_installation_messages', 'module', 'mod_status_post_installation_messages', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
(0, 'mod_status_user', 'module', 'mod_status_user', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
(0, 'mod_frontend', 'module', 'mod_frontend', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
(0, 'mod_messages', 'module', 'mod_messages', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
(0, 'mod_post_installation_messages', 'module', 'mod_post_installation_messages', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
(0, 'mod_user', 'module', 'mod_user', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0),
INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
('Frontend Link', '', '', 5, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_frontend', 1, 1, '', 1, '*');
('Frontend Link', '', '', 5, 'status', 0, NULL, NULL, NULL, 1, 'mod_frontend', 1, 1, '', 1, '*');
RETURNING id INTO lastmoduleid;
INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0);
INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
('Messages', '', '', 4, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_messages', 3, 1, '', 1, '*');
('Messages', '', '', 4, 'status', 0, NULL, NULL, NULL, 1, 'mod_messages', 3, 1, '', 1, '*');
RETURNING id INTO lastmoduleid;
INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0);
INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
('Post Install Messages', '', '', 3, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_post_installation_messages', 3, 1, '', 1, '*');
('Post Install Messages', '', '', 3, 'status', 0, NULL, NULL, NULL, 1, 'mod_post_installation_messages', 3, 1, '', 1, '*');
RETURNING id INTO lastmoduleid;
INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0);
INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
('User Status', '', '', 6, 'status', 0, NULL, NULL, NULL, 1, 'mod_status_user', 3, 1, '', 1, '*');
('User Status', '', '', 6, 'status', 0, NULL, NULL, NULL, 1, 'mod_user', 3, 1, '', 1, '*');
RETURNING id INTO lastmoduleid;
INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (lastmoduleid, 0);

7
administrator/components/com_associations/Helper/AssociationsHelper.php
View File

@ -31,8 +31,7 @@ class AssociationsHelper extends ContentHelper
/**
* Array of Registry objects of extensions
*
* var array $extensionsSupport
*
* @var array
* @since 3.7.0
*/
public static $extensionsSupport = null;
@ -40,8 +39,7 @@ class AssociationsHelper extends ContentHelper
/**
* List of extensions name with support
*
* var array $supportedExtensionsList
*
* @var array
* @since 3.7.0
*/
public static $supportedExtensionsList = array();
@ -422,6 +420,7 @@ class AssociationsHelper extends ContentHelper
$languageKey = $typeName;
$typeNameExploded = explode('.', $typeName);
if (array_pop($typeNameExploded) === 'category')
{
$languageKey = strtoupper($extensionName) . '_CATEGORIES';

2
administrator/components/com_associations/Model/AssociationsModel.php
View File

@ -238,7 +238,7 @@ class AssociationsModel extends ListModel
->join(
'LEFT',
$db->quoteName('#__associations', 'asso') . ' ON ' . $db->quoteName('asso.id') . ' = ' . $db->quoteName($fields['id'])
. ' AND ' . $db->quoteName('asso.context') . ' = ' . $db->quote($extensionName . '.' . 'item')
. ' AND ' . $db->quoteName('asso.context') . ' = ' . $db->quote($extensionName . '.item')
)
->join('LEFT', $db->quoteName('#__associations', 'asso2') . ' ON ' . $db->quoteName('asso2.key') . ' = ' . $db->quoteName('asso.key'));

1
administrator/components/com_associations/View/Association/HtmlView.php
View File

@ -123,6 +123,7 @@ class HtmlView extends BaseHtmlView
// Check for special case category
$typeNameExploded = explode('.', $typeName);
if (array_pop($typeNameExploded) === 'category')
{
$this->typeName = 'category';

41
administrator/components/com_banners/tmpl/banner/edit.php
View File

@ -32,20 +32,24 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_BANNERS_BANNER_DETAILS')); ?>
<div class="row">
<div class="col-md-9">
<?php echo $this->form->renderField('type'); ?>
<div id="image">
<?php echo $this->form->renderFieldset('image'); ?>
<div class="card">
<div class="card-body">
<?php echo $this->form->renderField('type'); ?>
<div id="image">
<?php echo $this->form->renderFieldset('image'); ?>
</div>
<div id="custom">
<?php echo $this->form->renderField('custombannercode'); ?>
</div>
<?php
echo $this->form->renderField('clickurl');
echo $this->form->renderField('description');
?>
</div>
</div>
<div id="custom">
<?php echo $this->form->renderField('custombannercode'); ?>
</div>
<?php
echo $this->form->renderField('clickurl');
echo $this->form->renderField('description');
?>
</div>
<div class="col-md-3">
<div class="card card-light">
<div class="card">
<div class="card-body">
<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
</div>
@ -55,16 +59,25 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'otherparams', Text::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS')); ?>
<?php echo $this->form->renderFieldset('otherparams'); ?>
<fieldset id="fieldset-otherparams" class="options-fieldset">
<legend><?php echo Text::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS'); ?></legend>
<?php echo $this->form->renderFieldset('otherparams'); ?>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-md-6">
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
<fieldset id="fieldset-publishingdata" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</fieldset>
</div>
<div class="col-md-6">
<?php echo $this->form->renderFieldset('metadata'); ?>
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<?php echo $this->form->renderFieldset('metadata'); ?>
</fieldset>
</div>
</div>
<?php echo HTMLHelper::_('uitab.endTab'); ?>

31
administrator/components/com_banners/tmpl/client/edit.php
View File

@ -30,17 +30,21 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'general', empty($this->item->id) ? Text::_('COM_BANNERS_NEW_CLIENT') : Text::_('COM_BANNERS_EDIT_CLIENT')); ?>
<div class="row">
<div class="col-md-9">
<?php
echo $this->form->renderField('contact');
echo $this->form->renderField('email');
echo $this->form->renderField('purchase_type');
echo $this->form->renderField('track_impressions');
echo $this->form->renderField('track_clicks');
echo $this->form->renderFieldset('extra');
?>
<div class="card">
<div class="card-body">
<?php
echo $this->form->renderField('contact');
echo $this->form->renderField('email');
echo $this->form->renderField('purchase_type');
echo $this->form->renderField('track_impressions');
echo $this->form->renderField('track_clicks');
echo $this->form->renderFieldset('extra');
?>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card card-light">
<div class="card">
<div class="card-body">
<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
</div>
@ -50,7 +54,14 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'metadata', Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS')); ?>
<?php echo $this->form->renderFieldset('metadata'); ?>
<div class="row">
<div class="col-12 col-md-6">
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<?php echo $this->form->renderFieldset('metadata'); ?>
</fieldset>
</div>
</div>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.endTabSet'); ?>

24
administrator/components/com_banners/tmpl/clients/default.php
View File

@ -67,24 +67,24 @@ $params = $this->state->params ?? new CMSObject;
<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
</span>
<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
</span>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</span>
<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</span>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
</span>
<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
</span>
</th>
<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
</span>
<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
</span>
</th>
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_PURCHASETYPE', 'a.purchase_type', $listDirn, $listOrder); ?>

4
administrator/components/com_categories/Controller/CategoriesController.php
View File

@ -42,8 +42,8 @@ class CategoriesController extends AdminController
/**
* Method to get the number of content categories
*
* @return void
*
* @return string The JSON-encoded amount of published content categories
*
* @since 4.0
*/

1
administrator/components/com_categories/Field/CategoryeditField.php
View File

@ -89,7 +89,6 @@ class CategoryeditField extends ListField
{
case 'allowAdd':
return (bool) $this->$name;
}
return parent::__get($name);

5
administrator/components/com_categories/Field/Modal/CategoryField.php
View File

@ -86,8 +86,8 @@ class CategoryField extends FormField
Factory::getDocument()->addScriptDeclaration("
function jSelectCategory_" . $this->id . "(id, title, object) {
window.processModalSelect('Category', '" . $this->id . "', id, title, '', object);
}
");
}"
);
Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
@ -136,6 +136,7 @@ class CategoryField extends FormField
// The current category display field.
$html = '';
if ($allowSelect || $allowNew || $allowEdit || $allowClear)
{
$html .= '<span class="input-group">';

6
administrator/components/com_categories/Helper/CategoryAssociationHelper.php
View File

@ -18,6 +18,12 @@ defined('_JEXEC') or die;
*/
abstract class CategoryAssociationHelper
{
/**
* Flag if associations are present for categories
*
* @var boolean
* @since 3.0
*/
public static $category_association = true;
/**

3
administrator/components/com_categories/Model/CategoryModel.php
View File

@ -648,7 +648,8 @@ class CategoryModel extends AdminModel
if ($associations)
{
$query->where('(' . $db->quoteName('id') . ' IN (' . implode(',', $associations) . ') OR '
. $db->quoteName('key') . ' = ' . $db->quote($oldKey) . ')');
. $db->quoteName('key') . ' = ' . $db->quote($oldKey) . ')'
);
}
else
{

4
administrator/components/com_categories/View/Category/HtmlView.php
View File

@ -166,8 +166,8 @@ class HtmlView extends BaseHtmlView
elseif ($lang->hasKey($component_section_key = $component . ($section ? "_$section" : '')))
{
$title = Text::sprintf('COM_CATEGORIES_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT')
. '_TITLE', $this->escape(Text::_($component_section_key))
);
. '_TITLE', $this->escape(Text::_($component_section_key))
);
}
// Else use the base title
else

45
administrator/components/com_categories/forms/category.xml
View File

@ -223,31 +223,34 @@
section="category"
/>
<fields name="params" label="COM_CATEGORIES_FIELD_BASIC_LABEL">
<fields name="params">
<fieldset name="basic">
<fieldset name="options">
<field
name="category_layout"
type="componentlayout"
label="JFIELD_ALT_LAYOUT_LABEL"
class="custom-select"
view="category"
useglobal="true"
/>
<fieldset name="basic" label="COM_CATEGORIES_FIELD_BASIC_LABEL">
<field
name="image"
type="media"
label="COM_CATEGORIES_FIELD_IMAGE_LABEL"
/>
<field
name="category_layout"
type="componentlayout"
label="JFIELD_ALT_LAYOUT_LABEL"
class="custom-select"
view="category"
useglobal="true"
/>
<field
name="image_alt"
type="text"
label="COM_CATEGORIES_FIELD_IMAGE_ALT_LABEL"
size="20"
/>
<field
name="image"
type="media"
label="COM_CATEGORIES_FIELD_IMAGE_LABEL"
/>
<field
name="image_alt"
type="text"
label="COM_CATEGORIES_FIELD_IMAGE_ALT_LABEL"
size="20"
/>
</fieldset>
</fieldset>
</fields>

6
administrator/components/com_categories/forms/filter_categories.xml
View File

@ -42,13 +42,13 @@
<field
name="tag"
type="tag"
multiple="true"
label="JOPTION_SELECT_TAG"
hint="JOPTION_SELECT_TAG"
mode="nested"
custom="false"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_TAG</option>
</field>
/>
<field
name="level"

2
administrator/components/com_categories/tmpl/categories/default.xml
View File

@ -9,7 +9,7 @@
<fields name="request">
<field
name="extension"
type="componentscategory"
type="ComponentsCategory"
label="COM_CATEGORIES_CHOOSE_COMPONENT_LABEL"
required="true"
>

2
administrator/components/com_categories/tmpl/categories/modal.php
View File

@ -106,7 +106,7 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php echo LayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
<a href="javascript:void(0)" onclick="if (window.parent) window.parent.<?php echo $this->escape($function); ?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->title)); ?>', null, '<?php echo $this->escape(ContentHelperRoute::getCategoryRoute($item->id, $item->language)); ?>', '<?php echo $this->escape($lang); ?>', null);">
<?php echo $this->escape($item->title); ?></a>
<span class="small" title="<?php echo $this->escape($item->path); ?>">
<span class="small" title="<?php echo $this->escape($item->path); ?>">
<?php if (empty($item->note)) : ?>
<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
<?php else : ?>

26
administrator/components/com_categories/tmpl/category/edit.php
View File

@ -29,7 +29,7 @@ $assoc = Associations::isEnabled();
$extensionassoc = array_key_exists('item_associations', $this->form->getFieldsets());
// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
$this->ignore_fieldsets = array('jmetadata', 'item_associations');
$this->ignore_fieldsets = ['jmetadata', 'item_associations'];
$this->useCoreUI = true;
// In case of modal
@ -47,7 +47,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'general', Text::_('JCATEGORY')); ?>
<div class="row">
<div class="col-md-9">
<div class="card card-light">
<div class="card">
<div class="card-body">
<?php echo $this->form->getLabel('description'); ?>
<?php echo $this->form->getInput('description'); ?>
@ -55,7 +55,11 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
</div>
</div>
<div class="col-md-3">
<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
<div class="card card-block">
<div class="card-body">
<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
</div>
</div>
</div>
</div>
@ -65,11 +69,14 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('COM_CATEGORIES_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-md-6">
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
<div class="col-12 col-md-6">
<fieldset id="fieldset-publishingdata" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('COM_CATEGORIES_FIELDSET_PUBLISHING'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</fieldset>
</div>
<div class="col-md-6">
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
<div class="col-12 col-md-6">
<?php echo $this->loadTemplate('metadata'); ?>
</div>
</div>
@ -86,7 +93,10 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'rules', Text::_('COM_CATEGORIES_FIELDSET_RULES')); ?>
<?php echo $this->form->getInput('rules'); ?>
<fieldset id="fieldset-rules" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('COM_CATEGORIES_FIELDSET_RULES'); ?></legend>
<?php echo $this->form->getInput('rules'); ?>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

2
administrator/components/com_categories/tmpl/category/edit.xml
View File

@ -9,7 +9,7 @@
<fields name="request">
<field
name="extension"
type="componentscategory"
type="ComponentsCategory"
label="COM_CATEGORIES_CHOOSE_COMPONENT_LABEL"
required="true"
>

13
administrator/components/com_categories/tmpl/category/edit_associations.php
View File

@ -9,6 +9,17 @@
defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
echo LayoutHelper::render('joomla.edit.associations', $this);
$hasAssoc = ($this->form->getValue('language', null, '*') !== '*');
?>
<?php if ($hasAssoc) : ?>
<fieldset id="fieldset-associations" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php endif; ?>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
<?php if ($hasAssoc) : ?>
</fieldset>
<?php endif; ?>

7
administrator/components/com_categories/tmpl/category/edit_metadata.php
View File

@ -9,6 +9,11 @@
defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
echo LayoutHelper::render('joomla.edit.metadata', $this);
?>
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</fieldset>

10
administrator/components/com_categories/tmpl/category/modal_extrafields.php
View File

@ -1,10 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_categories
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;

14
administrator/components/com_categories/tmpl/category/modal_metadata.php
View File

@ -1,14 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_categories
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
use Joomla\CMS\Layout\LayoutHelper;
echo LayoutHelper::render('joomla.edit.metadata', $this);

51
administrator/components/com_categories/tmpl/category/modal_options.php
View File

@ -1,51 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_categories
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
echo HTMLHelper::_('bootstrap.startAccordion', 'categoryOptions', array('active' => 'collapse0'));
$fieldSets = $this->form->getFieldsets('params');
$i = 0;
?>
<?php foreach ($fieldSets as $name => $fieldSet) : ?>
<?php
$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL';
echo HTMLHelper::_('bootstrap.addSlide', 'categoryOptions', Text::_($label), 'collapse' . ($i++));
if (isset($fieldSet->description) && trim($fieldSet->description))
{
echo '<p class="tip">' . $this->escape(Text::_($fieldSet->description)) . '</p>';
}
?>
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
<div class="control-group">
<div class="control-label">
<?php echo $field->label; ?>
</div>
<div class="controls">
<?php echo $field->input; ?>
</div>
</div>
<?php endforeach; ?>
<?php if ($name == 'basic') : ?>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('note'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('note'); ?>
</div>
</div>
<?php endif; ?>
<?php echo HTMLHelper::_('bootstrap.endSlide'); ?>
<?php endforeach; ?>
<?php echo HTMLHelper::_('bootstrap.endAccordion'); ?>

6
administrator/components/com_config/Controller/ApplicationController.php
View File

@ -76,6 +76,7 @@ class ApplicationController extends BaseController
if (!$this->app->getIdentity()->authorise('core.admin'))
{
$this->setRedirect('index.php', Text::_('JERROR_ALERTNOAUTHOR'), 'error');
return false;
}
@ -140,6 +141,7 @@ class ApplicationController extends BaseController
// Redirect back to the edit screen.
$this->setRedirect(Route::_('index.php?option=com_config', false));
return false;
}
@ -156,6 +158,7 @@ class ApplicationController extends BaseController
// Save failed, go back to the screen and display a notice.
$this->setRedirect(Route::_('index.php?option=com_config', false));
return false;
}
@ -189,6 +192,7 @@ class ApplicationController extends BaseController
if (!Session::checkToken('get'))
{
$this->setRedirect('index.php', Text::_('JINVALID_TOKEN'), 'error');
return false;
}
@ -196,6 +200,7 @@ class ApplicationController extends BaseController
if (!$this->app->getIdentity()->authorise('core.admin'))
{
$this->setRedirect('index.php', Text::_('JERROR_ALERTNOAUTHOR'), 'error');
return false;
}
@ -213,6 +218,7 @@ class ApplicationController extends BaseController
{
// Save failed, go back to the screen and display a notice.
$this->setRedirect('index.php', Text::_('JERROR_SAVE_FAILED', $e->getMessage()), 'error');
return false;
}

10
administrator/components/com_config/Field/FiltersField.php
View File

@ -82,8 +82,8 @@ class FiltersField extends FormField
parent = $("#filter-config select[data-id=" + parent.attr("data-parent") + "]")
}
});
});
');
});'
);
// Get the available user groups.
$groups = $this->getUserGroups();
@ -132,7 +132,8 @@ class FiltersField extends FormField
$html[] = ' ' . LayoutHelper::render('joomla.html.treeprefix', array('level' => $group->level + 1)) . $group->text;
$html[] = ' </td>';
$html[] = ' <td>';
$html[] = ' <label for="' . $this->id . $group->value . '_filter_type" class="sr-only">' . Text::_('JGLOBAL_FILTER_TYPE_LABEL') . '</label>';
$html[] = ' <label for="' . $this->id . $group->value . '_filter_type" class="sr-only">'
. Text::_('JGLOBAL_FILTER_TYPE_LABEL') . '</label>';
$html[] = ' <select'
. ' name="' . $this->name . '[' . $group->value . '][filter_type]"'
. ' id="' . $this->id . $group->value . '_filter_type"'
@ -153,7 +154,8 @@ class FiltersField extends FormField
$html[] = ' </select>';
$html[] = ' </td>';
$html[] = ' <td>';
$html[] = ' <label for="' . $this->id . $group->value . '_filter_tags" class="sr-only">' . Text::_('JGLOBAL_FILTER_TAGS_LABEL') . '</label>';
$html[] = ' <label for="' . $this->id . $group->value . '_filter_tags" class="sr-only">'
. Text::_('JGLOBAL_FILTER_TAGS_LABEL') . '</label>';
$html[] = ' <input'
. ' name="' . $this->name . '[' . $group->value . '][filter_tags]"'
. ' type="text"'

10
administrator/components/com_config/Model/ApplicationModel.php
View File

@ -335,7 +335,10 @@ class ApplicationModel extends FormModel
try
{
Log::add(
Text::sprintf('COM_CONFIG_ERROR_CUSTOM_SESSION_FILESYSTEM_PATH_NOTWRITABLE_USING_DEFAULT', $data['session_filesystem_path']),
Text::sprintf(
'COM_CONFIG_ERROR_CUSTOM_SESSION_FILESYSTEM_PATH_NOTWRITABLE_USING_DEFAULT',
$data['session_filesystem_path']
),
Log::WARNING,
'jerror'
);
@ -343,7 +346,10 @@ class ApplicationModel extends FormModel
catch (\RuntimeException $logException)
{
$app->enqueueMessage(
Text::sprintf('COM_CONFIG_ERROR_CUSTOM_SESSION_FILESYSTEM_PATH_NOTWRITABLE_USING_DEFAULT', $data['session_filesystem_path']),
Text::sprintf(
'COM_CONFIG_ERROR_CUSTOM_SESSION_FILESYSTEM_PATH_NOTWRITABLE_USING_DEFAULT',
$data['session_filesystem_path']
),
'warning'
);
}

86
administrator/components/com_config/tmpl/application/default.php
View File

@ -30,13 +30,12 @@ Text::script('MESSAGE');
<form action="<?php echo Route::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate" data-cancel-task="config.cancel.component">
<div class="row">
<!-- Begin Sidebar -->
<div id="sidebar" class="col-md-2">
<button class="navbar-toggler options-menu d-md-none d-lg-none d-xl-non" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="Toggle navigation">
<span class="burger-toggler-icon">
<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>
</span>
</button>
<div class="sidebar-nav">
<div id="sidebar" class="col-md-3">
<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>">
<span class="fas fa-align-justify" aria-hidden="true"></span>
<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>
</button>
<div class="sidebar-nav bg-light p-2 my-2">
<?php echo $this->loadTemplate('navigation'); ?>
<?php
// Display the submenu position modules
@ -52,9 +51,8 @@ Text::script('MESSAGE');
</div>
<!-- End Sidebar -->
<!-- Begin Content -->
<div class="col-md-10">
<div class="col-md-9 mt-2">
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link active" href="#page-site" data-toggle="tab"><?php echo Text::_('JSITE'); ?></a></li>
<li class="nav-item"><a class="nav-link" href="#page-system" data-toggle="tab"><?php echo Text::_('COM_CONFIG_SYSTEM'); ?></a></li>
<li class="nav-item"><a class="nav-link" href="#page-server" data-toggle="tab"><?php echo Text::_('COM_CONFIG_SERVER'); ?></a></li>
@ -65,60 +63,36 @@ Text::script('MESSAGE');
<li class="nav-item"><a class="nav-link" href="#page-permissions" data-toggle="tab"><?php echo Text::_('COM_CONFIG_PERMISSIONS'); ?></a></li>
</ul>
<div id="config-document" class="tab-content">
<div id="page-site" class="tab-pane card-body active">
<div class="row">
<div class="col-lg-12 col-xl-6">
<?php echo $this->loadTemplate('site'); ?>
<?php echo $this->loadTemplate('metadata'); ?>
</div>
<div class="col-lg-12 col-xl-6">
<?php echo $this->loadTemplate('seo'); ?>
<?php echo $this->loadTemplate('cookie'); ?>
</div>
</div>
<div id="page-site" class="tab-pane active">
<?php echo $this->loadTemplate('site'); ?>
<?php echo $this->loadTemplate('metadata'); ?>
<?php echo $this->loadTemplate('seo'); ?>
<?php echo $this->loadTemplate('cookie'); ?>
</div>
<div id="page-system" class="tab-pane card-body">
<div class="row">
<div class="col-md-12">
<?php echo $this->loadTemplate('system'); ?>
<?php echo $this->loadTemplate('debug'); ?>
<?php echo $this->loadTemplate('cache'); ?>
<?php echo $this->loadTemplate('session'); ?>
</div>
</div>
<div id="page-system" class="tab-pane">
<?php echo $this->loadTemplate('system'); ?>
<?php echo $this->loadTemplate('debug'); ?>
<?php echo $this->loadTemplate('cache'); ?>
<?php echo $this->loadTemplate('session'); ?>
</div>
<div id="page-server" class="tab-pane card-body">
<div class="row">
<div class="col-lg-12 col-xl-6">
<?php echo $this->loadTemplate('server'); ?>
<?php echo $this->loadTemplate('locale'); ?>
<?php echo $this->loadTemplate('ftp'); ?>
<?php echo $this->loadTemplate('proxy'); ?>
</div>
<div class="col-lg-12 col-xl-6">
<?php echo $this->loadTemplate('database'); ?>
<?php echo $this->loadTemplate('mail'); ?>
</div>
</div>
<div id="page-server" class="tab-pane">
<?php echo $this->loadTemplate('server'); ?>
<?php echo $this->loadTemplate('locale'); ?>
<?php echo $this->loadTemplate('ftp'); ?>
<?php echo $this->loadTemplate('proxy'); ?>
<?php echo $this->loadTemplate('database'); ?>
<?php echo $this->loadTemplate('mail'); ?>
</div>
<div id="page-filters" class="tab-pane card-body">
<div class="row">
<div class="col-md-12">
<?php echo $this->loadTemplate('filters'); ?>
</div>
</div>
<div id="page-filters" class="tab-pane">
<?php echo $this->loadTemplate('filters'); ?>
</div>
<?php if ($this->ftp) : ?>
<div id="page-ftp" class="tab-pane card-body">
<div class="col-md-12">
<?php echo $this->loadTemplate('ftplogin'); ?>
</div>
<div id="page-ftp" class="tab-pane">
<?php echo $this->loadTemplate('ftplogin'); ?>
</div>
<?php endif; ?>
<div id="page-permissions" class="tab-pane card-body">
<div class="row">
<?php echo $this->loadTemplate('permissions'); ?>
</div>
<div id="page-permissions" class="tab-pane">
<?php echo $this->loadTemplate('permissions'); ?>
</div>
<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>

2
administrator/components/com_config/tmpl/application/default_cache.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_CACHE_SETTINGS');
$this->fieldsname = 'cache';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_cookie.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_COOKIE_SETTINGS');
$this->fieldsname = 'cookie';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_database.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_DATABASE_SETTINGS');
$this->fieldsname = 'database';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_debug.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_DEBUG_SETTINGS');
$this->fieldsname = 'debug';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_filters.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
$this->fieldsname = 'filters';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.text_filters', $this);

2
administrator/components/com_config/tmpl/application/default_ftp.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_FTP_SETTINGS');
$this->fieldsname = 'ftp';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_ftplogin.php
View File

@ -12,7 +12,7 @@ defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
?>
<fieldset>
<fieldset class="options-fieldset option-fieldset-half">
<legend><?php echo Text::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
<?php echo Text::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
<?php if ($this->ftp instanceof Exception) : ?>

2
administrator/components/com_config/tmpl/application/default_locale.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_LOCATION_SETTINGS');
$this->fieldsname = 'locale';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_mail.php
View File

@ -36,6 +36,8 @@ $ajaxUri = Route::_('index.php?option=com_config&task=application.sendtestmail&f
$this->name = Text::_('COM_CONFIG_MAIL_SETTINGS');
$this->fieldsname = 'mail';
$this->formclass = 'options-fieldset option-fieldset-half';
?>
<joomla-field-send-test-mail uri="<?php echo $ajaxUri; ?>">

2
administrator/components/com_config/tmpl/application/default_metadata.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_METADATA_SETTINGS');
$this->fieldsname = 'metadata';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

3
administrator/components/com_config/tmpl/application/default_permissions.php
View File

@ -15,6 +15,7 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_PERMISSION_SETTINGS');
$this->description = '';
$this->fieldsname = 'permissions';
$this->formclass = 'form-no-margin';
$this->formclass = 'form-no-margin options-fieldset option-fieldset-half';
$this->showlabel = false;
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_proxy.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_PROXY_SETTINGS');
$this->fieldsname = 'proxy';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_seo.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SEO_SETTINGS');
$this->fieldsname = 'seo';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_server.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SERVER_SETTINGS');
$this->fieldsname = 'server';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_session.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SESSION_SETTINGS');
$this->fieldsname = 'session';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_site.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SITE_SETTINGS');
$this->fieldsname = 'site';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_system.php
View File

@ -14,4 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SYSTEM_SETTINGS');
$this->fieldsname = 'system';
$this->formclass = 'options-fieldset option-fieldset-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

84
administrator/components/com_config/tmpl/component/default.php
View File

@ -35,29 +35,37 @@ if ($this->fieldsets)
// @TODO delete this when custom elements modal is merged
HTMLHelper::_('script', 'com_config/admin-application-default.min.js', ['version' => 'auto', 'relative' => true]);
$xml = $this->form->getXml();
?>
<form action="<?php echo Route::_('index.php?option=com_config'); ?>" id="component-form" method="post" class="form-validate" name="adminForm" autocomplete="off" data-cancel-task="config.cancel.component">
<div class="row">
<?php // Begin Sidebar ?>
<div class="col-md-2" id="sidebar">
<button class="navbar-toggler options-menu d-md-none d-lg-none d-xl-non" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="Toggle navigation">
<span class="burger-toggler-icon">
<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>
</span>
</button>
<div class="sidebar-nav">
<div class="col-md-3" id="sidebar">
<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>">
<span class="fas fa-align-justify" aria-hidden="true"></span>
<?php echo Text::_('TPL_ATUM_TOGGLE_SIDEBAR'); ?>
</button>
<div class="sidebar-nav bg-light p-2 my-2">
<?php echo $this->loadTemplate('navigation'); ?>
</div>
</div>
<?php // End Sidebar ?>
<div class="col-md-10" id="config">
<div class="col-md-9" id="config">
<?php if ($this->fieldsets): ?>
<ul class="nav nav-tabs" id="configTabs">
<?php $opentab = 0; ?>
<ul class="nav nav-tabs mt-2" id="configTabs">
<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
<?php
// Only show first level fieldsets as tabs
if ($xml->xpath('//fieldset/fieldset[@name="' . $name . '"]')) :
continue;
endif;
?>
<?php $dataShowOn = ''; ?>
<?php if (!empty($fieldSet->showon)) : ?>
<?php HTMLHelper::_('script', 'system/showon.min.js', array('version' => 'auto', 'relative' => true)); ?>
@ -70,16 +78,62 @@ HTMLHelper::_('script', 'com_config/admin-application-default.min.js', ['version
<div class="tab-content" id="configContent">
<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
<div class="tab-pane" id="<?php echo $name; ?>">
<?php if (!empty($fieldSet->description)) : ?>
<div class="tab-description alert alert-info">
<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_($fieldSet->description); ?>
<?php
$hasChildren = $xml->xpath('//fieldset[@name="' . $name . '"]/fieldset');
$hasParent = $xml->xpath('//fieldset/fieldset[@name="' . $name . '"]');
$isGrandchild = $xml->xpath('//fieldset/fieldset/fieldset[@name="' . $name . '"]');
?>
<?php if (!$isGrandchild && $hasParent) : ?>
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-fieldset option-fieldset-half">
<legend><?php echo Text::_($fieldSet->label); ?></legend>
<?php elseif (!$hasParent) : ?>
<?php if ($opentab) : ?>
<?php if ($opentab > 1) : ?>
</fieldset>
<?php endif; ?>
</div>
<?php endif; ?>
<div class="tab-pane" id="<?php echo $name; ?>">
<?php $opentab = 1; ?>
<?php if (!$hasChildren) : ?>
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-fieldset option-fieldset-half">
<legend><?php echo Text::_($fieldSet->label); ?></legend>
<?php $opentab = 2; ?>
<?php endif; ?>
<?php endif; ?>
<?php if (!empty($fieldSet->description)) : ?>
<div class="tab-description alert alert-info">
<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_($fieldSet->description); ?>
</div>
<?php endif; ?>
<?php if (!$hasChildren) : ?>
<?php echo $this->form->renderFieldset($name, $name === 'permissions' ? ['hiddenLabel' => true, 'class' => 'revert-controls'] : []); ?>
</div>
<?php endif; ?>
<?php if (!$isGrandchild && $hasParent) : ?>
</fieldset>
<?php endif; ?>
<?php endforeach; ?>
<?php if ($opentab) : ?>
<?php if ($opentab > 1) : ?>
</fieldset>
<?php endif; ?>
</div>
<?php endif; ?>
</div>
<?php else: ?>
<div class="alert alert-info">

5
administrator/components/com_contact/Field/Modal/ContactField.php
View File

@ -78,8 +78,8 @@ class ContactField extends FormField
Factory::getDocument()->addScriptDeclaration("
function jSelectContact_" . $this->id . "(id, title, object) {
window.processModalSelect('Contact', '" . $this->id . "', id, title, '', object);
}
");
}"
);
Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
@ -127,6 +127,7 @@ class ContactField extends FormField
// The current contact display field.
$html = '';
if ($allowSelect || $allowNew || $allowEdit || $allowClear)
{
$html .= '<span class="input-group">';

2
administrator/components/com_contact/Model/ContactModel.php
View File

@ -500,7 +500,7 @@ class ContactModel extends AdminModel
$query->set($db->quoteName('featured') . ' = :featured');
$query->whereIn($db->quoteName('id'), $pks);
$query->bind(':featured', $value, ParameterType::INTEGER);
$db->setQuery($query);
$db->execute();

22
administrator/components/com_contact/Model/ContactsModel.php
View File

@ -153,11 +153,13 @@ class ContactsModel extends ListModel
// Select the required fields from the table.
$query->select(
$db->quoteName(
explode(', ', $this->getState(
'list.select',
'a.id, a.name, a.alias, a.checked_out, a.checked_out_time, a.catid, a.user_id' .
', a.published, a.access, a.created, a.created_by, a.ordering, a.featured, a.language' .
', a.publish_up, a.publish_down'
explode(
', ',
$this->getState(
'list.select',
'a.id, a.name, a.alias, a.checked_out, a.checked_out_time, a.catid, a.user_id' .
', a.published, a.access, a.created, a.created_by, a.ordering, a.featured, a.language' .
', a.publish_up, a.publish_down'
)
)
)
@ -166,11 +168,11 @@ class ContactsModel extends ListModel
// Join over the users for the linked user.
$query->select(
array(
$db->quoteName('ul.name', 'linked_user'),
$db->quoteName('ul.email')
)
array(
$db->quoteName('ul.name', 'linked_user'),
$db->quoteName('ul.email')
)
)
->join(
'LEFT',
$db->quoteName('#__users', 'ul') . ' ON ' . $db->quoteName('ul.id') . ' = ' . $db->quoteName('a.user_id')
@ -305,7 +307,7 @@ class ContactsModel extends ListModel
{
$search = '%' . trim($search) . '%';
$query->where(
'(' . $db->quoteName('a.name') . ' LIKE :name OR ' . $db->quoteName('a.alias') . ' LIKE :alias' . ')'
'(' . $db->quoteName('a.name') . ' LIKE :name OR ' . $db->quoteName('a.alias') . ' LIKE :alias)'
);
$query->bind(':name', $search);
$query->bind(':alias', $search);

6
administrator/components/com_contact/Service/HTML/AdministratorService.php
View File

@ -104,8 +104,12 @@ class AdministratorService
*
* @since 1.6
*/
public function featured($value = 0, $i, $canChange = true)
public function featured($value = 0, $i = 0, $canChange = true)
{
if ($i === 0)
{
throw new \InvalidArgumentException('$i is not allowed to be 0');
}
// Array of image, task, title, action
$states = array(

21
administrator/components/com_contact/config.xml
View File

@ -961,11 +961,10 @@
description="COM_CONTACT_CONFIG_INTEGRATION_SETTINGS_DESC"
>
<field
<fieldset
name="integration_newsfeeds"
type="note"
label="JGLOBAL_FEED_TITLE"
/>
>
<field
name="show_feed_link"
@ -978,11 +977,12 @@
<option value="1">JSHOW</option>
</field>
<field
</fieldset>
<fieldset
name="integration_sef"
type="note"
label="JGLOBAL_SEF_TITLE"
/>
>
<field
name="sef_ids"
@ -995,11 +995,12 @@
<option value="1">JYES</option>
</field>
<field
</fieldset>
<fieldset
name="integration_customfields"
type="note"
label="JGLOBAL_FIELDS_TITLE"
/>
>
<field
name="custom_fields_enable"
@ -1012,6 +1013,8 @@
<option value="1">JYES</option>
</field>
</fieldset>
</fieldset>
<fieldset

773
administrator/components/com_contact/forms/contact.xml
View File

@ -382,432 +382,441 @@
/>
</fieldset>
<fields name="params" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
<fields name="params">
<fieldset name="display" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
<field
name="show_contact_category"
type="list"
label="JGLOBAL_SHOW_CATEGORY_LABEL"
useglobal="true"
>
<option value="hide">JHIDE</option>
<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
</field>
<fieldset name="basic" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
<field
name="show_contact_list"
type="list"
label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_contact_category"
type="list"
label="JGLOBAL_SHOW_CATEGORY_LABEL"
useglobal="true"
>
<option value="hide">JHIDE</option>
<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
</field>
<field
name="show_tags"
type="list"
label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_contact_list"
type="list"
label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_info"
type="list"
label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
class="chzn-color"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_tags"
type="list"
label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_name"
type="list"
label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_info"
type="list"
label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
class="chzn-color"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_position"
type="list"
label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_name"
type="list"
label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_email"
type="list"
label="JGLOBAL_EMAIL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_position"
type="list"
label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="add_mailto_link"
type="list"
label="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL"
class="chzn-color"
useglobal="true"
showon="show_info:1"
>
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
<field
name="show_email"
type="list"
label="JGLOBAL_EMAIL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_street_address"
type="list"
label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="add_mailto_link"
type="list"
label="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL"
class="chzn-color"
useglobal="true"
showon="show_info:1"
>
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>
<field
name="show_suburb"
type="list"
label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_street_address"
type="list"
label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_state"
type="list"
label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_suburb"
type="list"
label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_postcode"
type="list"
label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_state"
type="list"
label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_country"
type="list"
label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_postcode"
type="list"
label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_telephone"
type="list"
label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_country"
type="list"
label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_mobile"
type="list"
label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_telephone"
type="list"
label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_fax"
type="list"
label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_mobile"
type="list"
label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_webpage"
type="list"
label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_fax"
type="list"
label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_image"
type="list"
label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
class="chzn-color"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_webpage"
type="list"
label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_misc"
type="list"
label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
class="chzn-color"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_image"
type="list"
label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
class="chzn-color"
useglobal="true"
showon="show_info:1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="allow_vcard"
type="list"
label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_misc"
type="list"
label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
class="chzn-color"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_articles"
type="list"
label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="allow_vcard"
type="list"
label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="articles_display_num"
type="list"
label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
default=""
useglobal="true"
>
<option value="5">J5</option>
<option value="10">J10</option>
<option value="15">J15</option>
<option value="20">J20</option>
<option value="25">J25</option>
<option value="30">J30</option>
<option value="50">J50</option>
<option value="75">J75</option>
<option value="100">J100</option>
<option value="150">J150</option>
<option value="200">J200</option>
<option value="250">J250</option>
<option value="300">J300</option>
<option value="0">JALL</option>
</field>
<field
name="show_articles"
type="list"
label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_profile"
type="list"
label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="articles_display_num"
type="list"
label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
default=""
useglobal="true"
>
<option value="5">J5</option>
<option value="10">J10</option>
<option value="15">J15</option>
<option value="20">J20</option>
<option value="25">J25</option>
<option value="30">J30</option>
<option value="50">J50</option>
<option value="75">J75</option>
<option value="100">J100</option>
<option value="150">J150</option>
<option value="200">J200</option>
<option value="250">J250</option>
<option value="300">J300</option>
<option value="0">JALL</option>
</field>
<field
name="show_user_custom_fields"
type="fieldgroups"
label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
multiple="true"
context="com_users.user"
addfieldprefix="Joomla\Component\Fields\Administrator\Field"
>
<option value="-1">JALL</option>
</field>
<field
name="show_profile"
type="list"
label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_links"
type="list"
label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_user_custom_fields"
type="fieldgroups"
label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
multiple="true"
context="com_users.user"
addfieldprefix="Joomla\Component\Fields\Administrator\Field"
>
<option value="-1">JALL</option>
</field>
<field
name="linka_name"
type="text"
label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
<field
name="contact_layout"
type="componentlayout"
label="JFIELD_ALT_LAYOUT_LABEL"
class="custom-select"
extension="com_contact"
view="contact"
useglobal="true"
/>
</fieldset>
<fieldset name="link" label="JGLOBAL_FIELDSET_DISPLAY_LINK_OPTIONS">
<field
name="show_links"
type="list"
label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="linka_name"
type="text"
label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
size="30"
/>
<field
name="linka"
type="url"
label="COM_CONTACT_FIELD_LINKA_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linkb_name"
type="text"
label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
size="30"
/>
<field
name="linkb"
type="url"
label="COM_CONTACT_FIELD_LINKB_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linkc_name"
type="text"
label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
size="30"
/>
<field
name="linkc"
type="url"
label="COM_CONTACT_FIELD_LINKC_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linkd_name"
type="text"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
size="30"
/>
/>
<field
name="linka"
type="url"
label="COM_CONTACT_FIELD_LINKA_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linkd"
type="url"
label="COM_CONTACT_FIELD_LINKD_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linkb_name"
type="text"
label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
size="30"
/>
<field
name="linke_name"
type="text"
label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
size="30"
/>
<field
name="linkb"
type="url"
label="COM_CONTACT_FIELD_LINKB_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linkc_name"
type="text"
label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
size="30"
/>
<field
name="linkc"
type="url"
label="COM_CONTACT_FIELD_LINKC_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linkd_name"
type="text"
label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
size="30"
/>
<field
name="linkd"
type="url"
label="COM_CONTACT_FIELD_LINKD_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="linke_name"
type="text"
label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
size="30"
/>
<field
name="linke"
type="url"
label="COM_CONTACT_FIELD_LINKE_LABEL"
size="30"
filter="url"
validate="url"
/>
<field
name="contact_layout"
type="componentlayout"
label="JFIELD_ALT_LAYOUT_LABEL"
class="custom-select"
extension="com_contact"
view="contact"
useglobal="true"
/>
<field
name="linke"
type="url"
label="COM_CONTACT_FIELD_LINKE_LABEL"
size="30"
filter="url"
validate="url"
/>
</fieldset>
</fieldset>
<fieldset name="email" label="COM_CONTACT_FIELDSET_CONTACT_LABEL">
<fieldset name="form" label="COM_CONTACT_FIELDSET_FORM_LABEL">
<field
name="show_email_form"
type="list"
label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
useglobal="true"
<field
name="show_email_form"
type="list"
label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_email_copy"
type="list"
label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
useglobal="true"
<field
name="show_email_copy"
type="list"
label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="validate_session"
type="list"
label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
useglobal="true"
<field
name="validate_session"
type="list"
label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="custom_reply"
type="list"
label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
useglobal="true"
<field
name="custom_reply"
type="list"
label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="redirect"
type="text"
label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
size="30"
/>
<field
name="redirect"
type="text"
label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
size="30"
/>
</fieldset>
</fieldset>
</fields>

7
administrator/components/com_contact/forms/filter_contacts.xml
View File

@ -54,11 +54,12 @@
name="tag"
type="tag"
label="JOPTION_SELECT_TAG"
multiple="true"
mode="nested"
custom="false"
hint="JOPTION_SELECT_TAG"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_TAG</option>
</field>
/>
<field
name="level"

61
administrator/components/com_contact/tmpl/contact/edit.php
View File

@ -27,7 +27,7 @@ $input = $app->input;
$assoc = Associations::isEnabled();
// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
$this->ignore_fieldsets = array('details', 'item_associations', 'jmetadata');
$this->ignore_fieldsets = ['details', 'item_associations', 'jmetadata'];
$this->useCoreUI = true;
// In case of modal
@ -46,31 +46,35 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', empty($this->item->id) ? Text::_('COM_CONTACT_NEW_CONTACT') : Text::_('COM_CONTACT_EDIT_CONTACT')); ?>
<div class="row">
<div class="col-md-9">
<div class="row">
<div class="col-md-6">
<?php echo $this->form->renderField('user_id'); ?>
<?php echo $this->form->renderField('image'); ?>
<?php echo $this->form->renderField('con_position'); ?>
<?php echo $this->form->renderField('email_to'); ?>
<?php echo $this->form->renderField('address'); ?>
<?php echo $this->form->renderField('suburb'); ?>
<?php echo $this->form->renderField('state'); ?>
<?php echo $this->form->renderField('postcode'); ?>
<?php echo $this->form->renderField('country'); ?>
</div>
<div class="col-md-6">
<?php echo $this->form->renderField('telephone'); ?>
<?php echo $this->form->renderField('mobile'); ?>
<?php echo $this->form->renderField('fax'); ?>
<?php echo $this->form->renderField('webpage'); ?>
<?php echo $this->form->renderField('sortname1'); ?>
<?php echo $this->form->renderField('sortname2'); ?>
<?php echo $this->form->renderField('sortname3'); ?>
<div class="card">
<div class="card-body">
<div class="row">
<div class="col-md-6">
<?php echo $this->form->renderField('user_id'); ?>
<?php echo $this->form->renderField('image'); ?>
<?php echo $this->form->renderField('con_position'); ?>
<?php echo $this->form->renderField('email_to'); ?>
<?php echo $this->form->renderField('address'); ?>
<?php echo $this->form->renderField('suburb'); ?>
<?php echo $this->form->renderField('state'); ?>
<?php echo $this->form->renderField('postcode'); ?>
<?php echo $this->form->renderField('country'); ?>
</div>
<div class="col-md-6">
<?php echo $this->form->renderField('telephone'); ?>
<?php echo $this->form->renderField('mobile'); ?>
<?php echo $this->form->renderField('fax'); ?>
<?php echo $this->form->renderField('webpage'); ?>
<?php echo $this->form->renderField('sortname1'); ?>
<?php echo $this->form->renderField('sortname2'); ?>
<?php echo $this->form->renderField('sortname3'); ?>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card card-light">
<div class="card">
<div class="card-body">
<?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
</div>
@ -82,8 +86,10 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'misc', Text::_('JGLOBAL_FIELDSET_MISCELLANEOUS')); ?>
<div class="row">
<div class="col-md-12">
<?php echo $this->form->getLabel('misc'); ?>
<?php echo $this->form->getInput('misc'); ?>
<fieldset id="fieldset-misc" class="options-fieldset option-fieldset-full">
<legend><?php echo $this->form->getField('misc')->title; ?></legend>
<?php echo $this->form->getInput('misc'); ?>
</fieldset>
</div>
</div>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
@ -93,10 +99,13 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-md-6">
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
<fieldset id="fieldset-publishingdata" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</fieldset>
</div>
<div class="col-md-6">
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
<?php echo $this->loadTemplate('metadata'); ?>
</div>
</div>
<?php echo HTMLHelper::_('uitab.endTab'); ?>

13
administrator/components/com_contact/tmpl/contact/edit_associations.php
View File

@ -9,6 +9,17 @@
defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
echo LayoutHelper::render('joomla.edit.associations', $this);
$hasAssoc = !($this->form->getValue('language', null, '*') === '*');
?>
<?php if ($hasAssoc) : ?>
<fieldset id="fieldset-associations" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php endif; ?>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
<?php if ($hasAssoc) : ?>
</fieldset>
<?php endif; ?>

7
administrator/components/com_contact/tmpl/contact/edit_metadata.php
View File

@ -9,6 +9,11 @@
defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
echo LayoutHelper::render('joomla.edit.metadata', $this);
?>
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</fieldset>

31
administrator/components/com_contact/tmpl/contact/edit_params.php
View File

@ -1,31 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_contact
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
$fieldSets = $this->form->getFieldsets('params');
foreach ($fieldSets as $name => $fieldSet) :
$paramstabs = 'params-' . $name;
echo HTMLHelper::_('bootstrap.addTab', 'myTab', $paramstabs, Text::_($fieldSet->label));
if (isset($fieldSet->description) && trim($fieldSet->description)) :
echo '<div class="alert alert-info">' . $this->escape(Text::_($fieldSet->description)) . '</div>';
endif;
?>
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
<div class="control-group">
<div class="control-label"><?php echo $field->label; ?></div>
<div class="controls"><?php echo $field->input; ?></div>
</div>
<?php endforeach; ?>
<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
<?php endforeach; ?>

14
administrator/components/com_contact/tmpl/contact/modal_associations.php
View File

@ -1,14 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_contact
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
use Joomla\CMS\Layout\LayoutHelper;
echo LayoutHelper::render('joomla.edit.associations', $this);

14
administrator/components/com_contact/tmpl/contact/modal_metadata.php
View File

@ -1,14 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_contact
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
use Joomla\CMS\Layout\LayoutHelper;
echo LayoutHelper::render('joomla.edit.metadata', $this);

31
administrator/components/com_contact/tmpl/contact/modal_params.php
View File

@ -1,31 +0,0 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_contact
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
$fieldSets = $this->form->getFieldsets('params');
foreach ($fieldSets as $name => $fieldSet) :
$paramstabs = 'params-' . $name;
echo HTMLHelper::_('bootstrap.addTab', 'myTab', $paramstabs, Text::_($fieldSet->label));
if (isset($fieldSet->description) && trim($fieldSet->description)) :
echo '<div class="alert alert-info">' . $this->escape(Text::_($fieldSet->description)) . '</div>';
endif;
?>
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
<div class="control-group">
<div class="control-label"><?php echo $field->label; ?></div>
<div class="controls"><?php echo $field->input; ?></div>
</div>
<?php endforeach; ?>
<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
<?php endforeach; ?>

10
administrator/components/com_contact/tmpl/contacts/default.php
View File

@ -37,11 +37,11 @@ if ($saveOrder && !empty($this->items))
<form action="<?php echo Route::_('index.php?option=com_contact'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<?php if (!empty($this->sidebar)) : ?>
<div id="j-sidebar-container" class="col-md-2">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
</div>
<?php endif; ?>
<div class="<?php if (!empty($this->sidebar)) {echo 'col-md-10'; } else { echo 'col-md-12'; } ?>">
<div class="col-md-<?php echo !empty($this->sidebar) ? 10 : 12; ?>">
<div id="j-main-container" class="j-main-container">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
@ -132,9 +132,7 @@ if ($saveOrder && !empty($this->items))
<?php echo HTMLHelper::_('contactadministrator.featured', $item->featured, $i, $canChange); ?>
</td>
<td class="text-center">
<div class="btn-group">
<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
</div>
<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
</td>
<th scope="row" class="has-context">

4
administrator/components/com_content/Controller/ArticlesController.php
View File

@ -139,12 +139,14 @@ class ArticlesController extends AdminController
/**
* Method to get the number of published articles for quickicons
*
* @return string The JSON-encoded amount of published articles
*
* @since 4.0
*/
public function getQuickiconContent()
{
$model = $this->getModel('articles');
$model->setState('filter.published', 1);
$amount = (int) $model->getTotal();

5
administrator/components/com_content/Field/Modal/ArticleField.php
View File

@ -77,8 +77,8 @@ class ArticleField extends FormField
Factory::getDocument()->addScriptDeclaration("
function jSelectArticle_" . $this->id . "(id, title, catid, object, url, language) {
window.processModalSelect('Article', '" . $this->id . "', id, title, catid, object, url, language);
}
");
}"
);
Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
@ -128,6 +128,7 @@ class ArticleField extends FormField
// The current article display field.
$html = '';
if ($allowSelect || $allowNew || $allowEdit || $allowClear)
{
$html .= '<span class="input-group">';

16
administrator/components/com_content/Helper/ContentHelper.php
View File

@ -24,8 +24,6 @@ use Joomla\Registry\Registry;
*/
class ContentHelper extends \Joomla\CMS\Helper\ContentHelper
{
public static $extension = 'com_content';
/**
* Check if state can be deleted
*
@ -135,10 +133,10 @@ class ContentHelper extends \Joomla\CMS\Helper\ContentHelper
$query = $db->getQuery(true);
$query ->select($db->quoteName('title'))
->from($db->quoteName('#__workflows'))
->where($db->quoteName('default') . ' = 1')
->where($db->quoteName('published') . ' = 1');
$query->select($db->quoteName('title'))
->from($db->quoteName('#__workflows'))
->where($db->quoteName('default') . ' = 1')
->where($db->quoteName('published') . ' = 1');
$defaulttitle = $db->setQuery($query)->loadResult();
@ -175,9 +173,9 @@ class ContentHelper extends \Joomla\CMS\Helper\ContentHelper
}
elseif ((int) $workflow_id > 0)
{
$query ->clear('where')
->where($db->quoteName('id') . ' = ' . (int) $workflow_id)
->where($db->quoteName('published') . ' = 1');
$query->clear('where')
->where($db->quoteName('id') . ' = ' . (int) $workflow_id)
->where($db->quoteName('published') . ' = 1');
$title = $db->setQuery($query)->loadResult();

122
administrator/components/com_content/Model/ArticleModel.php
View File

@ -378,27 +378,28 @@ class ArticleModel extends AdminModel
$query = $db->getQuery(true);
$select = $db->quoteName(
[
'wt.id',
'wa.item_id'
]
);
[
'wt.id',
'wa.item_id'
]
);
$query ->select($select)
->from($db->quoteName('#__workflow_transitions', 'wt'))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflow_stages', 'ws2'))
->from($db->quoteName('#__workflow_associations', 'wa'))
->where('(' . $db->quoteName('wt.from_stage_id') . ' = -1 OR ' .
$db->quoteName('wt.from_stage_id') . ' = ' . $db->quoteName('wa.stage_id') . ')')
->where($db->quoteName('wt.to_stage_id') . ' = ' . $db->quoteName('ws.id'))
->where($db->quoteName('wa.stage_id') . ' = ' . $db->quoteName('ws2.id'))
->where($db->quoteName('wt.workflow_id') . ' = ' . $db->quoteName('ws.workflow_id'))
->where($db->quoteName('wt.workflow_id') . ' = ' . $db->quoteName('ws2.workflow_id'))
->where($db->quoteName('wt.to_stage_id') . ' != ' . $db->quoteName('wa.stage_id'))
->whereIn($db->quoteName('wa.item_id'), $pks)
->where($db->quoteName('wa.extension') . ' = ' . $db->quote('com_content'))
->where($db->quoteName('ws.condition') . ' = ' . (int) $value);
$query->select($select)
->from($db->quoteName('#__workflow_transitions', 'wt'))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflow_stages', 'ws2'))
->from($db->quoteName('#__workflow_associations', 'wa'))
->where('(' . $db->quoteName('wt.from_stage_id') . ' = -1 OR ' .
$db->quoteName('wt.from_stage_id') . ' = ' . $db->quoteName('wa.stage_id') . ')'
)
->where($db->quoteName('wt.to_stage_id') . ' = ' . $db->quoteName('ws.id'))
->where($db->quoteName('wa.stage_id') . ' = ' . $db->quoteName('ws2.id'))
->where($db->quoteName('wt.workflow_id') . ' = ' . $db->quoteName('ws.workflow_id'))
->where($db->quoteName('wt.workflow_id') . ' = ' . $db->quoteName('ws2.workflow_id'))
->where($db->quoteName('wt.to_stage_id') . ' != ' . $db->quoteName('wa.stage_id'))
->whereIn($db->quoteName('wa.item_id'), $pks)
->where($db->quoteName('wa.extension') . ' = ' . $db->quote('com_content'))
->where($db->quoteName('ws.condition') . ' = ' . (int) $value);
$transitions = $db->setQuery($query)->loadObjectList();
@ -849,7 +850,6 @@ class ArticleModel extends AdminModel
}
}
$workflowId = 0;
$stageId = 0;
// Set status depending on category
@ -869,8 +869,8 @@ class ArticleModel extends AdminModel
// B/C state
$data['state'] = (int) $workflow->condition;
}
// Calculate new status depending on transition
// Calculate new status depending on transition
if (!empty($data['transition']))
{
// Check if the user is allowed to execute this transition
@ -884,13 +884,13 @@ class ArticleModel extends AdminModel
// Set the new state
$query = $db->getQuery(true);
$query ->select($db->quoteName(['ws.id', 'ws.condition']))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflow_transitions', 'wt'))
->where($db->quoteName('wt.to_stage_id') . ' = ' . $db->quoteName('ws.id'))
->where($db->quoteName('wt.id') . ' = ' . (int) $data['transition'])
->where($db->quoteName('ws.published') . ' = 1')
->where($db->quoteName('wt.published') . ' = 1');
$query->select($db->quoteName(['ws.id', 'ws.condition']))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflow_transitions', 'wt'))
->where($db->quoteName('wt.to_stage_id') . ' = ' . $db->quoteName('ws.id'))
->where($db->quoteName('wt.id') . ' = ' . (int) $data['transition'])
->where($db->quoteName('ws.published') . ' = 1')
->where($db->quoteName('wt.published') . ' = 1');
$stage = $db->setQuery($query)->loadObject();
@ -1275,22 +1275,22 @@ class ArticleModel extends AdminModel
{
$query = $db->getQuery(true);
$query ->select(
$db->quoteName(
[
'w.id',
'ws.condition'
]
)
)
->select($db->quoteName('ws.id', 'stage_id'))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflows', 'w'))
->where($db->quoteName('ws.workflow_id') . ' = ' . $db->quoteName('w.id'))
->where($db->quoteName('ws.default') . ' = 1')
->where($db->quoteName('w.published') . ' = 1')
->where($db->quoteName('ws.published') . ' = 1')
->where($db->quoteName('w.id') . ' = ' . (int) $workflow_id);
$query->select(
$db->quoteName(
[
'w.id',
'ws.condition'
]
)
)
->select($db->quoteName('ws.id', 'stage_id'))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflows', 'w'))
->where($db->quoteName('ws.workflow_id') . ' = ' . $db->quoteName('w.id'))
->where($db->quoteName('ws.default') . ' = 1')
->where($db->quoteName('w.published') . ' = 1')
->where($db->quoteName('ws.published') . ' = 1')
->where($db->quoteName('w.id') . ' = ' . (int) $workflow_id);
$workflow = $db->setQuery($query)->loadObject();
@ -1303,22 +1303,22 @@ class ArticleModel extends AdminModel
// Use default workflow
$query = $db->getQuery(true);
$query ->select(
$db->quoteName(
[
'w.id',
'ws.condition'
]
)
)
->select($db->quoteName('ws.id', 'stage_id'))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflows', 'w'))
->where($db->quoteName('ws.default') . ' = 1')
->where($db->quoteName('ws.workflow_id') . ' = ' . $db->quoteName('w.id'))
->where($db->quoteName('w.published') . ' = 1')
->where($db->quoteName('ws.published') . ' = 1')
->where($db->quoteName('w.default') . ' = 1');
$query->select(
$db->quoteName(
[
'w.id',
'ws.condition'
]
)
)
->select($db->quoteName('ws.id', 'stage_id'))
->from($db->quoteName('#__workflow_stages', 'ws'))
->from($db->quoteName('#__workflows', 'w'))
->where($db->quoteName('ws.default') . ' = 1')
->where($db->quoteName('ws.workflow_id') . ' = ' . $db->quoteName('w.id'))
->where($db->quoteName('w.published') . ' = 1')
->where($db->quoteName('ws.published') . ' = 1')
->where($db->quoteName('w.default') . ' = 1');
$workflow = $db->setQuery($query)->loadObject();

19
administrator/components/com_content/Model/ArticlesModel.php
View File

@ -226,8 +226,10 @@ class ArticlesModel extends ListModel
->join('LEFT', '#__categories AS c ON c.id = a.catid');
// Join over the parent categories.
$query->select('parent.title AS parent_category_title, parent.id AS parent_category_id,
parent.created_user_id AS parent_category_uid, parent.level AS parent_category_level')
$query->select(
'parent.title AS parent_category_title, parent.id AS parent_category_id,' .
'parent.created_user_id AS parent_category_uid, parent.level AS parent_category_level'
)
->join('LEFT', '#__categories AS parent ON parent.id = c.parent_id');
// Join over the users for the author.
@ -237,7 +239,7 @@ class ArticlesModel extends ListModel
// Join over the associations.
$query->select($query->quoteName('wa.stage_id', 'stage_id'))
->innerJoin(
$query->quoteName('#__workflow_associations', 'wa')
$query->quoteName('#__workflow_associations', 'wa')
. ' ON ' . $query->quoteName('wa.item_id') . ' = ' . $query->quoteName('a.id')
);
@ -256,10 +258,10 @@ class ArticlesModel extends ListModel
]
)
)
->innerJoin(
$query->quoteName('#__workflow_stages', 'ws')
. ' ON ' . $query->quoteName('ws.id') . ' = ' . $query->quoteName('wa.stage_id')
);
->innerJoin(
$query->quoteName('#__workflow_stages', 'ws')
. ' ON ' . $query->quoteName('ws.id') . ' = ' . $query->quoteName('wa.stage_id')
);
// Join on voting table
$associationsGroupBy = array(
@ -299,7 +301,8 @@ class ArticlesModel extends ListModel
if (PluginHelper::isEnabled('content', 'vote'))
{
$query->select('COALESCE(NULLIF(ROUND(v.rating_sum / v.rating_count, 0), 0), 0) AS rating,
COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count')
COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count'
)
->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
array_push($associationsGroupBy, 'v.rating_sum', 'v.rating_count');

37
administrator/components/com_content/Model/FeaturedModel.php
View File

@ -112,8 +112,10 @@ class FeaturedModel extends ArticlesModel
->join('LEFT', '#__categories AS c ON c.id = a.catid');
// Join over the parent categories.
$query->select('parent.title AS parent_category_title, parent.id AS parent_category_id,
parent.created_user_id AS parent_category_uid, parent.level AS parent_category_level')
$query->select(
'parent.title AS parent_category_title, parent.id AS parent_category_id,
parent.created_user_id AS parent_category_uid, parent.level AS parent_category_level'
)
->join('LEFT', '#__categories AS parent ON parent.id = c.parent_id');
// Join over the users for the author.
@ -126,26 +128,27 @@ class FeaturedModel extends ArticlesModel
// Join over the workflow stages.
$query ->select(
$query->quoteName(
[
'ws.title',
'ws.condition',
'ws.workflow_id'
],
[
'stage_title',
'stage_condition',
'workflow_id'
]
)
)
->join('INNER', '#__workflow_stages AS ws ON ' . $query->quoteName('ws.id') . ' = ' . $query->quoteName('wa.stage_id'));
$query->quoteName(
[
'ws.title',
'ws.condition',
'ws.workflow_id'
],
[
'stage_title',
'stage_condition',
'workflow_id'
]
)
)
->join('INNER', '#__workflow_stages AS ws ON ' . $query->quoteName('ws.id') . ' = ' . $query->quoteName('wa.stage_id'));
// Join on voting table
if (PluginHelper::isEnabled('content', 'vote'))
{
$query->select('COALESCE(NULLIF(ROUND(v.rating_sum / v.rating_count, 0), 0), 0) AS rating,
COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count')
COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count'
)
->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
}

7
administrator/components/com_content/Service/HTML/AdministratorService.php
View File

@ -104,8 +104,13 @@ class AdministratorService
*
* @return string HTML code
*/
public function featured($value = 0, $i, $canChange = true)
public function featured($value = 0, $i = 0, $canChange = true)
{
if ($i === 0)
{
throw new \InvalidArgumentException('$i is not allowed to be 0');
}
// Array of image, task, title, action
$states = array(
0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),

8
administrator/components/com_content/View/Article/HtmlView.php
View File

@ -37,7 +37,7 @@ class HtmlView extends BaseHtmlView
/**
* The \JForm object
*
* @var \JForm
* @var \Joomla\CMS\Form\Form
*/
protected $form;
@ -166,6 +166,7 @@ class HtmlView extends BaseHtmlView
{
$toolbar->apply('article.apply');
}
$saveGroup = $toolbar->dropdownButton('save-group');
$saveGroup->configure(
@ -259,7 +260,6 @@ class HtmlView extends BaseHtmlView
)
);
echo '<input type="hidden" class="form-control" id="' . $modalId . '_name" value="">';
echo '<input type="hidden" id="' . $modalId . '_id" value="0">';
}
@ -268,8 +268,8 @@ class HtmlView extends BaseHtmlView
if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations'))
{
$toolbar->standardButton('contract')
->text('JTOOLBAR_ASSOCIATIONS')
->task('article.editAssociations');
->text('JTOOLBAR_ASSOCIATIONS')
->task('article.editAssociations');
}
$toolbar->cancel('article.cancel', 'JTOOLBAR_CLOSE');

9
administrator/components/com_content/View/Articles/HtmlView.php
View File

@ -64,14 +64,6 @@ class HtmlView extends BaseHtmlView
*/
public $activeFilters;
/**
* Array used for displaying the levels filter
*
* @return \stdClass[]
* @since 4.0.0
*/
protected $f_levels;
/**
* Display the view
*
@ -206,7 +198,6 @@ class HtmlView extends BaseHtmlView
$childBar = $dropdown->getChildToolbar();
if ($canDo->get('core.execute.transition'))
{
$childBar->publish('articles.publish')->listCheck(true);

9
administrator/components/com_content/View/Featured/HtmlView.php
View File

@ -64,14 +64,6 @@ class HtmlView extends BaseHtmlView
*/
public $activeFilters;
/**
* Array used for displaying the levels filter
*
* @return stdClass[]
* @since 4.0.0
*/
protected $f_levels;
/**
* Display the view
*
@ -185,7 +177,6 @@ class HtmlView extends BaseHtmlView
$childBar = $dropdown->getChildToolbar();
if ($canDo->get('core.execute.transition'))
{
$childBar->publish('articles.publish')->listCheck(true);

158
administrator/components/com_content/config.xml
View File

@ -939,92 +939,94 @@
label="JGLOBAL_INTEGRATION_LABEL"
description="COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC"
>
<field
name="integration_newsfeeds"
type="note"
<fieldset
name="integration_newsfeed"
label="JGLOBAL_FEED_TITLE"
/>
<field
name="show_feed_link"
type="radio"
label="JGLOBAL_SHOW_FEED_LINK_LABEL"
class="switcher"
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="feed_summary"
type="list"
label="JGLOBAL_FEED_SUMMARY_LABEL"
default="0"
showon="show_feed_link:1"
>
<option value="0">JGLOBAL_INTRO_TEXT</option>
<option value="1">JGLOBAL_FULL_TEXT</option>
</field>
<field
name="feed_show_readmore"
type="radio"
label="JGLOBAL_FEED_SHOW_READMORE_LABEL"
description="JGLOBAL_FEED_SHOW_READMORE_DESC"
class="switcher"
default="0"
showon="show_feed_link:1[AND]feed_summary:0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="integration_sef"
type="note"
label="JGLOBAL_SEF_TITLE"
/>
<field
name="sef_ids"
type="radio"
class="switcher"
default="0"
label="JGLOBAL_SEF_NOIDS_LABEL"
filter="integer"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
<field
name="show_feed_link"
type="radio"
label="JGLOBAL_SHOW_FEED_LINK_LABEL"
class="switcher"
default="1"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="feed_summary"
type="list"
label="JGLOBAL_FEED_SUMMARY_LABEL"
default="0"
showon="show_feed_link:1"
>
<option value="0">JGLOBAL_INTRO_TEXT</option>
<option value="1">JGLOBAL_FULL_TEXT</option>
</field>
<field
name="feed_show_readmore"
type="radio"
label="JGLOBAL_FEED_SHOW_READMORE_LABEL"
description="JGLOBAL_FEED_SHOW_READMORE_DESC"
class="switcher"
default="0"
showon="show_feed_link:1[AND]feed_summary:0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
</fieldset>
<fieldset
name="integration_sef"
label="JGLOBAL_SEF_TITLE"
>
<field
name="sef_ids"
type="radio"
class="switcher"
default="0"
label="JGLOBAL_SEF_NOIDS_LABEL"
filter="integer"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
</fieldset>
<fieldset
name="integration_customfields"
type="note"
label="JGLOBAL_FIELDS_TITLE"
/>
>
<field
name="custom_fields_enable"
type="radio"
label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
class="switcher"
default="1"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="custom_fields_enable"
type="radio"
label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
class="switcher"
default="1"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="workflows_enable"
type="radio"
label="JGLOBAL_WORKFLOWS_ENABLE_LABEL"
class="switcher"
default="1"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="workflows_enable"
type="radio"
label="JGLOBAL_WORKFLOWS_ENABLE_LABEL"
class="switcher"
default="1"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
</fieldset>
</fieldset>

783
administrator/components/com_content/forms/article.xml
View File

@ -21,7 +21,8 @@
type="text"
label="JGLOBAL_TITLE"
size="40"
required="true" />
required="true"
/>
<field
name="alias"
@ -68,10 +69,9 @@
<field
name="transition"
type="transition"
extension="com_content"
label="COM_CONTENT_TRANSITION"
>
</field>
extension="com_content"
/>
<field
name="tags"
@ -244,279 +244,259 @@
</fieldset>
<fields name="attribs" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
<fieldset name="basic" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
<fieldset name="attribs" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
<fieldset name="basic" label="JFIELD_ALT_LAYOUT_LABEL">
<field
name="article_layout"
type="componentlayout"
label="JFIELD_ALT_LAYOUT_LABEL"
class="custom-select"
useglobal="true"
extension="com_content"
view="article"
/>
<field
name="article_layout"
type="componentlayout"
label="JFIELD_ALT_LAYOUT_LABEL"
class="custom-select"
useglobal="true"
extension="com_content"
view="article"
/>
<field
name="show_title"
type="list"
label="JGLOBAL_SHOW_TITLE_LABEL"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field
name="show_title"
type="list"
label="JGLOBAL_SHOW_TITLE_LABEL"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field
name="link_titles"
type="list"
label="JGLOBAL_LINKED_TITLES_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="link_titles"
type="list"
label="JGLOBAL_LINKED_TITLES_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="show_tags"
type="list"
label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
class="custom-select-color"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field
name="show_tags"
type="list"
label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
class="custom-select-color"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field
name="show_intro"
type="list"
label="JGLOBAL_SHOW_INTRO_LABEL"
class="custom-select-color"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field
name="show_intro"
type="list"
label="JGLOBAL_SHOW_INTRO_LABEL"
class="custom-select-color"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field
name="info_block_position"
type="list"
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
useglobal="true"
>
<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
</field>
<field
name="info_block_position"
type="list"
label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
useglobal="true"
>
<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
</field>
<field
name="info_block_show_title"
type="list"
label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="info_block_show_title"
type="list"
label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
</fieldset>
<field
name="option_spacer1"
type="spacer"
hr="false"
label="JCATEGORY"
/>
<fieldset name="category" label="JCATEGORY">
<field
name="show_category"
type="list"
label="JGLOBAL_SHOW_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_category"
type="list"
label="JGLOBAL_SHOW_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="link_category"
type="list"
label="JGLOBAL_LINK_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="link_category"
type="list"
label="JGLOBAL_LINK_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="show_parent_category"
type="list"
label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_parent_category"
type="list"
label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="link_parent_category"
type="list"
label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="link_parent_category"
type="list"
label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="show_associations"
type="assoc"
label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
</fieldset>
<field
name="show_associations"
type="assoc"
label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
useglobal="true"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>
<field
name="option_spacer2"
type="spacer"
hr="false"
<fieldset name="author" label="JGLOBAL_SHOW_AUTHOR_LABEL">
<field
name="show_author"
type="list"
label="JGLOBAL_SHOW_AUTHOR_LABEL"
/>
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_author"
type="list"
label="JGLOBAL_SHOW_AUTHOR_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="link_author"
type="list"
label="JGLOBAL_LINK_AUTHOR_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
</fieldset>
<field
name="link_author"
type="list"
label="JGLOBAL_LINK_AUTHOR_LABEL"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<fieldset name="date" label="JDATE">
<field
name="show_create_date"
type="list"
label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="option_spacer3"
type="spacer"
hr="false"
label="JDATE"
/>
<field
name="show_modify_date"
type="list"
label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_create_date"
type="list"
label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_publish_date"
type="list"
label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
</fieldset>
<field
name="show_modify_date"
type="list"
label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<fieldset name="other" label="COM_CONTENT_OTHER_OPTIONS">
<field
name="show_item_navigation"
type="list"
label="JGLOBAL_SHOW_NAVIGATION_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_publish_date"
type="list"
label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_vote"
type="list"
label="JGLOBAL_SHOW_VOTE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="option_spacer4"
type="spacer"
hr="true"
/>
<field
name="show_hits"
type="list"
label="JGLOBAL_SHOW_HITS_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_item_navigation"
type="list"
label="JGLOBAL_SHOW_NAVIGATION_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_noauth"
type="list"
label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="show_vote"
type="list"
label="JGLOBAL_SHOW_VOTE_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="urls_position"
type="list"
label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
useglobal="true"
>
<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
</field>
</fieldset>
<field
name="show_hits"
type="list"
label="JGLOBAL_SHOW_HITS_LABEL"
useglobal="true"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<fieldset name="global" label="COM_CONTENT_GLOBAL_OPTIONS">
<field
name="alternative_readmore"
type="text"
label="JFIELD_READMORE_LABEL"
description="JFIELD_READMORE_DESC"
size="25"
/>
<field
name="show_noauth"
type="list"
label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
useglobal="true"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="article_page_title"
type="text"
label="COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_LABEL"
size="25"
/>
</fieldset>
<field
name="urls_position"
type="list"
label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
useglobal="true"
>
<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
</field>
<field
name="option_spacer5"
type="spacer"
hr="true"
/>
<field
name="alternative_readmore"
type="text"
label="JFIELD_READMORE_LABEL"
description="JFIELD_READMORE_DESC"
size="25"
/>
<field
name="article_page_title"
type="text"
label="COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_LABEL"
size="25"
/>
</fieldset>
<fieldset name="editorConfig" label="COM_CONTENT_EDITORCONFIG_FIELDSET_LABEL">
@ -690,182 +670,175 @@
/>
<fields name="images" label="COM_CONTENT_FIELD_IMAGE_OPTIONS">
<field
name="image_intro"
type="media"
label="COM_CONTENT_FIELD_INTRO_LABEL"
/>
<fieldset name="image-intro" label="COM_CONTENT_FIELD_INTRO_LABEL">
<field
name="image_intro"
type="media"
label="COM_CONTENT_FIELD_INTRO_LABEL"
/>
<field
name="float_intro"
type="list"
label="COM_CONTENT_FLOAT_LABEL"
useglobal="true"
>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
</field>
<field
name="float_intro"
type="list"
label="COM_CONTENT_FLOAT_LABEL"
useglobal="true"
>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
</field>
<field
name="image_intro_alt"
type="text"
label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
size="20"
/>
<field
name="image_intro_alt"
type="text"
label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
size="20"
/>
<field
name="image_intro_caption"
type="text"
label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
size="20"
/>
<field
name="image_intro_caption"
type="text"
label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
size="20"
/>
<field
name="spacer1"
type="spacer"
hr="true"
/>
</fieldset>
<field
name="image_fulltext"
type="media"
label="COM_CONTENT_FIELD_FULL_LABEL"
/>
<fieldset name="image-full" label="COM_CONTENT_FIELD_FULL_LABEL">
<field
name="image_fulltext"
type="media"
label="COM_CONTENT_FIELD_FULL_LABEL"
/>
<field
name="float_fulltext"
type="list"
label="COM_CONTENT_FLOAT_LABEL"
useglobal="true"
>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
</field>
<field
name="float_fulltext"
type="list"
label="COM_CONTENT_FLOAT_LABEL"
useglobal="true"
>
<option value="right">COM_CONTENT_RIGHT</option>
<option value="left">COM_CONTENT_LEFT</option>
<option value="none">COM_CONTENT_NONE</option>
</field>
<field
name="image_fulltext_alt"
type="text"
label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
size="20"
/>
<field
name="image_fulltext_alt"
type="text"
label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
size="20"
/>
<field
name="image_fulltext_caption"
type="text"
label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
size="20"
/>
<field
name="image_fulltext_caption"
type="text"
label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
size="20"
/>
</fieldset>
</fields>
<fields name="urls" label="COM_CONTENT_FIELD_URLS_OPTIONS">
<field
name="urla"
type="url"
label="COM_CONTENT_FIELD_URLA_LABEL"
validate="url"
filter="url"
relative="true"
/>
<fieldset name="linka" label="COM_CONTENT_FIELD_URLA_LABEL">
<field
name="urla"
type="url"
label="COM_CONTENT_FIELD_URLA_LABEL"
validate="url"
filter="url"
relative="true"
/>
<field
name="urlatext"
type="text"
label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
size="20"
/>
<field
name="urlatext"
type="text"
label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
size="20"
/>
<field
name="targeta"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
default=""
filter="options"
useglobal="true"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
<field
name="targeta"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
default=""
filter="options"
useglobal="true"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
</fieldset>
<field
name="spacer3"
type="spacer"
hr="true"
/>
<fieldset name="linkb" label="COM_CONTENT_FIELD_URLB_LABEL">
<field
name="urlb"
type="url"
label="COM_CONTENT_FIELD_URLB_LABEL"
validate="url"
filter="url"
relative="true"
/>
<field
name="urlb"
type="url"
label="COM_CONTENT_FIELD_URLB_LABEL"
validate="url"
filter="url"
relative="true"
/>
<field
name="urlbtext"
type="text"
label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
size="20"
/>
<field
name="urlbtext"
type="text"
label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
size="20"
/>
<field
name="targetb"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
default=""
filter="options"
useglobal="true"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
</fieldset>
<field
name="targetb"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
default=""
filter="options"
useglobal="true"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
<fieldset name="linkc" label="COM_CONTENT_FIELD_URLC_LABEL">
<field
name="urlc"
type="url"
label="COM_CONTENT_FIELD_URLC_LABEL"
validate="url"
filter="url"
relative="true"
/>
<field
name="spacer4"
type="spacer"
hr="true"
/>
<field
name="urlc"
type="url"
label="COM_CONTENT_FIELD_URLC_LABEL"
validate="url"
filter="url"
relative="true"
/>
<field
name="urlctext"
type="text"
label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
size="20"
/>
<field
name="targetc"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
default=""
filter="options"
useglobal="true"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
<field
name="urlctext"
type="text"
label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
size="20"
/>
<field
name="targetc"
type="list"
label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
default=""
filter="options"
useglobal="true"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
<option value="2">JBROWSERTARGET_POPUP</option>
<option value="3">JBROWSERTARGET_MODAL</option>
</field>
</fieldset>
</fields>
<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<fieldset name="jmetadata"
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field
name="robots"

1
administrator/components/com_content/forms/filter_articles.xml
View File

@ -86,6 +86,7 @@
name="tag"
type="tag"
multiple="true"
label="JOPTION_SELECT_TAG"
hint="JOPTION_SELECT_TAG"
mode="nested"
custom="false"

2
administrator/components/com_content/forms/filter_featured.xml
View File

@ -76,7 +76,7 @@
<field
name="tag"
type="tag"
labl="JOPTION_SELECT_TAG"
label="JOPTION_SELECT_TAG"
multiple="true"
mode="nested"
custom="false"

Some files were not shown because too many files have changed in this diff Show More