From 4a4fa18c289237d2bb138701f40166e3c30a6144 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Mon, 22 Jan 2018 19:47:44 +0800 Subject: [PATCH] #158 Fixed fatal error in PHP < 5.5 --- element/bgimage/classes/element.php | 10 +++++---- element/border/classes/element.php | 5 +++-- element/date/classes/element.php | 22 ++++++++++++-------- element/digitalsignature/classes/element.php | 10 +++++---- element/grade/classes/element.php | 17 ++++++++------- element/gradeitemname/classes/element.php | 15 +++++++------ element/image/classes/element.php | 15 +++++++------ element/teachername/classes/element.php | 5 +++-- element/text/classes/element.php | 5 +++-- element/userfield/classes/element.php | 5 +++-- element/userpicture/classes/element.php | 15 +++++++------ 11 files changed, 74 insertions(+), 50 deletions(-) diff --git a/element/bgimage/classes/element.php b/element/bgimage/classes/element.php index cbd2641..0ea4abf 100644 --- a/element/bgimage/classes/element.php +++ b/element/bgimage/classes/element.php @@ -67,11 +67,12 @@ class element extends \customcertelement_image\element { */ public function render($pdf, $preview, $user) { // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return; } - $imageinfo = json_decode($this->get_data()); + $imageinfo = json_decode($data); // If there is no file, we have nothing to display. if (empty($imageinfo->filename)) { @@ -104,11 +105,12 @@ class element extends \customcertelement_image\element { global $DB; // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return ''; } - $imageinfo = json_decode($this->get_data()); + $imageinfo = json_decode($data); // If there is no file, we have nothing to display. if (empty($imageinfo->filename)) { diff --git a/element/border/classes/element.php b/element/border/classes/element.php index 127754c..d4239cf 100644 --- a/element/border/classes/element.php +++ b/element/border/classes/element.php @@ -106,9 +106,10 @@ class element extends \mod_customcert\element { * @param \mod_customcert\edit_element_form $mform the edit_form instance */ public function definition_after_data($mform) { - if (!empty($this->get_data())) { + $data = $this->get_data(); + if (!empty($data)) { $element = $mform->getElement('width'); - $element->setValue($this->get_data()); + $element->setValue($data); } parent::definition_after_data($mform); } diff --git a/element/date/classes/element.php b/element/date/classes/element.php index a466ae3..e8a2efa 100644 --- a/element/date/classes/element.php +++ b/element/date/classes/element.php @@ -117,14 +117,15 @@ class element extends \mod_customcert\element { global $DB; // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return; } $courseid = \mod_customcert\element_helper::get_courseid($this->id); // Decode the information stored in the database. - $dateinfo = json_decode($this->get_data()); + $dateinfo = json_decode($data); $dateitem = $dateinfo->dateitem; $dateformat = $dateinfo->dateformat; @@ -179,8 +180,9 @@ class element extends \mod_customcert\element { ); } - if ($grade && !empty($grade->get_dategraded())) { - $date = $grade->get_dategraded(); + $dategraded = $grade->get_dategraded(); + if ($grade && !empty($dategraded)) { + $date = $dategraded; } } } @@ -201,12 +203,13 @@ class element extends \mod_customcert\element { */ public function render_html() { // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { - return; + $data = $this->get_data(); + if (empty($data)) { + return ''; } // Decode the information stored in the database. - $dateinfo = json_decode($this->get_data()); + $dateinfo = json_decode($data); $dateformat = $dateinfo->dateformat; return \mod_customcert\element_helper::render_html_content($this, $this->get_date_format_string(time(), $dateformat)); @@ -219,8 +222,9 @@ class element extends \mod_customcert\element { */ public function definition_after_data($mform) { // Set the item and format for this element. - if (!empty($this->get_data())) { - $dateinfo = json_decode($this->get_data()); + $data = $this->get_data(); + if (!empty($data)) { + $dateinfo = json_decode($data); $element = $mform->getElement('dateitem'); $element->setValue($dateinfo->dateitem); diff --git a/element/digitalsignature/classes/element.php b/element/digitalsignature/classes/element.php index 65c07ce..dc5b032 100644 --- a/element/digitalsignature/classes/element.php +++ b/element/digitalsignature/classes/element.php @@ -195,11 +195,12 @@ class element extends \customcertelement_image\element { */ public function render($pdf, $preview, $user) { // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return; } - $imageinfo = json_decode($this->get_data()); + $imageinfo = json_decode($data); // If there is no file, we have nothing to display. if (empty($imageinfo->filename)) { @@ -252,8 +253,9 @@ class element extends \customcertelement_image\element { $context = \context_course::instance($COURSE->id); } - if (!empty($this->get_data())) { - $imageinfo = json_decode($this->get_data()); + $data = $this->get_data(); + if (!empty($data)) { + $imageinfo = json_decode($data); $element = $mform->getElement('signaturename'); $element->setValue($imageinfo->signaturename); diff --git a/element/grade/classes/element.php b/element/grade/classes/element.php index e10a6fd..802c6d3 100644 --- a/element/grade/classes/element.php +++ b/element/grade/classes/element.php @@ -93,14 +93,15 @@ class element extends \mod_customcert\element { */ public function render($pdf, $preview, $user) { // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return; } $courseid = \mod_customcert\element_helper::get_courseid($this->id); // Decode the information stored in the database. - $gradeinfo = json_decode($this->get_data()); + $gradeinfo = json_decode($data); $gradeitem = $gradeinfo->gradeitem; $gradeformat = $gradeinfo->gradeformat; @@ -156,12 +157,13 @@ class element extends \mod_customcert\element { global $COURSE; // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { - return; + $data = $this->get_data(); + if (empty($data)) { + return ''; } // Decode the information stored in the database. - $gradeinfo = json_decode($this->get_data()); + $gradeinfo = json_decode($data); $courseitem = \grade_item::fetch_course_item($COURSE->id); @@ -183,8 +185,9 @@ class element extends \mod_customcert\element { */ public function definition_after_data($mform) { // Set the item and format for this element. - if (!empty($this->get_data())) { - $gradeinfo = json_decode($this->get_data()); + $data = $this->get_data(); + if (!empty($data)) { + $gradeinfo = json_decode($data); $element = $mform->getElement('gradeitem'); $element->setValue($gradeinfo->gradeitem); diff --git a/element/gradeitemname/classes/element.php b/element/gradeitemname/classes/element.php index 82c7435..1a8fc12 100644 --- a/element/gradeitemname/classes/element.php +++ b/element/gradeitemname/classes/element.php @@ -76,9 +76,10 @@ class element extends \mod_customcert\element { global $DB; // Check that the grade item is not empty. - if (!empty($this->get_data())) { + $data = $this->get_data(); + if (!empty($data)) { // Get the course module information. - $cm = $DB->get_record('course_modules', array('id' => $this->get_data()), '*', MUST_EXIST); + $cm = $DB->get_record('course_modules', array('id' => $data), '*', MUST_EXIST); $module = $DB->get_record('modules', array('id' => $cm->module), '*', MUST_EXIST); // Get the name of the item. @@ -100,9 +101,10 @@ class element extends \mod_customcert\element { global $DB; // Check that the grade item is not empty. - if (!empty($this->get_data())) { + $data = $this->get_data(); + if (!empty($data)) { // Get the course module information. - $cm = $DB->get_record('course_modules', array('id' => $this->get_data()), '*', MUST_EXIST); + $cm = $DB->get_record('course_modules', array('id' => $data), '*', MUST_EXIST); $module = $DB->get_record('modules', array('id' => $cm->module), '*', MUST_EXIST); // Get the name of the item. @@ -120,9 +122,10 @@ class element extends \mod_customcert\element { * @param \mod_customcert\edit_element_form $mform the edit_form instance */ public function definition_after_data($mform) { - if (!empty($this->get_data())) { + $data = $this->get_data(); + if (!empty($data)) { $element = $mform->getElement('gradeitem'); - $element->setValue($this->get_data()); + $element->setValue($data); } parent::definition_after_data($mform); } diff --git a/element/image/classes/element.php b/element/image/classes/element.php index 8261bb8..c6ebf23 100644 --- a/element/image/classes/element.php +++ b/element/image/classes/element.php @@ -174,11 +174,12 @@ class element extends \mod_customcert\element { */ public function render($pdf, $preview, $user) { // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return; } - $imageinfo = json_decode($this->get_data()); + $imageinfo = json_decode($data); // If there is no file, we have nothing to display. if (empty($imageinfo->filename)) { @@ -208,11 +209,12 @@ class element extends \mod_customcert\element { */ public function render_html() { // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return ''; } - $imageinfo = json_decode($this->get_data()); + $imageinfo = json_decode($data); // If there is no file, we have nothing to display. if (empty($imageinfo->filename)) { @@ -258,8 +260,9 @@ class element extends \mod_customcert\element { global $COURSE, $SITE; // Set the image, width and height for this element. - if (!empty($this->get_data())) { - $imageinfo = json_decode($this->get_data()); + $data = $this->get_data(); + if (!empty($data)) { + $imageinfo = json_decode($data); if (!empty($imageinfo->filename)) { if ($file = $this->get_file()) { $element = $mform->getElement('fileid'); diff --git a/element/teachername/classes/element.php b/element/teachername/classes/element.php index a2cba2d..1c60fd6 100644 --- a/element/teachername/classes/element.php +++ b/element/teachername/classes/element.php @@ -121,9 +121,10 @@ class element extends \mod_customcert\element { * @param \mod_customcert\edit_element_form $mform the edit_form instance */ public function definition_after_data($mform) { - if (!empty($this->get_data())) { + $data = $this->get_data(); + if (!empty($data)) { $element = $mform->getElement('teacher'); - $element->setValue($this->get_data()); + $element->setValue($data); } parent::definition_after_data($mform); } diff --git a/element/text/classes/element.php b/element/text/classes/element.php index 9ae500f..625926e 100644 --- a/element/text/classes/element.php +++ b/element/text/classes/element.php @@ -88,9 +88,10 @@ class element extends \mod_customcert\element { * @param \mod_customcert\edit_element_form $mform the edit_form instance */ public function definition_after_data($mform) { - if (!empty($this->get_data())) { + $data = $this->get_data(); + if (!empty($data)) { $element = $mform->getElement('text'); - $element->setValue($this->get_data()); + $element->setValue($data); } parent::definition_after_data($mform); } diff --git a/element/userfield/classes/element.php b/element/userfield/classes/element.php index 1b87086..ea096c9 100644 --- a/element/userfield/classes/element.php +++ b/element/userfield/classes/element.php @@ -164,9 +164,10 @@ class element extends \mod_customcert\element { * @param \mod_customcert\edit_element_form $mform the edit_form instance */ public function definition_after_data($mform) { - if (!empty($this->get_data())) { + $data = $this->get_data(); + if (!empty($data)) { $element = $mform->getElement('userfield'); - $element->setValue($this->get_data()); + $element->setValue($data); } parent::definition_after_data($mform); } diff --git a/element/userpicture/classes/element.php b/element/userpicture/classes/element.php index ce945cb..20be622 100644 --- a/element/userpicture/classes/element.php +++ b/element/userpicture/classes/element.php @@ -113,11 +113,12 @@ class element extends \mod_customcert\element { global $CFG; // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return; } - $imageinfo = json_decode($this->get_data()); + $imageinfo = json_decode($data); $context = \context_user::instance($user->id); @@ -157,11 +158,12 @@ class element extends \mod_customcert\element { global $PAGE, $USER; // If there is no element data, we have nothing to display. - if (empty($this->get_data())) { + $data = $this->get_data(); + if (empty($data)) { return ''; } - $imageinfo = json_decode($this->get_data()); + $imageinfo = json_decode($data); // Get the image. $userpicture = new \user_picture($USER); @@ -194,8 +196,9 @@ class element extends \mod_customcert\element { */ public function definition_after_data($mform) { // Set the image, width and height for this element. - if (!empty($this->get_data())) { - $imageinfo = json_decode($this->get_data()); + $data = $this->get_data(); + if (!empty($data)) { + $imageinfo = json_decode($data); $element = $mform->getElement('width'); $element->setValue($imageinfo->width);