Current status

As the userid in the customcert_issues table were using the userid from the site where the activity was backed up, emails were being sent to those that had already received them. Theoretically there wwere also users who should have received an email who didn't get one.

.github/workflows/moodle-ci.yml

@@ -29,16 +29,16 @@ jobs:
       matrix:
         include:
           - php: '7.4'
-            moodle-branch: 'MOODLE_39_STABLE'
+            moodle-branch: 'MOODLE_311_STABLE'
             database: pgsql
           - php: '7.4'
-            moodle-branch: 'MOODLE_39_STABLE'
+            moodle-branch: 'MOODLE_311_STABLE'
             database: mariadb
-          - php: '7.2'
-            moodle-branch: 'MOODLE_39_STABLE'
+          - php: '7.3'
+            moodle-branch: 'MOODLE_311_STABLE'
             database: pgsql
-          - php: '7.2'
-            moodle-branch: 'MOODLE_39_STABLE'
+          - php: '7.3'
+            moodle-branch: 'MOODLE_311_STABLE'
             database: mariadb
 
     steps:
@@ -111,9 +111,9 @@ jobs:
         run: |
           moodle-plugin-ci phpunit
           cd moodle
-          vendor/bin/phpunit --fail-on-risky --disallow-test-output -v admin/tool/dataprivacy/tests/metadata_registry_test.php
-          vendor/bin/phpunit --fail-on-risky --disallow-test-output -v lib/tests/externallib_test.php
-          vendor/bin/phpunit --fail-on-risky --disallow-test-output -v privacy/tests/provider_test.php
+          vendor/bin/phpunit --fail-on-risky --disallow-test-output --filter tool_dataprivacy_metadata_registry_testcase
+          vendor/bin/phpunit --fail-on-risky --disallow-test-output --filter core_externallib_testcase
+          vendor/bin/phpunit --fail-on-risky --disallow-test-output --testsuite core_privacy_testsuite --filter provider_testcase
 
       - name: Behat features
         if: ${{ always() }}

.gitignore

@@ -0,0 +1,2 @@
+vendor/
+*.swp

CHANGES.md

@@ -4,19 +4,25 @@ All notable changes to this project will be documented in this file.
 
 Note - All hash comments refer to the issue number. Eg. #169 refers to https://github.com/mdjnelson/moodle-mod_customcert/issues/169.
 
