Guest User

Untitled

a guest
Nov 20th, 2012
145
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -ur 101/chrome/content/secureLogin.js 099/chrome/content/secureLogin.js
  2. --- 101/chrome/content/secureLogin.js   2012-11-19 15:08:50.000000000 +0900
  3. +++ 099/chrome/content/secureLogin.js   2012-11-21 14:36:35.504491275 +0900
  4. @@ -91,16 +91,6 @@
  5.        
  6.         // Initialize the preferences settings:
  7.         this.initializePrefs();
  8. -
  9. -       var self = this;
  10. -       document.addEventListener("SSTabRestored", function(event){
  11. -           var just_installed = self.secureLoginPrefs.getBoolPref("just_installed");
  12. -           if(just_installed){
  13. -               self.secureLoginPrefs.setBoolPref("just_installed", false);
  14. -               gBrowser.selectedTab = gBrowser.addTab(self.secureLoginPrefs.getCharPref("post_install_url"));
  15. -
  16. -           }
  17. -       });
  18.     },
  19.  
  20.     initContentAreaContextMenu: function(event) {
  21. @@ -300,10 +290,7 @@
  22.             (this.secureLoginPrefs.getBoolPref('searchLoginsOnload') || this.secureLoginPrefs.getBoolPref('secureLoginBookmarks'))) {
  23.             // Add the progress listener to the browser object (if not added previously):
  24.             try {
  25. -               this.getBrowser().addProgressListener(
  26. -                   this.progressListener,
  27. -                   Components.interfaces.nsIWebProgress.NOTIFY_LOCATION | Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT
  28. -               );
  29. +               this.getBrowser().addProgressListener(this.progressListener);
  30.                 this.isProgressListenerRegistered = true;
  31.             } catch(e) {
  32.                 this.log(e);
  33. @@ -836,7 +823,7 @@
  34.             // Skip disabled elements or elements without a "name":
  35.             if(!elements[i].name || elements[i].disabled)
  36.                 continue;                  
  37. -           if(elements[i].type == 'text') {
  38. +           if(elements[i].type == 'text' || elements[i].type == 'email') {
  39.                 // input of type "text" found, this is no password only form:
  40.                 inputTextFound = true;
  41.                
  42. @@ -1539,6 +1526,7 @@
  43.                         }
  44.                        
  45.                         switch(elements[i].type) {
  46. +                           case 'email':
  47.                             case 'text':
  48.                                 if(!usernameField || elements[i].name != usernameField.name) {
  49.                                     addToDataString(elements[i].name, elements[i].value);
  50. @@ -1600,7 +1588,7 @@
  51.                     }
  52.                    
  53.                     // Check if the url is an allowed one (throws an exception if not):
  54. -                   this.urlSecurityCheck(url, doc.location.href);
  55. +                   this.urlSecurityCheck(url, doc.nodePrincipal);
  56.                    
  57.                     // Send the data by GET or POST:
  58.                     if(form.method && form.method.toLowerCase() == 'get') {
  59. @@ -2036,9 +2024,9 @@
  60.         }
  61.     },
  62.  
  63. -   urlSecurityCheck: function(url, sourceURL) {
  64. +   urlSecurityCheck: function(url, principal) {
  65.         try {
  66. -           this.getSecManager().checkLoadURIStr(sourceURL, url, Components.interfaces.nsIScriptSecurityManager.STANDARD);
  67. +           this.getSecManager().checkLoadURIStrWithPrincipal(principal, url, Components.interfaces.nsIScriptSecurityManager.STANDARD);
  68.         } catch(e) {
  69.             throw 'Loading of ' + url + ' denied.';
  70.         }
  71. diff -ur 101/defaults/preferences/secureLogin.js 099/defaults/preferences/secureLogin.js
  72. --- 101/defaults/preferences/secureLogin.js 2012-11-19 15:08:07.000000000 +0900
  73. +++ 099/defaults/preferences/secureLogin.js 2011-10-20 22:56:48.000000000 +0900
  74. @@ -24,6 +24,4 @@
  75.  pref('extensions.secureLogin@blueimp.net.autoLoginExceptions','');
  76.  pref('extensions.secureLogin@blueimp.net.defaultNotificationTimeout',3000);
  77.  pref('extensions.secureLogin@blueimp.net.defaultNotificationImage','chrome://secureLogin/skin/login-small.png');
  78. -pref('extensions.secureLogin@blueimp.net.helpURL', 'https://www.abine.com/support.php');
  79. -pref("extensions.secureLogin@blueimp.net.just_installed", true);
  80. -pref("extensions.secureLogin@blueimp.net.post_install_url", "https://www.abine.com/oldpostinstall.php?addon=secureLogin");
  81. \ No newline at end of file
  82. +pref('extensions.secureLogin@blueimp.net.helpURL', 'http://securelogin.mozdev.org/drupal/wiki/[TOPIC]');
  83. \ No newline at end of file
  84. diff -ur 101/install.rdf 099/install.rdf
  85. --- 101/install.rdf 2012-11-19 15:09:25.000000000 +0900
  86. +++ 099/install.rdf 2012-11-21 14:41:26.630319624 +0900
  87. @@ -8,13 +8,13 @@
  88.         <em:iconURL>chrome://securelogin/skin/icon.png</em:iconURL>
  89.         <em:optionsURL>chrome://securelogin/content/secureLoginOptions.xul</em:optionsURL>
  90.         <em:homepageURL>https://blueimp.net/mozilla/</em:homepageURL>
  91. -       <em:version>1.0.1</em:version>
  92. +       <em:version>1.0.2pre</em:version>
  93.         <em:targetApplication>
  94.             <Description>
  95.                 <!-- Firefox -->
  96.                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
  97.                 <em:minVersion>1.5</em:minVersion>
  98. -               <em:maxVersion>18.*</em:maxVersion>
  99. +               <em:maxVersion>*</em:maxVersion>
  100.             </Description>
  101.         </em:targetApplication>
  102.         <em:translator>Fingli (Bulgarian)</em:translator>
RAW Paste Data