fix: corrected URL schemes

Author: thorsten

phpmyfaq/assets/templates/admin/content/news.edit.twig

@@ -138,22 +138,5 @@
       </div>
     </div>
   </form>
-  {% if comments|length > 0 %}
-    <div class="row"><strong>{{ ad_entry_comment }}</strong></div>
-  {% endif %}
-  {% for item in comments %}
-    <div class="row">
-      {{ ad_entry_commentby }}
-      <a href="mailto:{{ item.email }}">
-        {{ item.user }}
-      </a>:<br>
-      {{ item.content }}<br>
-      {{ newsCommentDate }}{{ item.date|createIsoDate }}
-      <a href="?action=delcomment&artid={{ newsId }}&cmtid={{ item.id }}&type={{ commentTypeNews }}">
-        <i aria-hidden="true" class="bi bi-trash"></i>
-      </a>
-    </div>
-    </div>
-    </div>
-  {% endfor %}
+
 {% endblock %}

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ExportController.php

@@ -30,6 +30,7 @@
 use phpMyFAQ\Export;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Language\LanguageCodes;
+use phpMyFAQ\Link\Util\TitleSlugifier;
 use phpMyFAQ\Session\Token;
 use phpMyFAQ\Translation;
 use Symfony\Component\HttpFoundation\HeaderUtils;
@@ -186,11 +187,12 @@ public function exportReport(Request $request): Response
 
             if (isset($data->url)) {
                 $text[$i][] = Report::sanitize($report->convertEncoding(sprintf(
-                    '%sindex.php?action=faq&cat=%d&id=%d&artlang=%s',
+                    '%scontent/%d/%d/%s/%s.html',
                     $this->configuration->getDefaultUrl(),
                     $reportData['category_id'],
                     $reportData['faq_id'],
                     $reportData['faq_language'],
+                    TitleSlugifier::slug($reportData['faq_question']),
                 )));
             }
 

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/FaqController.php

@@ -42,6 +42,7 @@
 use phpMyFAQ\Instance\Search\OpenSearch;
 use phpMyFAQ\Language;
 use phpMyFAQ\Link;
+use phpMyFAQ\Link\Util\TitleSlugifier;
 use phpMyFAQ\Search;
 use phpMyFAQ\Search\SearchResultSet;
 use phpMyFAQ\Session\Token;
@@ -199,11 +200,12 @@ public function create(Request $request): JsonResponse
                 }
 
                 $url = sprintf(
-                    '%s?action=faq&cat=%d&id=%d&artlang=%s',
+                    '%scontent/%d/%d/%s/%s.html',
                     $this->configuration->getDefaultUrl(),
                     $categories[0],
                     $faqData->getId(),
                     $faqData->getLanguage(),
+                    TitleSlugifier::slug($faqData->getQuestion()),
                 );
                 $oLink = new Link($url, $this->configuration);
 

phpmyfaq/src/phpMyFAQ/Controller/Administration/NewsController.php

@@ -91,14 +91,12 @@ public function edit(Request $request): Response
     {
         $this->userHasPermission(PermissionType::NEWS_ADD);
 
-        $newsId = (int) Filter::filterVar($request->request->get('newsId'), FILTER_VALIDATE_INT);
+        $newsId = (int) Filter::filterVar($request->attributes->get('newsId'), FILTER_VALIDATE_INT);
 
         $news = $this->container->get(id: 'phpmyfaq.news');
         $comment = $this->container->get(id: 'phpmyfaq.comments');
         $newsData = $news->get($newsId, true);
 
-        $comments = $comment->getCommentsData($newsId, CommentType::NEWS);
-
         $this->addExtension(new AttributeExtension(IsoDateTwigExtension::class));
         $this->addExtension(new AttributeExtension(FormatDateTwigExtension::class));
         return $this->render('@admin/content/news.edit.twig', [
@@ -109,7 +107,6 @@ public function edit(Request $request): Response
             'newsDataContent' => isset($newsData['content'])
                 ? htmlspecialchars((string) $newsData['content'], ENT_QUOTES)
                 : '',
-            'comments' => $comments,
             'newsId' => $newsId,
             'commentTypeNews' => CommentType::NEWS,
         ]);

phpmyfaq/src/phpMyFAQ/Controller/Frontend/FaqController.php

@@ -268,11 +268,12 @@ public function show(Request $request): Response
         $languageUrls = [];
         foreach ($availableLanguages as $language) {
             $url = sprintf(
-                '%sindex.php?action=faq&cat=%d&id=%d&artlang=%s',
+                '%scontent/%d/%d/%s/%s.html',
                 $this->configuration->getDefaultUrl(),
                 $cat,
                 $faqId,
                 $language,
+                TitleSlugifier::slug($question),
             );
             $link = new Link($url, $this->configuration);
             $link->setTitle($question);

phpmyfaq/src/phpMyFAQ/Notification.php

@@ -22,6 +22,7 @@
 use phpMyFAQ\Entity\Comment;
 use phpMyFAQ\Entity\FaqEntity;
 use phpMyFAQ\Entity\QuestionEntity;
+use phpMyFAQ\Link\Util\TitleSlugifier;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 
 /**
@@ -148,13 +149,13 @@ public function sendFaqCommentNotification(Faq $faq, Comment $comment): void
 
         $title = $faq->faqRecord['title'];
 
-        $url = '%sindex.php?action=faq&cat=%d&id=%d&artlang=%s';
         $faqUrl = sprintf(
-            $url,
+            '%scontent/%d/%d/%s/%s.html',
             $this->configuration->getDefaultUrl(),
             $category->getCategoryIdFromFaq((int) $faq->faqRecord['id']),
             $faq->faqRecord['id'],
             $faq->faqRecord['lang'],
+            TitleSlugifier::slug($title),
         );
         $link = new Link($faqUrl, $this->configuration);
         $link->setTitle($title);
@@ -217,8 +218,13 @@ public function sendNewsCommentNotification(array $newsData, Comment $comment):
 
         $title = $newsData['header'];
 
-        $url = '%sindex.php?action=news&newsid=%d&newslang=%s';
-        $newsUrl = sprintf($url, $this->configuration->getDefaultUrl(), $newsData['id'], $newsData['lang']);
+        $newsUrl = sprintf(
+            '%news/%d/%s/%s.html',
+            $this->configuration->getDefaultUrl(),
+            $newsData['id'],
+            $newsData['lang'],
+            TitleSlugifier::slug($title),
+        );
         $link = new Link($newsUrl, $this->configuration);
         $link->setTitle($newsData['header']);