mac-cain13 · Aug 19, 2017 · Aug 19, 2017 · Aug 19, 2017 · Aug 19, 2017 · Aug 22, 2017
diff --git a/Readme.md b/Readme.md
@@ -1,27 +1,40 @@
-XDebug Helper for Google Chrome
-===============================
+XDebug Helper for Firefox
+=========================
 
 Debugging, profiling and tracing PHP code with [Xdebug](http://xdebug.org/) is very powerful, but enabling
 Xdebug with cookies or adding POST/GET variables is way too hard. This extension will help you to enable/disable
 debugging, profiling and tracing of your PHP-code easily.
 
+It is based on the Chrome extension https://github.com/mac-cain13/xdebug-helper-for-chrome/ with the edits to
+remove unsupported webextensions API calls.
+
 Hotkeys
 -------
-Ctrl+Shift+X (Cmd+Shift+X on Mac) opens the popup.  
+Ctrl+Shift+X (Cmd+Shift+X on Mac) opens the popup.
 Alt+Shift+X toggles the debugging state.
 
 How to install this extension?
 ------------------------------
-**Stable version:** Go to the [Google Chrome Web Store](https://chrome.google.com/webstore/detail/eadndfjplgieldjbigjakmdgkmoaaaoc)
-and click "Add to Chrome".
+**Stable version:** Go to the [Firefox Addon](https://addons.mozilla.org/en-GB/firefox/addon/xdebug-helper-for-firefox/)
+and click "Add to Firefox".
 
-**Development version:** [Download the source from GitHub](https://github.com/mac-cain13/xdebug-helper-for-chrome/archive/master.zip)
-and [load the extension into Chrome](http://developer.chrome.com/extensions/getstarted.html#unpacked)
+**Development version:** [Download the source from GitHub](https://github.com/BrianGilbert/xdebug-helper-for-firefox/archive/master.zip)
+and [load the extension into Firefox](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Temporary_Installation_in_Firefox)
 yourself!
 
+Pitfalls
+--------
+**Xdebug Icon not showing up in Address bar.**
+
+You might need to either allow the extension to run in private mode or enable your browser history.
+Disabling the browser history internally turns on the private-mode and disables all plugins that aren't allowed for private mode.
+
+@see [this comment](https://github.com/BrianGilbert/xdebug-helper-for-firefox/issues/33#issuecomment-1168994059) and [that comment](https://bugzilla.mozilla.org/show_bug.cgi?id=1266409#c2)
+
+
 How do I contribute?
 --------------------
-A: [Submit issues and ideas](https://github.com/mac-cain13/xdebug-helper-for-chrome/issues)
+A: [Submit issues and ideas](https://github.com/BrianGilbert/xdebug-helper-for-firefox/issues)
 
 B: [Submit a pull request](https://help.github.com/articles/using-pull-requests)
 
@@ -33,11 +46,12 @@ _**Pro-tip:** Make sure to build upon the latest version of the code and keep pu
 
 License
 -------
-The code of this project is licensed under the [MIT license](https://raw.github.com/mac-cain13/xdebug-helper-for-chrome/master/source/License)
+The code of this project is licensed under the [MIT license](https://raw.github.com/BrianGilbert/xdebug-helper-for-firefox/master/source/License)
 so you can use it in nearly every project you want to, commercial and non-commercial.
 
 Special thanks
 --------------
+* [Mathijs Kadijk](http://mathijskadijk.nl/) for creating [Xdebug helper](https://chrome.google.com/webstore/detail/eadndfjplgieldjbigjakmdgkmoaaaoc) for Chrome
 * [remailednet](http://blog.remailed.net) for creating the original [XDebug Enabler](https://chrome.google.com/webstore/detail/eippbhbeglgcphcjmpjcjinjamabeoln) for Chrome
 * [Guilherme Pim](https://github.com/pimguilherme) for contributing a Manifest v2 version
 * [All contributors](https://github.com/wrep/xdebug-helper-for-chrome/graphs/contributors) for taking the time to create a pull request
diff --git a/source/License b/source/License
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Mathijs Kadijk - https://github.com/mac-cain13
+Copyright (c) 2017 Brian Gilbert - https://github.com/BrianGilbert
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software

diff --git a/source/background.js b/source/background.js
@@ -1,5 +1,10 @@
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 {
+    // Only show icon on http/https pages.
+	if (!tab.url.match(/^about:|^moz-extension:/)) {
+        browser.pageAction.show(tab.id);
+    }
+
 	// We only react on a complete load of a http(s) page,
 	//  only then we're sure the content.js is loaded.
 	if (changeInfo.status !== "complete" || tab.url.indexOf("http") !== 0)
@@ -127,32 +132,32 @@ function updateIcon(status, tabId)
 {
 	// Figure the correct title/image with the given state
 	var title = "Debugging, profiling & tracing disabled",
-		image = "images/bug-gray.png";
+		image = "images/bug-outline.svg";
 
 	if (status == 1)
 	{
 		title = "Debugging enabled";
-		image = "images/bug.png";
+		image = "images/bug-green.svg";
 	}
 	else if (status == 2)
 	{
 		title = "Profiling enabled";
-		image = "images/clock.png";
+		image = "images/clock.svg";
 	}
 	else if (status == 3)
 	{
 		title = "Tracing enabled";
-		image = "images/script.png";
+		image = "images/script.svg";
 	}
 
 	// Update title
-	chrome.browserAction.setTitle({
+	chrome.pageAction.setTitle({
 		tabId: tabId,
 		title: title
 	});
 
 	// Update image
-	chrome.browserAction.setIcon({
+	chrome.pageAction.setIcon({
 		tabId: tabId,
 		path: image
 	});

diff --git a/source/content.js b/source/content.js
@@ -4,7 +4,7 @@ var xdebug = (function() {
 	{
 		var exp = new Date();
 		exp.setTime(exp.getTime() + (days * 24 * 60 * 60 * 1000));
-		document.cookie = name + "=" + value + "; expires=" + exp.toGMTString() + "; path=/";
+		document.cookie = name + "=" + value + "; expires=" + exp.toGMTString() + "; path=/; SameSite=Lax";
 	}
 
 	// Get the content in a cookie

diff --git a/source/fonts/MaterialIcons-Regular.eot b/source/fonts/MaterialIcons-Regular.eot
diff --git a/source/fonts/MaterialIcons-Regular.ttf b/source/fonts/MaterialIcons-Regular.ttf
diff --git a/source/fonts/MaterialIcons-Regular.woff b/source/fonts/MaterialIcons-Regular.woff
diff --git a/source/fonts/MaterialIcons-Regular.woff2 b/source/fonts/MaterialIcons-Regular.woff2
diff --git a/source/images/bug-gray.png b/source/images/bug-gray.png
diff --git a/source/images/bug-green.svg b/source/images/bug-green.svg
diff --git a/source/images/bug-outline.svg b/source/images/bug-outline.svg
diff --git a/source/images/bug.png b/source/images/bug.png
diff --git a/source/images/clock.png b/source/images/clock.png
diff --git a/source/images/clock.svg b/source/images/clock.svg
diff --git a/source/images/script.png b/source/images/script.png
diff --git a/source/images/script.svg b/source/images/script.svg