From 9dfcc9b408396dc17145a172c2de27ee230a62c1 Mon Sep 17 00:00:00 2001 From: Andrew Van Tassel Date: Sun, 31 May 2015 01:26:03 -0600 Subject: [PATCH] Combined Thunderbird and Postbox --- CHANGELOG.md | 9 +- LICENSE | 340 ------- chrome.manifest | 6 +- chrome/content/images/map.png | Bin 0 -> 804 bytes chrome/content/images/options.png | Bin 0 -> 512 bytes chrome/content/images/refresh.png | Bin 0 -> 685 bytes chrome/content/mailhops.js | 852 +++--------------- chrome/content/mailhopsMap.xul | 3 +- chrome/content/pb-overlay.js | 467 ++++++++++ .../{msgHdrViewOverlay.xul => pb-overlay.xul} | 4 +- chrome/content/preferences.js | 41 +- chrome/content/preferences.xul | 5 +- chrome/content/tb-overlay.js | 295 ++++++ chrome/content/tb-overlay.xul | 45 + chrome/content/utils.js | 179 ++++ .../classic/{mailhops.css => pb-styles.css} | 0 chrome/skin/classic/tb-styles.css | 11 + install.rdf | 15 +- mailhops.xpi | Bin 178050 -> 184356 bytes 19 files changed, 1150 insertions(+), 1122 deletions(-) delete mode 100644 LICENSE create mode 100644 chrome/content/images/map.png create mode 100644 chrome/content/images/options.png create mode 100644 chrome/content/images/refresh.png create mode 100644 chrome/content/pb-overlay.js rename chrome/content/{msgHdrViewOverlay.xul => pb-overlay.xul} (93%) create mode 100644 chrome/content/tb-overlay.js create mode 100644 chrome/content/tb-overlay.xul create mode 100644 chrome/content/utils.js rename chrome/skin/classic/{mailhops.css => pb-styles.css} (100%) create mode 100644 chrome/skin/classic/tb-styles.css diff --git a/CHANGELOG.md b/CHANGELOG.md index 66caf52..87ae987 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log -All notable changes to this project will be documented in this file. -This project adheres to [Semantic Versioning](http://semver.org/). + +## [1.0.0] - 2015-05-31 +### Changed +- Combined Thunderbird and Postbox code into one plugin + +### Fixed +- Fix mismatch IP from Microsoft SMTP id in received header ## [0.9.0] - 2015-05-30 ### Changed diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 3912109..0000000 --- a/LICENSE +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/chrome.manifest b/chrome.manifest index ac50955..55b1d3a 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -9,4 +9,8 @@ locale mailhops pt-BR jar:chrome/mailhops.jar!/locale/pt-BR/ locale mailhops ru jar:chrome/mailhops.jar!/locale/ru/ locale mailhops zh-CN jar:chrome/mailhops.jar!/locale/zh-CN/ -overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://mailhops/content/msgHdrViewOverlay.xul \ No newline at end of file +# Postbox +overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://mailhops/content/pb-overlay.xul application=postbox@postbox-inc.com + +# Thunberbird +overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://mailhops/content/tb-overlay.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6} \ No newline at end of file diff --git a/chrome/content/images/map.png b/chrome/content/images/map.png new file mode 100644 index 0000000000000000000000000000000000000000..f90ef25ec7f1cb0fdae38d9fe2d9edeee9928ef1 GIT binary patch literal 804 zcmV+<1Ka$GP)mbpQb1@7I~O+ue5CWtZi#AZox@gcwb{Xkx^Rf;Ty8yn6DWhJV4kC*wg94<7Vt zlteKm5+jKLV^qM1yt2HO4YZw^&a^Wfzb_m+@y40e_0^+M6ajz$03Zl}fU=sqfA9W} z@#^~O(a%3QB{YI^J_A4y)M^1_vjjn1H`Mc5t@6>y50A!C6seTL>`UqQ7p$DgY@K|> zQm^as;HM{#Qwj<3}(>R-AM4&+cd0t49%y2X`UaCBJg8YmB)K#uA{Z>9n zOp8>WCg#&r06`o8oz6gaIn`fY2FR)ssCr@3rc|5f%`bIJO$zbt__PK3gH51Sff`H}0ZWac9&q~*( zO@qNscV0VSU%X#sYO9)Qx4M=(eR(m}UFhondELHSnO2hr&mMO3 zv6gmw!P2y#u0c!?LPO88NyxOTj>XWm>*77F&55fo9Z?)iynObdfA;SdwVRl$W~G3* zEGt!2+1T-%ja32&!XdoMS_mM#IQK#{6D_nvjYu`GlvO3XdE)qYJJ;7CQDsH?WF>AIFt zQuJ}i;w2$ZUU#3SZ6RY0Gw;kZ&ol1~2ky^QZ(fom$=jNJZt!z7w_pH~wdQ;R)Gh%BbQFCx+Nm!4SuS-vkr`vhhrX zM*>w%e+v~?m@q~ImPAgtLkR_3U<2F8LP3W5=LJ*ZN|S5p#sf4YFr$p~Q~Z*0Ngxf2 zjk#J#<7EAlhzlrV53~GF&pIzcCN_lz9@05UeoUXiK%N z#x+4o*i_c|6_Uu1+&TIho?3@y4k-#b8Y_o94zW*B3a1ne2-Y5s0uke$$|@=}OP-i= zNYZQA=>PrZu0MfSL=b8UhD_={W4IY1{b{)U)*gc45xtL%IYLY&hF;d`@GzI&7H&D# zh;z_BX$#hqh@q?AY3sJTod2%*Yd)_>YM0#q&ixGuh+PQsneK)F0000`!iy8(2_#ButL^3%VaH2WCpD^U)OZxp@C)2#hU)y+@T%ZNzJigNk%37 zz-WYJwT%teVfiEI+B*@v4ey@58(ld4VY_&5-ox`e@AKg+0U-I`y79bmuw_~y6+4rZ zBG5EdFDS+@M0OSE`>d7SUDOzKZ&h*4eB1iX7tOd9RiYtW2mQ--bUahxr1`i{RG@dM zL#}_X=DDO1{;UI$pFu=dLYT_=5d8WC-sLfjr7UO-HKMAwa=!>)kEhvuwre zuW3yF@ZxFCkI*+ad|5kOX%5zu8IQjhan)UqgSrFGA_0nQFn@Z08DSEUToCSz4Z1ls z&fDbq$T&7|6iq$_uDI$@q1_kQ@dfqk*0>{SDL6V)94@)ete)j++*>bIc9sj}Y;R1o z#OpH+Yt-^4wfv{nern^iVag8',''); - var label = document.createElement('label'); - - label.setAttribute('class','text-link dataPaneURLitem'); - - if(href.indexOf('mailto:')!=-1){ - label.setAttribute('value','Unsubscribe via Email'); - if(href.toLowerCase().indexOf('subject=')==-1){ - if(href.indexOf('?')==-1) - href+='?subject=Unsubscribe'; - else - href+='&subject=Unsubscribe'; - } - } - else{ - label.setAttribute('value','Unsubscribe via Web'); - } - label.setAttribute('tooltiptext',href); - label.setAttribute('href',href); - mailHops.resultListDataPane.appendChild(label); - } - } - } -}; - -mailHops.displayResultAuth = function( header_xmailer, header_useragent, header_xmimeole, header_auth, header_spf ){ - - mailHops.mailhopsAuthContainer.style.display=''; - //SPF - if(header_spf){ - header_spf=header_spf.replace(/^\s+/,""); - var headerSPFArr=header_spf.split(' '); - mailHops.mailhopsDataPaneSPF.setAttribute('value','SPF: '+headerSPFArr[0]); - mailHops.mailhopsDataPaneSPF.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/'+headerSPFArr[0]+'.png)'; - mailHops.mailhopsDataPaneSPF.setAttribute('tooltiptext',header_spf+'\n'+mailHops.authExplainSPF(headerSPFArr[0])); - mailHops.mailhopsDataPaneSPF.style.display='block'; - } - else{ - mailHops.mailhopsDataPaneSPF.style.display='none'; - } - //Authentication-Results - //http://tools.ietf.org/html/rfc5451 - if(header_auth){ - var headerAuthArr=header_auth.split(';'); - var dkim_result; - var spf_result; - for(var h=0;h 0){ - - if(mailHops.options.client_location){ - var client_location = JSON.parse(mailHops.options.client_location); - response.route.push(client_location.route[0]); - } - - for(var i=0; i 0){ - if(mailHops.options.unit=='mi') - distanceText =' ( '+mailHops.addCommas(Math.round(response.distance.miles))+' mi traveled )'; - else - distanceText =' ( '+mailHops.addCommas(Math.round(response.distance.kilometers))+' km traveled )'; - } - else if(displayText=='') - displayText = ' Local message.'; - } - - if(header_route) - mailHops.resultMapLink.setAttribute("data-route", header_route); - else - mailHops.resultMapLink.removeAttribute("data-route"); - - mailHops.resultTextDataPane.style.backgroundImage = 'url('+image+')'; - mailHops.resultTextDataPane.value = displayText; - mailHops.resultTextDataPane.setAttribute('tooltiptext',displayText+' '+distanceText); - - if(distanceText){ - mailHops.resultTextDataPane2.style.display = 'block'; - mailHops.resultTextDataPane2.value = distanceText; - mailHops.resultTextDataPane2.setAttribute('tooltiptext',displayText+' '+distanceText); - } else { - mailHops.resultTextDataPane2.style.display = 'none'; - } - - //set weather of sender - if(weather){ - mailHops.resultTextDataPane3.style.display = 'block'; - mailHops.resultTextDataPane3.setAttribute('tooltiptext',new Date(weather.time*1000)); - mailHops.resultTextDataPane3.value = weather.summary+' '+Math.round(weather.temp)+'\u00B0'; - mailHops.resultTextDataPane3.style.backgroundImage = 'url('+mailHops.getWeatherIcon(weather.icon)+')'; - } - - //show the detail link - mailHops.resultDetailsLink.style.display = 'block'; - mailHops.resultMapLink.style.display = 'block'; - //show details by default - if(mailHops.options.show_details){ - mailHops.resultContainerDetails.style.display = 'block'; - mailHops.resultDetailsLink.setAttribute('class','text-link dataPaneMoreLink active'); - } - else{ - mailHops.resultContainerDetails.style.display = 'none'; - mailHops.resultDetailsLink.setAttribute('class','text-link dataPaneMoreLink'); - } -}; - -mailHops.getSecureTrans = function(ip){ - for(var i=0; i 1 ? '.' + x[1] : ''; - var rgx = /(\d+)(\d{3})/; - while (rgx.test(x1)) { - x1 = x1.replace(rgx, '$1' + ',' + '$2'); - } - return x1 + x2; -}; -mailHops.launchExternalURL = function(url){ - var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance().QueryInterface(Components.interfaces.nsIMessenger); - messenger.launchExternalURL(url); -}; -mailHops.launchWhoIs = function(ip){ - mailHops.launchExternalURL('http://www.mailhops.com/whois/'+ip); -}; -mailHops.launchSpamHausURL = function(ip){ - mailHops.launchExternalURL('http://www.spamhaus.org/query/bl?ip='+ip); -}; - -mailHops.launchMap = function(route){ - - if(route != '') { - var lookupURL=mailHops.options.api_url+'/v1/map/?pb&app='+mailHops.appVersion+'&l='+mailHops.options.lan+'&u='+mailHops.options.unit+'&r='+String(route); - - if(mailHops.options.fkey != '') - lookupURL += '&fkey='+mailHops.options.fkey; - - window.openDialog("chrome://mailhops/content/mailhopsMap.xul","MailHops",'toolbar=no,location=no,directories=no,menubar=yes,scrollbars=yes,close=yes,width=1024,height=768,resizable=yes', {src: lookupURL}); - } -}; - -// weather.style.backgroundImage = 'url(chrome://mailhops/content/images/weather - -mailHops.getWeatherIcon = function(icon){ - var forecast_icons = {'clear-day': {'day':'sun', 'night':'sun'} - , 'clear-night': {'day':'clear_night', 'night':'clear_night'} - , 'rain': {'day':'rain','night':'rain'} - , 'snow': {'day':'snow','night':'snow'} - , 'sleet': {'day':'rain','night':'rain'} - , 'wind': {'day':'clouds','night':'clouds'} - , 'fog': {'day':'clouds','night':'clouds'} - , 'cloudy': {'day':'clouds','night':'cloudy_night'} - , 'partly-cloudy-day': {'day':'cloudy','night':'cloudy'} - , 'partly-cloudy-night': {'day':'cloudy_night','night':'cloudy_night'} - , 'hail': {'day':'rain','night':'rain'} - , 'thunderstorm': {'day':'thunderstorm','night':'thunderstorm'} - , 'tornado': {'day':'thunderstorm','night':'thunderstorm'} - }; - var hr = (new Date).getHours(); - var time = (hr >= 4 && hr <= 18)?'day':'night'; - return 'chrome://mailhops/content/images/weather/'+forecast_icons[icon][time]+'.png'; -}; - mailHops.saveResults = function(results){ if(!mailHops.msgURI) diff --git a/chrome/content/mailhopsMap.xul b/chrome/content/mailhopsMap.xul index 4ceccdb..defe109 100644 --- a/chrome/content/mailhopsMap.xul +++ b/chrome/content/mailhopsMap.xul @@ -1,7 +1,6 @@ - -