diff --git a/assets/js/controllers.js b/assets/js/controllers.js index deef8b5..13cbfeb 100644 --- a/assets/js/controllers.js +++ b/assets/js/controllers.js @@ -57,7 +57,7 @@ mailhogApp.controller('MailCtrl', function ($scope, $http, $sce, $timeout) { $scope.startEvent = function(name, args, glyphicon) { var eID = guid(); - console.log("Starting event '" + name + "' with id '" + eID + "'") + //console.log("Starting event '" + name + "' with id '" + eID + "'") var e = { id: eID, name: name, @@ -82,9 +82,9 @@ mailhogApp.controller('MailCtrl', function ($scope, $http, $sce, $timeout) { e.complete = true; $scope.eventDone++; if(this.failed) { - console.log("Failed event '" + e.name + "' with id '" + eID + "'") + // console.log("Failed event '" + e.name + "' with id '" + eID + "'") } else { - console.log("Completed event '" + e.name + "' with id '" + eID + "'") + // console.log("Completed event '" + e.name + "' with id '" + eID + "'") $timeout(function() { e.remove(); }, 10000); @@ -96,7 +96,7 @@ mailhogApp.controller('MailCtrl', function ($scope, $http, $sce, $timeout) { this.done(); }, remove: function() { - console.log("Deleted event '" + e.name + "' with id '" + eID + "'") + // console.log("Deleted event '" + e.name + "' with id '" + eID + "'") if(e.failed) { $scope.eventFailed--; } @@ -160,46 +160,40 @@ mailhogApp.controller('MailCtrl', function ($scope, $http, $sce, $timeout) { } $scope.getMessagePlain = function(message) { - var part; - - if(message.MIME) { - for(var p in message.MIME.Parts) { - if("Content-Type" in message.MIME.Parts[p].Headers) { - if(message.MIME.Parts[p].Headers["Content-Type"].length > 0) { - if(message.MIME.Parts[p].Headers["Content-Type"][0].match(/text\/plain;?.*/)) { - part = message.MIME.Parts[p]; - break; - } - } - } - } + var l = $scope.findMatchingMIME(message, "text/plain"); + if(l != null && l !== "undefined") { + return l.Body; + } + return message.Content.Body; } - if(!part) part = message.Content; - - return part.Body; + $scope.findMatchingMIME = function(part, mime) { + if(part.MIME) { + for(var p in part.MIME.Parts) { + if("Content-Type" in part.MIME.Parts[p].Headers) { + if(part.MIME.Parts[p].Headers["Content-Type"].length > 0) { + if(part.MIME.Parts[p].Headers["Content-Type"][0].match(mime + ";?.*")) { + return part.MIME.Parts[p]; + } else if (part.MIME.Parts[p].Headers["Content-Type"][0].match(/multipart\/.*/)) { + var f = $scope.findMatchingMIME(part.MIME.Parts[p], mime); + if(f != null) { + return f; + } + } + } + } + } + } + return null; } $scope.getMessageHTML = function(message) { - var part; - - if(message.MIME) { - for(var p in message.MIME.Parts) { - if("Content-Type" in message.MIME.Parts[p].Headers) { - if(message.MIME.Parts[p].Headers["Content-Type"].length > 0) { - if(message.MIME.Parts[p].Headers["Content-Type"][0].match(/text\/html;?.*/)) { - part = message.MIME.Parts[p]; - break; - } - } - } - } + var l = $scope.findMatchingMIME(message, "text/html"); + if(l != null && l !== "undefined") { + return l.Body; + } + return ""; } - if(!part) part = message.Content; - - return part.Body; - } - $scope.date = function(timestamp) { return (new Date(timestamp)).toString(); }; diff --git a/bindata.go b/bindata.go index 46edd32..8c0a20f 100644 --- a/bindata.go +++ b/bindata.go @@ -449,160 +449,168 @@ func assets_images_hog_png() ([]byte, error) { func assets_js_controllers_js() ([]byte, error) { return bindata_read([]byte{ - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xec, 0x18, - 0x5b, 0x6b, 0x1b, 0xc7, 0xfa, 0x59, 0xfa, 0x15, 0x73, 0xf6, 0x18, 0xb4, - 0x1b, 0x4b, 0x2b, 0x1b, 0x0e, 0xe7, 0xc1, 0x22, 0x0d, 0xa9, 0xed, 0x10, - 0x17, 0xbb, 0x09, 0x71, 0x1e, 0x0a, 0x8e, 0x29, 0x63, 0xed, 0x48, 0xbb, - 0x64, 0x6f, 0xcc, 0x8c, 0xa4, 0x98, 0xa0, 0xff, 0xde, 0x6f, 0xee, 0xb3, - 0x37, 0x59, 0x24, 0xf4, 0xa1, 0xd0, 0xd0, 0x46, 0xd9, 0xf9, 0xae, 0xf3, - 0xdd, 0xbf, 0xd9, 0x62, 0x8a, 0x0a, 0x9c, 0xe5, 0x69, 0xb5, 0x7e, 0x5b, - 0xd7, 0xe8, 0x35, 0xc2, 0xe5, 0x7a, 0x93, 0x63, 0x1a, 0x17, 0x55, 0xb2, - 0xc9, 0x49, 0x38, 0x71, 0xc0, 0xc9, 0x14, 0x3d, 0x3c, 0x46, 0x8b, 0xf1, - 0x78, 0xb5, 0x29, 0x97, 0x3c, 0xab, 0x4a, 0xb4, 0xde, 0x64, 0x49, 0x18, - 0xa1, 0xef, 0x63, 0x84, 0xec, 0x19, 0xfb, 0x9f, 0x3e, 0x41, 0x88, 0x12, - 0xbe, 0xa1, 0x25, 0xba, 0xc3, 0x3c, 0x8d, 0x57, 0x79, 0x55, 0xd1, 0x30, - 0x3c, 0x47, 0xa7, 0xea, 0x9b, 0xe2, 0x32, 0xa9, 0x8a, 0x30, 0x8a, 0xd0, - 0x2b, 0x74, 0xf6, 0xed, 0xfc, 0x0c, 0xfe, 0x44, 0x92, 0xc8, 0xfb, 0x13, - 0xf3, 0xea, 0x9e, 0xd3, 0xac, 0x5c, 0x87, 0xe7, 0xff, 0xef, 0x02, 0xd9, - 0xe6, 0x89, 0x69, 0x28, 0x28, 0x85, 0xd0, 0x7e, 0x6c, 0x25, 0x4a, 0x1d, - 0x4e, 0xcd, 0xcf, 0x64, 0x36, 0x39, 0xf4, 0xe1, 0x18, 0xf7, 0xa1, 0x78, - 0x3f, 0x8b, 0xf1, 0x7e, 0x3c, 0x76, 0xe6, 0x88, 0x97, 0x55, 0xc9, 0x69, - 0x95, 0xe7, 0x84, 0x86, 0x93, 0x3b, 0x38, 0xbe, 0xe4, 0x34, 0x07, 0x1b, - 0x59, 0x4b, 0x84, 0x27, 0x6c, 0x59, 0xd5, 0x64, 0x8a, 0x4e, 0x52, 0xce, - 0x6b, 0xf8, 0x61, 0x4b, 0xf1, 0xc1, 0xb3, 0x82, 0x54, 0x1b, 0xae, 0x8c, - 0xa4, 0x50, 0xe2, 0x25, 0x5e, 0xa6, 0x04, 0x8c, 0xff, 0x7d, 0xbf, 0x70, - 0x87, 0x35, 0x25, 0xdb, 0x8c, 0xec, 0xde, 0xe6, 0xf9, 0x7b, 0x82, 0x13, - 0x42, 0x19, 0x20, 0xac, 0x70, 0xce, 0x08, 0xb8, 0xc0, 0x22, 0x91, 0x2d, - 0x29, 0x39, 0xfb, 0x48, 0xca, 0x04, 0x2c, 0xd1, 0xe6, 0x20, 0x81, 0x97, - 0xd5, 0xa6, 0xe4, 0x00, 0x39, 0x6b, 0x03, 0xae, 0xaa, 0x92, 0xf4, 0x9d, - 0xbf, 0x83, 0xbb, 0x90, 0x44, 0x41, 0x1c, 0x28, 0xc5, 0xec, 0x5a, 0x40, - 0xef, 0xab, 0x0d, 0x5d, 0x12, 0xa7, 0x8a, 0x45, 0x60, 0x06, 0x50, 0x6e, - 0xf2, 0x5c, 0x51, 0x86, 0xc6, 0x16, 0x36, 0x24, 0x34, 0x2e, 0xfc, 0x5f, - 0x82, 0x6b, 0x09, 0x2e, 0x42, 0xe5, 0xbb, 0xc8, 0x17, 0xc5, 0xab, 0xf5, - 0x3a, 0x27, 0x0a, 0x2e, 0x04, 0x0d, 0x30, 0x31, 0x02, 0x95, 0x44, 0xf4, - 0xa6, 0x8f, 0x39, 0xba, 0xb0, 0x26, 0xce, 0x2b, 0x46, 0x1a, 0x32, 0xc7, - 0x3d, 0xea, 0x1c, 0x21, 0x0e, 0x95, 0x64, 0x87, 0x3c, 0x53, 0x84, 0x93, - 0x39, 0xae, 0xb3, 0xf9, 0xf6, 0x7c, 0xae, 0x7c, 0x31, 0x91, 0xdc, 0x5b, - 0x64, 0x31, 0x4e, 0x12, 0x49, 0x73, 0x9b, 0x31, 0x4e, 0x4a, 0x11, 0x32, - 0x05, 0x61, 0x0c, 0xaf, 0x89, 0x17, 0x31, 0x21, 0x31, 0x22, 0x2d, 0xf5, - 0x09, 0xae, 0xeb, 0xfc, 0xb9, 0x6b, 0x47, 0x0f, 0x45, 0xf3, 0x61, 0x71, - 0xbd, 0x61, 0x69, 0xf8, 0xdb, 0xfd, 0x87, 0xdf, 0xe3, 0x1a, 0x53, 0x46, - 0x42, 0x12, 0x27, 0x98, 0xe3, 0x48, 0xab, 0xa3, 0x8c, 0x2c, 0x7f, 0xa7, - 0xca, 0x77, 0x47, 0xea, 0x29, 0x8c, 0xf3, 0xd3, 0x4a, 0x76, 0xa2, 0x87, - 0xd3, 0x0d, 0xf9, 0x49, 0xc5, 0x08, 0xa5, 0x15, 0x1d, 0xd0, 0x6c, 0x3e, - 0xcf, 0x56, 0x60, 0x00, 0x70, 0x69, 0xf2, 0x7c, 0xcf, 0x31, 0x97, 0x61, - 0xe2, 0x69, 0x10, 0x5f, 0xde, 0x7e, 0xb8, 0xbf, 0xbe, 0xea, 0xd1, 0xf4, - 0xd0, 0x65, 0x8e, 0x48, 0x86, 0xe6, 0x8d, 0x84, 0x22, 0xfb, 0xee, 0xdd, - 0xbc, 0xd0, 0xf3, 0xc2, 0xf2, 0xc5, 0xd8, 0x53, 0xc8, 0x61, 0x9f, 0x79, - 0x6c, 0xda, 0x1d, 0xa5, 0xe4, 0xde, 0x4b, 0x36, 0xc6, 0x31, 0xe5, 0x12, - 0xcf, 0x97, 0x5f, 0xe2, 0x02, 0x6a, 0x15, 0xa6, 0x6b, 0x36, 0x45, 0xeb, - 0xfc, 0xb9, 0x4e, 0x33, 0xa8, 0x76, 0x46, 0x29, 0xd1, 0x33, 0xc8, 0xcd, - 0x15, 0xe0, 0xab, 0x06, 0xa0, 0xa4, 0x02, 0x02, 0xab, 0x72, 0x12, 0xe7, - 0xd5, 0x3a, 0x0c, 0xee, 0x05, 0x57, 0x51, 0x91, 0x64, 0x4e, 0xa0, 0x49, - 0x00, 0x35, 0x54, 0xf0, 0x84, 0x9f, 0x60, 0x82, 0x76, 0x19, 0x4f, 0x51, - 0x96, 0xa8, 0x63, 0xc1, 0x49, 0x9c, 0x06, 0x91, 0x63, 0x2e, 0x0a, 0x99, - 0x36, 0x60, 0x96, 0x5c, 0x08, 0x94, 0xa9, 0xfe, 0x14, 0x4c, 0x2e, 0xe4, - 0xdf, 0xe6, 0x44, 0x5e, 0x80, 0x00, 0x96, 0xc8, 0xcb, 0x2b, 0x70, 0x75, - 0x18, 0x19, 0xd0, 0xb2, 0x2a, 0xea, 0x9c, 0x70, 0x20, 0x90, 0x57, 0x37, - 0xc7, 0x2b, 0x59, 0xe0, 0x5a, 0x87, 0xe2, 0xae, 0x17, 0xea, 0xc6, 0xfa, - 0xc4, 0xde, 0xfb, 0xc2, 0xfd, 0xd3, 0xc2, 0x08, 0xbf, 0xcc, 0x31, 0x03, - 0x8a, 0xde, 0x40, 0x99, 0xcf, 0xd1, 0xbb, 0x9b, 0x3f, 0xee, 0xae, 0xd1, - 0x53, 0xc6, 0x41, 0x59, 0xc6, 0x9f, 0x2d, 0x08, 0xe2, 0x92, 0xa7, 0x19, - 0x8b, 0x95, 0x12, 0xcd, 0xe8, 0xd2, 0xed, 0x2b, 0x78, 0x5a, 0xcf, 0x12, - 0xe8, 0xc3, 0x84, 0x06, 0x2e, 0xa2, 0x3a, 0x0c, 0xcc, 0xe5, 0x06, 0x59, - 0xb0, 0xcd, 0x72, 0x09, 0xb5, 0xa1, 0x8f, 0x87, 0x87, 0xb5, 0xc3, 0xb4, - 0x04, 0x47, 0x05, 0x0b, 0xa1, 0x74, 0xad, 0xfa, 0x88, 0xc9, 0x4b, 0x73, - 0xdb, 0x04, 0x3a, 0xc5, 0xe0, 0x4d, 0x13, 0x22, 0xb4, 0xe8, 0xed, 0x47, - 0x0f, 0xe0, 0xb8, 0x47, 0x8b, 0x6a, 0x3c, 0x2b, 0xb4, 0x77, 0xa9, 0x42, - 0xec, 0x45, 0x5a, 0x55, 0xa1, 0xdb, 0xac, 0x4e, 0x4f, 0x17, 0x47, 0x99, - 0xb1, 0x11, 0x89, 0xba, 0x9b, 0x79, 0x71, 0x48, 0xe2, 0xe3, 0x22, 0x51, - 0x9a, 0x00, 0x11, 0x88, 0x91, 0x61, 0xee, 0x97, 0x5a, 0xf7, 0x1f, 0x16, - 0x80, 0xec, 0x40, 0x30, 0x54, 0x72, 0x84, 0x89, 0x28, 0x29, 0xaa, 0xad, - 0xcd, 0x7c, 0xe3, 0x1d, 0xa4, 0xc6, 0xa6, 0x45, 0xc7, 0xc1, 0x7b, 0x3f, - 0xd2, 0x07, 0x1c, 0xd7, 0xed, 0xf8, 0xbe, 0x79, 0x3d, 0xdb, 0x76, 0xdc, - 0x22, 0x61, 0x22, 0x24, 0x9c, 0x3e, 0x56, 0xa0, 0x52, 0x74, 0x40, 0x64, - 0xc3, 0x72, 0x57, 0xe4, 0xa7, 0xec, 0x26, 0xcb, 0x7b, 0x9f, 0xf3, 0xbb, - 0xf7, 0x9a, 0xcd, 0xba, 0x16, 0x82, 0x98, 0x7e, 0x21, 0x6c, 0x87, 0xc3, - 0xd0, 0xe7, 0xd7, 0x19, 0xb4, 0x7c, 0xa0, 0xce, 0xb2, 0x46, 0x6f, 0xd0, - 0xdd, 0xa0, 0x51, 0xa8, 0xbb, 0xc2, 0xc1, 0xe6, 0xa4, 0x8b, 0x22, 0x05, - 0x18, 0x2f, 0x69, 0xe6, 0x9d, 0x7a, 0x6e, 0xc6, 0x81, 0xab, 0x8c, 0xd5, - 0x39, 0x7e, 0x96, 0xfe, 0xeb, 0x78, 0x43, 0x13, 0x9f, 0x84, 0x93, 0xff, - 0x1a, 0xfc, 0x99, 0x18, 0x67, 0x71, 0x06, 0x9d, 0x15, 0x71, 0xfc, 0x94, - 0x13, 0xc4, 0x9f, 0xaa, 0xe4, 0x19, 0x5c, 0x3f, 0x89, 0xe2, 0x9c, 0x94, - 0x6b, 0x9e, 0xb6, 0x04, 0x51, 0xb2, 0xa2, 0x84, 0xa5, 0x7d, 0xec, 0x4d, - 0xa6, 0x77, 0x5a, 0x4c, 0x18, 0xdc, 0x56, 0x58, 0x4e, 0xaa, 0x46, 0x6c, - 0x30, 0x95, 0x8d, 0x6b, 0x8a, 0x02, 0x5b, 0x63, 0x67, 0x49, 0xb5, 0x2b, - 0x73, 0xc0, 0x0b, 0x4c, 0xa7, 0x13, 0xf3, 0x73, 0x0c, 0x25, 0xd7, 0x8d, - 0x5a, 0x86, 0x1c, 0x94, 0xd3, 0x65, 0xce, 0xa5, 0x8f, 0x9c, 0x7a, 0xda, - 0x33, 0x8a, 0x21, 0x00, 0xad, 0x04, 0xdc, 0xb8, 0x83, 0x34, 0x02, 0x79, - 0xdf, 0xee, 0xce, 0xfa, 0x8e, 0x61, 0x63, 0x3c, 0x65, 0x10, 0x39, 0x4b, - 0x7e, 0xa7, 0x18, 0xfa, 0xd7, 0xd7, 0x32, 0x94, 0xec, 0x11, 0x44, 0xa8, - 0x3f, 0xdd, 0x3f, 0x68, 0x68, 0x7c, 0x93, 0x3c, 0x6a, 0x8c, 0x51, 0x73, - 0xd0, 0x77, 0x06, 0xeb, 0x10, 0x2c, 0x6c, 0x7a, 0xc1, 0x1e, 0xb5, 0x53, - 0xea, 0x8e, 0xbc, 0xda, 0xd4, 0xc3, 0x4a, 0x53, 0x1b, 0xca, 0xe3, 0x5d, - 0x02, 0x1e, 0x71, 0x92, 0x7b, 0xfd, 0x32, 0xc3, 0x39, 0x17, 0xbe, 0x19, - 0x81, 0xe0, 0x03, 0xbe, 0x99, 0x8b, 0x35, 0xca, 0xb1, 0x3a, 0xe0, 0x29, - 0xc1, 0x08, 0x0d, 0x5e, 0xde, 0xba, 0x6c, 0xa4, 0x33, 0x17, 0x3e, 0xcc, - 0x45, 0xdf, 0x7f, 0xbe, 0xbb, 0x55, 0xb7, 0x82, 0xb5, 0x81, 0x6e, 0x18, - 0x7f, 0xcb, 0xde, 0xf3, 0x22, 0x37, 0x96, 0x07, 0xbd, 0xb4, 0x9f, 0x04, - 0x62, 0xe8, 0xe6, 0xe1, 0xd1, 0xa8, 0xbd, 0x66, 0x79, 0x81, 0x21, 0x80, - 0xc7, 0xfb, 0xa4, 0xe9, 0x95, 0x76, 0x58, 0x8d, 0x4c, 0x5c, 0x8d, 0xf6, - 0xad, 0xfc, 0x51, 0x5b, 0x8e, 0xb7, 0xda, 0x19, 0xab, 0x6c, 0x71, 0xde, - 0x1a, 0xff, 0xfa, 0x36, 0x41, 0xc0, 0x5a, 0xd8, 0x64, 0x13, 0xb3, 0xdb, - 0x2e, 0x83, 0x8d, 0x7a, 0x07, 0xd1, 0xc9, 0x6f, 0x4a, 0x4e, 0x28, 0xc0, - 0xfb, 0x3a, 0x0a, 0x44, 0xa5, 0xc7, 0x5f, 0x9f, 0x88, 0x3a, 0x90, 0x66, - 0x09, 0x99, 0xa5, 0x8a, 0xbd, 0x4d, 0xf9, 0x66, 0x69, 0xd5, 0x12, 0x96, - 0x39, 0xc1, 0xd4, 0xca, 0xe0, 0x8d, 0xa6, 0xd4, 0x35, 0x85, 0xed, 0x49, - 0xed, 0x4e, 0xaa, 0xe5, 0xb2, 0xb4, 0xda, 0xfd, 0xad, 0x72, 0xcd, 0xf8, - 0x7d, 0x7e, 0x16, 0xb5, 0x6b, 0xa5, 0x0b, 0x8f, 0x8f, 0x39, 0x94, 0xbe, - 0xe1, 0x5c, 0x16, 0x36, 0x86, 0xa5, 0x8a, 0xcb, 0x32, 0x20, 0x32, 0xdb, - 0xc4, 0xc1, 0xdd, 0xcd, 0xdd, 0xb5, 0xc9, 0xe6, 0x55, 0x45, 0x43, 0x89, - 0x88, 0x80, 0x95, 0x8f, 0x10, 0x7f, 0x04, 0x52, 0xd6, 0xb2, 0x39, 0x8c, - 0x0e, 0x70, 0x15, 0x68, 0x18, 0x9f, 0x9f, 0x6b, 0x12, 0xf4, 0x93, 0x3c, - 0xd4, 0x8f, 0xb1, 0xf6, 0x78, 0xd3, 0x22, 0x2d, 0x0d, 0x3a, 0xd8, 0x0f, - 0x4d, 0xee, 0x8f, 0xda, 0xac, 0xe8, 0x17, 0x74, 0xe6, 0x18, 0x8d, 0x46, - 0xed, 0x9b, 0xbc, 0xc8, 0xe7, 0xe1, 0xec, 0x31, 0x2e, 0x30, 0x5f, 0xa6, - 0xe1, 0x9c, 0x93, 0x6f, 0xfc, 0xcb, 0xbc, 0x16, 0x76, 0x5b, 0xbc, 0x89, - 0x5f, 0xcd, 0xa3, 0x06, 0xe3, 0x91, 0xb0, 0x96, 0xab, 0x42, 0x4d, 0xee, - 0x0b, 0x0f, 0xef, 0x09, 0x36, 0x9f, 0xaf, 0xde, 0xc1, 0xde, 0x9f, 0x70, - 0x1a, 0xce, 0x14, 0x30, 0xf8, 0x6f, 0x2c, 0x94, 0xfe, 0x8f, 0x60, 0x1f, - 0xa1, 0x96, 0x10, 0xad, 0x2b, 0x38, 0x69, 0xa4, 0x1b, 0x9c, 0x40, 0x88, - 0x7f, 0x85, 0x3e, 0xd6, 0xaa, 0xeb, 0xcd, 0xba, 0x70, 0x8c, 0xdf, 0xe1, - 0xe3, 0x5f, 0xd7, 0x37, 0x5c, 0x9f, 0x42, 0x9d, 0xfd, 0xc7, 0x78, 0xde, - 0xb9, 0x3e, 0x91, 0x8f, 0x01, 0xce, 0xe1, 0x62, 0xfa, 0x86, 0x6e, 0x58, - 0xd4, 0xda, 0x97, 0x9a, 0x3e, 0xb4, 0xdb, 0xa4, 0x43, 0x88, 0xdc, 0x83, - 0xa4, 0x2a, 0x25, 0xfe, 0x54, 0xa0, 0xe6, 0x49, 0x28, 0xd1, 0xdd, 0x81, - 0x68, 0x24, 0xea, 0x1c, 0x34, 0xd0, 0x55, 0x46, 0x8b, 0x99, 0xc2, 0x83, - 0x16, 0x9a, 0x43, 0xb5, 0x2b, 0xaa, 0x04, 0x4a, 0xd9, 0x44, 0xd4, 0xc0, - 0x49, 0xa7, 0x3a, 0x51, 0xc0, 0xc4, 0x8c, 0x7c, 0x28, 0x87, 0x87, 0x8c, - 0x16, 0xae, 0x7a, 0x02, 0x6c, 0x74, 0x7e, 0x21, 0x5a, 0x33, 0x9a, 0x41, - 0x4b, 0xea, 0x97, 0xe9, 0x7a, 0xaf, 0x52, 0xf2, 0x93, 0x22, 0xe8, 0x19, - 0x71, 0xac, 0xd8, 0x21, 0xb6, 0xa2, 0x8d, 0x98, 0x17, 0x30, 0xf9, 0xb6, - 0x6c, 0x79, 0xb4, 0x35, 0x5d, 0x0c, 0xe9, 0x6f, 0xdf, 0x0f, 0x0f, 0x4e, - 0x2d, 0x9f, 0x2c, 0xc5, 0x8b, 0x73, 0x0b, 0x4b, 0x31, 0x25, 0x41, 0xa4, - 0x79, 0xaa, 0x89, 0xa5, 0xae, 0xd8, 0xcb, 0x23, 0x8b, 0x78, 0x0c, 0x9e, - 0xeb, 0x6b, 0x4e, 0xa6, 0x36, 0xca, 0x49, 0x21, 0xd7, 0x2a, 0xdf, 0x06, - 0x9a, 0x66, 0x26, 0x41, 0x60, 0x0d, 0xd1, 0xa1, 0xec, 0x33, 0x44, 0x0a, - 0xb2, 0xfa, 0xd1, 0x59, 0xc1, 0xeb, 0x99, 0x00, 0xb7, 0x49, 0xea, 0x8a, - 0x1e, 0x22, 0x11, 0xe0, 0x26, 0xc9, 0xbe, 0x67, 0xbc, 0x72, 0x79, 0xd9, - 0x1e, 0x73, 0x63, 0xf9, 0x76, 0xe6, 0x30, 0xe1, 0xd3, 0x47, 0x16, 0x7b, - 0x95, 0xeb, 0xa5, 0x44, 0x61, 0x8b, 0x9d, 0x84, 0xd2, 0xe6, 0xa0, 0xdc, - 0xa8, 0xa8, 0xee, 0x9d, 0x69, 0xb8, 0x98, 0xda, 0xd7, 0xaa, 0x20, 0x90, - 0x35, 0xf5, 0x24, 0x26, 0x30, 0x57, 0x85, 0xad, 0x3c, 0x36, 0x35, 0xc8, - 0x7b, 0xdb, 0xfb, 0x3a, 0x45, 0x5b, 0x53, 0x6d, 0x35, 0x93, 0xd3, 0xd7, - 0xe8, 0xab, 0x58, 0x0b, 0x2f, 0x90, 0xd8, 0x11, 0xb7, 0xe2, 0x9f, 0x5f, - 0x4a, 0xc5, 0x56, 0x0e, 0x5c, 0x0e, 0x4d, 0x9d, 0x7b, 0x07, 0x6d, 0x79, - 0xaa, 0x50, 0x98, 0xdc, 0x57, 0x78, 0x9d, 0xc2, 0x61, 0x12, 0xfc, 0x52, - 0x25, 0xc9, 0x0f, 0xe4, 0x79, 0x3b, 0x39, 0x06, 0x42, 0x5b, 0xae, 0xc6, - 0x22, 0xb2, 0x81, 0xf8, 0xe0, 0xa2, 0xa4, 0xb6, 0xed, 0xd9, 0x32, 0xa3, - 0x30, 0x1b, 0xa9, 0x6d, 0x49, 0x0f, 0xe4, 0x4a, 0xfa, 0x71, 0xfb, 0x52, - 0x6b, 0x1b, 0xf1, 0x76, 0x9e, 0xde, 0xc5, 0xc2, 0xbd, 0x33, 0xba, 0xb8, - 0x32, 0x36, 0xef, 0xb3, 0xd8, 0xe1, 0xfa, 0x75, 0x8c, 0x19, 0x5e, 0x4c, - 0x70, 0x65, 0x87, 0xa3, 0x0c, 0xf0, 0xf2, 0x52, 0x62, 0xcc, 0xe1, 0xf6, - 0x37, 0x7d, 0xf7, 0xf8, 0xcf, 0x2c, 0x11, 0xcf, 0xc8, 0x86, 0x1a, 0x3e, - 0xa3, 0xee, 0x12, 0x61, 0xcc, 0xd3, 0x6f, 0xcf, 0x76, 0x32, 0x5a, 0xab, - 0xc1, 0xef, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x3d, 0x82, 0xd5, - 0x8b, 0x1b, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xb4, 0x19, + 0x59, 0x6f, 0x1b, 0xb9, 0xf9, 0x59, 0xfa, 0x15, 0xec, 0xd4, 0x58, 0x8d, + 0x62, 0x69, 0x64, 0x03, 0x45, 0x1f, 0xac, 0x66, 0x17, 0xa9, 0xed, 0x45, + 0x5c, 0x58, 0x4d, 0xb0, 0xce, 0x43, 0x01, 0xc7, 0x28, 0x68, 0x0d, 0xa5, + 0x19, 0x84, 0x73, 0x80, 0xe4, 0x48, 0x31, 0x02, 0xfd, 0xf7, 0x7e, 0x1c, + 0x9e, 0x73, 0xc9, 0x6a, 0x92, 0x0d, 0xd0, 0xca, 0x43, 0x7e, 0xf7, 0xfd, + 0x71, 0x77, 0x98, 0xa1, 0x0c, 0xa7, 0x34, 0x29, 0xb6, 0xef, 0xca, 0x12, + 0xbd, 0x45, 0x38, 0xdf, 0x56, 0x14, 0xb3, 0x28, 0x2b, 0xe2, 0x8a, 0x92, + 0x70, 0xe2, 0x2e, 0x27, 0x33, 0xf4, 0xf8, 0x34, 0x5d, 0x8e, 0xc7, 0x9b, + 0x2a, 0x5f, 0x8b, 0xb4, 0xc8, 0xd1, 0xb6, 0x4a, 0xe3, 0x70, 0x8a, 0xbe, + 0x8d, 0x11, 0xb2, 0x67, 0xfc, 0x6f, 0xfa, 0x04, 0x21, 0x46, 0x44, 0xc5, + 0x72, 0xb4, 0xc2, 0x22, 0x89, 0x36, 0xb4, 0x28, 0x58, 0x18, 0x5e, 0xa2, + 0x73, 0xf5, 0xcd, 0x70, 0x1e, 0x17, 0x59, 0x38, 0x9d, 0xa2, 0x37, 0xe8, + 0xe2, 0xeb, 0xe5, 0x05, 0xfc, 0x9b, 0xd6, 0x48, 0xde, 0xbf, 0x48, 0x14, + 0x0f, 0x82, 0xa5, 0xf9, 0x36, 0xbc, 0xfc, 0x7b, 0xf7, 0x92, 0x57, 0xcf, + 0x5c, 0xdf, 0x82, 0x50, 0x08, 0x1d, 0xc6, 0x96, 0x63, 0x2d, 0xc3, 0xb9, + 0xf9, 0x99, 0xcc, 0x27, 0xc7, 0x3e, 0x1c, 0xe1, 0x3e, 0x10, 0xef, 0x67, + 0x39, 0x3e, 0x8c, 0xc7, 0xce, 0x1c, 0xd1, 0xba, 0xc8, 0x05, 0x2b, 0x28, + 0x25, 0x2c, 0x9c, 0xac, 0xe0, 0xf8, 0x5a, 0x30, 0x0a, 0x36, 0xb2, 0x96, + 0x08, 0xcf, 0xf8, 0xba, 0x28, 0xc9, 0x0c, 0x9d, 0x25, 0x42, 0x94, 0xf0, + 0xc3, 0xd7, 0xf2, 0x43, 0xa4, 0x19, 0x29, 0x2a, 0xa1, 0x8c, 0xa4, 0x40, + 0xa2, 0x35, 0x5e, 0x27, 0x04, 0x8c, 0xff, 0xed, 0xb0, 0x74, 0x87, 0x25, + 0x23, 0xbb, 0x94, 0xec, 0xdf, 0x51, 0xfa, 0x9e, 0xe0, 0x98, 0x30, 0x0e, + 0x00, 0x1b, 0x4c, 0x39, 0x01, 0x17, 0x58, 0x20, 0xb2, 0x23, 0xb9, 0xe0, + 0x1f, 0x49, 0x1e, 0x83, 0x25, 0xda, 0x14, 0xea, 0xcb, 0xeb, 0xa2, 0xca, + 0x05, 0xdc, 0x5c, 0xb4, 0x2f, 0x6e, 0x8a, 0x9c, 0xf4, 0x9d, 0xff, 0x0e, + 0xba, 0x90, 0x58, 0xdd, 0xb8, 0xab, 0x04, 0xf3, 0x5b, 0x79, 0xfb, 0x50, + 0x54, 0x6c, 0x4d, 0x9c, 0x28, 0x16, 0x80, 0x9b, 0x8b, 0xbc, 0xa2, 0x54, + 0x61, 0x86, 0xc6, 0x16, 0x36, 0x24, 0x34, 0x2c, 0xfc, 0x2f, 0x07, 0xd7, + 0x12, 0x9c, 0x85, 0xca, 0x77, 0x53, 0x9f, 0x95, 0x28, 0xb6, 0x5b, 0x4a, + 0xd4, 0xbd, 0x64, 0x34, 0x40, 0xc4, 0x30, 0x54, 0x1c, 0xd1, 0x6f, 0x7d, + 0xc4, 0xd1, 0x95, 0x35, 0x31, 0x2d, 0x38, 0x69, 0xf0, 0x1c, 0xf7, 0x88, + 0x73, 0x02, 0x3b, 0x94, 0x93, 0x3d, 0xf2, 0x4c, 0x11, 0x4e, 0x16, 0xb8, + 0x4c, 0x17, 0xbb, 0xcb, 0x85, 0xf2, 0xc5, 0xa4, 0xa6, 0xde, 0x42, 0x8b, + 0x70, 0x1c, 0xd7, 0x38, 0xf7, 0x29, 0x17, 0x24, 0x97, 0x21, 0x93, 0x11, + 0xce, 0xf1, 0x96, 0x78, 0x11, 0x13, 0x12, 0xc3, 0xd2, 0x62, 0x9f, 0xe1, + 0xb2, 0xa4, 0x2f, 0x5d, 0x3b, 0x7a, 0x20, 0x9a, 0x0e, 0x8f, 0xca, 0x8a, + 0x27, 0xe1, 0xbf, 0x1e, 0x3e, 0xfc, 0x3b, 0x2a, 0x31, 0xe3, 0x24, 0x24, + 0x51, 0x8c, 0x05, 0x9e, 0x6a, 0x71, 0x94, 0x91, 0xeb, 0xdf, 0x99, 0xf2, + 0xdd, 0x89, 0x72, 0x4a, 0xe3, 0xfc, 0xb0, 0x90, 0x9d, 0xe8, 0x11, 0xac, + 0x22, 0x3f, 0x28, 0x18, 0x61, 0xac, 0x60, 0x03, 0x92, 0x2d, 0x16, 0xe9, + 0x06, 0x0c, 0x00, 0x2e, 0x8d, 0x5f, 0x1e, 0x04, 0x16, 0x75, 0x98, 0x78, + 0x12, 0x44, 0xd7, 0xf7, 0x1f, 0x1e, 0x6e, 0x6f, 0x7a, 0x24, 0x3d, 0xa6, + 0xcc, 0x09, 0xc9, 0xd0, 0xd4, 0x48, 0x0a, 0x72, 0xe8, 0xea, 0xe6, 0x85, + 0x9e, 0x17, 0x96, 0xaf, 0xc6, 0x9e, 0x02, 0x0e, 0xfb, 0xcc, 0x63, 0xd3, + 0xee, 0x24, 0x21, 0x0f, 0x5e, 0xb2, 0x71, 0x81, 0x99, 0xa8, 0xe1, 0x7c, + 0xfe, 0x39, 0xce, 0xa0, 0x56, 0x61, 0xb6, 0xe5, 0x33, 0xb4, 0xa5, 0x2f, + 0x65, 0x92, 0x42, 0xb5, 0x33, 0x42, 0xc9, 0x9e, 0x41, 0xee, 0x6e, 0x00, + 0x5e, 0x35, 0x00, 0xc5, 0x75, 0xb1, 0x00, 0x10, 0x5e, 0x50, 0x12, 0xd1, + 0x62, 0x1b, 0x06, 0x0f, 0x92, 0xae, 0xac, 0x49, 0x75, 0x56, 0xa0, 0x49, + 0x00, 0x55, 0x54, 0x52, 0x85, 0x9f, 0x60, 0x82, 0xf6, 0xa9, 0x48, 0x50, + 0x1a, 0xab, 0x63, 0x49, 0x4b, 0x9e, 0x06, 0x53, 0x47, 0x5e, 0x96, 0x32, + 0x6d, 0xc2, 0x34, 0xbe, 0x92, 0x20, 0x33, 0xfd, 0x29, 0x89, 0x5c, 0xd5, + 0xff, 0x6f, 0x4e, 0x6a, 0x15, 0x08, 0x40, 0xc9, 0xcc, 0xbc, 0x01, 0x67, + 0x87, 0x53, 0x73, 0xb5, 0x2e, 0xb2, 0x92, 0x12, 0x01, 0x08, 0xb5, 0xf2, + 0xe6, 0x78, 0x53, 0x97, 0xb8, 0xd6, 0xa1, 0xd4, 0xf6, 0x4a, 0xe9, 0xac, + 0x4f, 0xac, 0xe6, 0x57, 0xee, 0x4f, 0x7b, 0x47, 0xc4, 0x35, 0xc5, 0x1c, + 0x30, 0x7a, 0x43, 0x65, 0xb1, 0x40, 0xbf, 0xdf, 0xfd, 0x67, 0x75, 0x8b, + 0x9e, 0x53, 0x01, 0xc2, 0x72, 0xf1, 0x62, 0xaf, 0x20, 0x32, 0x45, 0x92, + 0xf2, 0x48, 0x09, 0xd1, 0x8c, 0x2f, 0xdd, 0xc0, 0x82, 0xe7, 0xed, 0x3c, + 0x86, 0x4e, 0x4c, 0x58, 0xe0, 0x62, 0xaa, 0x43, 0xc0, 0x28, 0x37, 0x48, + 0x82, 0x57, 0xeb, 0x35, 0x54, 0x87, 0x3e, 0x1a, 0x1e, 0xd4, 0x1e, 0xb3, + 0x1c, 0x1c, 0x15, 0x2c, 0xa5, 0xd0, 0xa5, 0xea, 0x24, 0x26, 0x33, 0x8d, + 0xb6, 0x31, 0xf4, 0x8a, 0x41, 0x4d, 0x63, 0x22, 0xa5, 0xe8, 0xed, 0x48, + 0x8f, 0xe0, 0xb8, 0x27, 0x0b, 0x6a, 0x3c, 0x2b, 0xa5, 0x77, 0xc9, 0x42, + 0xac, 0x22, 0xad, 0xba, 0xd0, 0x6d, 0x57, 0xe7, 0xe7, 0xcb, 0x93, 0xcc, + 0x08, 0x8a, 0x34, 0x82, 0x51, 0xb7, 0x34, 0x2f, 0x14, 0x49, 0x74, 0x5a, + 0x30, 0xd6, 0x56, 0x40, 0x04, 0xc2, 0xe4, 0x28, 0x83, 0x6b, 0xad, 0xc1, + 0x77, 0xf3, 0x40, 0x76, 0x30, 0x18, 0x2a, 0x3d, 0xd2, 0x50, 0x8c, 0x64, + 0xc5, 0xce, 0x56, 0x00, 0xe3, 0x23, 0xa4, 0xc6, 0xa7, 0x65, 0xc7, 0xcd, + 0x07, 0x3f, 0xde, 0x07, 0xdc, 0xd7, 0xed, 0xfc, 0xbe, 0x91, 0x3d, 0x0b, + 0x77, 0x9c, 0x53, 0xdf, 0xc9, 0xc0, 0x70, 0xf2, 0x58, 0x86, 0x4a, 0xd0, + 0xe1, 0xdc, 0x68, 0x18, 0xef, 0x86, 0xfc, 0x90, 0xe9, 0xea, 0x4a, 0xdf, + 0x17, 0x05, 0x5d, 0xd5, 0xe6, 0xf3, 0xae, 0x91, 0x20, 0xb8, 0x5f, 0x89, + 0xdf, 0xe1, 0x78, 0xf4, 0xe9, 0x75, 0x66, 0x2e, 0xff, 0x52, 0xa7, 0x5b, + 0xa3, 0x4d, 0xe8, 0xc6, 0xd0, 0xa8, 0xd9, 0x5d, 0xe6, 0x60, 0x76, 0xd2, + 0x05, 0xa9, 0x19, 0x18, 0x47, 0x69, 0xe2, 0x9d, 0xd2, 0x6e, 0x26, 0x83, + 0x9b, 0x94, 0x97, 0x14, 0xbf, 0xd4, 0x2e, 0xec, 0x38, 0x44, 0x23, 0x9f, + 0x85, 0x93, 0xbf, 0x1a, 0xf8, 0xb9, 0x9c, 0x6c, 0x71, 0x0a, 0x4d, 0x16, + 0x09, 0xfc, 0x4c, 0x09, 0x12, 0xcf, 0x45, 0xfc, 0x02, 0xde, 0x9f, 0x4c, + 0x23, 0x4a, 0xf2, 0xad, 0x48, 0x5a, 0x8c, 0x18, 0xd9, 0x30, 0xc2, 0x93, + 0x3e, 0xf2, 0x26, 0xe5, 0x3b, 0xdd, 0x26, 0x0c, 0xee, 0x0b, 0x5c, 0x0f, + 0xad, 0x86, 0x6d, 0x30, 0xab, 0x7b, 0xd8, 0x0c, 0x05, 0xb6, 0xd8, 0xce, + 0xe3, 0x62, 0x9f, 0x53, 0x80, 0x0b, 0x4c, 0xd3, 0x93, 0xa3, 0x74, 0x04, + 0xb5, 0xd7, 0x4d, 0x5d, 0x06, 0x1d, 0x84, 0xd3, 0xf5, 0xce, 0x65, 0x50, + 0x3d, 0x00, 0xb5, 0xc7, 0x15, 0x83, 0x00, 0x52, 0xc9, 0x7b, 0xe3, 0x0e, + 0xd2, 0x88, 0xe5, 0x43, 0xbb, 0x51, 0x6b, 0x1d, 0xc3, 0xc6, 0xa4, 0xca, + 0x21, 0x72, 0xd6, 0x62, 0xa5, 0x08, 0xfa, 0xea, 0x6b, 0x1e, 0x8a, 0xf7, + 0x08, 0x22, 0xd4, 0x1f, 0xf4, 0x1f, 0xf5, 0x6d, 0x74, 0x17, 0x3f, 0x69, + 0x88, 0x51, 0x73, 0xe6, 0x77, 0x06, 0xeb, 0x20, 0x2c, 0x6d, 0x86, 0xc1, + 0x4a, 0xb5, 0x57, 0xe2, 0x8e, 0xbc, 0x0a, 0xd5, 0x43, 0x4a, 0x63, 0x1b, + 0xcc, 0xd3, 0x5d, 0x02, 0x1e, 0x71, 0x9c, 0x7b, 0xfd, 0x32, 0xc7, 0x54, + 0x48, 0xdf, 0x8c, 0x80, 0xf1, 0x11, 0xdf, 0x2c, 0xe4, 0x46, 0xe5, 0x48, + 0x1d, 0xf1, 0x94, 0x24, 0x84, 0x06, 0x95, 0xb7, 0x2e, 0x1b, 0xe9, 0xcc, + 0x85, 0x0f, 0xa3, 0xe8, 0xfb, 0x4f, 0xab, 0x7b, 0xa5, 0x15, 0x6c, 0x10, + 0xac, 0xe2, 0xe2, 0x1d, 0x7f, 0x2f, 0x32, 0x6a, 0x2c, 0x0f, 0x72, 0x69, + 0x3f, 0x49, 0xc0, 0xd0, 0x8d, 0xc6, 0xa3, 0x51, 0x7b, 0xe3, 0xf2, 0x02, + 0x43, 0x5e, 0x9e, 0xee, 0x93, 0xa6, 0x57, 0xda, 0x61, 0x35, 0x32, 0x71, + 0x35, 0x3a, 0xb4, 0xf2, 0x47, 0x2d, 0x3c, 0xde, 0x96, 0x67, 0xac, 0xb2, + 0xc3, 0xb4, 0x35, 0x09, 0xf6, 0x2d, 0x85, 0x00, 0xb5, 0xb4, 0xc9, 0x26, + 0xc7, 0xb8, 0x7d, 0x0a, 0xcb, 0xf5, 0x1e, 0xa2, 0x53, 0xdc, 0xe5, 0x82, + 0x30, 0xb8, 0xef, 0x6b, 0x2a, 0x10, 0x95, 0x1e, 0x7d, 0x7d, 0x22, 0xeb, + 0x40, 0x92, 0xc6, 0x64, 0x9e, 0x28, 0xf2, 0x36, 0xe5, 0x9b, 0xa5, 0x55, + 0x73, 0x58, 0x53, 0x82, 0x99, 0xe5, 0x21, 0x1a, 0x7d, 0xa9, 0x6b, 0x0a, + 0xdb, 0x96, 0xda, 0xfd, 0x54, 0xf3, 0xe5, 0x49, 0xb1, 0xff, 0x53, 0xf9, + 0x9a, 0x49, 0xfc, 0xf2, 0x62, 0xda, 0xae, 0x95, 0x2e, 0x3c, 0x3e, 0x52, + 0x28, 0x7d, 0x83, 0xb9, 0xac, 0x8c, 0x4c, 0x5d, 0x30, 0x6c, 0x40, 0xa2, + 0x15, 0x16, 0xeb, 0x04, 0xf2, 0x66, 0x75, 0xb7, 0xba, 0x35, 0xe0, 0x90, + 0x2e, 0x82, 0x7c, 0x15, 0x8b, 0x52, 0x92, 0x33, 0xe5, 0x0b, 0x14, 0xa5, + 0xe8, 0x2f, 0x7a, 0x61, 0xfd, 0xe5, 0x17, 0x24, 0x3f, 0xde, 0xa2, 0xa0, + 0xca, 0x63, 0x02, 0x74, 0x08, 0x94, 0x39, 0xab, 0xad, 0xae, 0xcb, 0x34, + 0xfa, 0x27, 0xd4, 0x5e, 0x5d, 0x93, 0xfc, 0x82, 0x6d, 0xc2, 0xef, 0x1a, + 0x6a, 0x35, 0xe4, 0xae, 0x06, 0x1b, 0xf9, 0x3a, 0xb5, 0x45, 0xf3, 0x95, + 0x82, 0x15, 0x51, 0x40, 0x76, 0xc3, 0xc8, 0x61, 0x58, 0x82, 0x6c, 0xf2, + 0x30, 0x92, 0x90, 0x4e, 0x8c, 0x4d, 0xc1, 0x42, 0xa9, 0x71, 0x89, 0xc0, + 0x28, 0xf6, 0x3e, 0xfa, 0x08, 0x7f, 0xf1, 0x56, 0xe8, 0x04, 0x5a, 0x94, + 0xf9, 0xa7, 0x97, 0x92, 0x04, 0x3d, 0xf0, 0x8f, 0xe5, 0x53, 0xa4, 0xa3, + 0xb6, 0xe9, 0x55, 0x9f, 0x75, 0x07, 0xf4, 0xb1, 0x49, 0xf7, 0x49, 0xc7, + 0x05, 0xfa, 0x15, 0x5d, 0xb4, 0x07, 0xa4, 0xff, 0x8b, 0xce, 0xe3, 0xc5, + 0x53, 0x94, 0x49, 0xeb, 0x84, 0xd2, 0x0a, 0x72, 0xa8, 0x58, 0xfe, 0x16, + 0xbd, 0x09, 0xa6, 0x6d, 0xa2, 0xd6, 0xe2, 0x5d, 0xd2, 0xcb, 0x06, 0xa0, + 0x0e, 0xeb, 0x74, 0x83, 0xbe, 0x4b, 0x8a, 0x45, 0x56, 0x51, 0x91, 0x4a, + 0xcc, 0xcf, 0x8b, 0xe8, 0xcd, 0xa2, 0x47, 0x0e, 0xe9, 0x87, 0xcd, 0x91, + 0xc8, 0xeb, 0x72, 0xd5, 0x1e, 0x5e, 0xb6, 0x08, 0x81, 0x9d, 0x36, 0x26, + 0x0c, 0xbb, 0x6c, 0xdc, 0xb4, 0xd2, 0xc6, 0x3b, 0x8c, 0x87, 0xbe, 0x0e, + 0x43, 0xc9, 0xe6, 0x87, 0xac, 0xd9, 0x50, 0x0f, 0x7d, 0x69, 0xa7, 0xcb, + 0xf7, 0x4f, 0xca, 0xba, 0x04, 0x2a, 0xff, 0xcf, 0x4b, 0xba, 0x91, 0xd9, + 0x96, 0xfe, 0x51, 0x4b, 0x99, 0x17, 0x02, 0xf2, 0x02, 0xf0, 0x7f, 0x0d, + 0x5a, 0x19, 0x17, 0xd7, 0x2f, 0x0d, 0x4e, 0x09, 0x39, 0xd2, 0x43, 0x7f, + 0xcd, 0x4a, 0xdd, 0xe6, 0x35, 0x9d, 0xd0, 0x2e, 0xaa, 0x0e, 0x60, 0xea, + 0x5e, 0x3b, 0x55, 0x71, 0xf2, 0xe7, 0x0c, 0x35, 0xa1, 0x42, 0xd1, 0xef, + 0x8e, 0x58, 0x23, 0x59, 0x39, 0xa1, 0x25, 0x6f, 0x52, 0x96, 0xcd, 0x15, + 0x1c, 0x34, 0x65, 0x0a, 0xf5, 0x33, 0x2b, 0x62, 0x28, 0x8e, 0x13, 0x59, + 0x55, 0x27, 0x9d, 0x7a, 0xc7, 0x00, 0x12, 0x73, 0xf2, 0x21, 0x1f, 0x1e, + 0x5b, 0x5a, 0xb0, 0xea, 0x7d, 0xb1, 0x31, 0x4b, 0x48, 0xd6, 0x9a, 0xd0, + 0x1c, 0x9a, 0x5c, 0x3f, 0x4f, 0xd7, 0xcd, 0x95, 0x90, 0x7f, 0x28, 0x84, + 0x9e, 0xa1, 0xc9, 0xb2, 0x1d, 0x22, 0x2b, 0x1b, 0x93, 0x79, 0x5e, 0xab, + 0x1f, 0xae, 0x2d, 0x8d, 0xb6, 0xa4, 0xcb, 0x21, 0xf9, 0xed, 0xe3, 0xe4, + 0xd1, 0x39, 0xe8, 0x0f, 0x8b, 0xf1, 0xea, 0x24, 0xc4, 0x13, 0xcc, 0x48, + 0x30, 0xd5, 0x34, 0xd5, 0x0c, 0x54, 0x16, 0xfc, 0xf5, 0x21, 0x48, 0xbe, + 0x34, 0x2f, 0xb4, 0x9a, 0x93, 0x99, 0x0d, 0x41, 0x92, 0xd5, 0xbb, 0x9a, + 0x6f, 0x03, 0x8d, 0x33, 0xaf, 0xaf, 0xc0, 0x1a, 0xb2, 0xe7, 0xd9, 0x17, + 0x8e, 0x04, 0x78, 0xf5, 0x83, 0xf3, 0x4c, 0x94, 0x73, 0x79, 0xdd, 0x46, + 0x29, 0x0b, 0x76, 0x0c, 0x45, 0x5e, 0x37, 0x51, 0x0e, 0x3d, 0x03, 0x9b, + 0x4b, 0x9a, 0xf6, 0xe0, 0x1c, 0xd5, 0x0f, 0x73, 0x0e, 0x12, 0x3e, 0x7d, + 0x60, 0xb9, 0xa9, 0xb9, 0xee, 0x4c, 0x14, 0xb4, 0xdc, 0x72, 0x18, 0x6b, + 0x8e, 0xde, 0x8d, 0x2a, 0xe1, 0x1e, 0xb1, 0xfa, 0x47, 0x6c, 0xe9, 0x4c, + 0xfb, 0x14, 0x16, 0x04, 0xf5, 0xec, 0x76, 0x16, 0x11, 0x2c, 0xcb, 0x7b, + 0xab, 0x53, 0xea, 0x4a, 0xec, 0x3d, 0x1c, 0x7e, 0x99, 0xa1, 0x9d, 0x19, + 0xc4, 0x35, 0x91, 0xf3, 0xb7, 0xe8, 0x8b, 0xec, 0x09, 0x57, 0x48, 0x6e, + 0x9d, 0x3b, 0xf9, 0xe7, 0xe7, 0x5c, 0x91, 0xad, 0x47, 0x38, 0x07, 0xa6, + 0xce, 0xbd, 0x83, 0x81, 0xce, 0x6c, 0xfe, 0xdb, 0x44, 0x0d, 0xd7, 0xd6, + 0xd0, 0x26, 0xf8, 0xb5, 0x4a, 0x92, 0xef, 0xc8, 0xf3, 0x76, 0x72, 0x0c, + 0x84, 0x76, 0xbd, 0x6c, 0xcb, 0xc8, 0x06, 0xe4, 0xa3, 0xab, 0x97, 0x5a, + 0xe1, 0xe7, 0xeb, 0x94, 0xc1, 0xb4, 0xa5, 0x6a, 0xa9, 0x1e, 0xf1, 0x15, + 0xf7, 0xd3, 0x36, 0xb0, 0xd6, 0x7e, 0xe3, 0x6d, 0x51, 0xbd, 0xab, 0x8a, + 0x7b, 0xc4, 0x74, 0x71, 0x65, 0x6c, 0xde, 0x67, 0xb1, 0xe3, 0xf5, 0xeb, + 0x14, 0x33, 0xbc, 0x9a, 0xe0, 0xca, 0x0e, 0x27, 0x19, 0xe0, 0xf5, 0x35, + 0xc7, 0x98, 0xc3, 0x6d, 0x84, 0x5a, 0xf7, 0xe8, 0xbf, 0x69, 0x2c, 0xdf, + 0xa8, 0x0d, 0x36, 0x7c, 0x4e, 0xbb, 0x6b, 0x89, 0x31, 0x4f, 0xbf, 0x3d, + 0xdb, 0xc9, 0x68, 0xad, 0x06, 0xbf, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, + 0x7f, 0x3a, 0x5f, 0x79, 0xe8, 0x1b, 0x00, 0x00, }, "assets/js/controllers.js", ) diff --git a/mailhog/data/message.go b/mailhog/data/message.go index 7c202a3..bc51e8b 100644 --- a/mailhog/data/message.go +++ b/mailhog/data/message.go @@ -16,7 +16,7 @@ type Message struct { To []*Path Content *Content Created time.Time - MIME *MIMEBody + MIME *MIMEBody // FIXME refactor to use Content.MIME } type Path struct { @@ -30,6 +30,7 @@ type Content struct { Headers map[string][]string Body string Size int + MIME *MIMEBody } type SMTPMessage struct { @@ -43,6 +44,8 @@ type MIMEBody struct { Parts []*Content } +// TODO support nested MIME content + func ParseSMTPMessage(m *SMTPMessage, hostname string) *Message { arr := make([]*Path, 0) for _, path := range m.To { @@ -68,7 +71,9 @@ func ParseSMTPMessage(m *SMTPMessage, hostname string) *Message { } func (content *Content) IsMIME() bool { - return strings.HasPrefix(content.Headers["Content-Type"][0], "multipart/") + header, ok := content.Headers["Content-Type"] + if !ok { return false } + return strings.HasPrefix(header[0], "multipart/") } func (content *Content) ParseMIMEBody() *MIMEBody { @@ -80,7 +85,12 @@ func (content *Content) ParseMIMEBody() *MIMEBody { parts := make([]*Content, 0) for m := range p { if len(p[m]) > 0 { - parts = append(parts, ContentFromString(strings.Trim(p[m], "\r\n"))) + part := ContentFromString(strings.Trim(p[m], "\r\n")) + if(part.IsMIME()) { + log.Printf("Parsing inner MIME body") + part.MIME = part.ParseMIMEBody() + } + parts = append(parts, part) } }