fix: removed doubled encoded entities

thorsten · thorsten · commit 99cc869ad44e · 2025-07-07T10:34:52.000+02:00
diff --git a/phpmyfaq/admin/attachments.php b/phpmyfaq/admin/attachments.php
@@ -47,7 +47,7 @@
     $crumbs = array_slice($allCrumbs, ($page - 1) * $itemsPerPage, $itemsPerPage);
 
     $baseUrl = sprintf(
-        '%sadmin/?action=attachments&amp;page=%d',
+        '%sadmin/?action=attachments&page=%d',
         $faqConfig->getDefaultUrl(),
         $page
     );
diff --git a/phpmyfaq/admin/statistics.admin-log.php b/phpmyfaq/admin/statistics.admin-log.php
@@ -53,7 +53,7 @@
         $pages = round(($logging->getNumberOfEntries() + ($itemsPerPage / 3)) / $itemsPerPage, 0);
     }
 
-    $baseUrl = sprintf('%sadmin/?action=adminlog&amp;page=%d', $faqConfig->getDefaultUrl(), $page);
+    $baseUrl = sprintf('%sadmin/?action=adminlog&page=%d', $faqConfig->getDefaultUrl(), $page);
 
     // Pagination options
     $options = [
diff --git a/phpmyfaq/admin/statistics.search.php b/phpmyfaq/admin/statistics.search.php
@@ -60,7 +60,7 @@
     $end = $start + $perPage;
 
     $baseUrl = sprintf(
-        '%sadmin/?action=searchstats&amp;page=%d',
+        '%sadmin/?action=searchstats&page=%d',
         $faqConfig->getDefaultUrl(),
         $page
     );
diff --git a/phpmyfaq/admin/user.php b/phpmyfaq/admin/user.php
@@ -73,7 +73,7 @@
     $firstPage = $lastPage - $perPage;
 
     $baseUrl = sprintf(
-        '%sadmin/?action=user&amp;user_action=listallusers&amp;page=%d',
+        '%sadmin/?action=user&user_action=listallusers&page=%d',
         $faqConfig->getDefaultUrl(),
         $page
     );
diff --git a/phpmyfaq/glossary.php b/phpmyfaq/glossary.php
@@ -43,7 +43,7 @@
 $itemsPerPage = 8;
 
 $baseUrl = sprintf(
-    '%sindex.php?action=glossary&amp;page=%d',
+    '%sindex.php?action=glossary&page=%d',
     $faqConfig->getDefaultUrl(),
     $page
 );
diff --git a/phpmyfaq/index.php b/phpmyfaq/index.php
@@ -281,11 +281,11 @@
     if ($faqSession->getCurrentSessionId() > 0) {
         $faqSession->setCookie(Session::PMF_COOKIE_NAME_SESSIONID, $faqSession->getCurrentSessionId());
         if (is_null($sidCookie)) {
-            $sids = sprintf('sid=%d&amp;lang=%s&amp;', $faqSession->getCurrentSessionId(), $faqLangCode);
+            $sids = sprintf('sid=%d&lang=%s&', $faqSession->getCurrentSessionId(), $faqLangCode);
         }
     } elseif (is_null($sidGet) || is_null($sidCookie)) {
         if (is_null($sidCookie) && !is_null($sidGet)) {
-            $sids = sprintf('sid=%d&amp;lang=%s&amp;', $sidGet, $faqLangCode);
+            $sids = sprintf('sid=%d&lang=%s&', $sidGet, $faqLangCode);
         }
     }
 } elseif (
@@ -295,7 +295,7 @@
         $request->server->get('REQUEST_TIME') + 3600
     )
 ) {
-    $sids = sprintf('lang=%s&amp;', $faqLangCode);
+    $sids = sprintf('lang=%s&', $faqLangCode);
 }
 
 //
