moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-65705 badges: fix issued date for external badges

Browse source 
The preg_match('~^[1-9][0-9]*$~', x) calls have been replaced to
is_numeric(x).
This commit is contained in:
Sara Arjona 2019-05-24 13:59:15 +02:00
parent 383aec8a01
commit 39f4caf351
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
badges/renderer.php
View file

@ -420,12 +420,14 @@ class core_badges_renderer extends plugin_renderer_base {
$output .= $this->output->heading(get_string('issuancedetails', 'badges'), 3); $output .= $this->output->heading(get_string('issuancedetails', 'badges'), 3);
$dl = array(); $dl = array();
$issued['issuedOn'] = !preg_match( '~^[1-9][0-9]*$~', $issued['issuedOn'] ) ? if (!is_numeric($issued['issuedOn'])) {
strtotime($issued['issuedOn']) : $issued['issuedOn']; $issued['issuedOn'] = strtotime($issued['issuedOn']);
}
$dl[get_string('dateawarded', 'badges')] = userdate($issued['issuedOn']); $dl[get_string('dateawarded', 'badges')] = userdate($issued['issuedOn']);
if (isset($issued['expires'])) { if (isset($issued['expires'])) {
$issued['expires'] = !preg_match( '~^[1-9][0-9]*$~', $issued['expires'] ) ? if (!is_numeric($issued['expires'])) {
strtotime($issued['expires']) : $issued['expires']; $issued['expires'] = strtotime($issued['expires']);
}
if ($issued['expires'] < $now) { if ($issued['expires'] < $now) {
$dl[get_string('expirydate', 'badges')] = userdate($issued['expires']) . get_string('warnexpired', 'badges'); $dl[get_string('expirydate', 'badges')] = userdate($issued['expires']) . get_string('warnexpired', 'badges');
@ -508,7 +510,7 @@ class core_badges_renderer extends plugin_renderer_base {
} }
$output .= html_writer::empty_tag('img', array('src' => $issued->image, 'width' => '100')); $output .= html_writer::empty_tag('img', array('src' => $issued->image, 'width' => '100'));
if (isset($assertion->expires)) { if (isset($assertion->expires)) {
$expiration = !strtotime($assertion->expires) ? s($assertion->expires) : strtotime($assertion->expires); $expiration = is_numeric($assertion->expires) ? $assertion->expires : strtotime($assertion->expires);
if ($expiration < $today) { if ($expiration < $today) {
$output .= $this->output->pix_icon('i/expired', $output .= $this->output->pix_icon('i/expired',
get_string('expireddate', 'badges', userdate($expiration)), get_string('expireddate', 'badges', userdate($expiration)),
@ -564,7 +566,7 @@ class core_badges_renderer extends plugin_renderer_base {
$dl = array(); $dl = array();
if (isset($assertion->issued_on)) { if (isset($assertion->issued_on)) {
$issuedate = !strtotime($assertion->issued_on) ? s($assertion->issued_on) : strtotime($assertion->issued_on); $issuedate = is_numeric($assertion->issued_on) ? $assertion->issued_on : strtotime($assertion->issued_on);
$dl[get_string('dateawarded', 'badges')] = userdate($issuedate); $dl[get_string('dateawarded', 'badges')] = userdate($issuedate);
} }
if (isset($assertion->expires)) { if (isset($assertion->expires)) {