From 275ca6b1d6bc47ad72db367ff054ac1682b06663 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Wed, 23 Jun 2021 13:07:17 +0200 Subject: [PATCH 01/43] Update signature --- .drone.yml | 163 ++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 83 deletions(-) diff --git a/.drone.yml b/.drone.yml index 954b3df2b709c..ba9e9af2842b1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: - name: phpcs image: joomlaprojects/docker-images:php7.2 - depends_on: [ composer ] + depends_on: [composer] commands: - echo $(date) - ./libraries/vendor/bin/phpcs --extensions=php -p --standard=libraries/vendor/joomla/cms-coding-standards/lib/Joomla-CMS . @@ -25,40 +25,40 @@ steps: - name: npm image: node:14-alpine - depends_on: [ phpcs ] + depends_on: [phpcs] commands: - npm ci --unsafe-perm - name: php72-unit - depends_on: [ phpcs ] + depends_on: [phpcs] image: joomlaprojects/docker-images:php7.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php73-unit - depends_on: [ phpcs ] + depends_on: [phpcs] image: joomlaprojects/docker-images:php7.3 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php74-unit - depends_on: [ phpcs ] + depends_on: [phpcs] image: joomlaprojects/docker-images:php7.4 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php80-unit - depends_on: [ phpcs ] + depends_on: [phpcs] image: joomlaprojects/docker-images:php8.0 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php81-unit - depends_on: [ phpcs ] + depends_on: [phpcs] image: joomlaprojects/docker-images:php8.1 failure: ignore commands: @@ -66,28 +66,28 @@ steps: - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php72-integration - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php7.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php73-integration - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php7.3 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php74-integration - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php7.4 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php80-integration - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php8.0 failure: ignore commands: @@ -95,42 +95,42 @@ steps: - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php81-integration - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php8.1 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php82-integration - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php8.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php72-integration-pgsql - depends_on: [ npm ] + 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 ] + 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 ] + depends_on: [npm] image: joomlaprojects/docker-images:php7.4 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: php80-integration-pgsql - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php8.0 failure: ignore commands: @@ -138,27 +138,27 @@ steps: - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: php81-integration-pgsql - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php8.1 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: php82-integration-pgsql - depends_on: [ npm ] + depends_on: [npm] image: joomlaprojects/docker-images:php8.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: scss-cs - depends_on: [ npm ] + depends_on: [npm] image: node:current-alpine commands: - npm run lint:css - name: javascript-cs - depends_on: [ npm ] + depends_on: [npm] image: node:current-alpine commands: - npm run lint:js @@ -182,19 +182,19 @@ steps: commands: - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql -# - name: phpnext-api-mysql -# depends_on: -# - phpmin-api-mysql -# image: joomlaprojects/docker-images:systemtests8.2 -# failure: ignore -# environment: -# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 -# commands: -# - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext + # - name: phpnext-api-mysql + # depends_on: + # - phpmin-api-mysql + # image: joomlaprojects/docker-images:systemtests8.2 + # failure: ignore + # environment: + # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 + # commands: + # - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext - name: phpmin-api-postgres depends_on: - # - phpnext-api-mysql + # - phpnext-api-mysql - phpmin-api-mysql image: joomlaprojects/docker-images:systemtests failure: ignore @@ -203,19 +203,19 @@ steps: commands: - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres -# - name: phpnext-api-postgres -# depends_on: -# - phpmin-api-postgres -# image: joomlaprojects/docker-images:systemtests8.2 -# failure: ignore -# environment: -# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 -# commands: -# - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext + # - name: phpnext-api-postgres + # depends_on: + # - phpmin-api-postgres + # image: joomlaprojects/docker-images:systemtests8.2 + # failure: ignore + # environment: + # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 + # commands: + # - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext - name: phpmax-api-postgres depends_on: -# - phpnext-api-postgres + # - phpnext-api-postgres - phpmin-api-postgres image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -235,19 +235,19 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql -# - name: phpnext-system-mysql -# depends_on: -# - phpmin-system-mysql -# image: joomlaprojects/docker-images:systemtests8.2 -# failure: ignore -# environment: -# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 -# commands: -# - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext + # - name: phpnext-system-mysql + # depends_on: + # - phpmin-system-mysql + # image: joomlaprojects/docker-images:systemtests8.2 + # failure: ignore + # environment: + # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 + # commands: + # - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext - name: phpmax-system-mysql depends_on: -# - phpnext-system-mysql + # - phpnext-system-mysql - phpmin-system-mysql image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -256,19 +256,19 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax -# - name: phpnext-system-mysql8 -# depends_on: -# - phpmax-system-mysql -# image: joomlaprojects/docker-images:systemtests8.2 -# failure: ignore -# environment: -# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 -# commands: -# - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext + # - name: phpnext-system-mysql8 + # depends_on: + # - phpmax-system-mysql + # image: joomlaprojects/docker-images:systemtests8.2 + # failure: ignore + # environment: + # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 + # commands: + # - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext - name: phpmax-system-mysql8 depends_on: -# - phpnext-system-mysql + # - phpnext-system-mysql - phpmax-system-mysql image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -277,19 +277,19 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax -# - name: phpnext-system-postgres -# depends_on: -# - phpmax-system-mysql8 -# image: joomlaprojects/docker-images:systemtests8.2 -# failure: ignore -# environment: -# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 -# commands: -# - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext + # - name: phpnext-system-postgres + # depends_on: + # - phpmax-system-mysql8 + # image: joomlaprojects/docker-images:systemtests8.2 + # failure: ignore + # environment: + # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 + # commands: + # - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext - name: phpmax-system-postgres depends_on: -# - phpnext-system-mysql8 + # - phpnext-system-mysql8 - phpmax-system-mysql8 image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -299,7 +299,7 @@ steps: - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax - name: phpmin-system-mysql8 - depends_on: [ phpmax-system-postgres ] + depends_on: [phpmax-system-postgres] image: joomlaprojects/docker-images:systemtests environment: JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 @@ -307,7 +307,7 @@ steps: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8 - name: phpmin-system-postgres - depends_on: [ phpmin-system-mysql8 ] + depends_on: [phpmin-system-mysql8] image: joomlaprojects/docker-images:systemtests environment: JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 @@ -317,17 +317,17 @@ steps: - name: artifacts-system-tests image: cschlosser/drone-ftps depends_on: -# - phpnext-system-mysql -# - phpnext-system-mysql8 -# - phpnext-system-postgres + # - phpnext-system-mysql + # - phpnext-system-mysql8 + # - phpnext-system-postgres - phpmax-system-mysql - phpmax-system-mysql8 - phpmax-system-postgres - phpmin-system-mysql - phpmin-system-mysql8 - phpmin-system-postgres -# - phpnext-api-mysql -# - phpnext-api-postgres + # - phpnext-api-mysql + # - phpnext-api-postgres - phpmax-api-mysql - phpmax-api-postgres - phpmin-api-mysql @@ -351,7 +351,7 @@ steps: - failure branches: - exclude: [ l10n_* ] + exclude: [l10n_*] volumes: - name: composer-cache @@ -417,9 +417,6 @@ steps: branch: - 4.2-dev - --- kind: signature -hmac: d9707d261edba35bc6b70f09a1babee119cb0a88cebda40171248e5c0a8b135e - -... +hmac: 53e23beca546bde246f812a726320210f33d231106cb154a65cc900ecbf7502e From 0f07418c15c8a3abc2c514ad2eea827e97465819 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Wed, 4 Aug 2021 23:37:33 +0530 Subject: [PATCH 02/43] add selector field dropdown --- administrator/components/com_content/tmpl/articles/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 599b0ec92372b..9a271bb7dc9ff 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -98,7 +98,7 @@
$this)); + echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => ['selectorFieldName' => 'featured'])); ?> items)) : ?>
From be4195503fb75b0c32ec104eb4a7e13a247b98bf Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Thu, 5 Aug 2021 16:13:40 +0530 Subject: [PATCH 03/43] change featured from filter to selector --- .../com_content/forms/filter_articles.xml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml index 5bc5cf786f44c..ef0de6d36a006 100644 --- a/administrator/components/com_content/forms/filter_articles.xml +++ b/administrator/components/com_content/forms/filter_articles.xml @@ -1,5 +1,18 @@
+ + + + + - - - - - - Date: Thu, 5 Aug 2021 16:16:43 +0530 Subject: [PATCH 04/43] update articles model to incorporate featurred --- .../com_content/src/Model/ArticlesModel.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index 8c9f46e058746..2bcf3ea1ab054 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -40,6 +40,8 @@ class ArticlesModel extends ListModel */ public function __construct($config = array()) { + $featured = $app->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + if (empty($config['filter_fields'])) { $config['filter_fields'] = array( @@ -56,7 +58,6 @@ public function __construct($config = array()) 'created_by', 'a.created_by', 'created_by_alias', 'a.created_by_alias', 'ordering', 'a.ordering', - 'featured', 'a.featured', 'featured_up', 'fp.featured_up', 'featured_down', 'fp.featured_down', 'language', 'a.language', @@ -73,6 +74,10 @@ public function __construct($config = array()) 'ws.title' ); + if ($featured === '1'){ + $config['filter_fields'][] = 'fp.ordering'; + } + if (Associations::isEnabled()) { $config['filter_fields'][] = 'association'; @@ -146,7 +151,8 @@ protected function populateState($ordering = 'a.id', $direction = 'desc') $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); $this->setState('filter.search', $search); - $featured = $this->getUserStateFromRequest($this->context . '.filter.featured', 'filter_featured', ''); + // Initialize featured to the get request value if it is set, else use the selector dropdown value. + $featured = $app->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); $this->setState('filter.featured', $featured); $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); @@ -233,6 +239,8 @@ protected function getListQuery() $query = $db->getQuery(true); $user = Factory::getUser(); + $featured = $app->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + $params = ComponentHelper::getParams('com_content'); // Select the required fields from the table. @@ -305,6 +313,13 @@ protected function getListQuery() ->join('INNER', $db->quoteName('#__workflow_stages', 'ws'), $db->quoteName('ws.id') . ' = ' . $db->quoteName('wa.stage_id')) ->join('INNER', $db->quoteName('#__workflows', 'w'), $db->quoteName('w.id') . ' = ' . $db->quoteName('ws.workflow_id')); + if ($featured === '1'){ + $query->select($this->getDbo()->quoteName('fp.ordering')); + } + elseif ($featured === '0'){ + $query->where($db->quoteName('a.featured') . ' = 0'); + } + if (PluginHelper::isEnabled('content', 'vote')) { $query->select( From 73634bb8facb149d50175a5508d4e37209f2aa04 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Thu, 5 Aug 2021 17:57:57 +0530 Subject: [PATCH 05/43] fix bug in dropdown value adaption --- .../com_content/src/Model/ArticlesModel.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index 2bcf3ea1ab054..ccaf551f03c88 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -40,7 +40,7 @@ class ArticlesModel extends ListModel */ public function __construct($config = array()) { - $featured = $app->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + $featured = Factory::getApplication()->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); if (empty($config['filter_fields'])) { @@ -239,8 +239,6 @@ protected function getListQuery() $query = $db->getQuery(true); $user = Factory::getUser(); - $featured = $app->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); - $params = ComponentHelper::getParams('com_content'); // Select the required fields from the table. @@ -313,13 +311,6 @@ protected function getListQuery() ->join('INNER', $db->quoteName('#__workflow_stages', 'ws'), $db->quoteName('ws.id') . ' = ' . $db->quoteName('wa.stage_id')) ->join('INNER', $db->quoteName('#__workflows', 'w'), $db->quoteName('w.id') . ' = ' . $db->quoteName('ws.workflow_id')); - if ($featured === '1'){ - $query->select($this->getDbo()->quoteName('fp.ordering')); - } - elseif ($featured === '0'){ - $query->where($db->quoteName('a.featured') . ' = 0'); - } - if (PluginHelper::isEnabled('content', 'vote')) { $query->select( @@ -365,7 +356,7 @@ protected function getListQuery() } // Filter by featured. - $featured = (string) $this->getState('filter.featured'); + $featured = $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); if (\in_array($featured, ['0','1'])) { @@ -374,6 +365,11 @@ protected function getListQuery() ->bind(':featured', $featured, ParameterType::INTEGER); } + if ($featured === '1') + { + $query->select($this->getDbo()->quoteName('fp.ordering')); + } + // Filter by access level on categories. if (!$user->authorise('core.admin')) { From f7f52a9d5c5b2f997d966f7c1b319488880b9d69 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Thu, 5 Aug 2021 18:17:29 +0530 Subject: [PATCH 06/43] remove unneccesary ternary --- .../components/com_content/src/Model/ArticlesModel.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index ccaf551f03c88..bdb129e6cdcc7 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -40,7 +40,7 @@ class ArticlesModel extends ListModel */ public function __construct($config = array()) { - $featured = Factory::getApplication()->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + $featured = $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); if (empty($config['filter_fields'])) { @@ -151,8 +151,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc') $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); $this->setState('filter.search', $search); - // Initialize featured to the get request value if it is set, else use the selector dropdown value. - $featured = $app->input->get('featured') ?? $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + $featured = $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); $this->setState('filter.featured', $featured); $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); From a5d723de73b15f546010f2a98db133cba5107ca9 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Thu, 5 Aug 2021 18:27:04 +0530 Subject: [PATCH 07/43] phpcs --- .../components/com_content/src/Model/ArticlesModel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index bdb129e6cdcc7..0f19d10cfc27f 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -74,7 +74,8 @@ public function __construct($config = array()) 'ws.title' ); - if ($featured === '1'){ + if ($featured === '1') + { $config['filter_fields'][] = 'fp.ordering'; } From 7074ae60f416ca03ef2d0d012c24e36a0acb3253 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Thu, 5 Aug 2021 20:29:37 +0530 Subject: [PATCH 08/43] merge tmpl --- .../com_content/tmpl/articles/default.php | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 9a271bb7dc9ff..78af94fc90c05 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -34,7 +34,9 @@ $userId = $user->get('id'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$saveOrder = $listOrder == 'a.ordering'; +$featured = $this->state->get('filter.featured'); +$orderName = $featured === "1" ? 'fp.ordering' : 'a.ordering'; +$saveOrder = $listOrder == $orderName ; if (strpos($listOrder, 'publish_up') !== false) { @@ -108,7 +110,7 @@ @@ -118,15 +120,15 @@ - +
- + - - + + - + @@ -174,6 +176,9 @@ class="js-draggable" data-url="" data-direction="" data-nested="true"> items as $i => $item) : $item->max_ordering = 0; + $ordering = ($listOrder == 'fp.ordering'); + $assetId = 'com_content.article.' . $item->id; + $canCreate = $user->authorise('core.create', 'com_content.category.' . $item->catid); $canEdit = $user->authorise('core.edit', 'com_content.article.' . $item->id); $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || is_null($item->checked_out); $canEditOwn = $user->authorise('core.edit.own', 'com_content.article.' . $item->id) && $item->created_by == $userId; @@ -389,19 +394,30 @@ pagination->getListFooter(); ?> - - authorise('core.create', 'com_content') - && $user->authorise('core.edit', 'com_content') - && $user->authorise('core.edit.state', 'com_content')) : ?> + Text::_('COM_CONTENT_BATCH_OPTIONS'), - 'footer' => $this->loadTemplate('batch_footer'), + 'title' => Text::_('JTOOLBAR_CHANGE_STATUS'), + 'footer' => $this->loadTemplate('stage_footer'), ), - $this->loadTemplate('batch_body') + $this->loadTemplate('stage_body') ); ?> + + authorise('core.create', 'com_content') + && $user->authorise('core.edit', 'com_content') + && $user->authorise('core.edit.state', 'com_content')) : ?> + Text::_('COM_CONTENT_BATCH_OPTIONS'), + 'footer' => $this->loadTemplate('batch_footer'), + ), + $this->loadTemplate('batch_body') + ); ?> + @@ -410,6 +426,9 @@ + + + From 4a69c58182ccef412826ad28ca74af7a6da8a2ea Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Thu, 5 Aug 2021 20:29:56 +0530 Subject: [PATCH 09/43] add default stage templates --- .../tmpl/articles/default_stage_body.php | 23 +++++++++++++++++++ .../tmpl/articles/default_stage_footer.php | 23 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 administrator/components/com_content/tmpl/articles/default_stage_body.php create mode 100644 administrator/components/com_content/tmpl/articles/default_stage_footer.php diff --git a/administrator/components/com_content/tmpl/articles/default_stage_body.php b/administrator/components/com_content/tmpl/articles/default_stage_body.php new file mode 100644 index 0000000000000..3dadb99058ecc --- /dev/null +++ b/administrator/components/com_content/tmpl/articles/default_stage_body.php @@ -0,0 +1,23 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ +defined('_JEXEC') or die; + +use Joomla\CMS\Language\Text; + +?> + +
+
+
+

