From 6ef666d0eabad2860e27994f946d6695d05e193f Mon Sep 17 00:00:00 2001 From: Tgiti Abderrazak Date: Fri, 5 Nov 2021 12:27:44 +0100 Subject: [PATCH 1/9] Add new emails option : links list --- Classes/CheckLinks/CheckLinksStatistics.php | 23 ++++++ .../CheckedLinksInfo/CheckedLinkInfoModel.php | 68 ++++++++++++++++++ Classes/LinkAnalyzer.php | 53 +++++++++++--- .../Private/Language/Module/locallang.xlf | 71 +++++++++++++++++++ .../Partials/BrokenLinksStatsTable.html | 49 ++++++++++++- .../Templates/Email/CheckLinksResults.html | 1 + 6 files changed, 252 insertions(+), 13 deletions(-) create mode 100644 Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php diff --git a/Classes/CheckLinks/CheckLinksStatistics.php b/Classes/CheckLinks/CheckLinksStatistics.php index 7615f0ec4..9e24fed0d 100644 --- a/Classes/CheckLinks/CheckLinksStatistics.php +++ b/Classes/CheckLinks/CheckLinksStatistics.php @@ -16,6 +16,8 @@ * The TYPO3 project - inspiring people to share! */ +use Sypets\Brofix\CheckLinks\CheckedLinksInfo\CheckedLinkInfoModel; + class CheckLinksStatistics { /** @@ -66,6 +68,11 @@ class CheckLinksStatistics */ protected $percentBrokenLinks; + /** + * @var array CheckedLinkInfoModel + */ + protected $checkedLinksInfoList = array(); + public function __construct() { } @@ -132,6 +139,14 @@ public function setPageTitle(string $pageTitle): void $this->pageTitle = $pageTitle; } + public function addCheckedLinkInfo(CheckedLinkInfoModel $checkedLinkInfo): void + { + // limit the display checked links details + if(count($this->checkedLinksInfoList) < 10){ + array_push($this->checkedLinksInfoList, $checkedLinkInfo); + } + } + public function getPageTitle(): string { return $this->pageTitle; @@ -196,4 +211,12 @@ public function getPercentBrokenLinks(): float { return $this->percentBrokenLinks; } + + /** + * @return array + */ + public function getCheckedLinksInfoList() : array + { + return $this->checkedLinksInfoList; + } } diff --git a/Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php b/Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php new file mode 100644 index 000000000..2dbb48e8f --- /dev/null +++ b/Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php @@ -0,0 +1,68 @@ +pageTitle; + } + public function getUrl(): string + { + return $this->url; + } + + public function getUid(): int + { + return $this->uid; + } + + public function getPid(): int + { + return $this->pid; + } + + // Setters + public function setPageTitle(string $pageTitle): void + { + $this->pageTitle = $pageTitle; + } + public function setUrl(string $url): void + { + $this->url = $url; + } + + public function setUid(int $uid): void + { + $this->uid = $uid; + } + + public function setPid(int $pid): void + { + $this->pid = $pid; + } + +} diff --git a/Classes/LinkAnalyzer.php b/Classes/LinkAnalyzer.php index 6e2ed989a..7cf289072 100644 --- a/Classes/LinkAnalyzer.php +++ b/Classes/LinkAnalyzer.php @@ -20,6 +20,7 @@ use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerAwareTrait; +use Sypets\Brofix\CheckLinks\CheckedLinksInfo\CheckedLinkInfoModel; use Sypets\Brofix\CheckLinks\CheckLinksStatistics; use Sypets\Brofix\CheckLinks\ExcludeLinkTarget; use Sypets\Brofix\Configuration\Configuration; @@ -118,6 +119,7 @@ class LinkAnalyzer implements LoggerAwareInterface */ protected $statistics; + /** * Fill hookObjectsArr with different link types and possible XClasses. */ @@ -236,9 +238,9 @@ public function recheckUrl(string &$message, array $record): int // URL is not ok, update records (error type may have changed) $response = [ - 'valid' => false, - 'errorParams' => $hookObj->getErrorParams()->toArray() - ]; + 'valid' => false, + 'errorParams' => $hookObj->getErrorParams()->toArray() + ]; $brokenLinkRecord = []; $brokenLinkRecord['url'] = $url; $brokenLinkRecord['url_response'] = json_encode($response) ?: ''; @@ -246,9 +248,9 @@ public function recheckUrl(string &$message, array $record): int $brokenLinkRecord['last_check_url'] = \time(); $brokenLinkRecord['last_check'] = \time(); $identifier = [ - 'url' => $url, - 'link_type' => $linkType - ]; + 'url' => $url, + 'link_type' => $linkType + ]; $count = $this->brokenLinkRepository->updateBrokenLink($brokenLinkRecord, $identifier); $message = sprintf( $this->getLanguageService()->getLL('list.recheck.url.notok.updated'), @@ -408,6 +410,34 @@ protected function checkLinks(array $links, array $linkTypes, int $mode = 0): vo $record['last_check'] = \time(); $this->brokenLinkRepository->insertOrUpdateBrokenLink($record); $this->statistics->incrementCountBrokenLinks(); + + // Get The Page Title + $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); + $queryBuilder = $connectionPool->getQueryBuilderForTable('pages'); + $queryBuilder->select('title') + ->from('pages') + ->where( + $queryBuilder->expr()->eq('pages' . '.uid', $record['record_pid']) + ); + + $result = $queryBuilder + ->execute(); + // Generate CheckedLinkInfoModel + $checkedLinkInfo = new CheckedLinkInfoModel(); + $checkedLinkInfo->setUid($row['uid']); + $checkedLinkInfo->setPid($record['record_pid']); + $checkedLinkInfo->setUrl($url); + //$row = $result->fetch(); + /*if (!is_null($row) && !is_null($row['title'])) { + $checkedLinkInfo->setPageTitle($row['title']); + }*/ + + while ($row = $result->fetch()){ + $checkedLinkInfo->setPageTitle($row['title']); + } + // add the records to the check links info array + $this->statistics->addCheckedLinkInfo($checkedLinkInfo); + } elseif (GeneralUtility::_GP('showalllinks')) { $response = ['valid' => true]; $record['url_response'] = json_encode($response) ?: ''; @@ -415,6 +445,7 @@ protected function checkLinks(array $links, array $linkTypes, int $mode = 0): vo $record['last_check'] = \time(); $this->brokenLinkRepository->insertOrUpdateBrokenLink($record); } + } } } @@ -425,7 +456,7 @@ protected function checkLinks(array $links, array $linkTypes, int $mode = 0): vo * @param array $linkTypes List of link types to check (corresponds to hook object) * @param bool $considerHidden Defines whether to look into hidden fields */ - public function generateBrokenLinkRecords(array $linkTypes = [], $considerHidden = false): void + public function generateBrokenLinkRecords(array $linkTypes = [], $considerHidden = false, $searchFilter = ''): void { if (empty($linkTypes) || empty($this->pids)) { return; @@ -594,7 +625,7 @@ public function getStatistics(): CheckLinksStatistics */ public function findLinksForRecord( array &$results, - $table, + $table, array $fields, array $record, int $checks = self::MASK_CONTENT_CHECK_ALL @@ -733,10 +764,10 @@ protected function analyzeLinks(array $resultArray, array &$results, array $reco protected function analyzeTypoLinks( array $resultArray, array &$results, - $htmlParser, + $htmlParser, array $record, - $field, - $table + $field, + $table ): void { $currentR = []; $linkTags = $htmlParser->splitIntoBlock('a,link', $resultArray['content']); diff --git a/Resources/Private/Language/Module/locallang.xlf b/Resources/Private/Language/Module/locallang.xlf index 2f228ddfe..8cc454249 100644 --- a/Resources/Private/Language/Module/locallang.xlf +++ b/Resources/Private/Language/Module/locallang.xlf @@ -16,6 +16,7 @@ Check links done + Page @@ -43,6 +44,16 @@ + + + UID + + + URL + + + Title + Recheck links @@ -269,6 +280,66 @@ You do not have access to these listings. + + + Page + + + Exclude list + + + Link type + + + Hidden + + + Excluding Date + + + Reason + + + Hidden + + + is Not Hidden + + + Non given + + + Was falsely detected as broken link + + + Export Csv File + + + Search + + + Select / Deselect + + + Delete Link(s) + + + Excluded Links + + + Select reason + + + External + + + Internal + + + Select Link Type + + + diff --git a/Resources/Private/Partials/BrokenLinksStatsTable.html b/Resources/Private/Partials/BrokenLinksStatsTable.html index b99bdd1ea..6f8a54642 100644 --- a/Resources/Private/Partials/BrokenLinksStatsTable.html +++ b/Resources/Private/Partials/BrokenLinksStatsTable.html @@ -13,20 +13,40 @@ } table.BrokenLinkStats td { - text-align: right; + text-align : right; } table.BrokenLinkStats tr.tableHeader { background-color: darkgrey; color: white; } + + + table.BrokenLinks, + table.BrokenLinks th, + table.BrokenLinks td { + padding: 10px; + border: 1px solid black; + border-collapse: collapse; + } + + table.BrokenLinks th { + text-align: left; + } + + table.BrokenLinks tr.tableHeader { + background-color: darkgrey; + color: white; + } - + @@ -83,4 +103,29 @@ + +
Broken links + Broken links +
Percent broken linksCheck done {stats.checkEndTime} {stats.checkEndTime}
+
+ + + +
+
+ + + + + + + + + + + + +
UID + + + +
{item.uid}{item.pageTitle}{item.url}
diff --git a/Resources/Private/Templates/Email/CheckLinksResults.html b/Resources/Private/Templates/Email/CheckLinksResults.html index 7fba36da7..cc60c6ad4 100644 --- a/Resources/Private/Templates/Email/CheckLinksResults.html +++ b/Resources/Private/Templates/Email/CheckLinksResults.html @@ -6,4 +6,5 @@ + From f162bb15d5369341b92abbb321c173bfbcda358b Mon Sep 17 00:00:00 2001 From: Tgiti Abderrazak Date: Fri, 5 Nov 2021 12:50:51 +0100 Subject: [PATCH 2/9] Add new emails option : links list - Adding TSConfig to enable the option --- Classes/Configuration/Configuration.php | 5 ++ Classes/LinkAnalyzer.php | 49 +++++++++---------- .../TsConfig/Page/pagetsconfig.tsconfig | 1 + .../Private/Language/Module/locallang.xlf | 9 ++++ .../Partials/BrokenLinksStatsTable.html | 38 +++++++------- 5 files changed, 58 insertions(+), 44 deletions(-) diff --git a/Classes/Configuration/Configuration.php b/Classes/Configuration/Configuration.php index fd5b6336a..ce39b93d8 100644 --- a/Classes/Configuration/Configuration.php +++ b/Classes/Configuration/Configuration.php @@ -416,6 +416,11 @@ public function getMailLanguage(): string return $this->tsConfig['mail.']['language'] ?? 'en'; } + public function getMailAddLinks(): string + { + return $this->tsConfig['mail.']['addLinks'] ?? '0'; + } + /** * @return mixed[] */ diff --git a/Classes/LinkAnalyzer.php b/Classes/LinkAnalyzer.php index 7cf289072..5c861ffe4 100644 --- a/Classes/LinkAnalyzer.php +++ b/Classes/LinkAnalyzer.php @@ -411,33 +411,30 @@ protected function checkLinks(array $links, array $linkTypes, int $mode = 0): vo $this->brokenLinkRepository->insertOrUpdateBrokenLink($record); $this->statistics->incrementCountBrokenLinks(); - // Get The Page Title - $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); - $queryBuilder = $connectionPool->getQueryBuilderForTable('pages'); - $queryBuilder->select('title') - ->from('pages') - ->where( - $queryBuilder->expr()->eq('pages' . '.uid', $record['record_pid']) - ); - - $result = $queryBuilder - ->execute(); - // Generate CheckedLinkInfoModel - $checkedLinkInfo = new CheckedLinkInfoModel(); - $checkedLinkInfo->setUid($row['uid']); - $checkedLinkInfo->setPid($record['record_pid']); - $checkedLinkInfo->setUrl($url); - //$row = $result->fetch(); - /*if (!is_null($row) && !is_null($row['title'])) { - $checkedLinkInfo->setPageTitle($row['title']); - }*/ - - while ($row = $result->fetch()){ - $checkedLinkInfo->setPageTitle($row['title']); + // test if the links list is enable + if ($this->configuration->getMailAddLinks() == '1') { + // Get The Page Title + $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); + $queryBuilder = $connectionPool->getQueryBuilderForTable('pages'); + $queryBuilder->select('title') + ->from('pages') + ->where( + $queryBuilder->expr()->eq('pages' . '.uid', $record['record_pid']) + ); + + $result = $queryBuilder + ->execute(); + // Generate CheckedLinkInfoModel + $checkedLinkInfo = new CheckedLinkInfoModel(); + $checkedLinkInfo->setUid($row['uid']); + $checkedLinkInfo->setPid($record['record_pid']); + $checkedLinkInfo->setUrl($url); + while ($row = $result->fetch()){ + $checkedLinkInfo->setPageTitle($row['title']); + } + // add the records to the check links info array + $this->statistics->addCheckedLinkInfo($checkedLinkInfo); } - // add the records to the check links info array - $this->statistics->addCheckedLinkInfo($checkedLinkInfo); - } elseif (GeneralUtility::_GP('showalllinks')) { $response = ['valid' => true]; $record['url_response'] = json_encode($response) ?: ''; diff --git a/Configuration/TsConfig/Page/pagetsconfig.tsconfig b/Configuration/TsConfig/Page/pagetsconfig.tsconfig index d0fe48a2c..6934e7718 100644 --- a/Configuration/TsConfig/Page/pagetsconfig.tsconfig +++ b/Configuration/TsConfig/Page/pagetsconfig.tsconfig @@ -63,6 +63,7 @@ mod.brofix { subject = template = CheckLinksResults language = en + addLinks = 0 } custom { diff --git a/Resources/Private/Language/Module/locallang.xlf b/Resources/Private/Language/Module/locallang.xlf index 8cc454249..a019520b3 100644 --- a/Resources/Private/Language/Module/locallang.xlf +++ b/Resources/Private/Language/Module/locallang.xlf @@ -338,6 +338,15 @@ Select Link Type + + Visit the backend page + + + Page Title + + + Link + diff --git a/Resources/Private/Partials/BrokenLinksStatsTable.html b/Resources/Private/Partials/BrokenLinksStatsTable.html index 6f8a54642..d65015e80 100644 --- a/Resources/Private/Partials/BrokenLinksStatsTable.html +++ b/Resources/Private/Partials/BrokenLinksStatsTable.html @@ -107,25 +107,27 @@
- +

