cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing issue where AM/PM are not handled correctly in campaign scheduling

attachment-support
Jordan Wright 2016-08-16 19:27:01 -05:00
parent ac62f33e80
commit bccf7f2fd2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/app/campaign_results.js
View File

@ -258,7 +258,7 @@ function renderTimeline(data) {
' <div class="timeline-icon ' + statuses[event.message].label + '">' + ' <div class="timeline-icon ' + statuses[event.message].label + '">' +
' <i class="fa ' + statuses[event.message].icon + '"></i></div>' + ' <i class="fa ' + statuses[event.message].icon + '"></i></div>' +
' <div class="timeline-message">' + escapeHtml(event.message) + ' <div class="timeline-message">' + escapeHtml(event.message) +
' <span class="timeline-date">' + moment(event.time).format('MMMM Do YYYY h:mm') + '</span>' ' <span class="timeline-date">' + moment(event.time).format('MMMM Do YYYY h:mm a') + '</span>'
if (event.details && event.message == "Submitted Data") { if (event.details && event.message == "Submitted Data") {
results += '<div class="timeline-replay-button"><button onclick="replay(' + i + ')" class="btn btn-success">' results += '<div class="timeline-replay-button"><button onclick="replay(' + i + ')" class="btn btn-success">'
results += '<i class="fa fa-refresh"></i> Replay Credentials</button></div>' results += '<i class="fa fa-refresh"></i> Replay Credentials</button></div>'
@ -449,7 +449,7 @@ function load() {
type: Chartist.FixedScaleAxis, type: Chartist.FixedScaleAxis,
divisor: 5, divisor: 5,
labelInterpolationFnc: function(value) { labelInterpolationFnc: function(value) {
return moment(value).format('MMMM Do YYYY h:mm') return moment(value).format('MMMM Do YYYY h:mm a')
} }
}, },
axisY: { axisY: {

2
static/js/app/campaigns.js
View File

@ -44,7 +44,7 @@ function launch() {
smtp: { smtp: {
name: $("#profile").val() name: $("#profile").val()
}, },
launch_date: moment($("#launch_date").val(), "MM/DD/YYYY HH:mm").format(), launch_date: moment($("#launch_date").val(), "MM/DD/YYYY hh:mm a").format(),
groups: groups groups: groups
} }
// Submit the campaign // Submit the campaign