Fixed issue with language strings not matching logic for placeholders (#684)

Also did some minor changes.

Author: mdjnelson

classes/template.php

@@ -320,38 +320,30 @@ 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)) {
-                $filenamepattern = $customcert->customfilenamepattern;
-            } else {
-                $filenamepattern = '{DEFAULT}';
-            }
-
-            if (empty($filenamepattern) || $filenamepattern === '{DEFAULT}') {
+            if (empty($customcert->usecustomfilename) || empty($customcert->customfilenamepattern)) {
                 // 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], '*', IGNORE_MISSING);
+                $course = $DB->get_record('course', ['id' => $customcert->course]);
 
                 $values = [
-                    '{FIRST NAME}' => $user->firstname ?? '',
-                    '{LAST NAME}' => $user->lastname ?? '',
-                    '{COURSE SHORT NAME}' => $course ? $course->shortname : '',
-                    '{COURSE FULL NAME}' => $course ? $course->fullname : '',
-                    '{DATE}' => $issuedate,
+                    '{FIRST_NAME}' => $user->firstname ?? '',
+                    '{LAST_NAME}' => $user->lastname ?? '',
+                    '{COURSE_SHORT_NAME}' => $course ? $course->shortname : '',
+                    '{COURSE_FULL_NAME}' => $course ? $course->fullname : '',
+                    '{ISSUE_DATE}' => $issuedate,
                 ];
 
                 // Handle group if needed.
@@ -360,13 +352,13 @@ public function generate_pdf(bool $preview = false, ?int $userid = null, bool $r
                     $groupnames = array_map(function($g) {
                         return $g->name;
                     }, $groups);
-                    $values['{GROUP}'] = implode(', ', $groupnames);
+                    $values['{GROUP_NAME}'] = implode(', ', $groupnames);
                 } else {
-                    $values['{GROUP}'] = '';
+                    $values['{GROUP_NAME}'] = '';
                 }
 
                 // Replace placeholders with actual values.
-                $filename = strtr($filenamepattern, $values);
+                $filename = strtr($customcert->customfilenamepattern, $values);
 
                 // Remove trailing dot to avoid "..pdf" issues.
                 $filename = rtrim($filename, '.');

lang/en/customcert.php

@@ -238,7 +238,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 such as {FIRST NAME}, {LAST NAME}, {GROUP}, {COUSRE SHORT NAME}, {DATE}.';
+$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['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';