Merge remote-tracking branch 'upstream/master' into dev

This commit is contained in:
Jay Townsend 2019-08-03 14:32:24 +01:00
commit ddda91efa5
2 changed files with 7 additions and 5 deletions

View file

@ -54,7 +54,7 @@ def banner():
print(r"* | |_| | | | __/ / __ / (_| | | \ V / __/\__ \ || __/ | *")
print(r"* \__|_| |_|\___| \/ /_/ \__,_|_| \_/ \___||___/\__\___|_| *")
print('* *')
print(f'* theHarvester {Core.version()} *')
print(f'* theHarvester {Core.version()} *')
print('* Coded by Christian Martorella *')
print('* Edge-Security Research *')
print('* cmartorella@edge-security.com *')

View file

@ -18,9 +18,9 @@ def generatepreviousscanresults(self, previousscanresults):
<td style="width: 157.153px; text-align: center;"><strong>Record type</strong></td>
<td style="width: 157.153px; text-align: center;"><strong>Result</strong></td>
</tr>
<tr>
'''
for i in previousscanresults:
html += '<tr>'
html += '<td style="width: 156.042px;">' + str(i) + "</td>"
html += '<td style="width: 156.042px;">' + str(i) + "</td>"
html += '<td style="width: 157.153px;">' + str(i) + "</td>"
@ -75,9 +75,9 @@ def generatelatestscanresults(self, latestscanresults):
<td style="width: 157.153px; text-align: center;"><strong>Record type</strong></td>
<td style="width: 157.153px; text-align: center;"><strong>Result</strong></td>
</tr>
<tr>
'''
for i in latestscanresults:
html += '<tr>'
html += '<td style="width: 156.042px;">' + str(i[0]) + "</td>"
html += '<td style="width: 156.042px;">' + str(i[1]) + "</td>"
html += '<td style="width: 157.153px;">' + str(i[2]) + "</td>"
@ -98,8 +98,10 @@ def generatelatestscanresults(self, latestscanresults):
def beginhtml(self):
html = '''
<head><script src="https://cdn.plot.ly/plotly-latest.min.js"></script></head>
<!doctype html>
<html>
<head><script src="https://cdn.plot.ly/plotly-latest.min.js" type="text/javascript"></script></head>
<title>theHarvester Scan Report</title>
<body>
<h1 style="text-align: center;"><span style="color: #ff0000;">theHarvester Scan Report</span></h1>
'''
@ -156,9 +158,9 @@ def generatepluginscanstatistics(self, scanstatistics):
<td style="width: 157.153px; text-align: center;"><strong>Source</strong></td>
<td style="width: 157.153px; text-align: center;"><strong>Total results</strong></td>
</tr>
<tr>
'''
for i in scanstatistics:
html += '<tr>'
html += '<td style="width: 156.042px;">' + str(i[0]) + "</td>"
html += '<td style="width: 156.042px;">' + str(i[1]) + "</td>"
html += '<td style="width: 157.153px;">' + str(i[2]) + "</td>"