-## [3.9.2] - 2021-??-??
+## [3.11.2] - 2021-??-??
 
 ### Fixed
 - Fix places not using the multi-language filter (#433).
 - Fix user IDs in the issue table not being mapped during restore (#449).
 - Fix emails displaying HTML entities encoded (#457).
+- Fix error message when we have custom profile fields (#465).
 - Respect multiple languages in manage template page title (#467).
 
 ### Added
 - You can now choose the course short or full name to display (#415).
 - You can now select the alignment for all text elements (#121).
  
-## [3.9.1] - 2021-06-13
+## [3.11.1] - 2021-06-13
+
+### Fixed
+- Usage of deprecated functions (#423)
+
+## [3.10.1] - 2021-06-13
 
 ### Added
 - Usage of github actions (#407).

README.md

@@ -6,6 +6,8 @@ This activity allows the dynamic generation of PDF certificates with complete cu
 
 There are two installation methods that are available. 
 
+First, make sure that wkhtmltopdf is installed on your server and available on $PATH.
+
 Follow one of these, then log into your Moodle site as an administrator and visit the notifications page to complete the install.
 
 ### Git

amd/src/dialogue.js

@@ -18,7 +18,6 @@
  * use the YUI version in AMD code until it is replaced.
  *
  * @module     mod_customcert/dialogue
- * @package    mod_customcert
  * @copyright  2016 Mark Nelson <markn@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */

amd/src/rearrange-area.js

@@ -17,7 +17,6 @@
  * AMD module used when rearranging a custom certificate.
  *
  * @module     mod_customcert/rearrange-area
- * @package    mod_customcert
  * @copyright  2016 Mark Nelson <markn@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */

classes/certificate.php

@@ -270,12 +270,20 @@ class certificate {
         $allparams = $conditionsparams + array('customcertid' => $customcertid);
 
         // Return the issues.
-        $extrafields = get_extra_user_fields(\context_module::instance($cm->id));
-        $ufields = \user_picture::fields('u', $extrafields);
-        $sql = "SELECT $ufields, ci.id as issueid, ci.code, ci.timecreated
+        $context = \context_module::instance($cm->id);
+        $extrafields = \core_user\fields::for_identity($context)->get_required_fields();
+
+        $ufields = \core_user\fields::for_userpic()->including(...$extrafields);
+        [
+            'selects' => $userfieldsselects,
+            'joins' => $userfieldsjoin,
+            'params' => $userfieldsparams
+        ] = (array) $ufields->get_sql('u', true);
+        $allparams = array_merge($allparams, $userfieldsparams);
+        $sql = "SELECT ci.id as issueid, ci.code, ci.timecreated $userfieldsselects
                   FROM {user} u
-            INNER JOIN {customcert_issues} ci
-                    ON u.id = ci.userid
+            INNER JOIN {customcert_issues} ci ON u.id = ci.userid
+                       $userfieldsjoin
                  WHERE u.deleted = 0
                    AND ci.customcertid = :customcertid
                        $conditionssql";

classes/helper.php

@@ -0,0 +1,64 @@
+<?php
+// This file is part of the customcert module for Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Provides helper functionality.
+ *
+ * @package    mod_customcert
+ * @copyright  2021 Mark Nelson <mdjnelson@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace mod_customcert;
+
+use core_user\fields;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Class helper.
+ *
+ * Helper functionality for this module.
+ *
+ * @package    mod_customcert
+ * @copyright  2021 Mark Nelson <mdjnelson@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class helper {
+
+    /**
+     * A centralised location for the all name fields.
+     *
+     * Returns a sql string snippet.
+     *
+     * @param string $tableprefix table query prefix to use in front of each field.
+     * @return string All name fields.
+     */
+    public static function get_all_user_name_fields(string $tableprefix = ''): string {
+        $alternatenames = [];
+        foreach (fields::get_name_fields() as $field) {
+            $alternatenames[$field] = $field;
+        }
+
+        if ($tableprefix) {
+            foreach ($alternatenames as $key => $altname) {
+                $alternatenames[$key] = $tableprefix . '.' . $altname;
+            }
+        }
+
+        return implode(',', $alternatenames);
+    }
+}

classes/report_table.php

@@ -66,7 +66,7 @@ class report_table extends \table_sql {
         parent::__construct('mod_customcert_report_table');
 
         $context = \context_module::instance($cm->id);
-        $extrafields = get_extra_user_fields($context);
+        $extrafields = \core_user\fields::for_identity($context)->get_required_fields();
 
         $columns = [];
         $columns[] = 'fullname';
@@ -79,7 +79,7 @@ class report_table extends \table_sql {
         $headers = [];
         $headers[] = get_string('fullname');
         foreach ($extrafields as $extrafield) {
-            $headers[] = get_user_field_name($extrafield);
+            $headers[] = \core_user\fields::get_display_name($extrafield);
         }
         $headers[] = get_string('receiveddate', 'customcert');
         $headers[] = get_string('code', 'customcert');

classes/task/email_certificate_task.php

@@ -23,6 +23,8 @@
  */
 namespace mod_customcert\task;
 
+use mod_customcert\helper;
+
 defined('MOODLE_INTERNAL') || die();
 
 /**
@@ -105,7 +107,7 @@ class email_certificate_task extends \core\task\scheduled_task {
             $info->certificatename = $certificatename;
 
             // Get a list of all the issues.
-            $userfields = get_all_user_name_fields(true, 'u');
+            $userfields = helper::get_all_user_name_fields('u');
             $sql = "SELECT u.id, u.username, $userfields, u.email, ci.id as issueid, ci.emailed
                       FROM {customcert_issues} ci
                       JOIN {user} u

classes/template.php

@@ -18,13 +18,19 @@
  * Class represents a customcert template.
  *
  * @package    mod_customcert
- * @copyright  2016 Mark Nelson <markn@moodle.com>
+ * @copyright  2016 Mark Nelson <markn@moodle.com>, 2022 Kumi Systems e.U. <office@kumi.systems>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 namespace mod_customcert;
 
-defined('MOODLE_INTERNAL') || die();
+error_reporting(E_ALL);
+require_once(__DIR__ . "/../vendor/autoload.php");
+require_once($CFG->dirroot.'/user/profile/lib.php');
+
+use mikehaertl\wkhtmlto\Pdf;
+
+#defined('MOODLE_INTERNAL') || die();
 
 /**
  * Class represents a customcert template.
@@ -50,6 +56,8 @@ class template {
      */
     protected $contextid;
 
+    protected $html;
+
     /**
      * The constructor.
      *
@@ -59,6 +67,7 @@ class template {
         $this->id = $template->id;
         $this->name = $template->name;
         $this->contextid = $template->contextid;
+	$this->html = $template->html;
     }
 
     /**
@@ -254,7 +263,7 @@ class template {
      * @return string|void Can return the PDF in string format if specified.
      */
     public function generate_pdf(bool $preview = false, int $userid = null, bool $return = false) {
-        global $CFG, $DB, $USER;
+        global $CFG, $DB, $USER, $SITE;
 
         if (empty($userid)) {
             $user = $USER;
@@ -264,6 +273,8 @@ class template {
 
         require_once($CFG->libdir . '/pdflib.php');
 
+	profile_load_data($user);
+
         // Get the pages for the template, there should always be at least one page for each template.
         if ($pages = $DB->get_records('customcert_pages', array('templateid' => $this->id), 'sequence ASC')) {
             // Create the pdf object.
@@ -310,24 +321,91 @@ class template {
                     $orientation = 'P';
                 }
                 $pdf->AddPage($orientation, array($page->width, $page->height));
-                $pdf->SetMargins($page->leftmargin, 0, $page->rightmargin);
-                // Get the elements for the page.
-                if ($elements = $DB->get_records('customcert_elements', array('pageid' => $page->id), 'sequence ASC')) {
-                    // Loop through and display.
-                    foreach ($elements as $element) {
-                        // Get an instance of the element class.
-                        if ($e = \mod_customcert\element_factory::get_element_instance($element)) {
-                            $e->render($pdf, $preview, $user);
-                        }
-                    }
-                }
+
+		if ($this->html) {
+			$pdf = new Pdf(array(
+				"disable-smart-shrinking",
+				"margin-bottom" => "0",
+				"margin-right" => "0",
+				"margin-left" => "0",
+				"margin-top" => "0"
+			));
+			$html = $this->html;
+
+			$context = \context_user::instance($user->id);
+		        $fs = get_file_storage();
+		        $files = $fs->get_area_files($context->id, 'user', 'icon', 0);
+
+		        $file = null;
+			$content = "";
+		        foreach ($files as $filefound) {
+		            if (!$filefound->is_directory()) {
+		                $file = $filefound;
+		                break;
+		            }
+		        }
+
+		        if ($file) {
+		            $location = make_request_directory() . '/target';
+		            $content = $file->get_content();
+		        } else if ($preview) { 
+		        }
+			$html = str_replace("__PROFILEPIC__", 'data: ' . mime_content_type($file) . ';base64,' . $content, $html);
+
+			$html = str_replace("__NAME__", $user->firstname . " " . $user->lastname, $html);
+
+		        if ($preview) {
+		            $code = \mod_customcert\certificate::generate_code();
+		        } else {
+		            $issue = $DB->get_record('customcert_issues', array('userid' => $user->id, 'customcertid' => $customcert->id),
+		                '*', IGNORE_MULTIPLE);
+		            $code = $issue->code;
+        		}
+
+			$html = str_replace("__CERTNUM__", $code, $html);
+
+			if ($preview) {
+				$courseid = $SITE->id;
+			} else {
+				$courseid = $customcert->course;
+			}
+
+			$course = get_course($courseid);
+			$coursename = $course->fullname;
+
+			$html = str_replace("__COURSE__", $coursename, $html);
+
+			$date = $issue->timecreated;
+
+			$html = str_replace("__DATE__", userdate($date, '%B %d, %Y'), $html);
+
+			$html = str_replace("__PIN__", $user->username, $html);
+
+			$pdf->addPage($html);
+			$pdf->send();
+			die($pdf->getError());
+		} else {
+                	$pdf->SetMargins($page->leftmargin, 0, $page->rightmargin);
+                	// Get the elements for the page.
+                	if ($elements = $DB->get_records('customcert_elements', array('pageid' => $page->id), 'sequence ASC')) {
+                    		// Loop through and display.
+                    		foreach ($elements as $element) {
+                        		// Get an instance of the element class.
+                        		if ($e = \mod_customcert\element_factory::get_element_instance($element)) {
+                            			$e->render($pdf, $preview, $user);
+                        		}
+                    		}
+                	}
+		}
             }
 
-            if ($return) {
+            if ($return && !$this->html) {
                 return $pdf->Output('', 'S');
             }
 
-            $pdf->Output($filename, $deliveryoption);
+	    if (!$this->html) {
+            	$pdf->Output($filename, $deliveryoption);
+	    }
         }
     }
 
@@ -339,6 +417,10 @@ class template {
     public function copy_to_template($copytotemplateid) {
         global $DB;
 
+	$copytotemplate = $DB->get_record('customcert_templates', array('id' => $copytotemplateid));
+	$copytotemplate->html = $this->html;
+	$DB->update_record('customcert_templates', $copytotemplate);
+
         // Get the pages for the template, there should always be at least one page for each template.
         if ($templatepages = $DB->get_records('customcert_pages', array('templateid' => $this->id))) {
             // Loop through the pages.
@@ -431,6 +513,10 @@ class template {
         return $this->name;
     }
 
+    public function get_html() {
+	return $this->html;
+    }
+
     /**
      * Returns the context id.
      *

composer.json

@@ -2,7 +2,8 @@
     "name": "mdjnelson/moodle-mod_customcert",
     "type": "moodle-mod",
     "require": {
-        "composer/installers": "~1.0"
+        "composer/installers": "~1.0",
+        "mikehaertl/phpwkhtmltopdf": "^2.5"
     },
     "extra": {
         "installer-name": "customcert"

composer.lock

@@ -0,0 +1,311 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "749e39445f7c33f767b710400da4e9c6",
+    "packages": [
+        {
+            "name": "composer/installers",
+            "version": "v1.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/d20a64ed3c94748397ff5973488761b22f6d3f19",
+                "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0"
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.6.* || ^2.0",
+                "composer/semver": "^1 || ^3",
+                "phpstan/phpstan": "^0.12.55",
+                "phpstan/phpstan-phpunit": "^0.12.16",
+                "symfony/phpunit-bridge": "^4.2 || ^5",
+                "symfony/process": "^2.3"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Eliasis",
+                "Hurad",
+                "ImageCMS",
+                "Kanboard",
+                "Lan Management System",
+                "MODX Evo",
+                "MantisBT",
+                "Mautic",
+                "Maya",
+                "OXID",
+                "Plentymarkets",
+                "Porto",
+                "RadPHP",
+                "SMF",
+                "Starbug",
+                "Thelia",
+                "Whmcs",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "eZ Platform",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "itop",
+                "joomla",
+                "known",
+                "kohana",
+                "laravel",
+                "lavalite",
+                "lithium",
+                "magento",
+                "majima",
+                "mako",
+                "mediawiki",
+                "miaoxing",
+                "modulework",
+                "modx",
+                "moodle",
+                "osclass",
+                "pantheon",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "processwire",
+                "puppet",
+                "pxcms",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "sydes",
+                "sylius",
+                "symfony",
+                "tastyigniter",
+                "typo3",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v1.12.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-09-13T08:19:44+00:00"
+        },
+        {
+            "name": "mikehaertl/php-shellcommand",
+            "version": "1.6.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mikehaertl/php-shellcommand.git",
+                "reference": "3488d7803df1e8f1a343d3d0ca452d527ad8d5e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mikehaertl/php-shellcommand/zipball/3488d7803df1e8f1a343d3d0ca452d527ad8d5e5",
+                "reference": "3488d7803df1e8f1a343d3d0ca452d527ad8d5e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">= 5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">4.0 <=9.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "mikehaertl\\shellcommand\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Härtl",
+                    "email": "haertl.mike@gmail.com"
+                }
+            ],
+            "description": "An object oriented interface to shell commands",
+            "keywords": [
+                "shell"
+            ],
+            "support": {
+                "issues": "https://github.com/mikehaertl/php-shellcommand/issues",
+                "source": "https://github.com/mikehaertl/php-shellcommand/tree/1.6.4"
+            },
+            "time": "2021-03-17T06:54:33+00:00"
+        },
+        {
+            "name": "mikehaertl/php-tmpfile",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mikehaertl/php-tmpfile.git",
+                "reference": "70a5b70b17bc0d9666388e6a551ecc93d0b40a10"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mikehaertl/php-tmpfile/zipball/70a5b70b17bc0d9666388e6a551ecc93d0b40a10",
+                "reference": "70a5b70b17bc0d9666388e6a551ecc93d0b40a10",
+                "shasum": ""
+            },
+            "require-dev": {
+                "php": ">=5.3.0",
+                "phpunit/phpunit": ">4.0 <=9.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "mikehaertl\\tmp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Härtl",
+                    "email": "haertl.mike@gmail.com"
+                }
+            ],
+            "description": "A convenience class for temporary files",
+            "keywords": [
+                "files"
+            ],
+            "support": {
+                "issues": "https://github.com/mikehaertl/php-tmpfile/issues",
+                "source": "https://github.com/mikehaertl/php-tmpfile/tree/1.2.1"
+            },
+            "time": "2021-03-01T18:26:25+00:00"
+        },
+        {
+            "name": "mikehaertl/phpwkhtmltopdf",
+            "version": "2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mikehaertl/phpwkhtmltopdf.git",
+                "reference": "17ee71341591415d942774eda2c98d8ba7ea9e90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mikehaertl/phpwkhtmltopdf/zipball/17ee71341591415d942774eda2c98d8ba7ea9e90",
+                "reference": "17ee71341591415d942774eda2c98d8ba7ea9e90",
+                "shasum": ""
+            },
+            "require": {
+                "mikehaertl/php-shellcommand": "^1.5.0",
+                "mikehaertl/php-tmpfile": "^1.2.1",
+                "php": ">=5.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">4.0 <9.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "mikehaertl\\wkhtmlto\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Haertl",
+                    "email": "haertl.mike@gmail.com"
+                }
+            ],
+            "description": "A slim PHP wrapper around wkhtmltopdf with an easy to use and clean OOP interface",
+            "homepage": "http://mikehaertl.github.com/phpwkhtmltopdf/",
+            "keywords": [
+                "pdf",
+                "wkhtmltoimage",
+                "wkhtmltopdf"
+            ],
+            "support": {
+                "issues": "https://github.com/mikehaertl/phpwkhtmltopdf/issues",
+                "source": "https://github.com/mikehaertl/phpwkhtmltopdf/tree/2.5.0"
+            },
+            "time": "2021-03-01T19:41:06+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.0.0"
+}

db/install.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="mod/customcert/db" VERSION="20170530" COMMENT="XMLDB file for Moodle mod/customcert"
+<XMLDB PATH="mod/customcert/db" VERSION="20211105" COMMENT="XMLDB file for Moodle mod/customcert"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
 >
@@ -10,7 +10,7 @@
         <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="templateid" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/>
-        <FIELD NAME="intro" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false"/>
+        <FIELD NAME="intro" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="introformat" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="requiredtime" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="verifyany" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
@@ -34,6 +34,7 @@
         <FIELD NAME="contextid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" COMMENT="References contextid."/>
         <FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
+        <FIELD NAME="html" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for customcert_template"/>
@@ -77,7 +78,7 @@
         <FIELD NAME="pageid" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/>
         <FIELD NAME="element" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/>
-        <FIELD NAME="data" TYPE="text" LENGTH="big" NOTNULL="false" SEQUENCE="false"/>
+        <FIELD NAME="data" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="font" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="fontsize" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false"/>
         <FIELD NAME="colour" TYPE="char" LENGTH="50" NOTNULL="false" SEQUENCE="false"/>

db/upgrade.php

@@ -166,7 +166,7 @@ function xmldb_customcert_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2019111803, 'customcert');
     }
 
-    if ($oldversion < 2020061501) {
+    if ($oldversion < 2020110901) {
         $table = new xmldb_table('customcert');
         $field = new xmldb_field('deliveryoption', XMLDB_TYPE_CHAR, '255', null, null, null, null, 'verifyany');
 
@@ -175,16 +175,28 @@ function xmldb_customcert_upgrade($oldversion) {
             $dbman->add_field($table, $field);
         }
 
-        upgrade_mod_savepoint(true, 2020061501, 'customcert');
+        upgrade_mod_savepoint(true, 2020110901, 'customcert');
     }
 
-    if ($oldversion < 2020061503) {
+    if ($oldversion < 2021051702) {
         $table = new xmldb_table('customcert_elements');
         $field = new xmldb_field('alignment', XMLDB_TYPE_CHAR, '1', null, XMLDB_NOTNULL, null, 'L', 'refpoint');
 
         $dbman->add_field($table, $field);
 
-        upgrade_mod_savepoint(true, 2020061503, 'customcert'); // Replace with the actual version number.
+        upgrade_mod_savepoint(true, 2021051702, 'customcert');
+    }
+
+    if ($oldversion < 2021110501) {
+        $table = new xmldb_table('customcert_templates');
+        $field = new xmldb_field('html', XMLDB_TYPE_TEXT, null, null, null, null, null, 'timemodified');
+
+        // Conditionally launch add field html.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+	
+        upgrade_mod_savepoint(true, 2021110501, 'customcert');
     }
 
     return true;

element/bgimage/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_bgimage';

element/border/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_border';

element/categoryname/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_categoryname';

element/code/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_code';

element/coursefield/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_coursefield';

element/coursename/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_coursename';

element/date/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_date';

element/daterange/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_daterange';

element/digitalsignature/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_digitalsignature';

element/grade/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_grade';

element/gradeitemname/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_gradeitemname';

element/image/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_image';

element/qrcode/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_qrcode';

element/studentname/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_studentname';

element/teachername/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_teachername';

element/text/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_text';

element/userfield/classes/element.php

@@ -24,6 +24,8 @@
 
 namespace customcertelement_userfield;
 
+use core_user\fields;
+
 defined('MOODLE_INTERNAL') || die();
 
 /**
@@ -43,24 +45,20 @@ class element extends \mod_customcert\element {
     public function render_form_elements($mform) {
         // Get the user profile fields.
         $userfields = array(
-            'firstname' => get_user_field_name('firstname'),
-            'lastname' => get_user_field_name('lastname'),
-            'username' => get_user_field_name('username'),
-            'email' => get_user_field_name('email'),
-            'city' => get_user_field_name('city'),
-            'country' => get_user_field_name('country'),
-            'url' => get_user_field_name('url'),
-            'icq' => get_user_field_name('icq'),
-            'skype' => get_user_field_name('skype'),
-            'aim' => get_user_field_name('aim'),
-            'yahoo' => get_user_field_name('yahoo'),
-            'msn' => get_user_field_name('msn'),
-            'idnumber' => get_user_field_name('idnumber'),
-            'institution' => get_user_field_name('institution'),
-            'department' => get_user_field_name('department'),
-            'phone1' => get_user_field_name('phone1'),
-            'phone2' => get_user_field_name('phone2'),
-            'address' => get_user_field_name('address')
+            'firstname' => fields::get_display_name('firstname'),
+            'lastname' => fields::get_display_name('lastname'),
+            'username' => fields::get_display_name('username'),
+            'email' => fields::get_display_name('email'),
+            'city' => fields::get_display_name('city'),
+            'country' => fields::get_display_name('country'),
+            'url' => fields::get_display_name('url'),
+            'skype' => fields::get_display_name('skype'),
+            'idnumber' => fields::get_display_name('idnumber'),
+            'institution' => fields::get_display_name('institution'),
+            'department' => fields::get_display_name('department'),
+            'phone1' => fields::get_display_name('phone1'),
+            'phone2' => fields::get_display_name('phone2'),
+            'address' => fields::get_display_name('address')
         );
         // Get the user custom fields.
         $arrcustomfields = \availability_profile\condition::get_custom_profile_fields();

element/userfield/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_userfield';

element/userpicture/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061500; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021051700; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->component = 'customcertelement_userpicture';

load_template_cli.php

@@ -0,0 +1,57 @@
+<?php
+// This file is part of the customcert module for Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+define('CLI_SCRIPT', true);
+require_once('../../config.php');
+
+$tid = $argv[1];
+$ltid = $argv[2];
+
+$template = $DB->get_record('customcert_templates', array('id' => $tid), '*', MUST_EXIST);
+$template = new \mod_customcert\template($template);
+
+$loadtemplate = $DB->get_record('customcert_templates', array('id' => $ltid), '*', MUST_EXIST);
+$loadtemplate = new \mod_customcert\template($loadtemplate);
+
+$cm = $template->get_cm();
+
+if ($template->get_context()->contextlevel == CONTEXT_MODULE) {
+    $customcert = $DB->get_record('customcert', ['id' => $cm->instance], '*', MUST_EXIST);
+    $title = $customcert->name;
+    $heading = format_string($title);
+} else {
+    $title = $SITE->fullname;
+    $heading = $title;
+}
+
+$sql = "SELECT e.*
+          FROM {customcert_elements} e
+          INNER JOIN {customcert_pages} p
+          ON e.pageid = p.id
+          WHERE p.templateid = :templateid";
+
+if ($elements = $DB->get_records_sql($sql, array('templateid' => $template->get_id()))) {
+    foreach ($elements as $element) {
+        if ($e = \mod_customcert\element_factory::get_element_instance($element)) {
+            $e->delete();
+        }
+    }
+}
+
+$DB->delete_records('customcert_pages', array('templateid' => $template->get_id()));
+
+$loadtemplate->copy_to_template($template->get_id());
+

tests/behat/activity_options.feature

@@ -8,11 +8,9 @@ Feature: Being able to correctly display options on the certificate activity edi
     And the following "users" exist:
       | username | firstname | lastname | email                |
       | teacher1 | Teacher   | 1        | teacher1@example.com |
-      | manager1 | Manager   | 1        | Manager1@example.com |
     And the following "course enrolments" exist:
       | user     | course | role           |
       | teacher1 | C1     | editingteacher |
-      | manager1 | C1     | manager        |
     And the following "activities" exist:
       | activity   | name                 | intro                      | course | idnumber    |
       | customcert | Custom certificate 1 | Custom certificate 1 intro | C1     | customcert1 |
@@ -29,40 +27,7 @@ Feature: Being able to correctly display options on the certificate activity edi
     And I should see "Required minutes in course"
     And I should see "Set protection"
 
-  Scenario: Create an activity as an Editing Teacher I can see all custom certificate options
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Custom certificate" to section "1"
-    And I should see "Email students"
-    And I should see "Email teachers"
-    And I should see "Email others"
-    And I should see "Allow anyone to verify a certificate"
-    And I should see "Required minutes in course"
-    And I should see "Set protection"
-
-  Scenario: Add an activity as a Manager I can see all custom certificate options
-    And I log in as "manager1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Custom certificate" to section "1"
-    And I should see "Email students"
-    And I should see "Email teachers"
-    And I should see "Email others"
-    And I should see "Allow anyone to verify a certificate"
-    And I should see "Required minutes in course"
-    And I should see "Set protection"
-
-  Scenario: Edit an activity as a Manager Teacher I can see all custom certificate options
-    And I log in as "manager1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I follow "Custom certificate 1"
-    And I navigate to "Edit settings" in current page administration
-    And I should see "Email students"
-    And I should see "Email teachers"
-    And I should see "Email others"
-    And I should see "Allow anyone to verify a certificate"
-    And I should see "Required minutes in course"
-    And I should see "Set protection"
-
+  @javascript
   Scenario: Create an activity as an Editing Teacher without required capabilities I can't see all custom certificate options
     And I log in as "admin"
     And I set the following system permissions of "Teacher" role:
@@ -106,8 +71,9 @@ Feature: Being able to correctly display options on the certificate activity edi
     And I should not see "Required minutes in course"
     And I should not see "Set protection"
 
+  @javascript
   Scenario: Add an activity using default custom certificate options
-    And I log in as "manager1"
+    And I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
     And I add a "Custom certificate" to section "0"
     And the field "emailstudents" matches value "0"
@@ -119,6 +85,7 @@ Feature: Being able to correctly display options on the certificate activity edi
     And the field "protection_modify" matches value "0"
     And the field "protection_copy" matches value "0"
 
+  @javascript
   Scenario: Add an activity using configured custom certificate options
     And the following config values are set as admin:
       | emailstudents     | 1               | customcert |
@@ -129,7 +96,7 @@ Feature: Being able to correctly display options on the certificate activity edi
       | protection_print  | 1               | customcert |
       | protection_modify | 1               | customcert |
       | protection_copy   | 1               | customcert |
-    And I log in as "manager1"
+    And I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
     And I add a "Custom certificate" to section "1"
     And the field "emailstudents" matches value "1"

tests/behat/view_issued_certificates.feature

@@ -21,6 +21,8 @@ Feature: Being able to view the certificates that have been issued
     And the following "activities" exist:
       | activity   | name                 | intro                      | course | idnumber    |
       | customcert | Custom certificate 1 | Custom certificate 1 intro | C1     | customcert1 |
+    And the following config values are set as admin:
+      | showuseridentity | username,email |
 
   Scenario: View the issued certificates
     And I log in as "student1"
@@ -38,6 +40,12 @@ Feature: Being able to view the certificates that have been issued
     And I follow "Custom certificate 1"
     And I should see "Student 1"
     And I should see "Student 2"
+    And I should see "Email address"
+    And I should see "Username"
+    And "Student 1" row "Email address" column of "generaltable" table should contain "student1@example.com"
+    And "Student 1" row "Username" column of "generaltable" table should contain "student1"
+    And "Student 2" row "Email address" column of "generaltable" table should contain "student2@example.com"
+    And "Student 2" row "Username" column of "generaltable" table should contain "student2"
 
   Scenario: Delete an issued certificate
     And I log in as "student1"

tests/element_helper_test.php

@@ -40,7 +40,7 @@ class mod_customcert_element_helper_testcase extends advanced_testcase {
     /**
      * Test set up.
      */
-    public function setUp() {
+    public function setUp(): void {
         $this->resetAfterTest();
     }
 

tests/email_certificate_task_test.php

@@ -38,7 +38,7 @@ class mod_customcert_task_email_certificate_task_testcase extends advanced_testc
     /**
      * Test set up.
      */
-    public function setUp() {
+    public function setUp(): void {
         $this->resetAfterTest();
     }
 

tests/external_test.php

@@ -40,7 +40,7 @@ class mod_customcert_external_test_testcase extends advanced_testcase {
     /**
      * Test set up.
      */
-    public function setUp() {
+    public function setUp(): void {
         $this->resetAfterTest();
     }
 

tests/privacy_provider_test.php

@@ -98,9 +98,9 @@ class mod_customcert_privacy_provider_testcase extends \core_privacy\tests\provi
 
         // Check this time there are 2 users.
         $this->assertCount(2, $userlist->get_userids());
-        $this->assertContains($user1->id, $userlist->get_userids());
-        $this->assertContains($user2->id, $userlist->get_userids());
-        $this->assertNotContains($user3->id, $userlist->get_userids());
+        $this->assertContains((int) $user1->id, $userlist->get_userids());
+        $this->assertContains((int) $user2->id, $userlist->get_userids());
+        $this->assertNotContains((int) $user3->id, $userlist->get_userids());
     }
 
     /**

verify_certificate.php

@@ -93,7 +93,7 @@ if ($code) {
     $result->issues = array();
 
     // Ok, now check if the code is valid.
-    $userfields = get_all_user_name_fields(true, 'u');
+    $userfields = \mod_customcert\helper::get_all_user_name_fields('u');
     $sql = "SELECT ci.id, u.id as userid, $userfields, co.id as courseid,
                    co.fullname as coursefullname, c.id as certificateid,
                    c.name as certificatename, c.verifyany

version.php

@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
 
-$plugin->version   = 2020061503; // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020061500; // Requires this Moodle version (3.9).
+$plugin->version   = 2021110501; // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051700; // Requires this Moodle version (3.11).
 $plugin->cron      = 0; // Period for cron to check this module (secs).
 $plugin->component = 'mod_customcert';
 
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->release   = "3.9.1"; // User-friendly version number.
+$plugin->release   = "3.11.1-seachefs"; // User-friendly version number.

view.php

@@ -18,7 +18,7 @@
  * Handles viewing a customcert.
  *
  * @package    mod_customcert
- * @copyright  2013 Mark Nelson <markn@moodle.com>
+ * @copyright  2013 Mark Nelson <markn@moodle.com>, 2022 Kumi Systems e.U. <office@kumi.systems>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
@@ -142,6 +142,7 @@ if (!$downloadown && !$downloadissue) {
         $link = new moodle_url('/mod/customcert/view.php', array('id' => $cm->id, 'downloadown' => true));
         $downloadbutton = new single_button($link, $linkname, 'get', true);
         $downloadbutton->class .= ' m-b-1';  // Seems a bit hackish, ahem.
+	$downloadbutton->add_action(new \popup_action('click', $link));
         $downloadbutton = $OUTPUT->render($downloadbutton);
     }