+
+
+
+
+
diff --git a/administrator/components/com_content/tmpl/articles/default_stage_footer.php b/administrator/components/com_content/tmpl/articles/default_stage_footer.php new file mode 100644 index 0000000000000..886538176cfc0 --- /dev/null +++ b/administrator/components/com_content/tmpl/articles/default_stage_footer.php @@ -0,0 +1,23 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ +defined('_JEXEC') or die; + +use Joomla\CMS\Language\Text; + +/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */ +$wa = $this->document->getWebAssetManager(); +$wa->useScript('com_content.admin-articles-stage'); + +?> + + From e732f6c5fee441f5868d3b813e926841ae1d6595 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Fri, 6 Aug 2021 23:14:56 +0530 Subject: [PATCH 10/43] phpcs --- administrator/components/com_content/tmpl/articles/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 78af94fc90c05..d34c365c840fe 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -36,7 +36,7 @@ $listDirn = $this->escape($this->state->get('list.direction')); $featured = $this->state->get('filter.featured'); $orderName = $featured === "1" ? 'fp.ordering' : 'a.ordering'; -$saveOrder = $listOrder == $orderName ; +$saveOrder = $listOrder == $orderName; if (strpos($listOrder, 'publish_up') !== false) { From 9cf22b8e855cfbe9f4fea3e8bcc4296d2449f7ab Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 7 Aug 2021 10:02:38 +0530 Subject: [PATCH 11/43] merge view --- .../src/View/Articles/HtmlView.php | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php index deb7a7c86b6fd..2231e280d23e4 100644 --- a/administrator/components/com_content/src/View/Articles/HtmlView.php +++ b/administrator/components/com_content/src/View/Articles/HtmlView.php @@ -96,6 +96,7 @@ public function display($tpl = null) $this->activeFilters = $this->get('ActiveFilters'); $this->vote = PluginHelper::isEnabled('content', 'vote'); $this->hits = ComponentHelper::getParams('com_content')->get('record_hits', 1); + $featured = $this->state->get('filter.featured'); if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) { @@ -110,7 +111,7 @@ public function display($tpl = null) } // Check for errors. - if (\count($errors = $this->get('Errors')) || $this->transitions === false) + if (\count($errors = $this->get('Errors')) || ($this->transitions === false && $featured === '1')) { throw new GenericDataException(implode("\n", $errors), 500); } @@ -157,13 +158,21 @@ public function display($tpl = null) */ protected function addToolbar() { - $canDo = ContentHelper::getActions('com_content', 'category', $this->state->get('filter.category_id')); - $user = Factory::getApplication()->getIdentity(); + $canDo = ContentHelper::getActions('com_content', 'category', $this->state->get('filter.category_id')); + $user = Factory::getApplication()->getIdentity(); + $featured = $this->state->get('filter.featured'); // Get the toolbar object instance $toolbar = Toolbar::getInstance('toolbar'); - ToolbarHelper::title(Text::_('COM_CONTENT_ARTICLES_TITLE'), 'copy article'); + if ($featured === '1') + { + ToolbarHelper::title(Text::_('COM_CONTENT_FEATURED_TITLE'), 'star featured'); + } + else + { + ToolbarHelper::title(Text::_('COM_CONTENT_ARTICLES_TITLE'), 'copy article'); + } if ($canDo->get('core.create') || \count($user->getAuthorisedCategories('com_content', 'core.create')) > 0) { @@ -210,15 +219,21 @@ protected function addToolbar() $childBar->unpublish('articles.unpublish')->listCheck(true); - $childBar->standardButton('featured') - ->text('JFEATURE') - ->task('articles.featured') - ->listCheck(true); + if ($featured !== '1') + { + $childBar->standardButton('featured') + ->text('JFEATURE') + ->task('articles.featured') + ->listCheck(true); + } - $childBar->standardButton('unfeatured') - ->text('JUNFEATURE') - ->task('articles.unfeatured') - ->listCheck(true); + if ($featured !== '0') + { + $childBar->standardButton('circle') + ->text('JUNFEATURE') + ->task('articles.unfeatured') + ->listCheck(true); + } $childBar->archive('articles.archive')->listCheck(true); @@ -233,7 +248,8 @@ protected function addToolbar() // Add a batch button if ($user->authorise('core.create', 'com_content') && $user->authorise('core.edit', 'com_content') - && $user->authorise('core.execute.transition', 'com_content')) + && $user->authorise('core.execute.transition', 'com_content') + && $featured !== '1') { $childBar->popupButton('batch') ->text('JTOOLBAR_BATCH') @@ -255,6 +271,13 @@ protected function addToolbar() $toolbar->preferences('com_content'); } - $toolbar->help('Articles'); + if ($featured === '1') + { + $toolbar->help('JHELP_CONTENT_ARTICLE_MANAGER'); + } + else + { + ToolbarHelper::help('JHELP_CONTENT_FEATURED_ARTICLES'); + } } } From be42ff8d2a9db48eed121d3721a86415a04ccc44 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sun, 8 Aug 2021 13:49:48 +0530 Subject: [PATCH 12/43] add isFeatured method to get featured selector --- .../com_content/src/Model/ArticlesModel.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index 0f19d10cfc27f..f822c0c367f0f 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -40,7 +40,7 @@ class ArticlesModel extends ListModel */ public function __construct($config = array()) { - $featured = $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + $featured = $this->isFeatured(); if (empty($config['filter_fields'])) { @@ -152,7 +152,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc') $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); $this->setState('filter.search', $search); - $featured = $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + $featured = $this->isFeatured(); $this->setState('filter.featured', $featured); $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); @@ -356,7 +356,7 @@ protected function getListQuery() } // Filter by featured. - $featured = $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + $featured = $this->isFeatured(); if (\in_array($featured, ['0','1'])) { @@ -726,4 +726,16 @@ public function getItems() return $items; } + + /** + * Method to get the value of featured selector. + * + * @return string Returns the value of featured selector. + * + * @since __DEPLOY_VERSION__ + */ + public function isFeatured() + { + return $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + } } From d3d51a917560ef5bf7c5e51d1addee0ebf4ca44e Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sun, 8 Aug 2021 13:50:15 +0530 Subject: [PATCH 13/43] merge featured controller --- .../src/Controller/ArticlesController.php | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/administrator/components/com_content/src/Controller/ArticlesController.php b/administrator/components/com_content/src/Controller/ArticlesController.php index 6bfa1850b484e..e1116943019e6 100644 --- a/administrator/components/com_content/src/Controller/ArticlesController.php +++ b/administrator/components/com_content/src/Controller/ArticlesController.php @@ -155,4 +155,60 @@ public function getQuickiconContent() echo new JsonResponse($result); } + + /** + * Removes an item. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function delete() + { + $articlesModel = $this->getModel('articles'); + $featured = $articlesModel->isFeatured(); + + if ($featured === "1") + { + // Check for request forgeries + $this->checkToken(); + + $user = $this->app->getIdentity(); + $ids = $this->input->get('cid', array(), 'array'); + + // Access checks. + foreach ($ids as $i => $id) + { + if (!$user->authorise('core.delete', 'com_content.article.' . (int) $id)) + { + // Prune items that you can't delete. + unset($ids[$i]); + $this->app->enqueueMessage(Text::_('JERROR_CORE_DELETE_NOT_PERMITTED'), 'notice'); + } + } + + if (empty($ids)) + { + $this->app->enqueueMessage(Text::_('JERROR_NO_ITEMS_SELECTED'), 'error'); + } + else + { + /** @var \Joomla\Component\Content\Administrator\Model\FeatureModel $model */ + $featureModel = $this->getModel('Feature'); + + // Remove the items. + if (!$featureModel->featured($ids, 0)) + { + $this->app->enqueueMessage($featureModel->getError(), 'error'); + } + } + + $this->setMessage(Text::plural('COM_CONTENT_N_ITEMS_DELETED', \count($ids))); + $this->setRedirect('index.php?option=com_content&view=articles&featured=1'); + } + else + { + parent::delete(); + } + } } From bfe7ac02786fb1e864f9efd7e604822e50ed973c Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Mon, 9 Aug 2021 23:31:11 +0530 Subject: [PATCH 14/43] update incoming links to featured --- administrator/components/com_content/presets/content.xml | 2 +- administrator/components/com_menus/presets/alternate.xml | 2 +- administrator/components/com_menus/presets/default.xml | 2 +- plugins/sampledata/testing/testing.php | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/administrator/components/com_content/presets/content.xml b/administrator/components/com_content/presets/content.xml index 214cf4c8ce64c..8e7a9cb6c6481 100644 --- a/administrator/components/com_content/presets/content.xml +++ b/administrator/components/com_content/presets/content.xml @@ -32,7 +32,7 @@ title="COM_CONTENT_MENUS_FEATURED" type="component" element="com_content" - link="index.php?option=com_content&view=featured" + link="index.php?option=com_content&view=articles&featured=1" class="class:featured" /> diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml index 8b4e74c23498e..2732873a60560 100644 --- a/administrator/components/com_menus/presets/alternate.xml +++ b/administrator/components/com_menus/presets/alternate.xml @@ -294,7 +294,7 @@ title="COM_CONTENT_MENUS_FEATURED" type="component" element="com_content" - link="index.php?option=com_content&view=featured" + link="index.php?option=com_content&view=articles&featured=1" /> diff --git a/plugins/sampledata/testing/testing.php b/plugins/sampledata/testing/testing.php index a7a0d506aedb3..a286f8dc04894 100644 --- a/plugins/sampledata/testing/testing.php +++ b/plugins/sampledata/testing/testing.php @@ -1836,7 +1836,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[6], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_18_TITLE'), - 'link' => 'index.php?option=com_content&view=featured', + 'link' => 'index.php?option=com_content&view=articles&featured=1', 'component_id' => ComponentHelper::getComponent('com_content')->id, 'params' => array( 'num_leading_articles' => 1, @@ -3113,7 +3113,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[2], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_1_TITLE'), - 'link' => 'index.php?option=com_content&view=featured', + 'link' => 'index.php?option=com_content&view=articles&featured=1', 'parent_id' => $menuIdsLevel4[8], 'component_id' => ComponentHelper::getComponent('com_content')->id, 'template_style_id' => 3, @@ -3145,7 +3145,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[2], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_3_TITLE'), - 'link' => 'index.php?option=com_content&view=featured', + 'link' => 'index.php?option=com_content&view=articles&featured=1', 'parent_id' => $menuIdsLevel4[7], 'component_id' => ComponentHelper::getComponent('com_content')->id, 'template_style_id' => 4, @@ -3177,7 +3177,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[2], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_5_TITLE'), - 'link' => 'index.php?option=com_content&view=featured', + 'link' => 'index.php?option=com_content&view=articles&featured=1', 'parent_id' => $menuIdsLevel4[9], 'component_id' => ComponentHelper::getComponent('com_content')->id, 'params' => array( From 2ffc28d99a5550c3ec50eb62794e70d1e10151d5 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Mon, 9 Aug 2021 23:31:43 +0530 Subject: [PATCH 15/43] update menu item install link --- installation/sql/mysql/base.sql | 2 +- installation/sql/postgresql/base.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql index dd7ab9e5a7776..75e55682cd423 100644 --- a/installation/sql/mysql/base.sql +++ b/installation/sql/mysql/base.sql @@ -523,7 +523,7 @@ SELECT 20, 'main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Sear INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`, `publish_up`, `publish_down`) SELECT 21, 'main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 13, 2, `extension_id`, 0, 0, 'class:finder-searches', 0, '', 36, 37, 0, '*', 1, NULL, NULL FROM `#__extensions` WHERE `name` = 'com_finder'; INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`, `publish_up`, `publish_down`) -SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, `extension_id`, 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM `#__extensions` WHERE `name` = 'com_content'; +SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=articles&featured=1', 'component', 1, 1, 1, `extension_id`, 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM `#__extensions` WHERE `name` = 'com_content'; -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql index cfc0e06a0e767..5375894cde50d 100644 --- a/installation/sql/postgresql/base.sql +++ b/installation/sql/postgresql/base.sql @@ -548,7 +548,7 @@ SELECT 20, 'main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Sear INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id", "publish_up", "publish_down") SELECT 21, 'main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 13, 2, "extension_id", 0, 0, 'class:finder-searches', 0, '', 36, 37, 0, '*', 1, NULL, NULL FROM "#__extensions" WHERE "name" = 'com_finder'; INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id", "publish_up", "publish_down") -SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, "extension_id", 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM "#__extensions" WHERE "name" = 'com_content'; +SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=articles&featured=1', 'component', 1, 1, 1, "extension_id", 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM "#__extensions" WHERE "name" = 'com_content'; SELECT setval('#__menu_id_seq', 102, false); -- From d6611876ee61e34cc4b28678cadaca5b0441ce07 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Mon, 9 Aug 2021 23:40:24 +0530 Subject: [PATCH 16/43] sql update link to featured --- .../com_admin/sql/updates/mysql/4.1.0-2021-08-09.sql | 4 ++++ .../com_admin/sql/updates/postgresql/4.1.0-2021-08-09.sql | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-08-09.sql create mode 100644 administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-08-09.sql diff --git a/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-08-09.sql b/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-08-09.sql new file mode 100644 index 0000000000000..4e39ce42304e2 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-08-09.sql @@ -0,0 +1,4 @@ +-- Update link to featured +UPDATE `#__menu` + SET `link` = 'index.php?option=com_content&view=articles&featured=1' + WHERE `link` = 'index.php?option=com_content&view=featured'; \ No newline at end of file diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-08-09.sql b/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-08-09.sql new file mode 100644 index 0000000000000..0e9b0c6ef6cff --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-08-09.sql @@ -0,0 +1,4 @@ +-- Update link to featured +UPDATE "#__menu" + SET "link" = 'index.php?option=com_content&view=articles&featured=1' + WHERE "link" = 'index.php?option=com_content&view=featured'; From cbf71ddc5ee3589a5205d58c9b1301c4613d3576 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 14 Aug 2021 00:09:47 +0530 Subject: [PATCH 17/43] fixes https://github.com/joomla-projects/gsoc21_core-enhancements/issues/13 by removing hidden field --- administrator/components/com_content/tmpl/articles/default.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index d34c365c840fe..46ec84f02be3d 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -426,9 +426,6 @@ - - - From 8c7ee8f86b97071d1dd0d5973f94e1942d591e06 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Tue, 17 Aug 2021 00:13:53 +0530 Subject: [PATCH 18/43] set default ordering for featured and articles --- .../com_content/src/Model/ArticlesModel.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index f822c0c367f0f..bedee0c17b0b7 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -358,16 +358,21 @@ protected function getListQuery() // Filter by featured. $featured = $this->isFeatured(); - if (\in_array($featured, ['0','1'])) + if ($featured === '1') { - $featured = (int) $featured; - $query->where($db->quoteName('a.featured') . ' = :featured') - ->bind(':featured', $featured, ParameterType::INTEGER); + $query->select($db->quoteName('fp.ordering')); + $defaultOrdering = 'fp.ordering'; + } + else + { + $defaultOrdering = 'a.id'; } - if ($featured === '1') + if (in_array($featured, ['0','1'])) { - $query->select($this->getDbo()->quoteName('fp.ordering')); + $featured = (int) $featured; + $query->where($db->quoteName('a.featured') . ' = :featured') + ->bind(':featured', $featured, ParameterType::INTEGER); } // Filter by access level on categories. @@ -572,7 +577,7 @@ protected function getListQuery() } // Add the list ordering clause. - $orderCol = $this->state->get('list.ordering', 'a.id'); + $orderCol = $this->state->get('list.ordering', $defaultOrdering); $orderDirn = $this->state->get('list.direction', 'DESC'); if ($orderCol === 'a.ordering' || $orderCol === 'category_title') From 5481e3c6f6ea8fc9cf3384841712a48f53af4be7 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Fri, 20 Aug 2021 14:00:03 +0530 Subject: [PATCH 19/43] single help page --- .../src/View/Articles/HtmlView.php | 15 +- administrator/language/en-GB/joomla.ini | 211 ++++++++++++++++++ api/language/en-GB/joomla.ini | 211 ++++++++++++++++++ 3 files changed, 427 insertions(+), 10 deletions(-) diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php index 2231e280d23e4..b520010a59b77 100644 --- a/administrator/components/com_content/src/View/Articles/HtmlView.php +++ b/administrator/components/com_content/src/View/Articles/HtmlView.php @@ -130,8 +130,10 @@ public function display($tpl = null) } else { - // In article associations modal we need to remove language filter if forcing a language. - // We also need to change the category filter to show show categories with All or the forced language. + /* + * In article associations modal we need to remove language filter if forcing a language. + * We also need to change the category filter to show show categories with All or the forced language. + */ if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) { // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field. @@ -271,13 +273,6 @@ protected function addToolbar() $toolbar->preferences('com_content'); } - if ($featured === '1') - { - $toolbar->help('JHELP_CONTENT_ARTICLE_MANAGER'); - } - else - { - ToolbarHelper::help('JHELP_CONTENT_FEATURED_ARTICLES'); - } + $toolbar->help('JHELP_CONTENT_ARTICLE_MANAGER'); } } diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index 5f96f9bbab9ec..4b77c66375b5d 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -709,6 +709,217 @@ JGRID_HEADING_ORDERING="Ordering" JGRID_HEADING_ORDERING_ASC="Ordering ascending" JGRID_HEADING_ORDERING_DESC="Ordering descending" +JHELP_ADMIN_USER_PROFILE_EDIT="My_Profile" +JHELP_COMPONENTS_ACTIONLOGS="User_Actions_Log" +JHELP_COMPONENTS_ASSOCIATIONS="Multilingual_Associations" +JHELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual_Associations:_Edit" +JHELP_COMPONENTS_BANNERS_BANNERS="Banners" +JHELP_COMPONENTS_BANNERS_BANNERS_EDIT="Banners:_Edit" +JHELP_COMPONENTS_BANNERS_CATEGORIES="Banners:_Categories" +JHELP_COMPONENTS_BANNERS_CATEGORY_ADD="Banners:_New_or_Edit_Category" +JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Banners:_New_or_Edit_Category" +JHELP_COMPONENTS_BANNERS_CLIENTS="Banners:_Clients" +JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banners:_New_or_Edit_Client" +JHELP_COMPONENTS_BANNERS_TRACKS="Banners:_Tracks" +JHELP_COMPONENTS_COM_ACTIONLOGS_OPTIONS="User_Actions_Log:_Options" +JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Multilingual_Associations:_Options" +JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Banners:_Options" +JHELP_COMPONENTS_COM_CACHE_OPTIONS="Cache:_Options" +JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Check-in:_Options" +JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Contacts:_Options" +JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Articles:_Options" +JHELP_COMPONENTS_COM_FINDER_OPTIONS="Smart_Search:_Options" +JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Installer:_Options" +JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Joomla_Update:_Options" +JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Languages:_Options" +JHELP_COMPONENTS_COM_MAILS_OPTIONS="Mail_Templates:_Options" +JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Media:_Options" +JHELP_COMPONENTS_COM_MENUS_OPTIONS="Menus:_Options" +JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Messages:_Options" +JHELP_COMPONENTS_COM_MODULES_OPTIONS="Module:_Options" +JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="News_Feed:_Options" +JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Plugin:_Options" +JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Post-installation_Messages:_Options" +JHELP_COMPONENTS_COM_PRIVACY_OPTIONS="Privacy:_Options" +JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Redirect:_Options" +JHELP_COMPONENTS_COM_TAGS_OPTIONS="Tags:_Options" +JHELP_COMPONENTS_COM_TEMPLATES_OPTIONS="Template:_Options" +JHELP_COMPONENTS_COM_USERS_OPTIONS="Users:_Options" +JHELP_COMPONENTS_CONTACT_CATEGORIES="Contacts:_Categories" +JHELP_COMPONENTS_CONTACT_CATEGORY_ADD="Contacts:_New_or_Edit_Category" +JHELP_COMPONENTS_CONTACT_CATEGORY_EDIT="Contacts:_New_or_Edit_Category" +JHELP_COMPONENTS_CONTACTS_CONTACTS="Contacts" +JHELP_COMPONENTS_CONTACTS_CONTACTS_EDIT="Contacts:_New_or_Edit" +JHELP_COMPONENTS_CONTENT_CATEGORIES="Articles:_Categories" +JHELP_COMPONENTS_CONTENT_CATEGORY_ADD="Articles:_New_or_Edit_Category" +JHELP_COMPONENTS_CONTENT_CATEGORY_EDIT="Articles:_New_or_Edit_Category" +JHELP_COMPONENTS_FIELDS_FIELD_GROUPS="Component:_Field_Groups" +JHELP_COMPONENTS_FIELDS_FIELD_GROUPS_EDIT="Component:_New_or_Edit_Field_Group" +JHELP_COMPONENTS_FIELDS_FIELDS="Component:_Fields" +JHELP_COMPONENTS_FIELDS_FIELDS_EDIT="Component:_New_or_Edit_Field" +JHELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS="Smart_Search:_Content_Maps" +JHELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT="Smart_Search:_Indexed_Content" +JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS="Smart_Search:_Search_Filters" +JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT="Smart_Search:_New_or_Edit_Filter" +JHELP_COMPONENTS_FINDER_MANAGE_SEARCHES="Smart_Search:_Search_Term_Analysis" +JHELP_COMPONENTS_INSTALLER_UPDATESITE_EDIT="Edit_Update_Site" +JHELP_COMPONENTS_JOOMLA_UPDATE="Joomla_Update" +JHELP_COMPONENTS_MAILS_TEMPLATES="Mail_Templates" +JHELP_COMPONENTS_MAILS_TEMPLATE_EDIT="Mail_Template:_Edit" +JHELP_COMPONENTS_MESSAGING_INBOX="Private_Messages" +JHELP_COMPONENTS_MESSAGING_READ="Private_Messages:_Read" +JHELP_COMPONENTS_MESSAGING_WRITE="Private_Messages:_Write" +JHELP_COMPONENTS_NEWSFEEDS_CATEGORIES="News_Feeds:_Categories" +JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_ADD="News_Feeds:_New_or_Edit_Category" +JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_EDIT="News_Feeds:_New_or_Edit_Category" +JHELP_COMPONENTS_NEWSFEEDS_FEEDS="News_Feeds" +JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="News_Feeds:_New_or_Edit" +JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Post-installation_Messages_for_Joomla_CMS" +JHELP_COMPONENTS_PRIVACY_CAPABILITIES="Privacy:_Extension_Capabilities" +JHELP_COMPONENTS_PRIVACY_CONSENTS="Privacy:_Consents" +JHELP_COMPONENTS_PRIVACY_DASHBOARD="Privacy_Dashboard" +JHELP_COMPONENTS_PRIVACY_REQUEST="Privacy:_Review_Information_Request" +JHELP_COMPONENTS_PRIVACY_REQUEST_EDIT="Privacy:_New_Information_Request" +JHELP_COMPONENTS_PRIVACY_REQUESTS="Privacy:_Information_Requests" +JHELP_COMPONENTS_REDIRECT_MANAGER="Redirects:_Links" +JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Redirects:_New_or_Edit" +JHELP_COMPONENTS_TAGS_MANAGER="Tags" +JHELP_COMPONENTS_TAGS_MANAGER_EDIT="Tags:_New_or_Edit" +JHELP_COMPONENTS_USERS_CATEGORIES="User_Notes:_Categories" +JHELP_COMPONENTS_USERS_CATEGORY_ADD="User_Notes:_New_or_Edit_Category" +JHELP_COMPONENTS_USERS_CATEGORY_EDIT="User_Notes:_New_or_Edit_Category" +JHELP_COMPONENTS_WORKFLOW_STAGES_LIST="Stages_List:_Basic_Workflow" +JHELP_COMPONENTS_WORKFLOW_TRANSITIONS_LIST="Transitions_List:_Basic_Workflow" +JHELP_COMPONENTS_WORKFLOW_WORKFLOWS_LIST="Workflows_List" +JHELP_CONTENT_ARTICLE_MANAGER="Articles" +JHELP_CONTENT_ARTICLE_MANAGER_EDIT="Articles:_Edit" +JHELP_CONTENT_MEDIA_MANAGER="Media" +JHELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE="Information:_Database" +JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER="Extensions:_Discover" +JHELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL="Extensions:_Install" +JHELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES="Extensions:_Languages" +JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE="Extensions:_Manage" +JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE="Extensions:_Update" +JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES="Extensions:_Update_Sites" +JHELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS="Information:_Warnings" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT="Languages:_Content" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT="Languages:_Edit_Content_Language" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED="Languages:_Installed" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES="Languages:_Overrides" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT="Languages:_Edit_Override" +JHELP_EXTENSIONS_MODULE_MANAGER="Modules" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_CUSTOM="Admin_Modules:_Custom" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FEED="Admin_Modules:_Feed_Display" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FRONTEND="Admin_Modules:_Frontend_Link" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST="Admin_Modules:_Articles_-_Latest" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATESTACTIONS="Admin_Modules:_Action_Logs_-_Latest" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGGED="Admin_Modules:_Logged-in_Users" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN="Admin_Modules:_Login_Form" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN_SUPPORT="Admin_Modules:_Login_Support_Information" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU="Admin_Modules:_Administrator_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MESSAGES="Admin_Modules:_Messages" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MULTILANG="Admin_Modules:_Multilingual_Status" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POPULAR="Admin_Modules:_Popular_Articles" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POST_INSTALLATION_MESSAGES="Admin_Modules:_Post_Installation_Messages" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_DASHBOARD="Admin_Modules:_Privacy_Dashboard" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_STATUS="Admin_Modules:_Privacy_Status_Check" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_QUICKICON="Admin_Modules:_Quick_Icons" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SAMPLE_DATA="Admin_Modules:_Sample_Data" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_STATUS_USER="Admin_Modules:_User_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SUBMENU="Admin_Modules:_Administrator_Dashboard_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TITLE="Admin_Modules:_Title" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TOOLBAR="Admin_Modules:_Toolbar" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_VERSION="Admin_Modules:_Joomla_Version_Information" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE="Site_Modules:_Articles_-_Archived" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES="Site_Modules:_Articles_-_Categories" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORY="Site_Modules:_Articles_-_Category" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_NEWSFLASH="Site_Modules:_Articles_-_Newsflash" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_RELATED="Site_Modules:_Articles_-_Related" +JHELP_EXTENSIONS_MODULE_MANAGER_BANNERS="Site_Modules:_Banners" +JHELP_EXTENSIONS_MODULE_MANAGER_BREADCRUMBS="Site_Modules:_Breadcrumbs" +JHELP_EXTENSIONS_MODULE_MANAGER_CUSTOM_HTML="Site_Modules:_Custom" +JHELP_EXTENSIONS_MODULE_MANAGER_EDIT="" +JHELP_EXTENSIONS_MODULE_MANAGER_FEED_DISPLAY="Site_Modules:_Feed_Display" +JHELP_EXTENSIONS_MODULE_MANAGER_FOOTER="Site_Modules:_Footer" +JHELP_EXTENSIONS_MODULE_MANAGER_LANGUAGE_SWITCHER="Site_Modules:_Language_Switcher" +JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_NEWS="Site_Modules:_Articles_-_Latest" +JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_USERS="Site_Modules:_Latest_Users" +JHELP_EXTENSIONS_MODULE_MANAGER_LOGIN="Site_Modules:_Login" +JHELP_EXTENSIONS_MODULE_MANAGER_MENU="Site_Modules:_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_MOST_READ="Site_Modules:_Articles_-_Most_Read" +JHELP_EXTENSIONS_MODULE_MANAGER_RANDOM_IMAGE="Site_Modules:_Random_Image" +JHELP_EXTENSIONS_MODULE_MANAGER_SMART_SEARCH="Site_Modules:_Smart_Search" +JHELP_EXTENSIONS_MODULE_MANAGER_STATISTICS="Site_Modules:_Statistics" +JHELP_EXTENSIONS_MODULE_MANAGER_SYNDICATION_FEEDS="Site_Modules:_Syndication_Feeds" +JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_POPULAR="Site_Modules:_Tags_-_Popular" +JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_SIMILAR="Site_Modules:_Tags_-_Similar" +JHELP_EXTENSIONS_MODULE_MANAGER_WHO_ONLINE="Site_Modules:_Who%27s_Online" +JHELP_EXTENSIONS_MODULE_MANAGER_WRAPPER="Site_Modules:_Wrapper" +JHELP_EXTENSIONS_PLUGIN_MANAGER="Plugins" +JHELP_EXTENSIONS_PLUGIN_MANAGER_EDIT="Plugins:_Name_of_Plugin" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES="Templates:_Styles" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT="Templates:_Edit_Style" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES="Templates:_Templates" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT="Templates:_Customise" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE="Templates:_Customise_Source" +JHELP_GLOSSARY="Glossary" +JHELP_MENUS_MENU_ITEM_ARTICLE_ARCHIVED="Menu_Item:_Article_Archived" +JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORIES="Menu_Item:_List_All_Categories" +JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG="Menu_Item:_Category_Blog" +JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST="Menu_Item:_Category_List" +JHELP_MENUS_MENU_ITEM_ARTICLE_CREATE="Menu_Item:_Create_Article" +JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED="Menu_Item:_Featured_Articles" +JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE="Menu_Item:_Single_Article" +JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORIES="Menu_Item:_List_All_Contact_Categories" +JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORY="Menu_Item:_List_Contacts_in_a_Category" +JHELP_MENUS_MENU_ITEM_CONTACT_CREATE="Menu_Item:_Create_Contact" +JHELP_MENUS_MENU_ITEM_CONTACT_FEATURED="Menu_Item:_Featured_Contacts" +JHELP_MENUS_MENU_ITEM_CONTACT_SINGLE_CONTACT="Menu_Item:_Single_Contact" +JHELP_MENUS_MENU_ITEM_DISPLAY_SITE_CONFIGURATION="Menu_Item:_Site_Configuration_Options" +JHELP_MENUS_MENU_ITEM_DISPLAY_TEMPLATE_OPTIONS="Menu_Item:_Display_Template_Options" +JHELP_MENUS_MENU_ITEM_EXTERNAL_URL="Menu_Item:_URL" +JHELP_MENUS_MENU_ITEM_FINDER_SEARCH="Menu_Item:_Search" +JHELP_MENUS_MENU_ITEM_MANAGER="Menus:_Items" +JHELP_MENUS_MENU_ITEM_MANAGER_EDIT="Menu_Item:_New_Item" +JHELP_MENUS_MENU_ITEM_MENU_ITEM_ALIAS="Menu_Item:_Alias" +JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING="Menu_Item:_Heading" +JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORIES="Menu_Item:_List_All_News_Feed_Categories" +JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORY="Menu_Item:_List_News_Feeds_in_a_Category" +JHELP_MENUS_MENU_ITEM_NEWSFEED_SINGLE_NEWSFEED="Menu_Item:_Single_News_Feed" +JHELP_MENUS_MENU_ITEM_PRIVACY_CONFIRM_REQUEST="Menu_Item:_Confirm_Request" +JHELP_MENUS_MENU_ITEM_PRIVACY_CREATE_REQUEST="Menu_Item:_Create_Request" +JHELP_MENUS_MENU_ITEM_PRIVACY_REMIND_REQUEST="Menu_Item:_Extend_Consent" +JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_COMPACT_LIST="Menu_Item:_Compact_List_of_Tagged_Items" +JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST="Menu_Item:_Tagged_Items" +JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST_ALL="Menu_Item:_List_All_Tags" +JHELP_MENUS_MENU_ITEM_TEXT_SEPARATOR="Menu_Item:_Separator" +JHELP_MENUS_MENU_ITEM_USER_LOGIN="Menu_Item:_Login_Form" +JHELP_MENUS_MENU_ITEM_USER_LOGOUT="Menu_Item:_Logout" +JHELP_MENUS_MENU_ITEM_USER_PASSWORD_RESET="Menu_Item:_Password_Reset" +JHELP_MENUS_MENU_ITEM_USER_PROFILE="Menu_Item:_User_Profile" +JHELP_MENUS_MENU_ITEM_USER_PROFILE_EDIT="Menu_Item:_Edit_User_Profile" +JHELP_MENUS_MENU_ITEM_USER_REGISTRATION="Menu_Item:_Registration_Form" +JHELP_MENUS_MENU_ITEM_USER_REMINDER="Menu_Item:_Username_Reminder_Request" +JHELP_MENUS_MENU_ITEM_WRAPPER="Menu_Item:_Iframe_Wrapper" +JHELP_MENUS_MENU_MANAGER="Menus" +JHELP_MENUS_MENU_MANAGER_EDIT="Menus:_Edit" +JHELP_SITE_GLOBAL_CONFIGURATION="Site_Global_Configuration" +JHELP_SITE_MAINTENANCE_CLEAR_CACHE="Maintenance:_Clear_Cache" +JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Maintenance:_Global_Check-in" +JHELP_SITE_SYSTEM_INFORMATION="Site_System_Information" +JHELP_START_HERE="Start_Here" +JHELP_USERS_ACCESS_LEVELS="Users:_Viewing_Access_Levels" +JHELP_USERS_ACCESS_LEVELS_EDIT="Users:_Edit_Viewing_Access_Level" +JHELP_USERS_DEBUG_GROUPS="Permissions_for_Group" +JHELP_USERS_DEBUG_USERS="Permissions_for_User" +JHELP_USERS_GROUPS="Users:_Groups" +JHELP_USERS_GROUPS_EDIT="Users:_New_or_Edit_Group" +JHELP_USERS_MASS_MAIL_USERS="Mass_Mail_Users" +JHELP_USERS_USER_MANAGER="Users" +JHELP_USERS_USER_MANAGER_EDIT="Users:_Edit_Profile" +JHELP_USERS_USER_NOTES="User_Notes" +JHELP_USERS_USER_NOTES_EDIT="User_Notes:_New_or_Edit" + ; If there is an error connecting database before initialisation, en-GB.lib_joomla.ini can't be loaded ; we therefore have to load the strings from en-GB.ini diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index 9fe95a000ee6d..d81f9f9d995b3 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -703,6 +703,217 @@ JGRID_HEADING_ORDERING="Ordering" JGRID_HEADING_ORDERING_ASC="Ordering ascending" JGRID_HEADING_ORDERING_DESC="Ordering descending" +JHELP_ADMIN_USER_PROFILE_EDIT="My_Profile" +JHELP_COMPONENTS_ACTIONLOGS="User_Actions_Log" +JHELP_COMPONENTS_ASSOCIATIONS="Multilingual_Associations" +JHELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual_Associations:_Edit" +JHELP_COMPONENTS_BANNERS_BANNERS="Banners" +JHELP_COMPONENTS_BANNERS_BANNERS_EDIT="Banners:_Edit" +JHELP_COMPONENTS_BANNERS_CATEGORIES="Banners:_Categories" +JHELP_COMPONENTS_BANNERS_CATEGORY_ADD="Banners:_New_or_Edit_Category" +JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Banners:_New_or_Edit_Category" +JHELP_COMPONENTS_BANNERS_CLIENTS="Banners:_Clients" +JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banners:_New_or_Edit_Client" +JHELP_COMPONENTS_BANNERS_TRACKS="Banners:_Tracks" +JHELP_COMPONENTS_COM_ACTIONLOGS_OPTIONS="User_Actions_Log:_Options" +JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Multilingual_Associations:_Options" +JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Banners:_Options" +JHELP_COMPONENTS_COM_CACHE_OPTIONS="Cache:_Options" +JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Check-in:_Options" +JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Contacts:_Options" +JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Articles:_Options" +JHELP_COMPONENTS_COM_FINDER_OPTIONS="Smart_Search:_Options" +JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Installer:_Options" +JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Joomla_Update:_Options" +JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Languages:_Options" +JHELP_COMPONENTS_COM_MAILS_OPTIONS="Mail_Templates:_Options" +JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Media:_Options" +JHELP_COMPONENTS_COM_MENUS_OPTIONS="Menus:_Options" +JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Messages:_Options" +JHELP_COMPONENTS_COM_MODULES_OPTIONS="Module:_Options" +JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="News_Feed:_Options" +JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Plugin:_Options" +JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Post-installation_Messages:_Options" +JHELP_COMPONENTS_COM_PRIVACY_OPTIONS="Privacy:_Options" +JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Redirect:_Options" +JHELP_COMPONENTS_COM_TAGS_OPTIONS="Tags:_Options" +JHELP_COMPONENTS_COM_TEMPLATES_OPTIONS="Template:_Options" +JHELP_COMPONENTS_COM_USERS_OPTIONS="Users:_Options" +JHELP_COMPONENTS_CONTACT_CATEGORIES="Contacts:_Categories" +JHELP_COMPONENTS_CONTACT_CATEGORY_ADD="Contacts:_New_or_Edit_Category" +JHELP_COMPONENTS_CONTACT_CATEGORY_EDIT="Contacts:_New_or_Edit_Category" +JHELP_COMPONENTS_CONTACTS_CONTACTS="Contacts" +JHELP_COMPONENTS_CONTACTS_CONTACTS_EDIT="Contacts:_New_or_Edit" +JHELP_COMPONENTS_CONTENT_CATEGORIES="Articles:_Categories" +JHELP_COMPONENTS_CONTENT_CATEGORY_ADD="Articles:_New_or_Edit_Category" +JHELP_COMPONENTS_CONTENT_CATEGORY_EDIT="Articles:_New_or_Edit_Category" +JHELP_COMPONENTS_FIELDS_FIELD_GROUPS="Component:_Field_Groups" +JHELP_COMPONENTS_FIELDS_FIELD_GROUPS_EDIT="Component:_New_or_Edit_Field_Group" +JHELP_COMPONENTS_FIELDS_FIELDS="Component:_Fields" +JHELP_COMPONENTS_FIELDS_FIELDS_EDIT="Component:_New_or_Edit_Field" +JHELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS="Smart_Search:_Content_Maps" +JHELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT="Smart_Search:_Indexed_Content" +JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS="Smart_Search:_Search_Filters" +JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT="Smart_Search:_New_or_Edit_Filter" +JHELP_COMPONENTS_FINDER_MANAGE_SEARCHES="Smart_Search:_Search_Term_Analysis" +JHELP_COMPONENTS_INSTALLER_UPDATESITE_EDIT="Edit_Update_Site" +JHELP_COMPONENTS_JOOMLA_UPDATE="Joomla_Update" +JHELP_COMPONENTS_MAILS_TEMPLATES="Mail_Templates" +JHELP_COMPONENTS_MAILS_TEMPLATE_EDIT="Mail_Template:_Edit" +JHELP_COMPONENTS_MESSAGING_INBOX="Private_Messages" +JHELP_COMPONENTS_MESSAGING_READ="Private_Messages:_Read" +JHELP_COMPONENTS_MESSAGING_WRITE="Private_Messages:_Write" +JHELP_COMPONENTS_NEWSFEEDS_CATEGORIES="News_Feeds:_Categories" +JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_ADD="News_Feeds:_New_or_Edit_Category" +JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_EDIT="News_Feeds:_New_or_Edit_Category" +JHELP_COMPONENTS_NEWSFEEDS_FEEDS="News_Feeds" +JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="News_Feeds:_New_or_Edit" +JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Post-installation_Messages_for_Joomla_CMS" +JHELP_COMPONENTS_PRIVACY_CAPABILITIES="Privacy:_Extension_Capabilities" +JHELP_COMPONENTS_PRIVACY_CONSENTS="Privacy:_Consents" +JHELP_COMPONENTS_PRIVACY_DASHBOARD="Privacy_Dashboard" +JHELP_COMPONENTS_PRIVACY_REQUEST="Privacy:_Review_Information_Request" +JHELP_COMPONENTS_PRIVACY_REQUEST_EDIT="Privacy:_New_Information_Request" +JHELP_COMPONENTS_PRIVACY_REQUESTS="Privacy:_Information_Requests" +JHELP_COMPONENTS_REDIRECT_MANAGER="Redirects:_Links" +JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Redirects:_New_or_Edit" +JHELP_COMPONENTS_TAGS_MANAGER="Tags" +JHELP_COMPONENTS_TAGS_MANAGER_EDIT="Tags:_New_or_Edit" +JHELP_COMPONENTS_USERS_CATEGORIES="User_Notes:_Categories" +JHELP_COMPONENTS_USERS_CATEGORY_ADD="User_Notes:_New_or_Edit_Category" +JHELP_COMPONENTS_USERS_CATEGORY_EDIT="User_Notes:_New_or_Edit_Category" +JHELP_COMPONENTS_WORKFLOW_STAGES_LIST="Stages_List:_Basic_Workflow" +JHELP_COMPONENTS_WORKFLOW_TRANSITIONS_LIST="Transitions_List:_Basic_Workflow" +JHELP_COMPONENTS_WORKFLOW_WORKFLOWS_LIST="Workflows_List" +JHELP_CONTENT_ARTICLE_MANAGER="Articles" +JHELP_CONTENT_ARTICLE_MANAGER_EDIT="Articles:_Edit" +JHELP_CONTENT_MEDIA_MANAGER="Media" +JHELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE="Information:_Database" +JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER="Extensions:_Discover" +JHELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL="Extensions:_Install" +JHELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES="Extensions:_Languages" +JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE="Extensions:_Manage" +JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE="Extensions:_Update" +JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES="Extensions:_Update_Sites" +JHELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS="Information:_Warnings" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT="Languages:_Content" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT="Languages:_Edit_Content_Language" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED="Languages:_Installed" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES="Languages:_Overrides" +JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT="Languages:_Edit_Override" +JHELP_EXTENSIONS_MODULE_MANAGER="Modules" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_CUSTOM="Admin_Modules:_Custom" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FEED="Admin_Modules:_Feed_Display" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FRONTEND="Admin_Modules:_Frontend_Link" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST="Admin_Modules:_Articles_-_Latest" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATESTACTIONS="Admin_Modules:_Action_Logs_-_Latest" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGGED="Admin_Modules:_Logged-in_Users" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN="Admin_Modules:_Login_Form" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN_SUPPORT="Admin_Modules:_Login_Support_Information" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU="Admin_Modules:_Administrator_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MESSAGES="Admin_Modules:_Messages" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MULTILANG="Admin_Modules:_Multilingual_Status" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POPULAR="Admin_Modules:_Popular_Articles" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POST_INSTALLATION_MESSAGES="Admin_Modules:_Post_Installation_Messages" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_DASHBOARD="Admin_Modules:_Privacy_Dashboard" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_STATUS="Admin_Modules:_Privacy_Status_Check" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_QUICKICON="Admin_Modules:_Quick_Icons" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SAMPLE_DATA="Admin_Modules:_Sample_Data" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_STATUS_USER="Admin_Modules:_User_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SUBMENU="Admin_Modules:_Administrator_Dashboard_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TITLE="Admin_Modules:_Title" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TOOLBAR="Admin_Modules:_Toolbar" +JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_VERSION="Admin_Modules:_Joomla_Version_Information" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE="Site_Modules:_Articles_-_Archived" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES="Site_Modules:_Articles_-_Categories" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORY="Site_Modules:_Articles_-_Category" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_NEWSFLASH="Site_Modules:_Articles_-_Newsflash" +JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_RELATED="Site_Modules:_Articles_-_Related" +JHELP_EXTENSIONS_MODULE_MANAGER_BANNERS="Site_Modules:_Banners" +JHELP_EXTENSIONS_MODULE_MANAGER_BREADCRUMBS="Site_Modules:_Breadcrumbs" +JHELP_EXTENSIONS_MODULE_MANAGER_CUSTOM_HTML="Site_Modules:_Custom" +JHELP_EXTENSIONS_MODULE_MANAGER_EDIT="" +JHELP_EXTENSIONS_MODULE_MANAGER_FEED_DISPLAY="Site_Modules:_Feed_Display" +JHELP_EXTENSIONS_MODULE_MANAGER_FOOTER="Site_Modules:_Footer" +JHELP_EXTENSIONS_MODULE_MANAGER_LANGUAGE_SWITCHER="Site_Modules:_Language_Switcher" +JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_NEWS="Site_Modules:_Articles_-_Latest" +JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_USERS="Site_Modules:_Latest_Users" +JHELP_EXTENSIONS_MODULE_MANAGER_LOGIN="Site_Modules:_Login" +JHELP_EXTENSIONS_MODULE_MANAGER_MENU="Site_Modules:_Menu" +JHELP_EXTENSIONS_MODULE_MANAGER_MOST_READ="Site_Modules:_Articles_-_Most_Read" +JHELP_EXTENSIONS_MODULE_MANAGER_RANDOM_IMAGE="Site_Modules:_Random_Image" +JHELP_EXTENSIONS_MODULE_MANAGER_SMART_SEARCH="Site_Modules:_Smart_Search" +JHELP_EXTENSIONS_MODULE_MANAGER_STATISTICS="Site_Modules:_Statistics" +JHELP_EXTENSIONS_MODULE_MANAGER_SYNDICATION_FEEDS="Site_Modules:_Syndication_Feeds" +JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_POPULAR="Site_Modules:_Tags_-_Popular" +JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_SIMILAR="Site_Modules:_Tags_-_Similar" +JHELP_EXTENSIONS_MODULE_MANAGER_WHO_ONLINE="Site_Modules:_Who%27s_Online" +JHELP_EXTENSIONS_MODULE_MANAGER_WRAPPER="Site_Modules:_Wrapper" +JHELP_EXTENSIONS_PLUGIN_MANAGER="Plugins" +JHELP_EXTENSIONS_PLUGIN_MANAGER_EDIT="Plugins:_Name_of_Plugin" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES="Templates:_Styles" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT="Templates:_Edit_Style" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES="Templates:_Templates" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT="Templates:_Customise" +JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE="Templates:_Customise_Source" +JHELP_GLOSSARY="Glossary" +JHELP_MENUS_MENU_ITEM_ARTICLE_ARCHIVED="Menu_Item:_Article_Archived" +JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORIES="Menu_Item:_List_All_Categories" +JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG="Menu_Item:_Category_Blog" +JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST="Menu_Item:_Category_List" +JHELP_MENUS_MENU_ITEM_ARTICLE_CREATE="Menu_Item:_Create_Article" +JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED="Menu_Item:_Featured_Articles" +JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE="Menu_Item:_Single_Article" +JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORIES="Menu_Item:_List_All_Contact_Categories" +JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORY="Menu_Item:_List_Contacts_in_a_Category" +JHELP_MENUS_MENU_ITEM_CONTACT_CREATE="Menu_Item:_Create_Contact" +JHELP_MENUS_MENU_ITEM_CONTACT_FEATURED="Menu_Item:_Featured_Contacts" +JHELP_MENUS_MENU_ITEM_CONTACT_SINGLE_CONTACT="Menu_Item:_Single_Contact" +JHELP_MENUS_MENU_ITEM_DISPLAY_SITE_CONFIGURATION="Menu_Item:_Site_Configuration_Options" +JHELP_MENUS_MENU_ITEM_DISPLAY_TEMPLATE_OPTIONS="Menu_Item:_Display_Template_Options" +JHELP_MENUS_MENU_ITEM_EXTERNAL_URL="Menu_Item:_URL" +JHELP_MENUS_MENU_ITEM_FINDER_SEARCH="Menu_Item:_Search" +JHELP_MENUS_MENU_ITEM_MANAGER="Menus:_Items" +JHELP_MENUS_MENU_ITEM_MANAGER_EDIT="Menu_Item:_New_Item" +JHELP_MENUS_MENU_ITEM_MENU_ITEM_ALIAS="Menu_Item:_Alias" +JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING="Menu_Item:_Heading" +JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORIES="Menu_Item:_List_All_News_Feed_Categories" +JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORY="Menu_Item:_List_News_Feeds_in_a_Category" +JHELP_MENUS_MENU_ITEM_NEWSFEED_SINGLE_NEWSFEED="Menu_Item:_Single_News_Feed" +JHELP_MENUS_MENU_ITEM_PRIVACY_CONFIRM_REQUEST="Menu_Item:_Confirm_Request" +JHELP_MENUS_MENU_ITEM_PRIVACY_CREATE_REQUEST="Menu_Item:_Create_Request" +JHELP_MENUS_MENU_ITEM_PRIVACY_REMIND_REQUEST="Menu_Item:_Extend_Consent" +JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_COMPACT_LIST="Menu_Item:_Compact_List_of_Tagged_Items" +JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST="Menu_Item:_Tagged_Items" +JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST_ALL="Menu_Item:_List_All_Tags" +JHELP_MENUS_MENU_ITEM_TEXT_SEPARATOR="Menu_Item:_Separator" +JHELP_MENUS_MENU_ITEM_USER_LOGIN="Menu_Item:_Login_Form" +JHELP_MENUS_MENU_ITEM_USER_LOGOUT="Menu_Item:_Logout" +JHELP_MENUS_MENU_ITEM_USER_PASSWORD_RESET="Menu_Item:_Password_Reset" +JHELP_MENUS_MENU_ITEM_USER_PROFILE="Menu_Item:_User_Profile" +JHELP_MENUS_MENU_ITEM_USER_PROFILE_EDIT="Menu_Item:_Edit_User_Profile" +JHELP_MENUS_MENU_ITEM_USER_REGISTRATION="Menu_Item:_Registration_Form" +JHELP_MENUS_MENU_ITEM_USER_REMINDER="Menu_Item:_Username_Reminder_Request" +JHELP_MENUS_MENU_ITEM_WRAPPER="Menu_Item:_Iframe_Wrapper" +JHELP_MENUS_MENU_MANAGER="Menus" +JHELP_MENUS_MENU_MANAGER_EDIT="Menus:_Edit" +JHELP_SITE_GLOBAL_CONFIGURATION="Site_Global_Configuration" +JHELP_SITE_MAINTENANCE_CLEAR_CACHE="Maintenance:_Clear_Cache" +JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Maintenance:_Global_Check-in" +JHELP_SITE_SYSTEM_INFORMATION="Site_System_Information" +JHELP_START_HERE="Start_Here" +JHELP_USERS_ACCESS_LEVELS="Users:_Viewing_Access_Levels" +JHELP_USERS_ACCESS_LEVELS_EDIT="Users:_Edit_Viewing_Access_Level" +JHELP_USERS_DEBUG_GROUPS="Permissions_for_Group" +JHELP_USERS_DEBUG_USERS="Permissions_for_User" +JHELP_USERS_GROUPS="Users:_Groups" +JHELP_USERS_GROUPS_EDIT="Users:_New_or_Edit_Group" +JHELP_USERS_MASS_MAIL_USERS="Mass_Mail_Users" +JHELP_USERS_USER_MANAGER="Users" +JHELP_USERS_USER_MANAGER_EDIT="Users:_Edit_Profile" +JHELP_USERS_USER_NOTES="User_Notes" +JHELP_USERS_USER_NOTES_EDIT="User_Notes:_New_or_Edit" + ; If there is an error connecting database before initialisation, en-GB.lib_joomla.ini can't be loaded ; we therefore have to load the strings from en-GB.ini From babde74e371a4db7669b38bfd763464b9edcac6f Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Fri, 20 Aug 2021 14:05:01 +0530 Subject: [PATCH 20/43] delete the moved file --- .../tmpl/articles/default_stage_body.php | 23 ------------------- .../tmpl/articles/default_stage_footer.php | 23 ------------------- 2 files changed, 46 deletions(-) delete mode 100644 administrator/components/com_content/tmpl/articles/default_stage_body.php delete mode 100644 administrator/components/com_content/tmpl/articles/default_stage_footer.php diff --git a/administrator/components/com_content/tmpl/articles/default_stage_body.php b/administrator/components/com_content/tmpl/articles/default_stage_body.php deleted file mode 100644 index 3dadb99058ecc..0000000000000 --- a/administrator/components/com_content/tmpl/articles/default_stage_body.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ -defined('_JEXEC') or die; - -use Joomla\CMS\Language\Text; - -?> - -
-
-
-

