Merge branch 'master' of git://github.com/codebutler/firesheep

babo · Oct 23, 2010 · cdd131a · cdd131a
2 parents b133a7f + 4f0d66e
commit cdd131a
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 54 deletions.
diff --git a/xpi/chrome.manifest b/xpi/chrome.manifest
@@ -2,8 +2,8 @@ content   firesheep                 chrome/content/
 skin      firesheep   classic/1.0   chrome/skin/
 locale    firesheep   en-US         chrome/locale/en-US/
 
-
-overlay   chrome://browser/content/browser.xul   chrome://firesheep/content/ff-overlay.xul
-style chrome://global/content/customizeToolbar.xul chrome://firesheep/skin/overlay.css
+overlay   chrome://browser/content/browser.xul                     chrome://firesheep/content/ff-overlay.xul
+style     chrome://firesheep/content/ff-sidebar.xul                chrome://firesheep/skin/sidebar-osx.css      OS=Darwin
+style     chrome://firesheep/content/preferences/prefsWindow.xul   chrome://firesheep/skin/preferences-osx.css  OS=Darwin
 
 resource firesheep modules/
diff --git a/xpi/chrome/content/ff-overlay.js b/xpi/chrome/content/ff-overlay.js
@@ -22,9 +22,19 @@
 
 var FiresheepUI = {
   onLoad: function() {
-    // initialization code
+    if (this.initialized)
+      return;
+
     this.initialized = true;
     this.strings = document.getElementById("firesheep-strings");
+
+    var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+    if (prefs.getBoolPref('firesheep.first_run')) {
+      toggleSidebar('viewSidebar_firesheep', true);
+      var welcomeUrl = "http://codebutler.github.com/firesheep/welcome.html";
+      window.gBrowser.selectedTab = window.gBrowser.addTab(welcomeUrl);
+      prefs.setBoolPref('firesheep.first_run', false);
+    }
   },
 
   toggleSidebar: function (e) {

diff --git a/xpi/chrome/content/ff-overlay.xul b/xpi/chrome/content/ff-overlay.xul
@@ -44,7 +44,7 @@
   </menupopup>
 
   <keyset id="mainKeyset">
-    <key id="key_openSidebar_firesheep" command="viewSidebar_firesheep" key="s" modifiers="meta shift control" />
+    <key id="key_openSidebar_firesheep" command="viewSidebar_firesheep" key="s" modifiers="shift control" />
   </keyset>
 
   <broadcasterset id="mainBroadcasterSet">

diff --git a/xpi/chrome/content/ff-sidebar.js b/xpi/chrome/content/ff-sidebar.js
@@ -33,7 +33,7 @@ function startup() {
                      .rootTreeItem
                      .QueryInterface(Ci.nsIInterfaceRequestor)
                      .getInterface(Ci.nsIDOMWindow);
-                     
+
   reloadSession();
   updateState();
 }
@@ -172,9 +172,11 @@ function onResultDoubleClick () {
 
       if (result.handler.spoofUserAgent) {
         // FIXME!
-        var errors = document.getElementById('errors');
-        errors.appendNotification('User agent spoofing not yet implemented.');
-        return;
+        if (window.navigator.userAgent != result.firstPacket.userAgent) {
+          var errors = document.getElementById('errors');
+          errors.appendNotification('User agent spoofing not yet implemented.');
+          return;
+        }
       }
 
       var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
@@ -188,7 +190,7 @@ function onResultDoubleClick () {
         var cookieString = cookieName + '=' + cookieValue + ';domain=.' + cookieUri.host;
         cookieSvc.setCookieString(cookieUri, null, cookieString, null);
       }
-
+      
       mainWindow.gBrowser.selectedTab = mainWindow.gBrowser.addTab(result.siteUrl);
     }
   } catch (e) {

diff --git a/xpi/chrome/content/preferences/websiteEditor.xul b/xpi/chrome/content/preferences/websiteEditor.xul
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
 <?xml-stylesheet href="chrome://firesheep/skin/preferences.css"?>
 
 <!--

diff --git a/xpi/chrome/content/preferences/websitesPane.js b/xpi/chrome/content/preferences/websitesPane.js
@@ -65,7 +65,7 @@ function editScript () {
   try {
     var item = document.getElementById("scriptsList").selectedItem;
     if (item)
-      window.openDialog('websiteEditor.xul', null, 'modal', item.value, item.isUser);
+      window.openDialog('websiteEditor.xul', null, 'modal,centerscreen', item.value, item.isUser);
   } catch (e) {
     alert(e);
   }

diff --git a/xpi/chrome/skin/preferences-osx.css b/xpi/chrome/skin/preferences-osx.css
@@ -0,0 +1,3 @@
+prefwindow {
+  height: auto !important;
+}
diff --git a/xpi/chrome/skin/preferences.css b/xpi/chrome/skin/preferences.css
@@ -1,18 +1,9 @@
-caption {
-  font-weight: bold;
+prefwindow {
+  height: 350px;
 }
 
-#websitesPane {
- /* padding: 0; */
-}
-
-#websitesPane listbox {
-/*  
-  margin: 0;
-  -moz-appearance: none; 
-  border: 0;
-  background: #DEE4EA;
-  */
+caption {
+  font-weight: bold;
 }
 
 #websitesPane splitter {

diff --git a/xpi/chrome/skin/sidebar-osx.css b/xpi/chrome/skin/sidebar-osx.css
@@ -0,0 +1,45 @@
+firesheepSidebar {
+  -moz-appearance: none;
+  background: transparent;
+}
+
+#firesheepSidebar #toolbar {
+  background: -moz-linear-gradient(top, #EDEDED, #D8D8D8);
+  border-bottom: 1px solid #B8B8B8;
+}
+
+#firesheepSidebar #toolbar button {
+  -moz-appearance: none;
+  border: 1px solid #7F7F7F;
+  -moz-border-radius: 10px;
+  background: -moz-linear-gradient(top, #FFF, #BBB);
+  min-width: 0px;
+  min-height: 0px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 5px;
+  margin: 0;
+  padding: 2px 0;
+}
+
+#firesheepSidebar #toolbar button:active {
+  background: -moz-linear-gradient(top, #BBB, #FFF);
+}
+
+#firesheepSidebar richlistbox {
+  background: transparent;
+}
+
+#bottombar {
+  background: white url(chrome://firesheep/skin/bottombar_bg.png) repeat-x;
+  border-top: 0 !important;
+}
+
+#bottombar button {
+}
+
+#splitterHandle {
+  background: url(chrome://firesheep/skin/bottombar_handle.png) no-repeat;
+  min-width: 15px;
+  max-width: 15px;
+	display: block !important;	
+}
diff --git a/xpi/chrome/skin/sidebar.css b/xpi/chrome/skin/sidebar.css
@@ -1,35 +1,11 @@
-#firesheepSidebar  {
-  -moz-appearance: none;
-  background: transparent;
-}
-
 #firesheepSidebar #toolbar {
   padding: 6px;
