diff --git a/classes/element.php b/classes/element.php
index 9c55060..0a9ebfa 100644
--- a/classes/element.php
+++ b/classes/element.php
@@ -129,7 +129,7 @@ abstract class element {
$element->name = $data->name;
$element->data = $this->save_unique_data($data);
$element->font = (isset($data->font)) ? $data->font : null;
- $element->size = (isset($data->size)) ? $data->size : null;
+ $element->fontsize = (isset($data->fontsize)) ? $data->fontsize : null;
$element->colour = (isset($data->colour)) ? $data->colour : null;
if ($this->showposxy) {
$element->posx = (isset($data->posx)) ? $data->posx : null;
diff --git a/classes/element_helper.php b/classes/element_helper.php
index 39cfe6d..d12b84c 100644
--- a/classes/element_helper.php
+++ b/classes/element_helper.php
@@ -61,7 +61,7 @@ class element_helper {
*/
public static function render_content($pdf, $element, $content) {
list($font, $attr) = self::get_font($element);
- $pdf->setFont($font, $attr, $element->size);
+ $pdf->setFont($font, $attr, $element->fontsize);
$fontcolour = \TCPDF_COLORS::convertHTMLColorToDec($element->colour, $fontcolour);
$pdf->SetTextColor($fontcolour['R'], $fontcolour['G'], $fontcolour['B']);
@@ -120,7 +120,7 @@ class element_helper {
$fontstyle .= '; font-style: italic';
}
- $style = $fontstyle . '; color: ' . $element->colour . '; font-size: ' . $element->size . 'pt;';
+ $style = $fontstyle . '; color: ' . $element->colour . '; font-size: ' . $element->fontsize . 'pt;';
if ($element->width) {
$style .= ' width: ' . $element->width . 'mm';
}
@@ -137,10 +137,10 @@ class element_helper {
$mform->setType('font', PARAM_TEXT);
$mform->setDefault('font', 'times');
$mform->addHelpButton('font', 'font', 'customcert');
- $mform->addElement('select', 'size', get_string('fontsize', 'customcert'), \mod_customcert\certificate::get_font_sizes());
- $mform->setType('size', PARAM_INT);
- $mform->setDefault('size', 12);
- $mform->addHelpButton('size', 'fontsize', 'customcert');
+ $mform->addElement('select', 'fontsize', get_string('fontsize', 'customcert'), \mod_customcert\certificate::get_font_sizes());
+ $mform->setType('fontsize', PARAM_INT);
+ $mform->setDefault('fontsize', 12);
+ $mform->addHelpButton('fontsize', 'fontsize', 'customcert');
}
/**
diff --git a/db/install.xml b/db/install.xml
index 44902c6..1fbf109 100644
--- a/db/install.xml
+++ b/db/install.xml
@@ -78,7 +78,7 @@
-
+
diff --git a/db/upgrade.php b/db/upgrade.php
index c927b3a..7d77093 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -121,5 +121,19 @@ function xmldb_customcert_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2016120508, 'customcert');
}
+ if ($oldversion < 2016120512) {
+ $table = new xmldb_table('customcert_elements');
+ $field = new xmldb_field('size');
+
+ // Rename column as it is a reserved word in Oracle.
+ if ($dbman->field_exists($table, $field)) {
+ $field->set_attributes(XMLDB_TYPE_INTEGER, '10', null, null, null, null, 'font');
+ $dbman->rename_field($table, $field, 'fontsize');
+ }
+
+ // Savepoint reached.
+ upgrade_mod_savepoint(true, 2016120512, 'customcert');
+ }
+
return true;
}
diff --git a/version.php b/version.php
index c94e0cc..3de88b4 100644
--- a/version.php
+++ b/version.php
@@ -24,10 +24,10 @@
defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
-$plugin->version = 2016120511; // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2016120512; // The current module version (Date: YYYYMMDDXX).
$plugin->requires = 2016120500; // Requires this Moodle version (3.2).
$plugin->cron = 0; // Period for cron to check this module (secs).
$plugin->component = 'mod_customcert';
$plugin->maturity = MATURITY_STABLE;
-$plugin->release = "3.2 release (Build: 2016120511)"; // User-friendly version number.
+$plugin->release = "3.2 release (Build: 2016120512)"; // User-friendly version number.