fix

Author: d0ubIeU

docs/plugins.md

@@ -30,7 +30,7 @@ class MyPluginConfiguration implements PluginConfigurationInterface
     }
 }
 ```
-These predefined values ​​in the file form the basis for the configuration options in the backend plugin overview. All future changes to these values ​​in the backend plugin settings will be saved in the database.
+These predefined values in the file form the basis for the configuration options in the backend plugin overview. All future changes to these values in the backend plugin settings will be saved in the database.
 
 ## 9.3 Plugin development
 
@@ -91,11 +91,13 @@ class MyPlugin implements PluginInterface
         return 'phpMyFAQ Team';
     }
 
+    // Extended description of the plugin that will be displayed in the plugin settings
     public function getAdvDescription(): string
     {
         return 'A simple Hello World plugin that demonstrates event handling in phpMyFAQ and with Configuration options.';
     }
 
+    // Implementation of the plugin that will be displayed in the plugin settings
     public function getImplementation(): string
     {
         return '{{ phpMyFAQPlugin(\'hello.world\', \'Hello, World!\') | raw }} oder {{ phpMyFAQPlugin(\'user.login\', \'John Doe\') | raw }}';

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

@@ -32,7 +32,7 @@ final class PluginController extends AbstractAdministrationController
     public function toggleStatus(Request $request): JsonResponse
     {
         $csrfToken = $request->headers->get('X-CSRF-Token');
-        if (!Token::getInstance($this->session)->verifyToken($csrfToken, 'admin-plugins')) {
+        if (!Token::getInstance($this->session)->verifyToken('admin-plugins', $csrfToken)) {
             return new JsonResponse(['success' => false, 'message' => 'Invalid CSRF token'], 403);
         }
 
@@ -79,8 +79,7 @@ public function saveConfig(Request $request): JsonResponse
         }
 
         $csrfToken = $data['csrf'] ?? $request->headers->get('X-CSRF-Token');
-        if (!Token::getInstance($this->session)->verifyToken($csrfToken, 'admin-plugins')) {
-            return new JsonResponse(['success' => false, 'message' => 'Invalid CSRF token'], 403);
+        if (!Token::getInstance($this->session)->verifyToken('admin-plugins', $csrfToken)) {            return new JsonResponse(['success' => false, 'message' => 'Invalid CSRF token'], 403);
         }
 
         $pluginManager = $this->container->get(id: 'phpmyfaq.plugin.plugin-manager');

phpmyfaq/src/phpMyFAQ/Database/Mysqli.php

@@ -170,10 +170,6 @@ public function fetchAll(mixed $result): ?array
             $result = $result->result;
         }
 
-        if ($result instanceof MysqliStatement) {
-            $result = $result->result;
-        }
-
         $ret = [];
         if (false === $result) {
             throw new Exception('Error while fetching result: ' . $this->error());
@@ -287,7 +283,6 @@ public function getTableNames(string $prefix = ''): array
             $prefix . 'faqvisits',
             $prefix . 'faqvoting',
             $prefix . 'faqplugins',
-            $prefix . 'faqplugins',
         ];
     }
 
@@ -399,9 +394,9 @@ public function execute(mixed $statement, array $params = []): bool
         $success = $statement->stmt->execute();
         if ($success) {
             $result = $statement->stmt->get_result();
-+            if ($result !== false) {
-+                $statement->result = $result;
-+            }
+            if ($result !== false) {
+                $statement->result = $result;
+            }
         }
 
         return $success;

phpmyfaq/src/phpMyFAQ/Database/Pgsql.php

@@ -34,7 +34,7 @@ class PgsqlStatement
 {
     public function __construct(
         private string $name,
-        public mixed $result = null
+        public mixed $result = null,
     ) {
     }
 

phpmyfaq/src/phpMyFAQ/Database/Sqlite3.php

@@ -143,10 +143,6 @@ public function fetchAll(mixed $result): ?array
             $result = $result->result;
         }
 
-        if ($result instanceof Sqlite3Statement) {
-            $result = $result->result;
-        }
-
         $ret = [];
         if (false === $result) {
             throw new Exception('Error while fetching result: ' . $this->error());
@@ -305,7 +301,6 @@ public function getTableNames(string $prefix = ''): array
             $prefix . 'faqvisits',
             $prefix . 'faqvoting',
             $prefix . 'faqplugins',
-            $prefix . 'faqplugins',
         ];
     }
 
@@ -377,8 +372,8 @@ public function execute(mixed $statement, array $params = []): bool
             } elseif (is_null($param)) {
                 $type = SQLITE3_NULL;
             } elseif (is_bool($param)) {
-+                $type = SQLITE3_INTEGER;
-+                $param = $param ? 1 : 0;
+                $type = SQLITE3_INTEGER;
+                $param = $param ? 1 : 0;
             }
             $statement->stmt->bindValue($index + 1, $param, $type);
         }

phpmyfaq/src/phpMyFAQ/Database/Sqlsrv.php

@@ -31,7 +31,7 @@ class SqlsrvStatement
 {
     public function __construct(
         public mixed $statement,
-        public mixed $result = null
+        public mixed $result = null,
     ) {
     }
 

phpmyfaq/src/phpMyFAQ/Plugin/PluginManager.php

@@ -130,7 +130,7 @@ public function loadPlugins(): void
                                                 $value = (int) $value;
                                                 break;
                                             case 'bool':
-                                                $value = filter_var($value, FILTER_VALIDATE_BOOLEAN);
+                                                $value = (bool) $value;
                                                 break;
                                             case 'float':
                                                 $value = (float) $value;
@@ -146,7 +146,6 @@ public function loadPlugins(): void
                     }
                 }
             } else {
-
                 // I will default to inactive (false) for new plugins found on disk but not in DB.
 
                 $isActive = false;
@@ -194,7 +193,6 @@ public function loadPlugins(): void
                     $this->registerPluginScripts($plugin->getName(), $plugin->getScripts());
                 }
             } elseif (!$this->areDependenciesMet($plugin)) {
-
                 $missingDeps = $this->getMissingDependencies($plugin);
                 $this->incompatiblePlugins[$plugin->getName()] = [
                     'plugin' => $plugin,
@@ -290,7 +288,7 @@ private function getPluginsFromDatabase(): array
     {
         $db = $this->configuration->getDb();
         $table = \phpMyFAQ\Database::getTablePrefix() . 'faqplugins';
-        
+
         // Ensure table exists to avoid crashes during update/install if not yet run
         try {
             $result = $db->query("SELECT name, active, config FROM $table");