remove initialize method in captcha classes (#894)

ltb-project · Jun 25, 2024 · c92927b · c92927b
1 parent c04729b
commit c92927b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/htdocs/index.php b/htdocs/index.php
@@ -147,7 +147,6 @@
         }
 
         $captchaInstance = new $captcha_class(...$params);
-        $captchaInstance->initialize();
     }
     else
     {

diff --git a/htdocs/newcaptcha.php b/htdocs/newcaptcha.php
@@ -11,8 +11,23 @@
         require_once(__DIR__ . "/../lib/captcha/" . $captcha_class . ".php");
         error_log("Captcha module $captcha_class successfully loaded");
 
-        $captchaInstance = new $captcha_class();
-        $captchaInstance->initialize();
+        # Inspect parameters of constructor
+        $reflection = new ReflectionClass($captcha_class);
+        $constructorParams = $reflection->getConstructor()->getParameters();
+
+        # Gather parameters to pass to the class: all config params to pass
+        $definedVariables = get_defined_vars(); # get all variables, including configuration
+        $params = [];
+        foreach ($constructorParams AS $param) {
+            if(!isset($definedVariables[$param->name]))
+            {
+                error_log("Error: Missing param $param->name for $captcha_class");
+                exit(1);
+            }
+            array_push($params, $definedVariables[$param->name]);
+        }
+
+        $captchaInstance = new $captcha_class(...$params);
     }
     else
     {

diff --git a/lib/captcha/InternalCaptcha.php b/lib/captcha/InternalCaptcha.php
@@ -15,11 +15,6 @@
 class InternalCaptcha extends Captcha
 {
 
-    # Function for initializing the component
-    # loading libraries,...
-    function initialize(){
-    }
-
     # Function that insert extra css
     function generate_css_captcha(){
         $captcha_css = '