Fetched upstream changes

Author: Raza403

classes/template.php

@@ -320,30 +320,38 @@ public function generate_pdf(bool $preview = false, ?int $userid = null, bool $r
             $pdf->SetAutoPageBreak(true, 0);
 
             // Get filename pattern from global settings.
-            if (empty($customcert->usecustomfilename) || empty($customcert->customfilenamepattern)) {
+            if (!empty($customcert->usecustomfilename) && !empty($customcert->customfilenamepattern)) {
+                $filenamepattern = $customcert->customfilenamepattern;
+            } else {
+                $filenamepattern = '{DEFAULT}';
+            }
+
+            if (empty($filenamepattern) || $filenamepattern === '{DEFAULT}') {
                 // Use the custom cert name as the base filename (strip any trailing dot).
                 $filename = rtrim(format_string($this->name, true, ['context' => $this->get_context()]), '.');
             } else {
+                // Build filename from pattern substitutions.
+
                 // Get issue record for date (if issued); fallback to current date if not found.
                 $issue = $DB->get_record('customcert_issues', [
                     'userid' => $user->id,
                     'customcertid' => $customcert->id,
-                ]);
+                ], '*', IGNORE_MISSING);
 
                 if ($issue && !empty($issue->timecreated)) {
                     $issuedate = date('Y-m-d', $issue->timecreated);
                 } else {
                     $issuedate = date('Y-m-d');
                 }
 
-                $course = $DB->get_record('course', ['id' => $customcert->course]);
+                $course = $DB->get_record('course', ['id' => $customcert->course], '*', IGNORE_MISSING);
 
                 $values = [
-                    '{FIRST_NAME}' => $user->firstname ?? '',
-                    '{LAST_NAME}' => $user->lastname ?? '',
-                    '{COURSE_SHORT_NAME}' => $course ? $course->shortname : '',
-                    '{COURSE_FULL_NAME}' => $course ? $course->fullname : '',
-                    '{ISSUE_DATE}' => $issuedate,
+                    '{FIRST NAME}' => $user->firstname ?? '',
+                    '{LAST NAME}' => $user->lastname ?? '',
+                    '{COURSE SHORT NAME}' => $course ? $course->shortname : '',
+                    '{COURSE FULL NAME}' => $course ? $course->fullname : '',
+                    '{DATE}' => $issuedate,
                 ];
 
                 // Handle group if needed.
@@ -352,13 +360,13 @@ public function generate_pdf(bool $preview = false, ?int $userid = null, bool $r
                     $groupnames = array_map(function($g) {
                         return $g->name;
                     }, $groups);
-                    $values['{GROUP_NAME}'] = implode(', ', $groupnames);
+                    $values['{GROUP}'] = implode(', ', $groupnames);
                 } else {
-                    $values['{GROUP_NAME}'] = '';
+                    $values['{GROUP}'] = '';
                 }
 
                 // Replace placeholders with actual values.
-                $filename = strtr($customcert->customfilenamepattern, $values);
+                $filename = strtr($filenamepattern, $values);
 
                 // Remove trailing dot to avoid "..pdf" issues.
                 $filename = rtrim($filename, '.');

db/upgrade.php

@@ -318,7 +318,7 @@ function xmldb_customcert_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2024042210, 'mod', 'customcert');
     }
 
-    if ($oldversion < 2024042213) {
+    if ($oldversion < 2025062100) {
         $table = new xmldb_table('customcert');
 
         // Add 'usecustomfilename' field.
@@ -334,8 +334,7 @@ function xmldb_customcert_upgrade($oldversion) {
         }
 
         // Savepoint reached.
-        upgrade_mod_savepoint(true, 2024042213, 'customcert');
+        upgrade_mod_savepoint(true, 2025062100, 'customcert');
     }
-
     return true;
 }

lang/en/customcert.php

@@ -22,6 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['Upper/lower/digits'] = '6aOdbLEuoC (Upper/lower/digits random string)';
 $string['activity'] = 'Activity';
 $string['addcertpage'] = 'Add page';
 $string['addelement'] = 'Add element';
@@ -65,6 +66,8 @@
 $string['customcertsettings'] = 'Custom certificate settings';
 $string['customfilenamepattern'] = 'Custom file name pattern';
 $string['customfilenamepattern_help'] = 'Enter the pattern for naming certificate files. You can use placeholders such as {firstname}, {lastname}, {group}, {coursename}, {date}.';
+$string['custompattern'] = 'First name, Last name, Course short name, Issue date';
+$string['defaultpattern'] = 'Default (certificate name)';
 $string['deletecertpage'] = 'Delete page';
 $string['deleteconfirm'] = 'Delete confirmation';
 $string['deleteelement'] = 'Delete element';
