Merge branch '2.4' into 2

ENH Update translations

.github/workflows/ci.yml

@@ -0,0 +1,11 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  ci:
+    name: CI
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 2:00 PM UTC, only on Wednesday and Thursday
+  schedule:
+    - cron: '0 14 * * 3,4'
+
+jobs:
+  dispatch-ci:
+    name: Dispatch CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch CI
+        uses: silverstripe/gha-dispatch-ci@v1

.github/workflows/keepalive.yml

@@ -0,0 +1,17 @@
+name: Keepalive
+
+on:
+  workflow_dispatch:
+  # The 4th of every month at 10:50am UTC
+  schedule:
+    - cron: '50 10 4 * *'
+
+jobs:
+  keepalive:
+    name: Keepalive
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Keepalive
+        uses: silverstripe/gha-keepalive@v1

.scrutinizer.yml

@@ -1,15 +0,0 @@
-inherit: true
-
-build:
-  nodes:
-    analysis:
-      tests:
-        override: [php-scrutinizer-run]
-
-checks:
-  php:
-    code_rating: true
-    duplication: true
-
-filter:
-  paths: [src/*, tests/*]

.travis.yml

@@ -1,8 +0,0 @@
-version: ~> 1.0
-
-import:
-  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-behat.yml
-
-env:
-  global:
-    - REQUIRE_EXTRA="symbiote/silverstripe-queuedjobs:^4"

.tx/config

@@ -1,8 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[silverstripe-externallinks.master]
+[o:silverstripe:p:silverstripe-externallinks:r:master]
 file_filter = lang/<lang>.yml
 source_file = lang/en.yml
 source_lang = en
-type = YML
+type        = YML
+

README.md

@@ -1,9 +1,7 @@
 # External links
 
-[![Build Status](https://api.travis-ci.com/silverstripe/silverstripe-externallinks.svg?branch=2)](https://travis-ci.com/silverstripe/silverstripe-externallinks)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-externallinks/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-externallinks/?branch=master)
-[![codecov](https://codecov.io/gh/silverstripe/silverstripe-externallinks/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-externallinks)
-[![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
+[![CI](https://github.com/silverstripe/silverstripe-externallinks/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-externallinks/actions/workflows/ci.yml)
+[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
 ## Introduction
 
@@ -15,9 +13,9 @@ The external links module is a task and ModelAdmin to track and to report on bro
 
 ## Requirements
 
-* SilverStripe ^4.0
+* Silverstripe ^4.0
 
-**Note:** For a SilverStripe 3.x compatible version, please use [the 1.x release line](https://github.com/silverstripe/silverstripe-externallinks/tree/1.0).
+**Note:** For a Silverstripe 3.x compatible version, please use [the 1.x release line](https://github.com/silverstripe/silverstripe-externallinks/tree/1.0).
 
 ## Features
 
@@ -81,7 +79,7 @@ SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask:
 
 ## Upgrading from 1.x to 2.x
 
-When upgrading from 1.x to 2.x (SilverStripe 3.x to 4.x) you will need to be aware of the following API changes:
+When upgrading from 1.x to 2.x (Silverstripe 3.x to 4.x) you will need to be aware of the following API changes:
 
  * Configuration property `CheckExternalLinksTask.IgnoreCodes` renamed to `CheckExternalLinksTask.ignore_codes`
  * Configuration property `CheckExternalLinksTask.FollowLocation` and `BypassCache` renamed to `follow_location` and `bypass_cache`

client/javascript/BrokenExternalLinksReport.js

@@ -17,6 +17,7 @@
       },
 
       start: function() {
+        var self = this;
         // initiate a new job
         $('.external-links-report__report-progress')
           .empty()
@@ -25,10 +26,14 @@
         $.ajax({
           url: "admin/externallinks/start",
           async: true,
-          timeout: 3000
+          timeout: 3000,
+          success: function() {
+            self.poll();
+          },
+          error: function() {
+            self.buttonReset();
+          }
         });
-
-        this.poll();
       },
 
       /**
@@ -125,10 +130,8 @@
               $('.external-links-report__create-report').poll();
             }, 1000));
           },
-          error: function(e) {
-            if (typeof console !== 'undefined') {
-              console.log(e);
-            }
+          error: function() {
+            self.buttonReset();
           }
         });
       }

composer.json

@@ -21,10 +21,11 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.0"
+        "squizlabs/php_codesniffer": "^3.0",
+        "symbiote/silverstripe-queuedjobs": "^4.9"
     },
     "suggest": {
-        "ssymbiote/silverstripe-queuedjobs": "Provides a more efficient method of generating/updating the report"
+        "symbiote/silverstripe-queuedjobs": "Provides a more efficient method of generating/updating the report"
     },
     "autoload": {
         "psr-4": {
@@ -35,8 +36,8 @@
     },
     "extra": {
         "expose": [
-            "css",
-            "javascript"
+            "client/css",
+            "client/javascript"
         ]
     },
     "minimum-stability": "dev",

lang/en.yml

@@ -9,18 +9,30 @@ en:
       other: '{count} Broken External Links'
     SINGULARNAME: 'Broken External Link'
     UNKNOWNRESPONSE: 'Unknown Response Code'
+    db_HTTPCode: 'HTTP code'
+    db_Link: Link
+    has_one_Status: Status
+    has_one_Track: Track
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack:
     PLURALNAME: 'Broken External Page Tracks'
     PLURALS:
       one: 'A Broken External Page Track'
       other: '{count} Broken External Page Tracks'
     SINGULARNAME: 'Broken External Page Track'
+    db_Processed: Processed
+    has_many_BrokenLinks: 'Broken links'
+    has_one_Page: Page
+    has_one_Status: Status
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
     PLURALNAME: 'Broken External Page Track Statuses'
     PLURALS:
       one: 'A Broken External Page Track Status'
       other: '{count} Broken External Page Track Statuses'
     SINGULARNAME: 'Broken External Page Track Status'
+    db_JobInfo: 'Job info'
+    db_Status: Status
+    has_many_BrokenLinks: 'Broken links'
+    has_many_TrackedPages: 'Tracked pages'
   SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport:
     EXTERNALBROKENLINKS: 'External broken links report'
     RUNREPORT: 'Create new report'

lang/eo.yml

@@ -9,18 +9,30 @@ eo:
       other: '{count} rompitaj eksteraj ligiloj'
     SINGULARNAME: 'Rompita ekstera ligilo'
     UNKNOWNRESPONSE: 'Nekonata respondokodo'
+    db_HTTPCode: HTTP-kodo
+    db_Link: Ligilo
+    has_one_Status: Stato
+    has_one_Track: Spuri
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack:
     PLURALNAME: 'Rompitaj eksteraj paĝaj trakoj'
     PLURALS:
       one: 'Unu rompita ekstera paĝa trako'
       other: '{count} rompitaj eksteraj paĝaj trakoj'
     SINGULARNAME: 'Rompita ekstera paĝa trako'
+    db_Processed: Traktita
+    has_many_BrokenLinks: 'Rompitaj ligiloj'
+    has_one_Page: Paĝo
+    has_one_Status: Stato
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
     PLURALNAME: 'Stato de rompitaj eksteraj paĝaj trakoj'
     PLURALS:
       one: 'Unu stato de rompita ekstera paĝa trako'
       other: '{count} statoj de rompitaj eksteraj paĝaj trakoj'
     SINGULARNAME: 'Stato de rompita ekstera paĝa trako'
+    db_JobInfo: 'Taska informo'
+    db_Status: Stato
+    has_many_BrokenLinks: 'Rompitaj ligiloj'
+    has_many_TrackedPages: 'Spuritaj paĝoj'
   SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport:
     EXTERNALBROKENLINKS: 'Raporto pri eksteraj rompitaj ligiloj'
     RUNREPORT: 'Krei novan raporton'

lang/fi.yml

@@ -0,0 +1,16 @@
+fi:
+  SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob:
+    TITLE: 'Tarkastettaan rikkinäiset ulkoiset linkit'
+  SilverStripe\ExternalLinks\Model\BrokenExternalLink:
+    NOTAVAILABLE: 'Palvelin ei saatavilla'
+    PLURALNAME: 'Rikkinäiset ulkoiset linkit'
+    SINGULARNAME: 'Rikkinäinen ulkoinen linkki'
+    UNKNOWNRESPONSE: 'Tuntematon vastauskoodi'
+  SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack:
+    PLURALNAME: 'Rikkinäiset ulkoisen sivun reitit'
+    SINGULARNAME: 'Rikkinäinen ulkoisen sivun reitti'
+  SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
+    SINGULARNAME: 'Rikkinäinen ulkoisen sivun reitin tila'
+  SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport:
+    EXTERNALBROKENLINKS: 'Raportti ulkoisista rikkinäisistä linkeistä'
+    RUNREPORT: 'Luo uusi raportti'

lang/it.yml

@@ -5,6 +5,7 @@ it:
     NOTAVAILABLE: 'Server Non Disponibile'
     PLURALNAME: 'Link Esterni Orfani'
     PLURALS:
+      many: '{count} Link Esterni Orfani'
       one: 'Un Link Esterno Orfano'
       other: '{count} Link Esterni Orfani'
     SINGULARNAME: 'Link Esterno Orfano'
@@ -12,12 +13,14 @@ it:
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack:
     PLURALNAME: 'Tracce Pagine Esterne Orfane'
     PLURALS:
+      many: '{count} Tracce Pagine Esterne Orfane'
       one: 'Una Traccia Pagina Esterna Orfana'
       other: '{count} Tracce Pagine Esterne Orfane'
     SINGULARNAME: 'Traccia Pagina Esterna Orfana'
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
     PLURALNAME: 'Stati Tracce Pagine Esterne Orfane'
     PLURALS:
+      many: '{count} Stati Tracce Pagine Esterne Orfane'
       one: 'Uno Stato Traccia Pagina Esterna Orfana'
       other: '{count} Stati Tracce Pagine Esterne Orfane'
     SINGULARNAME: 'Stato Traccia Pagina Esterna Orfana'

lang/pl.yml

@@ -1,4 +1,6 @@
 pl:
+  SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob:
+    TITLE: 'Wyszukiwanie uszkodzonych linków zewnętrznych'
   SilverStripe\ExternalLinks\Model\BrokenExternalLink:
     NOTAVAILABLE: 'Serwer niedostępny'
     PLURALNAME: 'Uszkodzone linki zewnętrzne'
@@ -10,8 +12,6 @@ pl:
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
     PLURALNAME: 'Statusy wykrywania wadliwych stron zewnętrznych'
     SINGULARNAME: 'Status wykrywania wadliwych stron zewnętrznych'
-  SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob:
-    TITLE: 'Wyszukiwanie uszkodzonych linków zewnętrznych'
   SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport:
     EXTERNALBROKENLINKS: 'Raport uszkodzonych linków zewnętrznych'
     RUNREPORT: 'Stwórz nowy raport'

lang/ru.yml

@@ -0,0 +1,16 @@
+ru:
+  SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob:
+    TITLE: 'Проверяю внешние ссылки'
+  SilverStripe\ExternalLinks\Model\BrokenExternalLink:
+    NOTAVAILABLE: 'Сервер не доступен'
+    PLURALNAME: 'Недоступные внешние ссылки'
+    SINGULARNAME: 'Недоступная внешняя ссылка'
+    UNKNOWNRESPONSE: 'Неизвестный ответ сервера'
+  SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack:
+    PLURALNAME: 'Внешнее отслеживание страниц нарушено'
+    SINGULARNAME: 'Внешнее отслеживание страниц нарушено'
+  SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
+    SINGULARNAME: 'Внешнее отслеживание страниц нарушено'
+  SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport:
+    EXTERNALBROKENLINKS: 'Отчёт о неработающих внешних ссылках'
+    RUNREPORT: 'Создать новый отчёт'

lang/sk.yml

@@ -0,0 +1,44 @@
+sk:
+  SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob:
+    TITLE: 'Kontrola externých nefunkčných odkazov'
+  SilverStripe\ExternalLinks\Model\BrokenExternalLink:
+    NOTAVAILABLE: 'Server nedostupný'
+    PLURALNAME: 'Nefunkčné externé odkazy'
+    PLURALS:
+      few: '{count} nefunkčné externé odkazy'
+      many: '{count} nefunkčných externých odkazov'
+      one: 'Nefunkčný externý odkaz'
+      other: '{count} nefunkčných externých odkazov'
+    SINGULARNAME: 'Nefunkčný externý odkaz'
+    UNKNOWNRESPONSE: 'Neznámy kód odpovede'
+    db_HTTPCode: 'HTTP kód'
+    db_Link: Odkaz
+    has_one_Status: Stav
+    has_one_Track: Stopa
+  SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack:
+    PLURALNAME: 'Nefunkčné externé stopy stránok'
+    PLURALS:
+      few: '{count} nefunkčné externé stopy stránky'
+      many: '{count} nefunkčných externých stôp stránky'
+      one: 'Nefunkčná externá stopa stránky'
+      other: '{count} nefunkčných externých stôp stránky'
+    SINGULARNAME: 'Nefunkčná externá stopa stránky'
+    db_Processed: Spracované
+    has_many_BrokenLinks: 'Nefunkčné odkazy'
+    has_one_Page: Stránka
+    has_one_Status: Stav
+  SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
+    PLURALNAME: 'Stavy nefunkčných externých stôp stránky'
+    PLURALS:
+      few: '{count} stavy nefunkčných externých stôp stránky'
+      many: '{count} stavov nefunkčných externých stôp stránky'
+      one: 'Stav nefunkčnej externej stopy stránky'
+      other: '{count} stavov nefunkčných externých stôp stránky'
+    SINGULARNAME: 'Stav nefunkčnej externej stopy stránky'
+    db_JobInfo: 'Informácie o úlohe'
+    db_Status: Stav
+    has_many_BrokenLinks: 'Nefunkčné odkazy'
+    has_many_TrackedPages: 'Sledované stránky'
+  SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport:
+    EXTERNALBROKENLINKS: 'Správa o externých nefunkčných odkazoch'
+    RUNREPORT: 'Vytvoriť novú správu'

lang/sl.yml

@@ -5,27 +5,27 @@ sl:
     NOTAVAILABLE: 'Strežnik ni na voljo'
     PLURALNAME: 'Nedostopne zunanje povezave'
     PLURALS:
-      one: 'Nedostopna zunanja povezava'
-      two: '{count} nedostopni zunanji povezavi'
       few: '{count} nedostopnih zunanjih povezav'
+      one: 'Nedostopna zunanja povezava'
       other: '{count} nedostopnih zunanjih povezav'
+      two: '{count} nedostopni zunanji povezavi'
     SINGULARNAME: 'Nedostopna zunanja povezava'
     UNKNOWNRESPONSE: 'Neznana šifra odziva'
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack:
     PLURALNAME: 'Preverjanja nedostopnih zunanjih povezav'
     PLURALS:
-      one: 'Preverjanje nedostopnih zunanjih povezav'
-      two: '{count} preverjanji nedostopnih zunanjih povezav'
       few: '{count} preverjanj nedostopnih zunanjih povezav'
+      one: 'Preverjanje nedostopnih zunanjih povezav'
       other: '{count} preverjanj nedostopnih zunanjih povezav'
+      two: '{count} preverjanji nedostopnih zunanjih povezav'
     SINGULARNAME: 'Preverjanje nedostopnih zunanjih povezav'
   SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus:
     PLURALNAME: 'Status preverjanj'
     PLURALS:
-      one: 'Status preverjanja'
-      two: '{count} statusa preverjanj'
       few: '{count} statusov preverjanj'
+      one: 'Status preverjanja'
       other: '{count} statusov preverjanj'
+      two: '{count} statusa preverjanj'
     SINGULARNAME: 'Status preverjanja'
   SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport:
     EXTERNALBROKENLINKS: 'Poročilo o nedostopnih zunanjih povezavah'

phpunit.xml.dist

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="Default">

src/Controllers/CMSExternalLinksController.php

@@ -2,13 +2,13 @@
 
 namespace SilverStripe\ExternalLinks\Controllers;
 
-use SilverStripe\Control\HTTP;
-use SilverStripe\Core\Convert;
 use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
 use SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob;
 use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask;
 use SilverStripe\Control\Controller;
 use Symbiote\QueuedJobs\Services\QueuedJobService;
+use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware;
+use SilverStripe\Security\Permission;
 
 class CMSExternalLinksController extends Controller
 {
@@ -25,9 +25,11 @@ class CMSExternalLinksController extends Controller
      */
     public function getJobStatus()
     {
+        if (!Permission::check('CMS_ACCESS_CMSMain')) {
+            return $this->httpError(403, 'You do not have permission to access this resource');
+        }
         // Set headers
-        HTTP::set_cache_age(0);
-        HTTP::add_cache_headers($this->response);
+        HTTPCacheControlMiddleware::singleton()->setMaxAge(0);
         $this->response
             ->addHeader('Content-Type', 'application/json')
             ->addHeader('Content-Encoding', 'UTF-8')
@@ -51,6 +53,9 @@ class CMSExternalLinksController extends Controller
      */
     public function start()
     {
+        if (!Permission::check('CMS_ACCESS_CMSMain')) {
+            return $this->httpError(403, 'You do not have permission to access this resource');
+        }
         // return if the a job is already running
         $status = BrokenExternalPageTrackStatus::get_latest();
         if ($status && $status->Status == 'Running') {

src/Reports/BrokenExternalLinksReport.php

@@ -79,8 +79,8 @@ class BrokenExternalLinksReport extends Report
 
     public function getCMSFields()
     {
-        Requirements::css('silverstripe/externallinks: css/BrokenExternalLinksReport.css');
-        Requirements::javascript('silverstripe/externallinks: javascript/BrokenExternalLinksReport.js');
+        Requirements::css('silverstripe/externallinks: client/css/BrokenExternalLinksReport.css');
+        Requirements::javascript('silverstripe/externallinks: client/javascript/BrokenExternalLinksReport.js');
 
         $fields = parent::getCMSFields();
 

tests/php/ExternalLinksTest.php

@@ -3,7 +3,7 @@
 namespace SilverStripe\ExternalLinks\Tests;
 
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus;
 use SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport;
 use SilverStripe\ExternalLinks\Tasks\CheckExternalLinksTask;
@@ -13,7 +13,7 @@ use SilverStripe\ExternalLinks\Tests\Stubs\PretendLinkChecker;
 use SilverStripe\i18n\i18n;
 use SilverStripe\Reports\Report;
 
-class ExternalLinksTest extends SapphireTest
+class ExternalLinksTest extends FunctionalTest
 {
 
     protected static $fixture_file = 'ExternalLinksTest.yml';
@@ -125,4 +125,29 @@ class ExternalLinksTest extends SapphireTest
         // Ensure report does not list the link associated with an archived page
         $this->assertEquals(3, BrokenExternalLinksReport::create()->sourceRecords()->count());
     }
+
+    public function provideGetJobStatus(): array
+    {
+        return [
+            'ADMIN - valid permission' => ['ADMIN', 200],
+            'CMS_ACCESS_CMSMain - valid permission' => ['CMS_ACCESS_CMSMain', 200],
+            'VIEW_SITE - not enough permission' => ['VIEW_SITE', 403],
+        ];
+    }
+
+    /**
+     * @dataProvider provideGetJobStatus
+     */
+    public function testGetJobStatus(
+        string $permission,
+        int $expectedResponseCode
+    ): void {
+        $this->logInWithPermission($permission);
+
+        $response = $this->get('admin/externallinks/start', null, ['Accept' => 'application/json']);
+        $this->assertEquals($expectedResponseCode, $response->getStatusCode());
+
+        $response = $this->get('admin/externallinks/getJobStatus', null, ['Accept' => 'application/json']);
+        $this->assertEquals($expectedResponseCode, $response->getStatusCode());
+    }
 }