-
-
-
-
-
diff --git a/administrator/components/com_content/tmpl/articles/default_stage_footer.php b/administrator/components/com_content/tmpl/articles/default_stage_footer.php deleted file mode 100644 index 886538176cfc0..0000000000000 --- a/administrator/components/com_content/tmpl/articles/default_stage_footer.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ -defined('_JEXEC') or die; - -use Joomla\CMS\Language\Text; - -/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */ -$wa = $this->document->getWebAssetManager(); -$wa->useScript('com_content.admin-articles-stage'); - -?> - - From 24b6a0aa6a3c0185029ce65678b58125450374c6 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Fri, 20 Aug 2021 14:05:28 +0530 Subject: [PATCH 21/43] replace the files --- .../tmpl/{featured => articles}/default_stage_body.php | 0 .../tmpl/{featured => articles}/default_stage_footer.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename administrator/components/com_content/tmpl/{featured => articles}/default_stage_body.php (100%) rename administrator/components/com_content/tmpl/{featured => articles}/default_stage_footer.php (100%) diff --git a/administrator/components/com_content/tmpl/featured/default_stage_body.php b/administrator/components/com_content/tmpl/articles/default_stage_body.php similarity index 100% rename from administrator/components/com_content/tmpl/featured/default_stage_body.php rename to administrator/components/com_content/tmpl/articles/default_stage_body.php diff --git a/administrator/components/com_content/tmpl/featured/default_stage_footer.php b/administrator/components/com_content/tmpl/articles/default_stage_footer.php similarity index 100% rename from administrator/components/com_content/tmpl/featured/default_stage_footer.php rename to administrator/components/com_content/tmpl/articles/default_stage_footer.php From 0e6cf7c7ac8b60352452ea95f3c40af6f0f5dc77 Mon Sep 17 00:00:00 2001 From: Yatharth Vyas Date: Fri, 20 Aug 2021 20:29:16 +0530 Subject: [PATCH 22/43] Change double quotes to single quotes Co-authored-by: Quy --- .../com_content/src/Controller/ArticlesController.php | 2 +- .../components/com_content/tmpl/articles/default.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/components/com_content/src/Controller/ArticlesController.php b/administrator/components/com_content/src/Controller/ArticlesController.php index e1116943019e6..b8733be0aa3fc 100644 --- a/administrator/components/com_content/src/Controller/ArticlesController.php +++ b/administrator/components/com_content/src/Controller/ArticlesController.php @@ -168,7 +168,7 @@ public function delete() $articlesModel = $this->getModel('articles'); $featured = $articlesModel->isFeatured(); - if ($featured === "1") + if ($featured === '1') { // Check for request forgeries $this->checkToken(); diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 46ec84f02be3d..8fc45db643574 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -35,7 +35,7 @@ $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); $featured = $this->state->get('filter.featured'); -$orderName = $featured === "1" ? 'fp.ordering' : 'a.ordering'; +$orderName = $featured === '1' ? 'fp.ordering' : 'a.ordering'; $saveOrder = $listOrder == $orderName; if (strpos($listOrder, 'publish_up') !== false) @@ -110,7 +110,7 @@ @@ -128,7 +128,7 @@
- + @@ -394,7 +394,7 @@ pagination->getListFooter(); ?> - + Date: Fri, 20 Aug 2021 20:29:37 +0530 Subject: [PATCH 23/43] correct typo Co-authored-by: Quy --- .../components/com_content/src/View/Articles/HtmlView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php index b520010a59b77..152fee5ea8173 100644 --- a/administrator/components/com_content/src/View/Articles/HtmlView.php +++ b/administrator/components/com_content/src/View/Articles/HtmlView.php @@ -132,7 +132,7 @@ public function display($tpl = null) { /* * In article associations modal we need to remove language filter if forcing a language. - * We also need to change the category filter to show show categories with All or the forced language. + * We also need to change the category filter to show categories with All or the forced language. */ if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) { From dcd78a1bb2deb67cf4d0bddb9bde056bae3cd629 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 30 Oct 2021 22:08:39 +0530 Subject: [PATCH 24/43] fix sorting by featured --- administrator/components/com_content/forms/filter_featured.xml | 2 ++ .../components/com_content/src/Model/ArticlesModel.php | 1 + 2 files changed, 3 insertions(+) diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml index eb1dcd5191dc3..4aef60255a0fe 100644 --- a/administrator/components/com_content/forms/filter_featured.xml +++ b/administrator/components/com_content/forms/filter_featured.xml @@ -113,6 +113,8 @@ + + diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index bedee0c17b0b7..09736172db847 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -52,6 +52,7 @@ public function __construct($config = array()) 'checked_out_time', 'a.checked_out_time', 'catid', 'a.catid', 'category_title', 'state', 'a.state', + 'featured', 'a.featured', 'access', 'a.access', 'access_level', 'created', 'a.created', 'modified', 'a.modified', From fcc9a5034ab8bbedf951d00a704543bca622b0e4 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 30 Oct 2021 22:11:29 +0530 Subject: [PATCH 25/43] delete featured template files --- .../com_content/tmpl/featured/default.php | 419 ------------------ .../com_content/tmpl/featured/default.xml | 8 - .../com_content/tmpl/featured/emptystate.php | 28 -- 3 files changed, 455 deletions(-) delete mode 100644 administrator/components/com_content/tmpl/featured/default.php delete mode 100644 administrator/components/com_content/tmpl/featured/default.xml delete mode 100644 administrator/components/com_content/tmpl/featured/emptystate.php diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php deleted file mode 100644 index 5ca431d64fe21..0000000000000 --- a/administrator/components/com_content/tmpl/featured/default.php +++ /dev/null @@ -1,419 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\Button\FeaturedButton; -use Joomla\CMS\Button\PublishedButton; -use Joomla\CMS\Button\TransitionButton; -use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\Factory; -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Language\Associations; -use Joomla\CMS\Language\Multilanguage; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Layout\LayoutHelper; -use Joomla\CMS\Router\Route; -use Joomla\CMS\Session\Session; -use Joomla\Component\Content\Administrator\Helper\ContentHelper; -use Joomla\Utilities\ArrayHelper; - -/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */ -$wa = $this->document->getWebAssetManager(); -$wa->useScript('table.columns') - ->useScript('multiselect'); - -$app = Factory::getApplication(); -$user = Factory::getUser(); -$userId = $user->get('id'); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -$saveOrder = $listOrder == 'fp.ordering'; - -if (strpos($listOrder, 'publish_up') !== false) -{ - $orderingColumn = 'publish_up'; -} -elseif (strpos($listOrder, 'publish_down') !== false) -{ - $orderingColumn = 'publish_down'; -} -elseif (strpos($listOrder, 'modified') !== false) -{ - $orderingColumn = 'modified'; -} -else -{ - $orderingColumn = 'created'; -} - - -if ($saveOrder && !empty($this->items)) -{ - $saveOrderingUrl = 'index.php?option=com_content&task=featured.saveOrderAjax&tmpl=component&' . Session::getFormToken() . '=1'; - HTMLHelper::_('draggablelist.draggable'); -} - -$workflow_enabled = ComponentHelper::getParams('com_content')->get('workflow_enabled'); -$workflow_state = false; -$workflow_featured = false; - -if ($workflow_enabled) : - -// @todo move the script to a file -$js = <<getRegistry()->addExtensionRegistryFile('com_workflow'); -$wa->useScript('com_workflow.admin-items-workflow-buttons') - ->addInlineScript($js, [], ['type' => 'module']); - -$workflow_state = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.state', 'com_content.article'); -$workflow_featured = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.featured', 'com_content.article'); - -endif; - -$assoc = Associations::isEnabled(); - -?> - - -
-
-
- $this)); - ?> - items)) : ?> -
- - -
- - - - - - - - - - - - - - - - - - - - - - - hits) : ?> - - - vote) : ?> - - - - - - - class="js-draggable" data-url="" data-direction=""> - items); ?> - items as $i => $item) : - $item->max_ordering = 0; - $ordering = ($listOrder == 'fp.ordering'); - $assetId = 'com_content.article.' . $item->id; - $canCreate = $user->authorise('core.create', 'com_content.category.' . $item->catid); - $canEdit = $user->authorise('core.edit', 'com_content.article.' . $item->id); - $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || is_null($item->checked_out); - $canChange = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin; - $canEditCat = $user->authorise('core.edit', 'com_content.category.' . $item->catid); - $canEditOwnCat = $user->authorise('core.edit.own', 'com_content.category.' . $item->catid) && $item->category_uid == $userId; - $canEditParCat = $user->authorise('core.edit', 'com_content.category.' . $item->parent_category_id); - $canEditOwnParCat = $user->authorise('core.edit.own', 'com_content.category.' . $item->parent_category_id) && $item->parent_category_uid == $userId; - - $transitions = ContentHelper::filterTransitions($this->transitions, (int) $item->stage_id, (int) $item->workflow_id); - - $transition_ids = ArrayHelper::getColumn($transitions, 'value'); - $transition_ids = ArrayHelper::toInteger($transition_ids); - - ?> - - - - - - - - - - - - - - - - - - - hits) : ?> - - - vote) : ?> - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- id, false, 'cid', 'cb', $item->title); ?> - - - - - - - - - - $transitions, - 'title' => Text::_($item->stage_title), - 'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)), - 'id' => 'workflow-' . $item->id, - 'task' => 'articles.runTransitions' - ]; - - echo (new TransitionButton($options)) - ->render(0, $i); - ?> - - 'articles.', - 'disabled' => $workflow_featured || !$canChange, - 'id' => 'featured-' . $item->id - ]; - - echo (new FeaturedButton) - ->render((int) $item->featured, $i, $options, $item->featured_up, $item->featured_down); - ?> - - 'articles.', - 'disabled' => $workflow_state || !$canChange, - 'id' => 'state-' . $item->id - ]; - - echo (new PublishedButton)->render((int) $item->state, $i, $options, $item->publish_up, $item->publish_down); - ?> - -
- checked_out) : ?> - editor, $item->checked_out_time, 'articles.', $canCheckin); ?> - - - - escape($item->title); ?> - - escape($item->title); ?> - -
- note)) : ?> - escape($item->alias)); ?> - - escape($item->alias), $this->escape($item->note)); ?> - -
-
- parent_category_id . '&extension=com_content'); - $CurrentCatUrl = Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->catid . '&extension=com_content'); - $EditCatTxt = Text::_('COM_CONTENT_EDIT_CATEGORY'); - echo Text::_('JCATEGORY') . ': '; - if ($item->category_level != '1') : - if ($item->parent_category_level != '1') : - echo ' » '; - endif; - endif; - if (Factory::getLanguage()->isRtl()) - { - if ($canEditCat || $canEditOwnCat) : - echo ''; - endif; - echo $this->escape($item->category_title); - if ($canEditCat || $canEditOwnCat) : - echo ''; - endif; - if ($item->category_level != '1') : - echo ' « '; - if ($canEditParCat || $canEditOwnParCat) : - echo ''; - endif; - echo $this->escape($item->parent_category_title); - if ($canEditParCat || $canEditOwnParCat) : - echo ''; - endif; - endif; - } - else - { - if ($item->category_level != '1') : - if ($canEditParCat || $canEditOwnParCat) : - echo ''; - endif; - echo $this->escape($item->parent_category_title); - if ($canEditParCat || $canEditOwnParCat) : - echo ''; - endif; - echo ' » '; - endif; - if ($canEditCat || $canEditOwnCat) : - echo ''; - endif; - echo $this->escape($item->category_title); - if ($canEditCat || $canEditOwnCat) : - echo ''; - endif; - } - ?> -
-
- 		- escape($item->access_level); ?> - - created_by != 0) : ?> - - escape($item->author_name); ?> - - - - - created_by_alias) : ?> -
escape($item->created_by_alias)); ?>
- - 		- association) : ?> - id); ?> - - - - - {$orderingColumn}; - echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC4')) : '-'; - ?> - - - hits; ?> - - - - rating_count; ?> - - - - rating; ?> - - - id; ?> -
- - - pagination->getListFooter(); ?> - - Text::_('JTOOLBAR_CHANGE_STATUS'), - 'footer' => $this->loadTemplate('stage_footer'), - ), - $this->loadTemplate('stage_body') - ); ?> - - - - - - - - - - - -
-
-
- diff --git a/administrator/components/com_content/tmpl/featured/default.xml b/administrator/components/com_content/tmpl/featured/default.xml deleted file mode 100644 index 4697ce1704542..0000000000000 --- a/administrator/components/com_content/tmpl/featured/default.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/administrator/components/com_content/tmpl/featured/emptystate.php b/administrator/components/com_content/tmpl/featured/emptystate.php deleted file mode 100644 index 99bc733f48366..0000000000000 --- a/administrator/components/com_content/tmpl/featured/emptystate.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\Factory; -use Joomla\CMS\Layout\LayoutHelper; - -$displayData = [ - 'textPrefix' => 'COM_CONTENT', - 'formURL' => 'index.php?option=com_content&view=featured', - 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Adding_a_new_article', -]; - -$user = Factory::getApplication()->getIdentity(); - -if ($user->authorise('core.create', 'com_content') || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0) -{ - $displayData['createURL'] = 'index.php?option=com_content&task=article.add'; -} - -echo LayoutHelper::render('joomla.content.emptystate', $displayData); From 751d5c6e40d3476cea419c10b77d44793001e35e Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 30 Oct 2021 22:12:02 +0530 Subject: [PATCH 26/43] delete featured controller --- .../src/Controller/FeaturedController.php | 97 ------------------- 1 file changed, 97 deletions(-) delete mode 100644 administrator/components/com_content/src/Controller/FeaturedController.php diff --git a/administrator/components/com_content/src/Controller/FeaturedController.php b/administrator/components/com_content/src/Controller/FeaturedController.php deleted file mode 100644 index 0751014dc7fea..0000000000000 --- a/administrator/components/com_content/src/Controller/FeaturedController.php +++ /dev/null @@ -1,97 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -namespace Joomla\Component\Content\Administrator\Controller; - -\defined('_JEXEC') or die; - -use Joomla\CMS\Language\Text; - -/** - * Featured content controller class. - * - * @since 1.6 - */ -class FeaturedController extends ArticlesController -{ - /** - * Removes an item. - * - * @return void - * - * @since 1.6 - */ - public function delete() - { - // Check for request forgeries - $this->checkToken(); - - $user = $this->app->getIdentity(); - $ids = $this->input->get('cid', array(), 'array'); - - // Access checks. - foreach ($ids as $i => $id) - { - if (!$user->authorise('core.delete', 'com_content.article.' . (int) $id)) - { - // Prune items that you can't delete. - unset($ids[$i]); - $this->app->enqueueMessage(Text::_('JERROR_CORE_DELETE_NOT_PERMITTED'), 'notice'); - } - } - - if (empty($ids)) - { - $this->app->enqueueMessage(Text::_('JERROR_NO_ITEMS_SELECTED'), 'error'); - } - else - { - /** @var \Joomla\Component\Content\Administrator\Model\FeatureModel $model */ - $model = $this->getModel(); - - // Remove the items. - if (!$model->featured($ids, 0)) - { - $this->app->enqueueMessage($model->getError(), 'error'); - } - } - - $this->setRedirect('index.php?option=com_content&view=featured'); - } - - /** - * Method to publish a list of articles. - * - * @return void - * - * @since 1.0 - */ - public function publish() - { - parent::publish(); - - $this->setRedirect('index.php?option=com_content&view=featured'); - } - - /** - * Method to get a model object, loading it if required. - * - * @param string $name The model name. Optional. - * @param string $prefix The class prefix. Optional. - * @param array $config Configuration array for model. Optional. - * - * @return \Joomla\CMS\MVC\Model\BaseDatabaseModel The model. - * - * @since 1.6 - */ - public function getModel($name = 'Feature', $prefix = 'Administrator', $config = array('ignore_request' => true)) - { - return parent::getModel($name, $prefix, $config); - } -} From d0c0f5c09f4da5b565753c8493197ff98fae0e29 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 30 Oct 2021 22:22:13 +0530 Subject: [PATCH 27/43] delete featured model --- .../com_content/src/Model/FeaturedModel.php | 101 ------------------ 1 file changed, 101 deletions(-) delete mode 100644 administrator/components/com_content/src/Model/FeaturedModel.php diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php deleted file mode 100644 index 450cd74507972..0000000000000 --- a/administrator/components/com_content/src/Model/FeaturedModel.php +++ /dev/null @@ -1,101 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -namespace Joomla\Component\Content\Administrator\Model; - -\defined('_JEXEC') or die; - -/** - * Methods supporting a list of featured article records. - * - * @since 1.6 - */ -class FeaturedModel extends ArticlesModel -{ - /** - * Constructor. - * - * @param array $config An optional associative array of configuration settings. - * - * @see \Joomla\CMS\MVC\Controller\BaseController - * @since 1.6 - */ - public function __construct($config = array()) - { - if (empty($config['filter_fields'])) - { - $config['filter_fields'] = array( - 'id', 'a.id', - 'title', 'a.title', - 'alias', 'a.alias', - 'checked_out', 'a.checked_out', - 'checked_out_time', 'a.checked_out_time', - 'catid', 'a.catid', 'category_title', - 'state', 'a.state', - 'access', 'a.access', 'access_level', - 'created', 'a.created', - 'created_by', 'a.created_by', - 'created_by_alias', 'a.created_by_alias', - 'ordering', 'a.ordering', - 'featured_up', 'fp.featured_up', - 'featured_down', 'fp.featured_down', - 'language', 'a.language', - 'hits', 'a.hits', - 'publish_up', 'a.publish_up', - 'publish_down', 'a.publish_down', - 'fp.ordering', - 'published', 'a.published', - 'author_id', - 'category_id', - 'level', - 'tag', - 'rating_count', 'rating', - 'ws.title', - ); - } - - parent::__construct($config); - } - - /** - * Method to auto-populate the model state. - * - * Note. Calling getState in this method will result in recursion. - * - * @param string $ordering An optional ordering field. - * @param string $direction An optional direction (asc|desc). - * - * @return void - * - * @since 3.5 - */ - protected function populateState($ordering = 'a.title', $direction = 'asc') - { - parent::populateState($ordering, $direction); - - // Filter by featured articles. - $this->setState('filter.featured', 1); - } - - /** - * Build an SQL query to load the list data. - * - * @return \Joomla\Database\DatabaseQuery - * - * @since 4.0.0 - */ - protected function getListQuery() - { - $query = parent::getListQuery(); - - $query->select($this->getDbo()->quoteName('fp.ordering')); - - return $query; - } -} From c61f30cc62c61375d5015dc2d5042ee074036f1e Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 30 Oct 2021 22:22:46 +0530 Subject: [PATCH 28/43] delete featured view --- .../src/View/Featured/HtmlView.php | 223 ------------------ 1 file changed, 223 deletions(-) delete mode 100644 administrator/components/com_content/src/View/Featured/HtmlView.php diff --git a/administrator/components/com_content/src/View/Featured/HtmlView.php b/administrator/components/com_content/src/View/Featured/HtmlView.php deleted file mode 100644 index ca034b3767112..0000000000000 --- a/administrator/components/com_content/src/View/Featured/HtmlView.php +++ /dev/null @@ -1,223 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -namespace Joomla\Component\Content\Administrator\View\Featured; - -\defined('_JEXEC') or die; - -use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Multilanguage; -use Joomla\CMS\Language\Text; -use Joomla\CMS\MVC\View\GenericDataException; -use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; -use Joomla\CMS\Plugin\PluginHelper; -use Joomla\CMS\Toolbar\Toolbar; -use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\Component\Content\Administrator\Extension\ContentComponent; -use Joomla\Component\Content\Administrator\Helper\ContentHelper; - -/** - * View class for a list of featured articles. - * - * @since 1.6 - */ -class HtmlView extends BaseHtmlView -{ - /** - * An array of items - * - * @var array - */ - protected $items; - - /** - * The pagination object - * - * @var \Joomla\CMS\Pagination\Pagination - */ - protected $pagination; - - /** - * The model state - * - * @var \Joomla\CMS\Object\CMSObject - */ - protected $state; - - /** - * Form object for search filters - * - * @var \Joomla\CMS\Form\Form - */ - public $filterForm; - - /** - * The active search filters - * - * @var array - */ - public $activeFilters; - - /** - * All transition, which can be executed of one if the items - * - * @var array - */ - protected $transitions = []; - - /** - * Is this view an Empty State - * - * @var boolean - * @since 4.0.0 - */ - private $isEmptyState = false; - - /** - * Display the view - * - * @param string $tpl The name of the template file to parse; automatically searches through the template paths. - * - * @return void - */ - public function display($tpl = null) - { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); - $this->vote = PluginHelper::isEnabled('content', 'vote'); - $this->hits = ComponentHelper::getParams('com_content')->get('record_hits', 1); - - if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) - { - $this->setLayout('emptystate'); - } - - if (ComponentHelper::getParams('com_content')->get('workflow_enabled')) - { - PluginHelper::importPlugin('workflow'); - - $this->transitions = $this->get('Transitions'); - } - - // Check for errors. - if (\count($errors = $this->get('Errors'))) - { - throw new GenericDataException(implode("\n", $errors), 500); - } - - $this->addToolbar(); - - // We do not need to filter by language when multilingual is disabled - if (!Multilanguage::isEnabled()) - { - unset($this->activeFilters['language']); - $this->filterForm->removeField('language', 'filter'); - } - - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - $canDo = ContentHelper::getActions('com_content', 'category', $this->state->get('filter.category_id')); - $user = Factory::getApplication()->getIdentity(); - - // Get the toolbar object instance - $toolbar = Toolbar::getInstance('toolbar'); - - ToolbarHelper::title(Text::_('COM_CONTENT_FEATURED_TITLE'), 'star featured'); - - if ($canDo->get('core.create') || \count($user->getAuthorisedCategories('com_content', 'core.create')) > 0) - { - $toolbar->addNew('article.add'); - } - - if (!$this->isEmptyState && ($canDo->get('core.edit.state') || \count($this->transitions))) - { - $dropdown = $toolbar->dropdownButton('status-group') - ->text('JTOOLBAR_CHANGE_STATUS') - ->toggleSplit(false) - ->icon('icon-ellipsis-h') - ->buttonClass('btn btn-action') - ->listCheck(true); - - $childBar = $dropdown->getChildToolbar(); - - if (\count($this->transitions)) - { - $childBar->separatorButton('transition-headline') - ->text('COM_CONTENT_RUN_TRANSITIONS') - ->buttonClass('text-center py-2 h3'); - - $cmd = "Joomla.submitbutton('articles.runTransition');"; - $messages = "{error: [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}"; - $alert = 'Joomla.renderMessages(' . $messages . ')'; - $cmd = 'if (document.adminForm.boxchecked.value == 0) { ' . $alert . ' } else { ' . $cmd . ' }'; - - foreach ($this->transitions as $transition) - { - $childBar->standardButton('transition') - ->text($transition['text']) - ->buttonClass('transition-' . (int) $transition['value']) - ->icon('icon-project-diagram') - ->onclick('document.adminForm.transition_id.value=' . (int) $transition['value'] . ';' . $cmd); - } - - $childBar->separatorButton('transition-separator'); - } - - if ($canDo->get('core.edit.state')) - { - $childBar->publish('articles.publish')->listCheck(true); - - $childBar->unpublish('articles.unpublish')->listCheck(true); - - $childBar->standardButton('unfeatured') - ->text('JUNFEATURE') - ->task('articles.unfeatured') - ->listCheck(true); - - $childBar->archive('articles.archive')->listCheck(true); - - $childBar->checkin('articles.checkin')->listCheck(true); - - if (!$this->state->get('filter.published') == ContentComponent::CONDITION_TRASHED) - { - $childBar->trash('articles.trash')->listCheck(true); - } - } - } - - if (!$this->isEmptyState && $this->state->get('filter.published') == ContentComponent::CONDITION_TRASHED && $canDo->get('core.delete')) - { - $toolbar->delete('articles.delete') - ->text('JTOOLBAR_EMPTY_TRASH') - ->message('JGLOBAL_CONFIRM_DELETE') - ->listCheck(true); - } - - if ($user->authorise('core.admin', 'com_content') || $user->authorise('core.options', 'com_content')) - { - $toolbar->preferences('com_content'); - } - - ToolbarHelper::help('Articles:_Featured'); - } -} From 1bac1782a679cac5a16775dbe54ee931f9002d79 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sat, 30 Oct 2021 22:25:49 +0530 Subject: [PATCH 29/43] delete featurd filter form --- administrator/components/com_admin/script.php | 1 - .../com_content/forms/filter_featured.xml | 152 ------------------ 2 files changed, 153 deletions(-) delete mode 100644 administrator/components/com_content/forms/filter_featured.xml diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index de074d91aabf8..5875d4598484b 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -1277,7 +1277,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_content/models/fields/voteradio.php', '/administrator/components/com_content/models/forms/article.xml', '/administrator/components/com_content/models/forms/filter_articles.xml', - '/administrator/components/com_content/models/forms/filter_featured.xml', '/administrator/components/com_content/tables/featured.php', '/administrator/components/com_content/views/article/tmpl/edit.php', '/administrator/components/com_content/views/article/tmpl/edit.xml', diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml deleted file mode 100644 index 4aef60255a0fe..0000000000000 --- a/administrator/components/com_content/forms/filter_featured.xml +++ /dev/null @@ -1,152 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
From 293c6b9fb7e0ca4963c1871caa733b551841dc57 Mon Sep 17 00:00:00 2001 From: Benjamin Trenkle Date: Sat, 8 Jan 2022 00:49:05 +0100 Subject: [PATCH 30/43] Update administrator/components/com_content/src/View/Articles/HtmlView.php Co-authored-by: Phil E. Taylor --- .../components/com_content/src/View/Articles/HtmlView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php index 152fee5ea8173..9623b108cdb1b 100644 --- a/administrator/components/com_content/src/View/Articles/HtmlView.php +++ b/administrator/components/com_content/src/View/Articles/HtmlView.php @@ -130,7 +130,7 @@ public function display($tpl = null) } else { - /* + /** * In article associations modal we need to remove language filter if forcing a language. * We also need to change the category filter to show categories with All or the forced language. */ From bf59c4d98bb3c571daf7f93739e639a8cc5154c5 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Wed, 23 Mar 2022 18:04:54 +0530 Subject: [PATCH 31/43] use short syntax array --- .../components/com_content/tmpl/articles/default.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 8fc45db643574..9563d347de8b0 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -398,10 +398,10 @@ Text::_('JTOOLBAR_CHANGE_STATUS'), - 'footer' => $this->loadTemplate('stage_footer'), - ), + [ + 'title' => Text::_('JTOOLBAR_CHANGE_STATUS'), + 'footer' => $this->loadTemplate('stage_footer'), + ], $this->loadTemplate('stage_body') ); ?> @@ -411,10 +411,10 @@ Text::_('COM_CONTENT_BATCH_OPTIONS'), 'footer' => $this->loadTemplate('batch_footer'), - ), + ], $this->loadTemplate('batch_body') ); ?> From 46e77788f0a62d99d90288ec807a4251129012b1 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Wed, 23 Mar 2022 18:05:08 +0530 Subject: [PATCH 32/43] revert changes to drone --- .drone.yml | 163 +++++++++++++++++++++++++++-------------------------- 1 file changed, 83 insertions(+), 80 deletions(-) diff --git a/.drone.yml b/.drone.yml index ba9e9af2842b1..677f458568c83 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: - name: phpcs image: joomlaprojects/docker-images:php7.2 - depends_on: [composer] + depends_on: [ composer ] commands: - echo $(date) - ./libraries/vendor/bin/phpcs --extensions=php -p --standard=libraries/vendor/joomla/cms-coding-standards/lib/Joomla-CMS . @@ -25,40 +25,40 @@ steps: - name: npm image: node:14-alpine - depends_on: [phpcs] + depends_on: [ phpcs ] commands: - npm ci --unsafe-perm - name: php72-unit - depends_on: [phpcs] + depends_on: [ phpcs ] image: joomlaprojects/docker-images:php7.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php73-unit - depends_on: [phpcs] + depends_on: [ phpcs ] image: joomlaprojects/docker-images:php7.3 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php74-unit - depends_on: [phpcs] + depends_on: [ phpcs ] image: joomlaprojects/docker-images:php7.4 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php80-unit - depends_on: [phpcs] + depends_on: [ phpcs ] image: joomlaprojects/docker-images:php8.0 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php81-unit - depends_on: [phpcs] + depends_on: [ phpcs ] image: joomlaprojects/docker-images:php8.1 failure: ignore commands: @@ -66,28 +66,28 @@ steps: - ./libraries/vendor/bin/phpunit --testsuite Unit - name: php72-integration - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php7.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php73-integration - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php7.3 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php74-integration - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php7.4 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php80-integration - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php8.0 failure: ignore commands: @@ -95,42 +95,42 @@ steps: - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php81-integration - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php8.1 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php82-integration - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php8.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration - name: php72-integration-pgsql - depends_on: [npm] + 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] + 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] + depends_on: [ npm ] image: joomlaprojects/docker-images:php7.4 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: php80-integration-pgsql - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php8.0 failure: ignore commands: @@ -138,27 +138,27 @@ steps: - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: php81-integration-pgsql - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php8.1 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: php82-integration-pgsql - depends_on: [npm] + depends_on: [ npm ] image: joomlaprojects/docker-images:php8.2 commands: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist - name: scss-cs - depends_on: [npm] + depends_on: [ npm ] image: node:current-alpine commands: - npm run lint:css - name: javascript-cs - depends_on: [npm] + depends_on: [ npm ] image: node:current-alpine commands: - npm run lint:js @@ -182,19 +182,19 @@ steps: commands: - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql - # - name: phpnext-api-mysql - # depends_on: - # - phpmin-api-mysql - # image: joomlaprojects/docker-images:systemtests8.2 - # failure: ignore - # environment: - # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - # commands: - # - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext +# - name: phpnext-api-mysql +# depends_on: +# - phpmin-api-mysql +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext - name: phpmin-api-postgres depends_on: - # - phpnext-api-mysql + # - phpnext-api-mysql - phpmin-api-mysql image: joomlaprojects/docker-images:systemtests failure: ignore @@ -203,19 +203,19 @@ steps: commands: - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres - # - name: phpnext-api-postgres - # depends_on: - # - phpmin-api-postgres - # image: joomlaprojects/docker-images:systemtests8.2 - # failure: ignore - # environment: - # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - # commands: - # - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext +# - name: phpnext-api-postgres +# depends_on: +# - phpmin-api-postgres +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext - name: phpmax-api-postgres depends_on: - # - phpnext-api-postgres +# - phpnext-api-postgres - phpmin-api-postgres image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -235,19 +235,19 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql - # - name: phpnext-system-mysql - # depends_on: - # - phpmin-system-mysql - # image: joomlaprojects/docker-images:systemtests8.2 - # failure: ignore - # environment: - # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - # commands: - # - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext +# - name: phpnext-system-mysql +# depends_on: +# - phpmin-system-mysql +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext - name: phpmax-system-mysql depends_on: - # - phpnext-system-mysql +# - phpnext-system-mysql - phpmin-system-mysql image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -256,19 +256,19 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax - # - name: phpnext-system-mysql8 - # depends_on: - # - phpmax-system-mysql - # image: joomlaprojects/docker-images:systemtests8.2 - # failure: ignore - # environment: - # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - # commands: - # - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext +# - name: phpnext-system-mysql8 +# depends_on: +# - phpmax-system-mysql +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext - name: phpmax-system-mysql8 depends_on: - # - phpnext-system-mysql +# - phpnext-system-mysql - phpmax-system-mysql image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -277,19 +277,19 @@ steps: commands: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax - # - name: phpnext-system-postgres - # depends_on: - # - phpmax-system-mysql8 - # image: joomlaprojects/docker-images:systemtests8.2 - # failure: ignore - # environment: - # JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 - # commands: - # - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext +# - name: phpnext-system-postgres +# depends_on: +# - phpmax-system-mysql8 +# image: joomlaprojects/docker-images:systemtests8.2 +# failure: ignore +# environment: +# JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 +# commands: +# - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext - name: phpmax-system-postgres depends_on: - # - phpnext-system-mysql8 +# - phpnext-system-mysql8 - phpmax-system-mysql8 image: joomlaprojects/docker-images:systemtests8.1 failure: ignore @@ -299,7 +299,7 @@ steps: - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpmax - name: phpmin-system-mysql8 - depends_on: [phpmax-system-postgres] + depends_on: [ phpmax-system-postgres ] image: joomlaprojects/docker-images:systemtests environment: JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 @@ -307,7 +307,7 @@ steps: - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8 - name: phpmin-system-postgres - depends_on: [phpmin-system-mysql8] + depends_on: [ phpmin-system-mysql8 ] image: joomlaprojects/docker-images:systemtests environment: JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 @@ -317,17 +317,17 @@ steps: - name: artifacts-system-tests image: cschlosser/drone-ftps depends_on: - # - phpnext-system-mysql - # - phpnext-system-mysql8 - # - phpnext-system-postgres +# - phpnext-system-mysql +# - phpnext-system-mysql8 +# - phpnext-system-postgres - phpmax-system-mysql - phpmax-system-mysql8 - phpmax-system-postgres - phpmin-system-mysql - phpmin-system-mysql8 - phpmin-system-postgres - # - phpnext-api-mysql - # - phpnext-api-postgres +# - phpnext-api-mysql +# - phpnext-api-postgres - phpmax-api-mysql - phpmax-api-postgres - phpmin-api-mysql @@ -351,7 +351,7 @@ steps: - failure branches: - exclude: [l10n_*] + exclude: [ l10n_* ] volumes: - name: composer-cache @@ -417,6 +417,9 @@ steps: branch: - 4.2-dev + --- kind: signature -hmac: 53e23beca546bde246f812a726320210f33d231106cb154a65cc900ecbf7502e +hmac: d9707d261edba35bc6b70f09a1babee119cb0a88cebda40171248e5c0a8b135e + +... \ No newline at end of file From 076e3d480ad7945143d3f1d094037e7e1e6abd88 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Wed, 23 Mar 2022 18:08:51 +0530 Subject: [PATCH 33/43] correctly filter user supplied input --- .../components/com_content/src/Model/ArticlesModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index 09736172db847..f47f07c7ab474 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -742,6 +742,6 @@ public function getItems() */ public function isFeatured() { - return $this->getUserStateFromRequest($this->context . '.featured', 'featured', ''); + return $this->getUserStateFromRequest($this->context . '.featured', 'featured', $this->type); } } From 9974bfd745e5338b5ca1ed175892df6f52d4a78d Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Wed, 23 Mar 2022 18:12:07 +0530 Subject: [PATCH 34/43] remove unused language constants --- administrator/language/en-GB/joomla.ini | 211 ------------------------ api/language/en-GB/joomla.ini | 211 ------------------------ 2 files changed, 422 deletions(-) diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index 4b77c66375b5d..5f96f9bbab9ec 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -709,217 +709,6 @@ JGRID_HEADING_ORDERING="Ordering" JGRID_HEADING_ORDERING_ASC="Ordering ascending" JGRID_HEADING_ORDERING_DESC="Ordering descending" -JHELP_ADMIN_USER_PROFILE_EDIT="My_Profile" -JHELP_COMPONENTS_ACTIONLOGS="User_Actions_Log" -JHELP_COMPONENTS_ASSOCIATIONS="Multilingual_Associations" -JHELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual_Associations:_Edit" -JHELP_COMPONENTS_BANNERS_BANNERS="Banners" -JHELP_COMPONENTS_BANNERS_BANNERS_EDIT="Banners:_Edit" -JHELP_COMPONENTS_BANNERS_CATEGORIES="Banners:_Categories" -JHELP_COMPONENTS_BANNERS_CATEGORY_ADD="Banners:_New_or_Edit_Category" -JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Banners:_New_or_Edit_Category" -JHELP_COMPONENTS_BANNERS_CLIENTS="Banners:_Clients" -JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banners:_New_or_Edit_Client" -JHELP_COMPONENTS_BANNERS_TRACKS="Banners:_Tracks" -JHELP_COMPONENTS_COM_ACTIONLOGS_OPTIONS="User_Actions_Log:_Options" -JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Multilingual_Associations:_Options" -JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Banners:_Options" -JHELP_COMPONENTS_COM_CACHE_OPTIONS="Cache:_Options" -JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Check-in:_Options" -JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Contacts:_Options" -JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Articles:_Options" -JHELP_COMPONENTS_COM_FINDER_OPTIONS="Smart_Search:_Options" -JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Installer:_Options" -JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Joomla_Update:_Options" -JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Languages:_Options" -JHELP_COMPONENTS_COM_MAILS_OPTIONS="Mail_Templates:_Options" -JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Media:_Options" -JHELP_COMPONENTS_COM_MENUS_OPTIONS="Menus:_Options" -JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Messages:_Options" -JHELP_COMPONENTS_COM_MODULES_OPTIONS="Module:_Options" -JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="News_Feed:_Options" -JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Plugin:_Options" -JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Post-installation_Messages:_Options" -JHELP_COMPONENTS_COM_PRIVACY_OPTIONS="Privacy:_Options" -JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Redirect:_Options" -JHELP_COMPONENTS_COM_TAGS_OPTIONS="Tags:_Options" -JHELP_COMPONENTS_COM_TEMPLATES_OPTIONS="Template:_Options" -JHELP_COMPONENTS_COM_USERS_OPTIONS="Users:_Options" -JHELP_COMPONENTS_CONTACT_CATEGORIES="Contacts:_Categories" -JHELP_COMPONENTS_CONTACT_CATEGORY_ADD="Contacts:_New_or_Edit_Category" -JHELP_COMPONENTS_CONTACT_CATEGORY_EDIT="Contacts:_New_or_Edit_Category" -JHELP_COMPONENTS_CONTACTS_CONTACTS="Contacts" -JHELP_COMPONENTS_CONTACTS_CONTACTS_EDIT="Contacts:_New_or_Edit" -JHELP_COMPONENTS_CONTENT_CATEGORIES="Articles:_Categories" -JHELP_COMPONENTS_CONTENT_CATEGORY_ADD="Articles:_New_or_Edit_Category" -JHELP_COMPONENTS_CONTENT_CATEGORY_EDIT="Articles:_New_or_Edit_Category" -JHELP_COMPONENTS_FIELDS_FIELD_GROUPS="Component:_Field_Groups" -JHELP_COMPONENTS_FIELDS_FIELD_GROUPS_EDIT="Component:_New_or_Edit_Field_Group" -JHELP_COMPONENTS_FIELDS_FIELDS="Component:_Fields" -JHELP_COMPONENTS_FIELDS_FIELDS_EDIT="Component:_New_or_Edit_Field" -JHELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS="Smart_Search:_Content_Maps" -JHELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT="Smart_Search:_Indexed_Content" -JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS="Smart_Search:_Search_Filters" -JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT="Smart_Search:_New_or_Edit_Filter" -JHELP_COMPONENTS_FINDER_MANAGE_SEARCHES="Smart_Search:_Search_Term_Analysis" -JHELP_COMPONENTS_INSTALLER_UPDATESITE_EDIT="Edit_Update_Site" -JHELP_COMPONENTS_JOOMLA_UPDATE="Joomla_Update" -JHELP_COMPONENTS_MAILS_TEMPLATES="Mail_Templates" -JHELP_COMPONENTS_MAILS_TEMPLATE_EDIT="Mail_Template:_Edit" -JHELP_COMPONENTS_MESSAGING_INBOX="Private_Messages" -JHELP_COMPONENTS_MESSAGING_READ="Private_Messages:_Read" -JHELP_COMPONENTS_MESSAGING_WRITE="Private_Messages:_Write" -JHELP_COMPONENTS_NEWSFEEDS_CATEGORIES="News_Feeds:_Categories" -JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_ADD="News_Feeds:_New_or_Edit_Category" -JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_EDIT="News_Feeds:_New_or_Edit_Category" -JHELP_COMPONENTS_NEWSFEEDS_FEEDS="News_Feeds" -JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="News_Feeds:_New_or_Edit" -JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Post-installation_Messages_for_Joomla_CMS" -JHELP_COMPONENTS_PRIVACY_CAPABILITIES="Privacy:_Extension_Capabilities" -JHELP_COMPONENTS_PRIVACY_CONSENTS="Privacy:_Consents" -JHELP_COMPONENTS_PRIVACY_DASHBOARD="Privacy_Dashboard" -JHELP_COMPONENTS_PRIVACY_REQUEST="Privacy:_Review_Information_Request" -JHELP_COMPONENTS_PRIVACY_REQUEST_EDIT="Privacy:_New_Information_Request" -JHELP_COMPONENTS_PRIVACY_REQUESTS="Privacy:_Information_Requests" -JHELP_COMPONENTS_REDIRECT_MANAGER="Redirects:_Links" -JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Redirects:_New_or_Edit" -JHELP_COMPONENTS_TAGS_MANAGER="Tags" -JHELP_COMPONENTS_TAGS_MANAGER_EDIT="Tags:_New_or_Edit" -JHELP_COMPONENTS_USERS_CATEGORIES="User_Notes:_Categories" -JHELP_COMPONENTS_USERS_CATEGORY_ADD="User_Notes:_New_or_Edit_Category" -JHELP_COMPONENTS_USERS_CATEGORY_EDIT="User_Notes:_New_or_Edit_Category" -JHELP_COMPONENTS_WORKFLOW_STAGES_LIST="Stages_List:_Basic_Workflow" -JHELP_COMPONENTS_WORKFLOW_TRANSITIONS_LIST="Transitions_List:_Basic_Workflow" -JHELP_COMPONENTS_WORKFLOW_WORKFLOWS_LIST="Workflows_List" -JHELP_CONTENT_ARTICLE_MANAGER="Articles" -JHELP_CONTENT_ARTICLE_MANAGER_EDIT="Articles:_Edit" -JHELP_CONTENT_MEDIA_MANAGER="Media" -JHELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE="Information:_Database" -JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER="Extensions:_Discover" -JHELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL="Extensions:_Install" -JHELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES="Extensions:_Languages" -JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE="Extensions:_Manage" -JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE="Extensions:_Update" -JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES="Extensions:_Update_Sites" -JHELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS="Information:_Warnings" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT="Languages:_Content" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT="Languages:_Edit_Content_Language" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED="Languages:_Installed" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES="Languages:_Overrides" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT="Languages:_Edit_Override" -JHELP_EXTENSIONS_MODULE_MANAGER="Modules" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_CUSTOM="Admin_Modules:_Custom" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FEED="Admin_Modules:_Feed_Display" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FRONTEND="Admin_Modules:_Frontend_Link" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST="Admin_Modules:_Articles_-_Latest" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATESTACTIONS="Admin_Modules:_Action_Logs_-_Latest" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGGED="Admin_Modules:_Logged-in_Users" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN="Admin_Modules:_Login_Form" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN_SUPPORT="Admin_Modules:_Login_Support_Information" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU="Admin_Modules:_Administrator_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MESSAGES="Admin_Modules:_Messages" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MULTILANG="Admin_Modules:_Multilingual_Status" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POPULAR="Admin_Modules:_Popular_Articles" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POST_INSTALLATION_MESSAGES="Admin_Modules:_Post_Installation_Messages" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_DASHBOARD="Admin_Modules:_Privacy_Dashboard" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_STATUS="Admin_Modules:_Privacy_Status_Check" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_QUICKICON="Admin_Modules:_Quick_Icons" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SAMPLE_DATA="Admin_Modules:_Sample_Data" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_STATUS_USER="Admin_Modules:_User_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SUBMENU="Admin_Modules:_Administrator_Dashboard_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TITLE="Admin_Modules:_Title" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TOOLBAR="Admin_Modules:_Toolbar" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_VERSION="Admin_Modules:_Joomla_Version_Information" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE="Site_Modules:_Articles_-_Archived" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES="Site_Modules:_Articles_-_Categories" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORY="Site_Modules:_Articles_-_Category" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_NEWSFLASH="Site_Modules:_Articles_-_Newsflash" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_RELATED="Site_Modules:_Articles_-_Related" -JHELP_EXTENSIONS_MODULE_MANAGER_BANNERS="Site_Modules:_Banners" -JHELP_EXTENSIONS_MODULE_MANAGER_BREADCRUMBS="Site_Modules:_Breadcrumbs" -JHELP_EXTENSIONS_MODULE_MANAGER_CUSTOM_HTML="Site_Modules:_Custom" -JHELP_EXTENSIONS_MODULE_MANAGER_EDIT="" -JHELP_EXTENSIONS_MODULE_MANAGER_FEED_DISPLAY="Site_Modules:_Feed_Display" -JHELP_EXTENSIONS_MODULE_MANAGER_FOOTER="Site_Modules:_Footer" -JHELP_EXTENSIONS_MODULE_MANAGER_LANGUAGE_SWITCHER="Site_Modules:_Language_Switcher" -JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_NEWS="Site_Modules:_Articles_-_Latest" -JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_USERS="Site_Modules:_Latest_Users" -JHELP_EXTENSIONS_MODULE_MANAGER_LOGIN="Site_Modules:_Login" -JHELP_EXTENSIONS_MODULE_MANAGER_MENU="Site_Modules:_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_MOST_READ="Site_Modules:_Articles_-_Most_Read" -JHELP_EXTENSIONS_MODULE_MANAGER_RANDOM_IMAGE="Site_Modules:_Random_Image" -JHELP_EXTENSIONS_MODULE_MANAGER_SMART_SEARCH="Site_Modules:_Smart_Search" -JHELP_EXTENSIONS_MODULE_MANAGER_STATISTICS="Site_Modules:_Statistics" -JHELP_EXTENSIONS_MODULE_MANAGER_SYNDICATION_FEEDS="Site_Modules:_Syndication_Feeds" -JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_POPULAR="Site_Modules:_Tags_-_Popular" -JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_SIMILAR="Site_Modules:_Tags_-_Similar" -JHELP_EXTENSIONS_MODULE_MANAGER_WHO_ONLINE="Site_Modules:_Who%27s_Online" -JHELP_EXTENSIONS_MODULE_MANAGER_WRAPPER="Site_Modules:_Wrapper" -JHELP_EXTENSIONS_PLUGIN_MANAGER="Plugins" -JHELP_EXTENSIONS_PLUGIN_MANAGER_EDIT="Plugins:_Name_of_Plugin" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES="Templates:_Styles" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT="Templates:_Edit_Style" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES="Templates:_Templates" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT="Templates:_Customise" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE="Templates:_Customise_Source" -JHELP_GLOSSARY="Glossary" -JHELP_MENUS_MENU_ITEM_ARTICLE_ARCHIVED="Menu_Item:_Article_Archived" -JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORIES="Menu_Item:_List_All_Categories" -JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG="Menu_Item:_Category_Blog" -JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST="Menu_Item:_Category_List" -JHELP_MENUS_MENU_ITEM_ARTICLE_CREATE="Menu_Item:_Create_Article" -JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED="Menu_Item:_Featured_Articles" -JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE="Menu_Item:_Single_Article" -JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORIES="Menu_Item:_List_All_Contact_Categories" -JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORY="Menu_Item:_List_Contacts_in_a_Category" -JHELP_MENUS_MENU_ITEM_CONTACT_CREATE="Menu_Item:_Create_Contact" -JHELP_MENUS_MENU_ITEM_CONTACT_FEATURED="Menu_Item:_Featured_Contacts" -JHELP_MENUS_MENU_ITEM_CONTACT_SINGLE_CONTACT="Menu_Item:_Single_Contact" -JHELP_MENUS_MENU_ITEM_DISPLAY_SITE_CONFIGURATION="Menu_Item:_Site_Configuration_Options" -JHELP_MENUS_MENU_ITEM_DISPLAY_TEMPLATE_OPTIONS="Menu_Item:_Display_Template_Options" -JHELP_MENUS_MENU_ITEM_EXTERNAL_URL="Menu_Item:_URL" -JHELP_MENUS_MENU_ITEM_FINDER_SEARCH="Menu_Item:_Search" -JHELP_MENUS_MENU_ITEM_MANAGER="Menus:_Items" -JHELP_MENUS_MENU_ITEM_MANAGER_EDIT="Menu_Item:_New_Item" -JHELP_MENUS_MENU_ITEM_MENU_ITEM_ALIAS="Menu_Item:_Alias" -JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING="Menu_Item:_Heading" -JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORIES="Menu_Item:_List_All_News_Feed_Categories" -JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORY="Menu_Item:_List_News_Feeds_in_a_Category" -JHELP_MENUS_MENU_ITEM_NEWSFEED_SINGLE_NEWSFEED="Menu_Item:_Single_News_Feed" -JHELP_MENUS_MENU_ITEM_PRIVACY_CONFIRM_REQUEST="Menu_Item:_Confirm_Request" -JHELP_MENUS_MENU_ITEM_PRIVACY_CREATE_REQUEST="Menu_Item:_Create_Request" -JHELP_MENUS_MENU_ITEM_PRIVACY_REMIND_REQUEST="Menu_Item:_Extend_Consent" -JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_COMPACT_LIST="Menu_Item:_Compact_List_of_Tagged_Items" -JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST="Menu_Item:_Tagged_Items" -JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST_ALL="Menu_Item:_List_All_Tags" -JHELP_MENUS_MENU_ITEM_TEXT_SEPARATOR="Menu_Item:_Separator" -JHELP_MENUS_MENU_ITEM_USER_LOGIN="Menu_Item:_Login_Form" -JHELP_MENUS_MENU_ITEM_USER_LOGOUT="Menu_Item:_Logout" -JHELP_MENUS_MENU_ITEM_USER_PASSWORD_RESET="Menu_Item:_Password_Reset" -JHELP_MENUS_MENU_ITEM_USER_PROFILE="Menu_Item:_User_Profile" -JHELP_MENUS_MENU_ITEM_USER_PROFILE_EDIT="Menu_Item:_Edit_User_Profile" -JHELP_MENUS_MENU_ITEM_USER_REGISTRATION="Menu_Item:_Registration_Form" -JHELP_MENUS_MENU_ITEM_USER_REMINDER="Menu_Item:_Username_Reminder_Request" -JHELP_MENUS_MENU_ITEM_WRAPPER="Menu_Item:_Iframe_Wrapper" -JHELP_MENUS_MENU_MANAGER="Menus" -JHELP_MENUS_MENU_MANAGER_EDIT="Menus:_Edit" -JHELP_SITE_GLOBAL_CONFIGURATION="Site_Global_Configuration" -JHELP_SITE_MAINTENANCE_CLEAR_CACHE="Maintenance:_Clear_Cache" -JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Maintenance:_Global_Check-in" -JHELP_SITE_SYSTEM_INFORMATION="Site_System_Information" -JHELP_START_HERE="Start_Here" -JHELP_USERS_ACCESS_LEVELS="Users:_Viewing_Access_Levels" -JHELP_USERS_ACCESS_LEVELS_EDIT="Users:_Edit_Viewing_Access_Level" -JHELP_USERS_DEBUG_GROUPS="Permissions_for_Group" -JHELP_USERS_DEBUG_USERS="Permissions_for_User" -JHELP_USERS_GROUPS="Users:_Groups" -JHELP_USERS_GROUPS_EDIT="Users:_New_or_Edit_Group" -JHELP_USERS_MASS_MAIL_USERS="Mass_Mail_Users" -JHELP_USERS_USER_MANAGER="Users" -JHELP_USERS_USER_MANAGER_EDIT="Users:_Edit_Profile" -JHELP_USERS_USER_NOTES="User_Notes" -JHELP_USERS_USER_NOTES_EDIT="User_Notes:_New_or_Edit" - ; If there is an error connecting database before initialisation, en-GB.lib_joomla.ini can't be loaded ; we therefore have to load the strings from en-GB.ini diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index d81f9f9d995b3..9fe95a000ee6d 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -703,217 +703,6 @@ JGRID_HEADING_ORDERING="Ordering" JGRID_HEADING_ORDERING_ASC="Ordering ascending" JGRID_HEADING_ORDERING_DESC="Ordering descending" -JHELP_ADMIN_USER_PROFILE_EDIT="My_Profile" -JHELP_COMPONENTS_ACTIONLOGS="User_Actions_Log" -JHELP_COMPONENTS_ASSOCIATIONS="Multilingual_Associations" -JHELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual_Associations:_Edit" -JHELP_COMPONENTS_BANNERS_BANNERS="Banners" -JHELP_COMPONENTS_BANNERS_BANNERS_EDIT="Banners:_Edit" -JHELP_COMPONENTS_BANNERS_CATEGORIES="Banners:_Categories" -JHELP_COMPONENTS_BANNERS_CATEGORY_ADD="Banners:_New_or_Edit_Category" -JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Banners:_New_or_Edit_Category" -JHELP_COMPONENTS_BANNERS_CLIENTS="Banners:_Clients" -JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banners:_New_or_Edit_Client" -JHELP_COMPONENTS_BANNERS_TRACKS="Banners:_Tracks" -JHELP_COMPONENTS_COM_ACTIONLOGS_OPTIONS="User_Actions_Log:_Options" -JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Multilingual_Associations:_Options" -JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Banners:_Options" -JHELP_COMPONENTS_COM_CACHE_OPTIONS="Cache:_Options" -JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Check-in:_Options" -JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Contacts:_Options" -JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Articles:_Options" -JHELP_COMPONENTS_COM_FINDER_OPTIONS="Smart_Search:_Options" -JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Installer:_Options" -JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Joomla_Update:_Options" -JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Languages:_Options" -JHELP_COMPONENTS_COM_MAILS_OPTIONS="Mail_Templates:_Options" -JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Media:_Options" -JHELP_COMPONENTS_COM_MENUS_OPTIONS="Menus:_Options" -JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Messages:_Options" -JHELP_COMPONENTS_COM_MODULES_OPTIONS="Module:_Options" -JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="News_Feed:_Options" -JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Plugin:_Options" -JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Post-installation_Messages:_Options" -JHELP_COMPONENTS_COM_PRIVACY_OPTIONS="Privacy:_Options" -JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Redirect:_Options" -JHELP_COMPONENTS_COM_TAGS_OPTIONS="Tags:_Options" -JHELP_COMPONENTS_COM_TEMPLATES_OPTIONS="Template:_Options" -JHELP_COMPONENTS_COM_USERS_OPTIONS="Users:_Options" -JHELP_COMPONENTS_CONTACT_CATEGORIES="Contacts:_Categories" -JHELP_COMPONENTS_CONTACT_CATEGORY_ADD="Contacts:_New_or_Edit_Category" -JHELP_COMPONENTS_CONTACT_CATEGORY_EDIT="Contacts:_New_or_Edit_Category" -JHELP_COMPONENTS_CONTACTS_CONTACTS="Contacts" -JHELP_COMPONENTS_CONTACTS_CONTACTS_EDIT="Contacts:_New_or_Edit" -JHELP_COMPONENTS_CONTENT_CATEGORIES="Articles:_Categories" -JHELP_COMPONENTS_CONTENT_CATEGORY_ADD="Articles:_New_or_Edit_Category" -JHELP_COMPONENTS_CONTENT_CATEGORY_EDIT="Articles:_New_or_Edit_Category" -JHELP_COMPONENTS_FIELDS_FIELD_GROUPS="Component:_Field_Groups" -JHELP_COMPONENTS_FIELDS_FIELD_GROUPS_EDIT="Component:_New_or_Edit_Field_Group" -JHELP_COMPONENTS_FIELDS_FIELDS="Component:_Fields" -JHELP_COMPONENTS_FIELDS_FIELDS_EDIT="Component:_New_or_Edit_Field" -JHELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS="Smart_Search:_Content_Maps" -JHELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT="Smart_Search:_Indexed_Content" -JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS="Smart_Search:_Search_Filters" -JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT="Smart_Search:_New_or_Edit_Filter" -JHELP_COMPONENTS_FINDER_MANAGE_SEARCHES="Smart_Search:_Search_Term_Analysis" -JHELP_COMPONENTS_INSTALLER_UPDATESITE_EDIT="Edit_Update_Site" -JHELP_COMPONENTS_JOOMLA_UPDATE="Joomla_Update" -JHELP_COMPONENTS_MAILS_TEMPLATES="Mail_Templates" -JHELP_COMPONENTS_MAILS_TEMPLATE_EDIT="Mail_Template:_Edit" -JHELP_COMPONENTS_MESSAGING_INBOX="Private_Messages" -JHELP_COMPONENTS_MESSAGING_READ="Private_Messages:_Read" -JHELP_COMPONENTS_MESSAGING_WRITE="Private_Messages:_Write" -JHELP_COMPONENTS_NEWSFEEDS_CATEGORIES="News_Feeds:_Categories" -JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_ADD="News_Feeds:_New_or_Edit_Category" -JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_EDIT="News_Feeds:_New_or_Edit_Category" -JHELP_COMPONENTS_NEWSFEEDS_FEEDS="News_Feeds" -JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="News_Feeds:_New_or_Edit" -JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Post-installation_Messages_for_Joomla_CMS" -JHELP_COMPONENTS_PRIVACY_CAPABILITIES="Privacy:_Extension_Capabilities" -JHELP_COMPONENTS_PRIVACY_CONSENTS="Privacy:_Consents" -JHELP_COMPONENTS_PRIVACY_DASHBOARD="Privacy_Dashboard" -JHELP_COMPONENTS_PRIVACY_REQUEST="Privacy:_Review_Information_Request" -JHELP_COMPONENTS_PRIVACY_REQUEST_EDIT="Privacy:_New_Information_Request" -JHELP_COMPONENTS_PRIVACY_REQUESTS="Privacy:_Information_Requests" -JHELP_COMPONENTS_REDIRECT_MANAGER="Redirects:_Links" -JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Redirects:_New_or_Edit" -JHELP_COMPONENTS_TAGS_MANAGER="Tags" -JHELP_COMPONENTS_TAGS_MANAGER_EDIT="Tags:_New_or_Edit" -JHELP_COMPONENTS_USERS_CATEGORIES="User_Notes:_Categories" -JHELP_COMPONENTS_USERS_CATEGORY_ADD="User_Notes:_New_or_Edit_Category" -JHELP_COMPONENTS_USERS_CATEGORY_EDIT="User_Notes:_New_or_Edit_Category" -JHELP_COMPONENTS_WORKFLOW_STAGES_LIST="Stages_List:_Basic_Workflow" -JHELP_COMPONENTS_WORKFLOW_TRANSITIONS_LIST="Transitions_List:_Basic_Workflow" -JHELP_COMPONENTS_WORKFLOW_WORKFLOWS_LIST="Workflows_List" -JHELP_CONTENT_ARTICLE_MANAGER="Articles" -JHELP_CONTENT_ARTICLE_MANAGER_EDIT="Articles:_Edit" -JHELP_CONTENT_MEDIA_MANAGER="Media" -JHELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE="Information:_Database" -JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER="Extensions:_Discover" -JHELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL="Extensions:_Install" -JHELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES="Extensions:_Languages" -JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE="Extensions:_Manage" -JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE="Extensions:_Update" -JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES="Extensions:_Update_Sites" -JHELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS="Information:_Warnings" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT="Languages:_Content" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT="Languages:_Edit_Content_Language" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED="Languages:_Installed" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES="Languages:_Overrides" -JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT="Languages:_Edit_Override" -JHELP_EXTENSIONS_MODULE_MANAGER="Modules" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_CUSTOM="Admin_Modules:_Custom" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FEED="Admin_Modules:_Feed_Display" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FRONTEND="Admin_Modules:_Frontend_Link" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST="Admin_Modules:_Articles_-_Latest" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATESTACTIONS="Admin_Modules:_Action_Logs_-_Latest" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGGED="Admin_Modules:_Logged-in_Users" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN="Admin_Modules:_Login_Form" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN_SUPPORT="Admin_Modules:_Login_Support_Information" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU="Admin_Modules:_Administrator_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MESSAGES="Admin_Modules:_Messages" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MULTILANG="Admin_Modules:_Multilingual_Status" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POPULAR="Admin_Modules:_Popular_Articles" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POST_INSTALLATION_MESSAGES="Admin_Modules:_Post_Installation_Messages" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_DASHBOARD="Admin_Modules:_Privacy_Dashboard" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_PRIVACY_STATUS="Admin_Modules:_Privacy_Status_Check" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_QUICKICON="Admin_Modules:_Quick_Icons" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SAMPLE_DATA="Admin_Modules:_Sample_Data" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_STATUS_USER="Admin_Modules:_User_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SUBMENU="Admin_Modules:_Administrator_Dashboard_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TITLE="Admin_Modules:_Title" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TOOLBAR="Admin_Modules:_Toolbar" -JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_VERSION="Admin_Modules:_Joomla_Version_Information" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE="Site_Modules:_Articles_-_Archived" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES="Site_Modules:_Articles_-_Categories" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORY="Site_Modules:_Articles_-_Category" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_NEWSFLASH="Site_Modules:_Articles_-_Newsflash" -JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_RELATED="Site_Modules:_Articles_-_Related" -JHELP_EXTENSIONS_MODULE_MANAGER_BANNERS="Site_Modules:_Banners" -JHELP_EXTENSIONS_MODULE_MANAGER_BREADCRUMBS="Site_Modules:_Breadcrumbs" -JHELP_EXTENSIONS_MODULE_MANAGER_CUSTOM_HTML="Site_Modules:_Custom" -JHELP_EXTENSIONS_MODULE_MANAGER_EDIT="" -JHELP_EXTENSIONS_MODULE_MANAGER_FEED_DISPLAY="Site_Modules:_Feed_Display" -JHELP_EXTENSIONS_MODULE_MANAGER_FOOTER="Site_Modules:_Footer" -JHELP_EXTENSIONS_MODULE_MANAGER_LANGUAGE_SWITCHER="Site_Modules:_Language_Switcher" -JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_NEWS="Site_Modules:_Articles_-_Latest" -JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_USERS="Site_Modules:_Latest_Users" -JHELP_EXTENSIONS_MODULE_MANAGER_LOGIN="Site_Modules:_Login" -JHELP_EXTENSIONS_MODULE_MANAGER_MENU="Site_Modules:_Menu" -JHELP_EXTENSIONS_MODULE_MANAGER_MOST_READ="Site_Modules:_Articles_-_Most_Read" -JHELP_EXTENSIONS_MODULE_MANAGER_RANDOM_IMAGE="Site_Modules:_Random_Image" -JHELP_EXTENSIONS_MODULE_MANAGER_SMART_SEARCH="Site_Modules:_Smart_Search" -JHELP_EXTENSIONS_MODULE_MANAGER_STATISTICS="Site_Modules:_Statistics" -JHELP_EXTENSIONS_MODULE_MANAGER_SYNDICATION_FEEDS="Site_Modules:_Syndication_Feeds" -JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_POPULAR="Site_Modules:_Tags_-_Popular" -JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_SIMILAR="Site_Modules:_Tags_-_Similar" -JHELP_EXTENSIONS_MODULE_MANAGER_WHO_ONLINE="Site_Modules:_Who%27s_Online" -JHELP_EXTENSIONS_MODULE_MANAGER_WRAPPER="Site_Modules:_Wrapper" -JHELP_EXTENSIONS_PLUGIN_MANAGER="Plugins" -JHELP_EXTENSIONS_PLUGIN_MANAGER_EDIT="Plugins:_Name_of_Plugin" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES="Templates:_Styles" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT="Templates:_Edit_Style" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES="Templates:_Templates" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT="Templates:_Customise" -JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE="Templates:_Customise_Source" -JHELP_GLOSSARY="Glossary" -JHELP_MENUS_MENU_ITEM_ARTICLE_ARCHIVED="Menu_Item:_Article_Archived" -JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORIES="Menu_Item:_List_All_Categories" -JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG="Menu_Item:_Category_Blog" -JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST="Menu_Item:_Category_List" -JHELP_MENUS_MENU_ITEM_ARTICLE_CREATE="Menu_Item:_Create_Article" -JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED="Menu_Item:_Featured_Articles" -JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE="Menu_Item:_Single_Article" -JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORIES="Menu_Item:_List_All_Contact_Categories" -JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORY="Menu_Item:_List_Contacts_in_a_Category" -JHELP_MENUS_MENU_ITEM_CONTACT_CREATE="Menu_Item:_Create_Contact" -JHELP_MENUS_MENU_ITEM_CONTACT_FEATURED="Menu_Item:_Featured_Contacts" -JHELP_MENUS_MENU_ITEM_CONTACT_SINGLE_CONTACT="Menu_Item:_Single_Contact" -JHELP_MENUS_MENU_ITEM_DISPLAY_SITE_CONFIGURATION="Menu_Item:_Site_Configuration_Options" -JHELP_MENUS_MENU_ITEM_DISPLAY_TEMPLATE_OPTIONS="Menu_Item:_Display_Template_Options" -JHELP_MENUS_MENU_ITEM_EXTERNAL_URL="Menu_Item:_URL" -JHELP_MENUS_MENU_ITEM_FINDER_SEARCH="Menu_Item:_Search" -JHELP_MENUS_MENU_ITEM_MANAGER="Menus:_Items" -JHELP_MENUS_MENU_ITEM_MANAGER_EDIT="Menu_Item:_New_Item" -JHELP_MENUS_MENU_ITEM_MENU_ITEM_ALIAS="Menu_Item:_Alias" -JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING="Menu_Item:_Heading" -JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORIES="Menu_Item:_List_All_News_Feed_Categories" -JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORY="Menu_Item:_List_News_Feeds_in_a_Category" -JHELP_MENUS_MENU_ITEM_NEWSFEED_SINGLE_NEWSFEED="Menu_Item:_Single_News_Feed" -JHELP_MENUS_MENU_ITEM_PRIVACY_CONFIRM_REQUEST="Menu_Item:_Confirm_Request" -JHELP_MENUS_MENU_ITEM_PRIVACY_CREATE_REQUEST="Menu_Item:_Create_Request" -JHELP_MENUS_MENU_ITEM_PRIVACY_REMIND_REQUEST="Menu_Item:_Extend_Consent" -JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_COMPACT_LIST="Menu_Item:_Compact_List_of_Tagged_Items" -JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST="Menu_Item:_Tagged_Items" -JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST_ALL="Menu_Item:_List_All_Tags" -JHELP_MENUS_MENU_ITEM_TEXT_SEPARATOR="Menu_Item:_Separator" -JHELP_MENUS_MENU_ITEM_USER_LOGIN="Menu_Item:_Login_Form" -JHELP_MENUS_MENU_ITEM_USER_LOGOUT="Menu_Item:_Logout" -JHELP_MENUS_MENU_ITEM_USER_PASSWORD_RESET="Menu_Item:_Password_Reset" -JHELP_MENUS_MENU_ITEM_USER_PROFILE="Menu_Item:_User_Profile" -JHELP_MENUS_MENU_ITEM_USER_PROFILE_EDIT="Menu_Item:_Edit_User_Profile" -JHELP_MENUS_MENU_ITEM_USER_REGISTRATION="Menu_Item:_Registration_Form" -JHELP_MENUS_MENU_ITEM_USER_REMINDER="Menu_Item:_Username_Reminder_Request" -JHELP_MENUS_MENU_ITEM_WRAPPER="Menu_Item:_Iframe_Wrapper" -JHELP_MENUS_MENU_MANAGER="Menus" -JHELP_MENUS_MENU_MANAGER_EDIT="Menus:_Edit" -JHELP_SITE_GLOBAL_CONFIGURATION="Site_Global_Configuration" -JHELP_SITE_MAINTENANCE_CLEAR_CACHE="Maintenance:_Clear_Cache" -JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Maintenance:_Global_Check-in" -JHELP_SITE_SYSTEM_INFORMATION="Site_System_Information" -JHELP_START_HERE="Start_Here" -JHELP_USERS_ACCESS_LEVELS="Users:_Viewing_Access_Levels" -JHELP_USERS_ACCESS_LEVELS_EDIT="Users:_Edit_Viewing_Access_Level" -JHELP_USERS_DEBUG_GROUPS="Permissions_for_Group" -JHELP_USERS_DEBUG_USERS="Permissions_for_User" -JHELP_USERS_GROUPS="Users:_Groups" -JHELP_USERS_GROUPS_EDIT="Users:_New_or_Edit_Group" -JHELP_USERS_MASS_MAIL_USERS="Mass_Mail_Users" -JHELP_USERS_USER_MANAGER="Users" -JHELP_USERS_USER_MANAGER_EDIT="Users:_Edit_Profile" -JHELP_USERS_USER_NOTES="User_Notes" -JHELP_USERS_USER_NOTES_EDIT="User_Notes:_New_or_Edit" - ; If there is an error connecting database before initialisation, en-GB.lib_joomla.ini can't be loaded ; we therefore have to load the strings from en-GB.ini From caf27d47c02a47b37626ca61c122d23ab5300ecd Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Wed, 23 Mar 2022 19:51:18 +0530 Subject: [PATCH 35/43] revert removal of filtered_articles from script --- administrator/components/com_admin/script.php | 1 + 1 file changed, 1 insertion(+) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 5875d4598484b..de074d91aabf8 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -1277,6 +1277,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_content/models/fields/voteradio.php', '/administrator/components/com_content/models/forms/article.xml', '/administrator/components/com_content/models/forms/filter_articles.xml', + '/administrator/components/com_content/models/forms/filter_featured.xml', '/administrator/components/com_content/tables/featured.php', '/administrator/components/com_content/views/article/tmpl/edit.php', '/administrator/components/com_content/views/article/tmpl/edit.xml', From 481321a6c92133c66821e9ac2ec6081c54a7c2cf Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Wed, 23 Mar 2022 23:23:54 +0530 Subject: [PATCH 36/43] fix invalid var for filtering user state input --- .../components/com_content/src/Model/ArticlesModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index f47f07c7ab474..2f5c499f6c3d9 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -742,6 +742,6 @@ public function getItems() */ public function isFeatured() { - return $this->getUserStateFromRequest($this->context . '.featured', 'featured', $this->type); + return $this->getUserStateFromRequest($this->context . '.featured', 'featured', 'int'); } } From fb97fd47f02fbd5aa71f13ec5815c4faf533e023 Mon Sep 17 00:00:00 2001 From: Yatharth Vyas Date: Sun, 27 Mar 2022 13:44:02 +0530 Subject: [PATCH 37/43] Update administrator/components/com_content/src/Controller/ArticlesController.php Co-authored-by: Quy --- .../com_content/src/Controller/ArticlesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_content/src/Controller/ArticlesController.php b/administrator/components/com_content/src/Controller/ArticlesController.php index b8733be0aa3fc..a6e91db13c3d8 100644 --- a/administrator/components/com_content/src/Controller/ArticlesController.php +++ b/administrator/components/com_content/src/Controller/ArticlesController.php @@ -174,7 +174,7 @@ public function delete() $this->checkToken(); $user = $this->app->getIdentity(); - $ids = $this->input->get('cid', array(), 'array'); + $ids = $this->input->get('cid', [], 'array'); // Access checks. foreach ($ids as $i => $id) From eae1700e1aec5cdadc4f22c271e18cee0e3388c0 Mon Sep 17 00:00:00 2001 From: Yatharth Vyas Date: Sun, 27 Mar 2022 16:44:57 +0530 Subject: [PATCH 38/43] Apply suggestions from code review Co-authored-by: Quy --- .../components/com_content/src/Model/ArticlesModel.php | 2 +- administrator/components/com_content/tmpl/articles/default.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php index 2f5c499f6c3d9..e4f6626622295 100644 --- a/administrator/components/com_content/src/Model/ArticlesModel.php +++ b/administrator/components/com_content/src/Model/ArticlesModel.php @@ -369,7 +369,7 @@ protected function getListQuery() $defaultOrdering = 'a.id'; } - if (in_array($featured, ['0','1'])) + if (\in_array($featured, ['0', '1'])) { $featured = (int) $featured; $query->where($db->quoteName('a.featured') . ' = :featured') diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 9563d347de8b0..502fd8a44599c 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -110,7 +110,7 @@ From d47fb0fcee8c99b51ac89799dbeaec948e64691c Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sun, 27 Mar 2022 16:49:56 +0530 Subject: [PATCH 39/43] rename sql update script --- .../updates/mysql/{4.1.0-2021-08-09.sql => 4.2.0-2022-03-27.sql} | 0 .../postgresql/{4.1.0-2021-08-09.sql => 4.2.0-2022-03-27.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename administrator/components/com_admin/sql/updates/mysql/{4.1.0-2021-08-09.sql => 4.2.0-2022-03-27.sql} (100%) rename administrator/components/com_admin/sql/updates/postgresql/{4.1.0-2021-08-09.sql => 4.2.0-2022-03-27.sql} (100%) diff --git a/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-08-09.sql b/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-03-27.sql similarity index 100% rename from administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-08-09.sql rename to administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-03-27.sql diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-08-09.sql b/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-03-27.sql similarity index 100% rename from administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-08-09.sql rename to administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-03-27.sql From 60fbda9a630c1169de1a11531c7293ef15fbc958 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sun, 27 Mar 2022 17:12:38 +0530 Subject: [PATCH 40/43] add client id filter in sql update script --- .../com_admin/sql/updates/mysql/4.2.0-2022-03-27.sql | 3 ++- .../com_admin/sql/updates/postgresql/4.2.0-2022-03-27.sql | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-03-27.sql b/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-03-27.sql index 4e39ce42304e2..22bbcb807e35c 100644 --- a/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-03-27.sql +++ b/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-03-27.sql @@ -1,4 +1,5 @@ -- Update link to featured UPDATE `#__menu` SET `link` = 'index.php?option=com_content&view=articles&featured=1' - WHERE `link` = 'index.php?option=com_content&view=featured'; \ No newline at end of file + WHERE `link` = 'index.php?option=com_content&view=featured' + AND `client_id` = 1; diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-03-27.sql b/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-03-27.sql index 0e9b0c6ef6cff..6d3e8e384fd92 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-03-27.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-03-27.sql @@ -1,4 +1,5 @@ -- Update link to featured UPDATE "#__menu" SET "link" = 'index.php?option=com_content&view=articles&featured=1' - WHERE "link" = 'index.php?option=com_content&view=featured'; + WHERE "link" = 'index.php?option=com_content&view=featured' + AND "client_id" = 1; From b0fea58c36423f4d2d281fc992b3fdde67f43c49 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sun, 27 Mar 2022 20:31:05 +0530 Subject: [PATCH 41/43] revert updation of links for client menu items --- installation/sql/mysql/base.sql | 2 +- installation/sql/postgresql/base.sql | 2 +- plugins/sampledata/testing/testing.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql index 75e55682cd423..dd7ab9e5a7776 100644 --- a/installation/sql/mysql/base.sql +++ b/installation/sql/mysql/base.sql @@ -523,7 +523,7 @@ SELECT 20, 'main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Sear INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`, `publish_up`, `publish_down`) SELECT 21, 'main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 13, 2, `extension_id`, 0, 0, 'class:finder-searches', 0, '', 36, 37, 0, '*', 1, NULL, NULL FROM `#__extensions` WHERE `name` = 'com_finder'; INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`, `publish_up`, `publish_down`) -SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=articles&featured=1', 'component', 1, 1, 1, `extension_id`, 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM `#__extensions` WHERE `name` = 'com_content'; +SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, `extension_id`, 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM `#__extensions` WHERE `name` = 'com_content'; -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql index 5375894cde50d..cfc0e06a0e767 100644 --- a/installation/sql/postgresql/base.sql +++ b/installation/sql/postgresql/base.sql @@ -548,7 +548,7 @@ SELECT 20, 'main', 'com_finder_filters', 'Smart-Search-Filters', '', 'Smart Sear INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id", "publish_up", "publish_down") SELECT 21, 'main', 'com_finder_searches', 'Smart-Search-Searches', '', 'Smart Search/Searches', 'index.php?option=com_finder&view=searches', 'component', 1, 13, 2, "extension_id", 0, 0, 'class:finder-searches', 0, '', 36, 37, 0, '*', 1, NULL, NULL FROM "#__extensions" WHERE "name" = 'com_finder'; INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id", "publish_up", "publish_down") -SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=articles&featured=1', 'component', 1, 1, 1, "extension_id", 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM "#__extensions" WHERE "name" = 'com_content'; +SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, "extension_id", 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","blog_class_leading":"","blog_class":"","num_leading_articles":"1","num_intro_articles":"3","num_links":"0","link_intro_image":"","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_associations":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_hits":"","show_tags":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_image_css":"","menu_text":1,"menu_show":1,"page_title":"","show_page_heading":"1","page_heading":"","pageclass_sfx":"","menu-meta_description":"","robots":""}', 41, 42, 1, '*', 0, NULL, NULL FROM "#__extensions" WHERE "name" = 'com_content'; SELECT setval('#__menu_id_seq', 102, false); -- diff --git a/plugins/sampledata/testing/testing.php b/plugins/sampledata/testing/testing.php index a286f8dc04894..a7a0d506aedb3 100644 --- a/plugins/sampledata/testing/testing.php +++ b/plugins/sampledata/testing/testing.php @@ -1836,7 +1836,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[6], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_18_TITLE'), - 'link' => 'index.php?option=com_content&view=articles&featured=1', + 'link' => 'index.php?option=com_content&view=featured', 'component_id' => ComponentHelper::getComponent('com_content')->id, 'params' => array( 'num_leading_articles' => 1, @@ -3113,7 +3113,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[2], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_1_TITLE'), - 'link' => 'index.php?option=com_content&view=articles&featured=1', + 'link' => 'index.php?option=com_content&view=featured', 'parent_id' => $menuIdsLevel4[8], 'component_id' => ComponentHelper::getComponent('com_content')->id, 'template_style_id' => 3, @@ -3145,7 +3145,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[2], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_3_TITLE'), - 'link' => 'index.php?option=com_content&view=articles&featured=1', + 'link' => 'index.php?option=com_content&view=featured', 'parent_id' => $menuIdsLevel4[7], 'component_id' => ComponentHelper::getComponent('com_content')->id, 'template_style_id' => 4, @@ -3177,7 +3177,7 @@ public function onAjaxSampledataApplyStep7() array( 'menutype' => $menuTypes[2], 'title' => Text::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_5_TITLE'), - 'link' => 'index.php?option=com_content&view=articles&featured=1', + 'link' => 'index.php?option=com_content&view=featured', 'parent_id' => $menuIdsLevel4[9], 'component_id' => ComponentHelper::getComponent('com_content')->id, 'params' => array( From ba8c2317a476199dc9ee871ef556b3fdba1da697 Mon Sep 17 00:00:00 2001 From: YatharthVyas Date: Sun, 27 Mar 2022 21:26:57 +0530 Subject: [PATCH 42/43] remove feature from actions if workflow is enabled --- .../src/View/Articles/HtmlView.php | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php index 9623b108cdb1b..20084e66b4e4c 100644 --- a/administrator/components/com_content/src/View/Articles/HtmlView.php +++ b/administrator/components/com_content/src/View/Articles/HtmlView.php @@ -221,20 +221,23 @@ protected function addToolbar() $childBar->unpublish('articles.unpublish')->listCheck(true); - if ($featured !== '1') + if (!ComponentHelper::getParams('com_content')->get('workflow_enabled')) { - $childBar->standardButton('featured') - ->text('JFEATURE') - ->task('articles.featured') - ->listCheck(true); - } - - if ($featured !== '0') - { - $childBar->standardButton('circle') - ->text('JUNFEATURE') - ->task('articles.unfeatured') - ->listCheck(true); + if ($featured !== '1') + { + $childBar->standardButton('featured') + ->text('JFEATURE') + ->task('articles.featured') + ->listCheck(true); + } + + if ($featured !== '0') + { + $childBar->standardButton('circle') + ->text('JUNFEATURE') + ->task('articles.unfeatured') + ->listCheck(true); + } } $childBar->archive('articles.archive')->listCheck(true); From 13f3d02fc9fad951947e572bcfda0aee4e9c55c5 Mon Sep 17 00:00:00 2001 From: Olivier Buisard Date: Fri, 26 Jul 2024 23:09:11 -0400 Subject: [PATCH 43/43] Update .drone.yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 677f458568c83..954b3df2b709c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -422,4 +422,4 @@ steps: kind: signature hmac: d9707d261edba35bc6b70f09a1babee119cb0a88cebda40171248e5c0a8b135e -... \ No newline at end of file +...