@@ -73,10 +76,14 @@
 $string['deleteissuedcertificates'] = 'Delete issued certificates';
 $string['deletepageconfirm'] = 'Are you sure you want to delete this certificate page?';
 $string['deletetemplateconfirm'] = 'Are you sure you want to delete this certificate template?';
+$string['deliveryoption'] = 'Delivery option';
+$string['deliveryoption_help'] = 'Choose how the certificate should be delivered to users.';
 $string['deliveryoptiondownload'] = 'Send to the browser and force a file download';
 $string['deliveryoptioninline'] = 'Send the file inline to the browser';
 $string['deliveryoptions'] = 'Delivery options';
 $string['description'] = 'Description';
+$string['digits-with-hyphens'] = '0123-4567-8901 (Digits with hyphens)';
+$string['download'] = 'Force download';
 $string['downloadallissuedcertificates'] = 'Download all issued certificates';
 $string['downloadallsitecertificates'] = 'Download all site certificates';
 $string['downloadallsitecertificatesdesc'] = 'This will download all the certificates on the site in a zip file.';
@@ -125,6 +132,8 @@
 $string['eventtemplatedeleted'] = 'Custom certificate template deleted';
 $string['eventtemplateupdated'] = 'Custom certificate template updated';
 $string['exampledatawarning'] = 'Some of these values may just be an example to ensure positioning of the elements is possible.';
+$string['filenamepattern'] = 'File name pattern (legacy)';
+$string['filenamepattern_help'] = 'Choose the pattern for naming certificate files (legacy setting).';
 $string['font'] = 'Font';
 $string['font_help'] = 'The font used when generating this element.';
 $string['fontcolour'] = 'Colour';
@@ -137,6 +146,7 @@
 $string['height_help'] = 'This is the height of the certificate PDF in mm. For reference an A4 piece of paper is 297mm high and a letter is 279mm high.';
 $string['includeinnotvisiblecourses'] = 'Include certificates in hidden courses';
 $string['includeinnotvisiblecourses_desc'] = 'Certificates from hidden courses are not proccesed by default. If you want to include them, enable this setting.';
+$string['inline'] = 'Display inline';
 $string['invalidcode'] = 'Invalid code supplied.';
 $string['invalidcolour'] = 'Invalid colour chosen, please enter a valid HTML colour name, or a six-digit, or three-digit hexadecimal colour.';
 $string['invalidelementwidthorheightnotnumber'] = 'Please enter a valid number.';
@@ -241,7 +251,7 @@
 
 Enabling this option may improve the performance of the scheduled task by offloading email processing to ad-hoc tasks.';
 $string['usecustomfilename'] = 'Use custom file name pattern';
-$string['usecustomfilename_help'] = 'If enabled, you can define a custom file name pattern for certificates using placeholders. The placeholders are {FIRST_NAME}, {LAST_NAME}, {GROUP_NAME}, {COURSE_SHORT_NAME}, {COURSE_FULL_NAME} and {ISSUE_DATE}.';
+$string['usecustomfilename_help'] = 'If enabled, you can define a custom file name pattern for certificates using placeholders such as {FIRST NAME}, {LAST NAME}, {GROUP}, {COUSRE SHORT NAME}, {DATE}.';
 $string['userlanguage'] = 'Use user preferences';
 $string['userlanguage_help'] = 'You can force the language of the certificate to override the user\'s language preferences.';
 $string['verified'] = 'Verified';

mod_form.php

@@ -77,6 +77,15 @@ public function definition() {
         $mform->addHelpButton('customfilenamepattern', 'customfilenamepattern', 'customcert');
         $mform->disabledIf('customfilenamepattern', 'usecustomfilename', 'notchecked');
 
+        if ($this->current) {
+            if (property_exists($this->current, 'usecustomfilename')) {
+                $mform->setDefault('usecustomfilename', $this->current->usecustomfilename);
+            }
+            if (property_exists($this->current, 'customfilenamepattern')) {
+                $mform->setDefault('customfilenamepattern', $this->current->customfilenamepattern);
+            }
+        }
+
         if (has_capability('mod/customcert:manageemailstudents', $this->get_context())) {
             $mform->addElement('selectyesno', 'emailstudents', get_string('emailstudents', 'customcert'));
             $mform->setDefault('emailstudents', get_config('customcert', 'emailstudents'));

version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2024042213; // The current module version (Date: YYYYMMDDXX).
+$plugin->version   = 2025062100; // The current module version (Date: YYYYMMDDXX).
 $plugin->requires  = 2024042200; // Requires this Moodle version (4.4).
 $plugin->cron      = 0; // Period for cron to check this module (secs).
 $plugin->component = 'mod_customcert';