-  background: -moz-linear-gradient(top, #EDEDED, #D8D8D8);
-  border-bottom: 1px solid #B8B8B8;
+  border-bottom: 1px solid threedshadow;
 }
 
 #firesheepSidebar richlistbox {
   margin: 0;
   -moz-appearance: none; 
-  background: transparent;
-}
-
-#firesheepSidebar #toolbar button {
-  -moz-appearance: none;
-  border: 1px solid #7F7F7F;
-  -moz-border-radius: 10px;
-  background: -moz-linear-gradient(top, #FFF, #BBB);
-  min-width: 0px;
-  min-height: 0px;
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px;
-  margin: 0;
-  padding: 2px 0;
-}
-
-#firesheepSidebar #toolbar button:active {
-  background: -moz-linear-gradient(top, #BBB, #FFF);
 }
 
 #detailsTree {
@@ -56,12 +32,12 @@ splitter {
 }
 
 #bottombar {
-  background: white url(chrome://firesheep/skin/bottombar_bg.png) repeat-x;
-/*  border-top: 1px solid #CACACA; */
+  border-top: 1px solid threedshadow;
 }
 
 #bottombar button {
   -moz-appearance: none;
+  border: 0;
   padding: 0;
   margin: 0px 0 0 -1px !important;
   min-height: 23px;
@@ -89,7 +65,5 @@ splitter {
 }
 
 #splitterHandle {
-  background: url(chrome://firesheep/skin/bottombar_handle.png) no-repeat;
-  min-width: 15px;
-  max-width: 15px;
+  display: none !important;
 }
diff --git a/xpi/defaults/preferences/prefs.js b/xpi/defaults/preferences/prefs.js
@@ -22,6 +22,7 @@
 
 pref("firesheep.capture_interface", "");
 pref("firesheep.capture_filter", "tcp port 80");
+pref("firesheep.first_run", true);
 
 // https://developer.mozilla.org/en/Localizing_extension_descriptions
 pref("extensions.firesheep@codebutler.com.description", "chrome://firesheep/locale/overlay.properties");