removed some errors in the code

Author: Raza403

classes/certificate.php

@@ -552,23 +552,34 @@ public static function issue_certificate($certificateid, $userid) {
         return $issueid;
     }
 
-    public static function generate_code() {
+    /**
+     * Generates an unused code of random letters and numbers.
+     *
+     * @return string
+    */
+    public static function generate_code(): string {
         global $DB;
 
-        // Get the user's selected method from settings
+        // Get the user's selected method from settings.
         $method = get_config('customcert', 'codegenerationmethod');
 
-        // If the upper/lower/digits is selected (0), use the upper/lower/digits code generation method
+        // If the upper/lower/digits is selected (0), use the upper/lower/digits code generation method.
         if ($method == 0) {
             return self::generate_code_upper_lower_digits();
         }
 
-        // Otherwise, use the digits with hyphens method (1)
+        // Otherwise, use the digits with hyphens method (1).
         return self::generate_code_digits_with_hyphens();
     }
 
-    // Upper/lower/digits random string
-    private static function generate_code_upper_lower_digits() {
+    // Upper/lower/digits random string.
+    /**
+     * Generate a random code of the format XXXXXXXXXX, where each X is a character from the set [A-Za-z0-9].
+     * Does not check that it is unused.
+     *
+     * @return string
+     */
+    private static function generate_code_upper_lower_digits(): string {
         global $DB;
 
         $uniquecodefound = false;
@@ -584,29 +595,34 @@ private static function generate_code_upper_lower_digits() {
         return $code;
     }
 
-    // Digits with hyphens
-    private static function generate_code_digits_with_hyphens() {
+    /**
+     * Generate an random code of the format XXXX-XXXX-XXXX, where each X is a random digit.
+     * Does not check that it is unused.
+     *
+     * @return string
+     */
+    private static function generate_code_digits_with_hyphens(): string {
         global $DB;
 
         // Define the character set (digits only).
         $characters = '0123456789';
-        $charCount = strlen($characters); // Cache the length to optimize loop performance
-        $length = 12; // Total length excluding hyphens
+        $charCount = strlen($characters); // Cache the length to optimize loop performance.
+        $length = 12; // Total length excluding hyphens.
 
         do {
-            // Generate a raw code
+            // Generate a raw code.
             $rawcode = '';
             for ($i = 0; $i < $length; $i++) {
-                $rawcode .= $characters[random_int(0, $charCount - 1)]; // Secure random number selection
+                $rawcode .= $characters[random_int(0, $charCount - 1)]; // Secure random number selection.
             }
 
-            // Format the code as XXXX-XXXX-XXXX
+            // Format the code as XXXX-XXXX-XXXX.
             $code = substr($rawcode, 0, 4) . '-' . substr($rawcode, 4, 4) . '-' . substr($rawcode, 8, 4);
 
-            // Check if the generated code already exists in the database
+            // Check if the generated code already exists in the database.
             $exists = $DB->record_exists('customcert_issues', ['code' => $code]);
 
-        } while ($exists); // Repeat until a unique code is found
+        } while ($exists); // Repeat until a unique code is found.
 
         return $code;
     }

db/upgrade.php

@@ -298,25 +298,42 @@ function xmldb_customcert_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2024042205, 'customcert');
     }
 
-    // Drop the unique index on 'code' and add a non-unique one.
     if ($oldversion < 2024042210) {
         $table = new xmldb_table('customcert_issues');
-
-        // Drop existing unique index if it exists.
         $index = new xmldb_index('code', XMLDB_INDEX_UNIQUE, ['code']);
+
         if ($dbman->index_exists($table, $index)) {
             $dbman->drop_index($table, $index);
         }
 
-        // Add non-unique index.
         $index = new xmldb_index('code', XMLDB_INDEX_NOTUNIQUE, ['code']);
+
         if (!$dbman->index_exists($table, $index)) {
             $dbman->add_index($table, $index);
         }
 
-        // Save the upgrade step.
+        // Update the plugin version in the database.
         upgrade_plugin_savepoint(true, 2024042210, 'mod', 'customcert');
     }
 
+    if ($oldversion < 2025041401) {
+        $table = new xmldb_table('customcert');
+
+        // Add 'usecustomfilename' field.
+        $field = new xmldb_field('usecustomfilename', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '0', 'deliveryoption');
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Add 'customfilenamepattern' field.
+        $field = new xmldb_field('customfilenamepattern', XMLDB_TYPE_TEXT, null, null, null, null, null, 'usecustomfilename');
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Savepoint reached.
+        upgrade_mod_savepoint(true, 2025041401, 'customcert');
+    }
+
     return true;
-}
+}

element/qrcode/classes/element.php

@@ -158,7 +158,8 @@ public function render($pdf, $preview, $user) {
             $context = \context::instance_by_id($issue->contextid);
 
             $urlparams = [
-                'certId' => $code,
+                'code' => $code,
+                'qrcode' => 1,
             ];
 
             // We only add the 'contextid' to the link if the site setting for verifying all certificates is off,

settings.php

@@ -85,10 +85,10 @@
     'customcert/codegenerationmethod',
     get_string('codegenerationmethod', 'customcert'),
     get_string('codegenerationmethod_desc', 'customcert'),
-    0, // Default option (0 = Upper/lower/digits random string method)
+    0, // Default option (0 = Upper/lower/digits random string method).
     [
-        0 => get_string('Upper/lower/digits', 'customcert'), // Upper/lower/digits random string
-        1 => get_string('digits-with-hyphens', 'customcert')  // Digits with hyphens numeric code
+        0 => get_string('codegenerationmethod_upperlowerdigits', 'customcert'), // Upper/lower/digits random string.
+        1 => get_string('codegenerationmethod_digitshyphens', 'customcert'), // Digits with hyphens numeric code.
     ]
 ));