Merge pull request #31 from alexplusde/hotfix-redeclared-functions

fix Cannot redeclare htmlEncode()
alexplusde · Feb 6, 2024 · a56726a · a56726a
2 parents 907985a + 2884972
commit a56726a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 36 deletions.
diff --git a/fragments/FAQPage.json-ld.php b/fragments/FAQPage.json-ld.php
@@ -1,18 +1,5 @@
 <?php
 $jsonOptions = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK;
-
-function htmlEncode($value)
-{
-    return htmlentities($value, ENT_QUOTES, 'UTF-8');
-}
-
-function getAuthor($question)
-{
-    return [
-        '@type' => 'Person',
-        'name' => json_encode($question->getAuthor(), $GLOBALS['jsonOptions']),
-    ];
-}
 ?>
 
 <script type="application/ld+json">
@@ -31,15 +18,15 @@ function getAuthor($question)
 				"name": <?= json_encode($question->getQuestion(), $jsonOptions) ?> ,
 				"text": <?= json_encode($question->getValue('answer'), $jsonOptions) ?> ,
 				"answerCount": 1,
-				"dateCreated": "<?= htmlEncode($question->getValue('createdate')) ?>",
-				"author": <?= json_encode(getAuthor($question), $jsonOptions) ?> ,
+				"dateCreated": "<?= qanda::htmlEncode($question->getValue('createdate')) ?>",
+				"author": <?= json_encode(qanda::getJsonAuthor($question), $jsonOptions) ?> ,
 				"acceptedAnswer": {
 					"@type": "Answer",
 					"text": <?= json_encode($question->getQuestion(), $jsonOptions) ?> ,
 					"upvoteCount": 0,
-					"url": "<?= htmlEncode($question->getUrl()) ?>",
-					"dateCreated": "<?= htmlEncode($question->getValue('updatedate')) ?>",
-					"author": <?= json_encode(getAuthor($question), $jsonOptions) ?>
+					"url": "<?= qanda::htmlEncode($question->getUrl()) ?>",
+					"dateCreated": "<?= qanda::htmlEncode($question->getValue('updatedate')) ?>",
+					"author": <?= json_encode(qanda::getJsonAuthor($question), $jsonOptions) ?>
 				}
 			}
 			<?php

diff --git a/fragments/qanda.json-ld.php b/fragments/qanda.json-ld.php
@@ -1,19 +1,6 @@
 <?php
 $jsonOptions = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK;
 
-function htmlEncode($value)
-{
-    return htmlentities($value, ENT_QUOTES, 'UTF-8');
-}
-
-function getAuthor($question)
-{
-    return [
-        '@type' => 'Person',
-        'name' => json_encode($question->getAuthor(), $GLOBALS['jsonOptions']),
-    ];
-}
-
 ?>
 
 <script type="application/ld+json">
@@ -23,15 +10,15 @@ function getAuthor($question)
 		"name": <?= json_encode($this->question->getQuestion(), $jsonOptions) ?> ,
 		"text": <?= json_encode($this->question->getQuestion(), $jsonOptions) ?> ,
 		"answerCount": 1,
-		"dateCreated": "<?= htmlEncode($this->question->getValue('createdate')) ?>",
-		"author": <?= json_encode(getAuthor($this->question), $jsonOptions) ?> ,
+		"dateCreated": "<?= qanda::htmlEncode($this->question->getValue('createdate')) ?>",
+		"author": <?= json_encode(qanda::getJsonAuthor($this->question), $jsonOptions) ?> ,
 		"acceptedAnswer": {
 			"@type": "Answer",
 			"text": <?= json_encode($this->question->getValue('answer'), $jsonOptions) ?> ,
 			"upvoteCount": 0,
-			"url": "<?= htmlEncode($this->question->getUrl()) ?>",
-			"dateCreated": "<?= htmlEncode($this->question->getValue('updatedate')) ?>",
-			"author": <?= json_encode(getAuthor($this->question), $jsonOptions) ?>
+			"url": "<?= qanda::htmlEncode($this->question->getUrl()) ?>",
+			"dateCreated": "<?= qanda::htmlEncode($this->question->getValue('updatedate')) ?>",
+			"author": <?= json_encode(qanda::getJsonAuthor($this->question), $jsonOptions) ?>
 		}
 	}
 </script>
diff --git a/lib/qanda.php b/lib/qanda.php
@@ -204,4 +204,23 @@ public static function showFAQPage(array|rex_yform_manager_collection $questions
         $fragment->setVar('questions', $questions);
         return $fragment->parse('FAQPage.json-ld.php');
     }
+
+
+    /* Hilfsklasse für JSON-LD Fragmente */
+    public static function htmlEncode($value)
+    {
+        return htmlentities($value, ENT_QUOTES, 'UTF-8');
+    }
+
+    /* Hilfsklasse für JSON-LD Fragmente */
+    public static function getJsonAuthor($question)
+    {
+        return [
+            '@type' => 'Person',
+            'name' => json_encode($question->getAuthor(), $GLOBALS['jsonOptions']),
+        ];
+    }
+
+
+
 }