- - - - - - - - - - - + +
UID - - - -
{item.uid}{item.pageTitle}{item.url}
+ + + + - -
UID + + + +
+ + + {item.uid} + {item.pageTitle} + {item.url} + + + + From 19a6f34f43087840c03086455365c8838cb27971 Mon Sep 17 00:00:00 2001 From: Tgiti Abderrazak Date: Fri, 5 Nov 2021 13:08:12 +0100 Subject: [PATCH 3/9] Add Documentation for new emails option TSConfig setup --- Documentation/Setup/Reference.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Documentation/Setup/Reference.rst b/Documentation/Setup/Reference.rst index ac552378e..7572480bf 100644 --- a/Documentation/Setup/Reference.rst +++ b/Documentation/Setup/Reference.rst @@ -826,3 +826,23 @@ mail.language Default en + +mail.addLinks +============ + +*optional* + +.. container:: table-row + + Property + mod.brofix.addLinks + + Data type + int + + Description + Get Broken links list int the e-mail report. ‘0’ is not displayed by default. + ‘1’ will send in the e-email report 10 broken links found, with the UID, page Title, and the link. + + Default + 0 From fedb1de1b2d4a60a4e9e8bb40d7d3e43e400d7c4 Mon Sep 17 00:00:00 2001 From: Abderrazak Tgiti Date: Fri, 5 Nov 2021 19:18:34 +0100 Subject: [PATCH 4/9] phpstan fix --- Classes/LinkAnalyzer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Classes/LinkAnalyzer.php b/Classes/LinkAnalyzer.php index 5c861ffe4..4273fd5b6 100644 --- a/Classes/LinkAnalyzer.php +++ b/Classes/LinkAnalyzer.php @@ -452,6 +452,7 @@ protected function checkLinks(array $links, array $linkTypes, int $mode = 0): vo * * @param array $linkTypes List of link types to check (corresponds to hook object) * @param bool $considerHidden Defines whether to look into hidden fields + * @param string $searchFilter */ public function generateBrokenLinkRecords(array $linkTypes = [], $considerHidden = false, $searchFilter = ''): void { From f56c5803b9367bb544a573c2fdb8cd0d2855afe7 Mon Sep 17 00:00:00 2001 From: Abderrazak Tgiti Date: Mon, 8 Nov 2021 12:06:25 +0100 Subject: [PATCH 5/9] cgl fixes --- Classes/CheckLinks/CheckLinksStatistics.php | 6 +++--- .../CheckedLinksInfo/CheckedLinkInfoModel.php | 1 - Classes/LinkAnalyzer.php | 12 +++++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Classes/CheckLinks/CheckLinksStatistics.php b/Classes/CheckLinks/CheckLinksStatistics.php index 9e24fed0d..f147b388e 100644 --- a/Classes/CheckLinks/CheckLinksStatistics.php +++ b/Classes/CheckLinks/CheckLinksStatistics.php @@ -71,7 +71,7 @@ class CheckLinksStatistics /** * @var array CheckedLinkInfoModel */ - protected $checkedLinksInfoList = array(); + protected $checkedLinksInfoList = []; public function __construct() { @@ -142,7 +142,7 @@ public function setPageTitle(string $pageTitle): void public function addCheckedLinkInfo(CheckedLinkInfoModel $checkedLinkInfo): void { // limit the display checked links details - if(count($this->checkedLinksInfoList) < 10){ + if (count($this->checkedLinksInfoList) < 10) { array_push($this->checkedLinksInfoList, $checkedLinkInfo); } } @@ -215,7 +215,7 @@ public function getPercentBrokenLinks(): float /** * @return array */ - public function getCheckedLinksInfoList() : array + public function getCheckedLinksInfoList(): array { return $this->checkedLinksInfoList; } diff --git a/Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php b/Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php index 2dbb48e8f..15664486d 100644 --- a/Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php +++ b/Classes/CheckLinks/CheckedLinksInfo/CheckedLinkInfoModel.php @@ -64,5 +64,4 @@ public function setPid(int $pid): void { $this->pid = $pid; } - } diff --git a/Classes/LinkAnalyzer.php b/Classes/LinkAnalyzer.php index 4273fd5b6..b14111238 100644 --- a/Classes/LinkAnalyzer.php +++ b/Classes/LinkAnalyzer.php @@ -119,7 +119,6 @@ class LinkAnalyzer implements LoggerAwareInterface */ protected $statistics; - /** * Fill hookObjectsArr with different link types and possible XClasses. */ @@ -429,7 +428,7 @@ protected function checkLinks(array $links, array $linkTypes, int $mode = 0): vo $checkedLinkInfo->setUid($row['uid']); $checkedLinkInfo->setPid($record['record_pid']); $checkedLinkInfo->setUrl($url); - while ($row = $result->fetch()){ + while ($row = $result->fetch()) { $checkedLinkInfo->setPageTitle($row['title']); } // add the records to the check links info array @@ -442,7 +441,6 @@ protected function checkLinks(array $links, array $linkTypes, int $mode = 0): vo $record['last_check'] = \time(); $this->brokenLinkRepository->insertOrUpdateBrokenLink($record); } - } } } @@ -623,7 +621,7 @@ public function getStatistics(): CheckLinksStatistics */ public function findLinksForRecord( array &$results, - $table, + $table, array $fields, array $record, int $checks = self::MASK_CONTENT_CHECK_ALL @@ -762,10 +760,10 @@ protected function analyzeLinks(array $resultArray, array &$results, array $reco protected function analyzeTypoLinks( array $resultArray, array &$results, - $htmlParser, + $htmlParser, array $record, - $field, - $table + $field, + $table ): void { $currentR = []; $linkTags = $htmlParser->splitIntoBlock('a,link', $resultArray['content']); From 9d4641364fbff51b9b5ffc61b91e09d22228ecca Mon Sep 17 00:00:00 2001 From: Tgiti Abderrazak Date: Tue, 9 Nov 2021 12:03:33 +0100 Subject: [PATCH 6/9] Get the last created links in the list of the broken links in the e-mail report --- Classes/LinkAnalyzer.php | 2 ++ Documentation/Setup/Reference.rst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/LinkAnalyzer.php b/Classes/LinkAnalyzer.php index b14111238..ae3ece187 100644 --- a/Classes/LinkAnalyzer.php +++ b/Classes/LinkAnalyzer.php @@ -506,6 +506,8 @@ public function generateBrokenLinkRecords(array $linkTypes = [], $considerHidden 'p', $queryBuilder->expr()->eq('p.uid', $queryBuilder->quoteIdentifier($table . '.pid')) ); + // order by the link creation + $queryBuilder->orderBy($table.'.crdate', 'DESC'); $constraints[] = $queryBuilder->expr()->neq('p.doktype', $queryBuilder->createNamedParameter(3, \PDO::PARAM_INT)); $constraints[] =$queryBuilder->expr()->neq('p.doktype', $queryBuilder->createNamedParameter(4, \PDO::PARAM_INT)); diff --git a/Documentation/Setup/Reference.rst b/Documentation/Setup/Reference.rst index 7572480bf..9f9027b3b 100644 --- a/Documentation/Setup/Reference.rst +++ b/Documentation/Setup/Reference.rst @@ -842,7 +842,7 @@ mail.addLinks Description Get Broken links list int the e-mail report. ‘0’ is not displayed by default. - ‘1’ will send in the e-email report 10 broken links found, with the UID, page Title, and the link. + ‘1’ will send in the e-email report 10 broken links found recently created, with the UID, page Title, and the link. Default 0 From 04c81f294a497437ee8e6b1ce6c17e76391f77c2 Mon Sep 17 00:00:00 2001 From: Tgiti Abderrazak Date: Tue, 14 Dec 2021 12:56:09 +0100 Subject: [PATCH 7/9] resolve merge conflicts problem --- .../Private/Language/Module/locallang.xlf | 87 ++----------------- .../Templates/Email/CheckLinksResults.html | 1 - 2 files changed, 8 insertions(+), 80 deletions(-) diff --git a/Resources/Private/Language/Module/locallang.xlf b/Resources/Private/Language/Module/locallang.xlf index a019520b3..2e3718565 100644 --- a/Resources/Private/Language/Module/locallang.xlf +++ b/Resources/Private/Language/Module/locallang.xlf @@ -16,7 +16,6 @@ Check links done - Page @@ -44,16 +43,6 @@ - - - UID - - - URL - - - Title - Recheck links @@ -280,75 +269,15 @@ You do not have access to these listings. - - - Page + + Visit the backend page + + + Page Title + + + Link - - Exclude list - - - Link type - - - Hidden - - - Excluding Date - - - Reason - - - Hidden - - - is Not Hidden - - - Non given - - - Was falsely detected as broken link - - - Export Csv File - - - Search - - - Select / Deselect - - - Delete Link(s) - - - Excluded Links - - - Select reason - - - External - - - Internal - - - Select Link Type - - - Visit the backend page - - - Page Title - - - Link - - - diff --git a/Resources/Private/Templates/Email/CheckLinksResults.html b/Resources/Private/Templates/Email/CheckLinksResults.html index cc60c6ad4..7fba36da7 100644 --- a/Resources/Private/Templates/Email/CheckLinksResults.html +++ b/Resources/Private/Templates/Email/CheckLinksResults.html @@ -6,5 +6,4 @@ - From 93f8efa930698b84b0c892d218abfcc703052f7a Mon Sep 17 00:00:00 2001 From: Tgiti Abderrazak Date: Tue, 14 Dec 2021 13:13:24 +0100 Subject: [PATCH 8/9] resolve Merge conflicts --- Resources/Private/Language/Module/locallang.xlf | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Private/Language/Module/locallang.xlf b/Resources/Private/Language/Module/locallang.xlf index 2e3718565..2f228ddfe 100644 --- a/Resources/Private/Language/Module/locallang.xlf +++ b/Resources/Private/Language/Module/locallang.xlf @@ -269,15 +269,6 @@ You do not have access to these listings. - - Visit the backend page - - - Page Title - - - Link - From 3d3b89d28126b33cc1361633e396bb27751b3109 Mon Sep 17 00:00:00 2001 From: Tgiti Abderrazak Date: Tue, 14 Dec 2021 13:19:11 +0100 Subject: [PATCH 9/9] Add columns titles for the mail report --- Resources/Private/Language/locallang.xlf | 9 +++++++++ Resources/Private/Partials/BrokenLinksStatsTable.html | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index e114a5ccd..ed5e2de31 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -106,6 +106,15 @@ and check links + + Visit the backend page + + + Page Title + + + Link + diff --git a/Resources/Private/Partials/BrokenLinksStatsTable.html b/Resources/Private/Partials/BrokenLinksStatsTable.html index d65015e80..45732f936 100644 --- a/Resources/Private/Partials/BrokenLinksStatsTable.html +++ b/Resources/Private/Partials/BrokenLinksStatsTable.html @@ -107,7 +107,7 @@
- +

@@ -116,10 +116,10 @@ UID - + - +