diff options
| author | jnew-gh <github@hazelden.ca> | 2021-05-17 21:30:47 +0300 |
|---|---|---|
| committer | jnew-gh <github@hazelden.ca> | 2021-05-17 21:30:47 +0300 |
| commit | f9b1f48ae324ce713f83738515da190894980fc2 (patch) | |
| tree | f4814222651dc79a6a74e770161379d1a092c07d | |
| parent | ea6bed1730ff5849546ebaf8f5ae3d242618097a (diff) | |
Replace hard-coded date format with new 'date_format' option
| -rw-r--r-- | dmarcts-report-viewer-report-data.php | 2 | ||||
| -rw-r--r-- | dmarcts-report-viewer-report-list.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dmarcts-report-viewer-report-data.php b/dmarcts-report-viewer-report-data.php index 5c862cd..aa04bc7 100644 --- a/dmarcts-report-viewer-report-data.php +++ b/dmarcts-report-viewer-report-data.php @@ -59,7 +59,7 @@ function tmpl_reportData($reportnumber, $reports, $host_lookup = 1) { $row['raw_xml'] = formatXML($row['raw_xml'], $reportnumber); $reportdata[] = "<div id='report_desc_container' class='center reportdesc_container'>"; - $reportdata[] = "<div id='report_desc' class='center reportdesc' class='hilighted' onmouseover='highlight(this);' onmouseout='unhighlight(this);' onclick='pin(this)'>Report from ".$row['org']." for ".$row['domain']."<br>(". format_date($row['mindate'], "r" ). " - ".format_date($row['maxdate'], "r" ).")<br> Policies: adkim=" . $row['policy_adkim'] . ", aspf=" . $row['policy_aspf'] . ", p=" . $row['policy_p'] . ", sp=" . $row['policy_sp'] . ", pct=" . $row['policy_pct'] . "</div>"; + $reportdata[] = "<div id='report_desc' class='center reportdesc' class='hilighted' onmouseover='highlight(this);' onmouseout='unhighlight(this);' onclick='pin(this)'>Report from ".$row['org']." for ".$row['domain']."<br>". format_date($row['mindate'], $cookie_options['date_format']). " to ".format_date($row['maxdate'], $cookie_options['date_format'])."<br> Policies: adkim=" . $row['policy_adkim'] . ", aspf=" . $row['policy_aspf'] . ", p=" . $row['policy_p'] . ", sp=" . $row['policy_sp'] . ", pct=" . $row['policy_pct'] . "</div>"; $reportdata[] = "<div style='display:inline-block;margin-left:20px;'><img src='xml.png' id='xml_html_img' width='30px' alt='Show Raw Report XML' title='Show Raw Report XML' onclick='report_data_xml_display_toggle()'></div>"; diff --git a/dmarcts-report-viewer-report-list.php b/dmarcts-report-viewer-report-list.php index 1136af7..06bf0d6 100644 --- a/dmarcts-report-viewer-report-list.php +++ b/dmarcts-report-viewer-report-list.php @@ -80,8 +80,8 @@ function tmpl_reportList($reports, $sort) { $reportlist[] = " <td class='circle_container'><span class='status_sort_key'>" . get_dmarc_result($row)['status_sort_key'] . "</span></td>"; // Col 0 $reportlist[] = " <td class='circle_container'><div style='white-space: nowrap;' title='DMARC: " . get_dmarc_result($row)['result'] . "\nSPF/DKIM/DMARC: " . get_report_status($row)['status_text'] . "\n" . $title_message_tr . "'><div class='circle circle_left circle_" . get_dmarc_result($row)['color'] . "'></div><div class='circle circle_right circle_" . get_report_status($row)['color'] . "'></div></div></td>"; // Col 0 $reportlist[] = " <td class='circle_container'><span class='status_sort_key'>" . get_report_status($row)['status_sort_key'] . "</span></span></td>"; // Col 0 - $reportlist[] = " <td class='right'>". format_date($row['mindate'], $date_output_format). "</td>"; // Col 1 - $reportlist[] = " <td class='right'>". format_date($row['maxdate'], $date_output_format). "</td>"; // Col 3 + $reportlist[] = " <td class='right'>". format_date($row['mindate'], $cookie_options['date_format']). "</td>"; // Col 1 + $reportlist[] = " <td class='right'>". format_date($row['maxdate'], $cookie_options['date_format']). "</td>"; // Col 3 $reportlist[] = " <td class='center'>". $row['domain']. "</td>"; // Col 5 $reportlist[] = " <td class='center'>". $row['org']. "</td>"; // Col 6 $reportlist[] = " <td class='center'>". $row['reportid'] . "</td>"; |