v/mailhops-plugin
1
0
Fork 0
mirror of https://github.com/MailHops/mailhops-plugin.git synced 2025-05-17 14:50:08 -07:00
Code Issues Releases Wiki Activity

Fixed mozilla review bugs

Browse Source
This commit is contained in:
Andrew Van Tassel 2011-04-19 10:57:03 -06:00
parent 90f4cd8f2d
commit 64f44b1cfc
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chrome/content/mailhops.js
View File

@ -4,12 +4,6 @@
* @website: http://mailhops.com * @website: http://mailhops.com
* @TODO: cache result and display country flag in column * @TODO: cache result and display country flag in column
*/ */
//import nativeJSON
var gNativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
//IP regex
var gIPRegEx=/(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)(\/(?:[012]\d?|3[012]?|[456789])){0,1}$/;
var gAllIPRegEx = /(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)(\/(?:[012]\d?|3[012]?|[456789])){0,1}/g;
var gApp = 'Postbox';
var mailHops = var mailHops =
{ {
@ -20,7 +14,7 @@ var mailHops =
isLoaded: false, isLoaded: false,
map: 'goog', map: 'goog',
unit: 'mi', unit: 'mi',
appVersion: 'MailHops '+gApp+' 0.4.4' appVersion: 'MailHops Postbox 0.4.5'
} }
mailHops.startLoading = function() mailHops.startLoading = function()
@ -100,6 +94,10 @@ mailHops.loadHeaderData = function()
mailHops.dispRoute = function() mailHops.dispRoute = function()
{ {
//IP regex
var regexIp=/(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)(\/(?:[012]\d?|3[012]?|[456789])){0,1}$/;
var regexAllIp = /(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)\.(1\d{0,2}|2(?:[0-4]\d{0,1}|[6789]|5[0-5]?)?|[3-9]\d?|0)(\/(?:[012]\d?|3[012]?|[456789])){0,1}/g;
var headReceived = mailHops.headers.extractHeader ( "Received" , true ) ; var headReceived = mailHops.headers.extractHeader ( "Received" , true ) ;
var headXOrigIP = mailHops.headers.extractHeader ( "X-Originating-IP" , false ) ; var headXOrigIP = mailHops.headers.extractHeader ( "X-Originating-IP" , false ) ;
var received_ips; var received_ips;
@ -107,7 +105,7 @@ mailHops.dispRoute = function()
var rline=''; var rline='';
//get the originating IP address //get the originating IP address
if(headXOrigIP){ if(headXOrigIP){
var ip = headXOrigIP.match(gAllIPRegEx); var ip = headXOrigIP.match(regexAllIp);
if(ip != null && ip.length != 0) if(ip != null && ip.length != 0)
all_ips.push( ip[0] ); all_ips.push( ip[0] );
} }
@ -120,12 +118,12 @@ mailHops.dispRoute = function()
rline += headReceivedArr[h]; rline += headReceivedArr[h];
if(headReceivedArr[h].indexOf(';')==-1) if(headReceivedArr[h].indexOf(';')==-1)
continue; continue;
received_ips = rline.match(gAllIPRegEx); received_ips = rline.match(regexAllIp);
//maybe multiple IPs in one Received: line //maybe multiple IPs in one Received: line
if(received_ips != null && received_ips.length !=0){ if(received_ips != null && received_ips.length !=0){
for( var r=0; r<received_ips.length; r++ ){ for( var r=0; r<received_ips.length; r++ ){
//only look at the first IP //only look at the first IP
if(gIPRegEx.test(received_ips[r]) && all_ips.indexOf(received_ips[r])==-1 && mailHops.testIP(received_ips[r],rline)){ if(regexIp.test(received_ips[r]) && all_ips.indexOf(received_ips[r])==-1 && mailHops.testIP(received_ips[r],rline)){
all_ips.push( received_ips[r] ); all_ips.push( received_ips[r] );
break; break;
} }
@ -275,6 +273,9 @@ mailHops.lookup = function(route){
//setup loading //setup loading
mailHops.clearRoute(); mailHops.clearRoute();
//import nativeJSON
var nativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
//call mailhops api for lookup //call mailhops api for lookup
var xmlhttp = new XMLHttpRequest(); var xmlhttp = new XMLHttpRequest();
var flag= 'chrome://mailhops/content/images/local.png'; var flag= 'chrome://mailhops/content/images/local.png';
@ -286,7 +287,7 @@ mailHops.lookup = function(route){
xmlhttp.onreadystatechange=function() { xmlhttp.onreadystatechange=function() {
if (xmlhttp.readyState==4) { if (xmlhttp.readyState==4) {
try{ try{
var data = gNativeJSON.decode(xmlhttp.responseText); var data = nativeJSON.decode(xmlhttp.responseText);
if(data && data.meta.code==200){ if(data && data.meta.code==200){
for(var i=0; i<data.response.route.length;i++){ for(var i=0; i<data.response.route.length;i++){
if(!data.response.route[i].private && !data.response.route[i].client){ if(!data.response.route[i].private && !data.response.route[i].client){

2
install.rdf
View File

@ -8,7 +8,7 @@
<em:type>2</em:type> <em:type>2</em:type>
<em:name>MailHops</em:name> <em:name>MailHops</em:name>
<em:version>0.4.4</em:version> <em:version>0.4.5</em:version>
<em:description>MailHops maps the route an email traveled to get to you. Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender.</em:description> <em:description>MailHops maps the route an email traveled to get to you. Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender.</em:description>
<em:iconURL>chrome://mailhops/content/images/mailhops32.png</em:iconURL> <em:iconURL>chrome://mailhops/content/images/mailhops32.png</em:iconURL>

BIN
mailhops-0.4.5-pb.xpi Normal file
View File

Binary file not shown.