diff --git a/phpmyfaq/news.php b/phpmyfaq/news.php
@@ -88,7 +88,7 @@
 $editThisEntry = '';
 if ($user->perm->hasPermission($user->getUserId(), PermissionType::NEWS_EDIT)) {
     $editThisEntry = sprintf(
-        '<a href="./admin/index.php?action=news&amp;do=edit&amp;id=%d">%s</a>',
+        '<a href="./admin/index.php?action=news&do=edit&id=%d">%s</a>',
         $newsId,
         Translation::get('ad_menu_news_edit')
     );
diff --git a/phpmyfaq/search.php b/phpmyfaq/search.php
@@ -74,7 +74,7 @@
 // Search only on current language (default)
 if ($inputLanguage !== '') {
     $allLanguages = true;
-    $languages = '&amp;langs=all';
+    $languages = '&langs=all';
 } else {
     $allLanguages = false;
     $languages = '';
@@ -224,7 +224,7 @@
 
 // Set base URL scheme
 $baseUrl = sprintf(
-    '%ssearch.html?search=%s&amp;seite=%d%s&amp;pmf-search-category=%d',
+    '%ssearch.html?search=%s&seite=%d%s&pmf-search-category=%d',
     $faqConfig->getDefaultUrl(),
     urlencode($inputSearchTerm),
     $page,
diff --git a/phpmyfaq/show.php b/phpmyfaq/show.php
@@ -91,7 +91,7 @@
     $up = '';
     if ($categoryData->getId() !== 0) {
         $url = sprintf(
-            '%sindex.php?%saction=show&amp;cat=%d',
+            '%sindex.php?%saction=show&cat=%d',
             $faqConfig->getDefaultUrl(),
             $sids,
             $categoryData->getParentId()
diff --git a/phpmyfaq/src/phpMyFAQ/Bookmark.php b/phpmyfaq/src/phpMyFAQ/Bookmark.php
@@ -129,7 +129,7 @@ public function getBookmarkList(): array
             $faqData = $faq->faqRecord;
 
             $url = sprintf(
-                '%sindex.php?action=faq&amp;id=%d&cat=%d&artlang=%s',
+                '%sindex.php?action=faq&id=%d&cat=%d&artlang=%s',
                 $this->configuration->getDefaultUrl(),
                 $faqData['id'],
                 $category->getCategoryIdFromFaq($faqData['id']),
diff --git a/phpmyfaq/src/phpMyFAQ/Category.php b/phpmyfaq/src/phpMyFAQ/Category.php
@@ -656,7 +656,7 @@ public function getPath(
         if ($renderAsHtml) {
             foreach ($tempName as $key => $category) {
                 $url = sprintf(
-                    '%sindex.php?%saction=show&amp;cat=%d',
+                    '%sindex.php?%saction=show&cat=%d',
                     $this->configuration->getDefaultUrl(),
                     $sids,
                     $categoryId[$key]
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/ExportController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/ExportController.php
@@ -144,7 +144,7 @@ public function exportReport(Request $request): Response
             if (isset($data->url)) {
                 $text[$i][] = Report::sanitize($report->convertEncoding(
                     sprintf(
-                        '%sindex.php?action=faq&amp;cat=%d&amp;id=%d&amp;artlang=%s',
+                        '%sindex.php?action=faq&cat=%d&id=%d&artlang=%s',
                         $this->configuration->getDefaultUrl(),
                         $reportData['category_id'],
                         $reportData['faq_id'],
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Api/AttachmentController.php b/phpmyfaq/src/phpMyFAQ/Controller/Api/AttachmentController.php
@@ -63,11 +63,11 @@ public function __construct()
         [
             {
                 "filename": "attachment-1.pdf",
-                "url": "https://www.example.org/index.php?action=attachment&amp;id=1"
+                "url": "https://www.example.org/index.php?action=attachment&id=1"
             },
             {
                 "filename": "attachment-2.pdf",
-                "url": "https://www.example.org/index.php?action=attachment&amp;id=2"
+                "url": "https://www.example.org/index.php?action=attachment&id=2"
             }
         ]')
     )]
diff --git a/phpmyfaq/src/phpMyFAQ/Helper/CategoryHelper.php b/phpmyfaq/src/phpMyFAQ/Helper/CategoryHelper.php
@@ -130,7 +130,7 @@ public function buildCategoryList(
 
                 if ($categoryNumbers[$categoryId]['faqs'] > 0) {
                     $url = sprintf(
-                        '%sindex.php?%saction=show&amp;cat=%d',
+                        '%sindex.php?%saction=show&cat=%d',
                         $this->configuration->getDefaultUrl(),
                         $sids,
                         $node['id']
@@ -174,7 +174,7 @@ public function buildAvailableCategoryTranslationsList(array $availableCategoryT
 
         foreach ($availableCategoryTranslations as $language => $category) {
             $url = sprintf(
-                '%sindex.php?action=show&amp;lang=%s',
+                '%sindex.php?action=show&lang=%s',
                 $this->configuration->getDefaultUrl(),
                 LanguageCodes::getKey($language)
             );
diff --git a/phpmyfaq/src/phpMyFAQ/Helper/FaqHelper.php b/phpmyfaq/src/phpMyFAQ/Helper/FaqHelper.php
@@ -74,7 +74,7 @@ public function renderChangeLanguageSelector(Faq $faq, int $categoryId): string
     {
         $html = '';
         $faqUrl = sprintf(
-            '?action=faq&amp;cat=%d&amp;id=%d&amp;artlang=%%s',
+            '?action=faq&cat=%d&id=%d&artlang=%%s',
             $categoryId,
             $faq->faqRecord['id']
         );
@@ -203,7 +203,7 @@ function ($matches) {
      * - http://<url>/index.php?action=artikel&cat=<category id>&id=<id>&artlang=<language>
      * - http://<url>/index.php?action=faq&cat=<category id>&id=<id>
      * - http://<url>/index.php?action=faq&cat=<category id>&id=<id>&artlang=<language>
-     * - supports also HTML encoded parameter (&#61; instead of =, &amp; instead of &)
+     * - supports also HTML encoded parameter (&#61; instead of =, & instead of &)
      *
      * to new URL structure:
      * https://<url>/content/<category id>/<id>/<language>/<the question with underscores as spaces>.html
@@ -236,8 +236,8 @@ function ($matches) use ($question, $link) {
         );
 
         if ($result === $decodedAnswer && $decodedAnswer !== $answer) {
-            $htmlEncodedPattern = '/(https?:\/\/[^\/]+)\/index\.php\?action(&#61;|=)(artikel|faq)(&amp;|&)cat' .
-                '(&#61;|=)(\d+)(&amp;|&)id(&#61;|=)(\d+)((&amp;|&)artlang(&#61;|=)([a-z]{2}))?/i';
+            $htmlEncodedPattern = '/(https?:\/\/[^\/]+)\/index\.php\?action(&#61;|=)(artikel|faq)(&|&)cat' .
+                '(&#61;|=)(\d+)(&|&)id(&#61;|=)(\d+)((&|&)artlang(&#61;|=)([a-z]{2}))?/i';
 
             return preg_replace_callback(
                 $htmlEncodedPattern,
diff --git a/phpmyfaq/src/phpMyFAQ/Helper/SearchHelper.php b/phpmyfaq/src/phpMyFAQ/Helper/SearchHelper.php
@@ -285,7 +285,7 @@ public function renderRelatedFaqs(SearchResultSet $searchResultSet, int $recordI
                 ++$counter;
 
                 $url = sprintf(
-                    '%sindex.php?action=faq&amp;cat=%d&amp;id=%d&amp;artlang=%s',
+                    '%sindex.php?action=faq&cat=%d&id=%d&artlang=%s',
                     $this->configuration->getDefaultUrl(),
                     $result->category_id,
                     $result->id,
diff --git a/phpmyfaq/src/phpMyFAQ/Helper/TagsHelper.php b/phpmyfaq/src/phpMyFAQ/Helper/TagsHelper.php
@@ -60,12 +60,12 @@ public function renderSearchTag(int $tagId, string $tagName): string
         $taggingIds = trim(implode(',', $taggingIds), ',');
 
         return ($taggingIds != '') ? sprintf(
-            '<a class="btn btn-outline-primary m-1" href="?action=search&amp;tagging_id=%s">%s ' .
+            '<a class="btn btn-outline-primary m-1" href="?action=search&tagging_id=%s">%s ' .
             '<i aria-hidden="true" class="bi bi-dash-square"></i></a> ',
             $taggingIds,
             Strings::htmlentities($tagName)
         ) : sprintf(
-            '<a class="btn btn-outline-primary m-1" href="?action=search&amp;search=%s">%s ' .
+            '<a class="btn btn-outline-primary m-1" href="?action=search&search=%s">%s ' .
             '<i aria-hidden="true" class="bi bi-dash-square"></i></a> ',
             Strings::htmlentities($tagName),
             Strings::htmlentities($tagName)
@@ -104,7 +104,7 @@ public function setTaggingIds(array $taggingIds): void
     public function renderRelatedTag(int $tagId, string $tagName, int $relevance): string
     {
         return sprintf(
-            '<a class="btn btn-outline-primary m-1" href="?action=search&amp;tagging_id=%s">%s %s ' .
+            '<a class="btn btn-outline-primary m-1" href="?action=search&tagging_id=%s">%s %s ' .
             '<span class="badge bg-info">%d</span></a>',
             implode(',', $this->getTaggingIds()) . ',' . $tagId,
             '<i aria-hidden="true" class="bi bi-plus-square"></i> ',
diff --git a/phpmyfaq/src/phpMyFAQ/Link.php b/phpmyfaq/src/phpMyFAQ/Link.php
@@ -30,7 +30,7 @@
  */
 class Link
 {
-    private const LINK_AMPERSAND = '&amp;';
+    private const LINK_AMPERSAND = '&';
 
     private const LINK_CATEGORY = 'category/';
 
diff --git a/phpmyfaq/src/phpMyFAQ/News.php b/phpmyfaq/src/phpMyFAQ/News.php
@@ -103,7 +103,7 @@ public function getLatestData(bool $showArchive = false, bool $active = true, bo
                     ((!$showArchive) && $forceConfLimit)
                 ) {
                     $url = sprintf(
-                        '%sindex.php?action=news&amp;newsid=%d&amp;newslang=%s',
+                        '%sindex.php?action=news&newsid=%d&newslang=%s',
                         $this->configuration->getDefaultUrl(),
                         $row->id,
                         $row->lang
diff --git a/phpmyfaq/src/phpMyFAQ/Pagination.php b/phpmyfaq/src/phpMyFAQ/Pagination.php
@@ -281,7 +281,7 @@ protected function renderUrl(string $url = '', int $page = 1): string
             return sprintf($this->rewriteUrl, $page);
         }
         $cleanedUrl = Strings::preg_replace(['$&(amp;|)' . $this->pageParamName . '=(\d+)$'], '', $url);
-        return sprintf('%s&amp;%s=%d', $cleanedUrl, $this->pageParamName, $page);
+        return sprintf('%s&%s=%d', $cleanedUrl, $this->pageParamName, $page);
     }
 
     /**
diff --git a/phpmyfaq/src/phpMyFAQ/Tags.php b/phpmyfaq/src/phpMyFAQ/Tags.php
@@ -47,7 +47,7 @@ public function getAllLinkTagsById(int $recordId): string
         foreach ($this->getAllTagsById($recordId) as $taggingId => $taggingName) {
             $title = Strings::htmlentities($taggingName);
             $url = sprintf(
-                '%sindex.php?action=search&amp;tagging_id=%d',
+                '%sindex.php?action=search&tagging_id=%d',
                 $this->configuration->getDefaultUrl(),
                 $taggingId
             );
diff --git a/tests/phpMyFAQ/Helper/TagsHelperTest.php b/tests/phpMyFAQ/Helper/TagsHelperTest.php
@@ -22,9 +22,9 @@ public function testRenderTagList()
 
         $this->tagsHelper->setTaggingIds([1, 2]);
 
-        $expectedOutput = '<a class="btn btn-outline-primary m-1" href="?action=search&amp;tagging_id=2">tag1 ' .
+        $expectedOutput = '<a class="btn btn-outline-primary m-1" href="?action=search&tagging_id=2">tag1 ' .
             '<i aria-hidden="true" class="bi bi-dash-square"></i></a> ' .
-            '<a class="btn btn-outline-primary m-1" href="?action=search&amp;tagging_id=1">tag2 ' .
+            '<a class="btn btn-outline-primary m-1" href="?action=search&tagging_id=1">tag2 ' .
             '<i aria-hidden="true" class="bi bi-dash-square"></i></a> ';
 
         $result = $this->tagsHelper->renderTagList($tags);
@@ -38,7 +38,7 @@ public function testRenderSearchTag()
 
         $this->tagsHelper->setTaggingIds([1, 2]);
 
-        $expectedOutput = '<a class="btn btn-outline-primary m-1" href="?action=search&amp;tagging_id=2">tag1 ' .
+        $expectedOutput = '<a class="btn btn-outline-primary m-1" href="?action=search&tagging_id=2">tag1 ' .
             '<i aria-hidden="true" class="bi bi-dash-square"></i></a> ';
 
         $result = $this->tagsHelper->renderSearchTag($tagId, $tagName);
@@ -62,7 +62,7 @@ public function testRenderRelatedTag()
 
         $this->tagsHelper->setTaggingIds([2, 3]);
 
-        $expectedOutput = '<a class="btn btn-outline-primary m-1" href="?action=search&amp;tagging_id=2,3,1">' .
+        $expectedOutput = '<a class="btn btn-outline-primary m-1" href="?action=search&tagging_id=2,3,1">' .
             '<i aria-hidden="true" class="bi bi-plus-square"></i>  tag1 ' .
             '<span class="badge bg-info">10</span></a>';
 
diff --git a/tests/phpMyFAQ/PaginationTest.php b/tests/phpMyFAQ/PaginationTest.php
@@ -17,15 +17,15 @@ public function testRender(): void
         $expectedOutput =
             '<ul class="pagination justify-content-center">' .
             '<li class="page-item active">' .
-            '<a class="page-link" href="http://example.com?action=foo&amp;page=1">1</a>' .
+            '<a class="page-link" href="http://example.com?action=foo&page=1">1</a>' .
             '</li>&nbsp;&nbsp;<li class="page-item">' .
-            '<a class="page-link" href="http://example.com?action=foo&amp;page=2">2</a>' .
+            '<a class="page-link" href="http://example.com?action=foo&page=2">2</a>' .
             '</li>&nbsp;&nbsp;<li class="page-item">' .
-            '<a class="page-link" href="http://example.com?action=foo&amp;page=3">3</a>' .
+            '<a class="page-link" href="http://example.com?action=foo&page=3">3</a>' .
             '</li>&nbsp;&nbsp;<li class="page-item">' .
-            '<a class="page-link" href="http://example.com?action=foo&amp;page=2">&rarr;</a>' .
+            '<a class="page-link" href="http://example.com?action=foo&page=2">&rarr;</a>' .
             '</li>&nbsp;&nbsp;<li class="page-item">' .
-            '<a class="page-link" href="http://example.com?action=foo&amp;page=3">&#8677;</a>' .
+            '<a class="page-link" href="http://example.com?action=foo&page=3">&#8677;</a>' .
             '</li></ul>';
 
         $this->assertEquals($expectedOutput, $pagination->render());

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`$pages = round(($logging->getNumberOfEntries() + ($itemsPerPage / 3)) / $itemsPerPage, 0);`
`54`	`54`	`}`
`55`	`55`
`56`		`- $baseUrl = sprintf('%sadmin/?action=adminlog&page=%d', $faqConfig->getDefaultUrl(), $page);`
	`56`	`+ $baseUrl = sprintf('%sadmin/?action=adminlog&page=%d', $faqConfig->getDefaultUrl(), $page);`
`57`	`57`
`58`	`58`	`// Pagination options`
`59`	`59`	`$options = [`
Original file line number	Diff line number	Diff line change
`@@ -281,11 +281,11 @@`
`281`	`281`	`if ($faqSession->getCurrentSessionId() > 0) {`
`282`	`282`	`$faqSession->setCookie(Session::PMF_COOKIE_NAME_SESSIONID, $faqSession->getCurrentSessionId());`
`283`	`283`	`if (is_null($sidCookie)) {`
`284`		`- $sids = sprintf('sid=%d&lang=%s&', $faqSession->getCurrentSessionId(), $faqLangCode);`
	`284`	`+ $sids = sprintf('sid=%d&lang=%s&', $faqSession->getCurrentSessionId(), $faqLangCode);`
`285`	`285`	`}`
`286`	`286`	`} elseif (is_null($sidGet) \|\| is_null($sidCookie)) {`
`287`	`287`	`if (is_null($sidCookie) && !is_null($sidGet)) {`
`288`		`- $sids = sprintf('sid=%d&lang=%s&', $sidGet, $faqLangCode);`
	`288`	`+ $sids = sprintf('sid=%d&lang=%s&', $sidGet, $faqLangCode);`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`	`} elseif (`
`@@ -295,7 +295,7 @@`
`295`	`295`	`$request->server->get('REQUEST_TIME') + 3600`
`296`	`296`	`)`
`297`	`297`	`) {`
`298`		`- $sids = sprintf('lang=%s&', $faqLangCode);`
	`298`	`+ $sids = sprintf('lang=%s&', $faqLangCode);`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`//`