Merge branch '4.0' into 'main'

Author: thorsten

phpmyfaq/assets/templates/admin/content/open-questions.twig

@@ -30,7 +30,8 @@
             <tr>
               <td>
                 <label>
-                  <input id="questions[]" name="questions[]" value="{{ question.id }}" type="checkbox">
+                  <input id="questions[]" name="questions[]" value="{{ question.id }}" type="checkbox"
+                         class="form-check-input">
                 </label>
               </td>
               <td>

phpmyfaq/assets/templates/default/open-questions.twig

@@ -25,18 +25,17 @@
                 {{ msg2answerFAQ }}
               </a>
             </td>
-          {% else %}
+          {% elseif userHasPermissionToAnswer %}
             <td class="text-end">
               <a class="btn btn-primary" href="?action=add&question={{ question.id }}&cat={{ question.categoryId }}">
                 {{ msg2answer }}
               </a>
             </td>
+          {% else %}
+            <td class="text-end"></td>
           {% endif %}
         </tr>
       {% endfor %}
-      <tr class="pmf-open-questions">
-
-      </tr>
     {% else %}
       <tr>
         <td colspan="3">{{ msgNoQuestionsAvailable }}</td>

phpmyfaq/open-questions.php

@@ -16,6 +16,7 @@
  */
 
 use phpMyFAQ\Category;
+use phpMyFAQ\Enums\PermissionType;
 use phpMyFAQ\Helper\QuestionHelper;
 use phpMyFAQ\Template\TwigWrapper;
 use phpMyFAQ\Translation;
@@ -51,6 +52,7 @@
     'msgQuestion2' => Translation::get('msgQuestion2'),
     'openQuestions' => $questionHelper->getOpenQuestions(),
     'isCloseQuestionEnabled' => $faqConfig->get('records.enableCloseQuestion'),
+    'userHasPermissionToAnswer' => $user->perm->hasPermission($user->getUserId(), PermissionType::FAQ_ADD->value),
     'msgQuestionsWaiting' => Translation::get('msgQuestionsWaiting'),
     'msgNoQuestionsAvailable' => Translation::get('msgNoQuestionsAvailable'),
     'msg2answerFAQ' => Translation::get('msg2answerFAQ'),

phpmyfaq/src/phpMyFAQ/Entity/CategoryEntity.php

@@ -109,7 +109,7 @@ public function setLang(string $lang): CategoryEntity
 
     public function getName(): string
     {
-        return $this->name;
+        return $this->name ?? '';
     }
 
     public function setName(string $name): CategoryEntity