From d1584f3f541eafac97ae5fb4b56ee21660ae7366 Mon Sep 17 00:00:00 2001
From: Brendan Coles <bcoles@gmail.com>
Date: Wed, 27 Jan 2016 17:29:01 +0000
Subject: [PATCH] Add support for Midori browser

---
 core/main/client/browser.js     | 22 +++++++++++++++++++---
 core/main/constants/browsers.rb |  6 ++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/core/main/client/browser.js b/core/main/client/browser.js
index 2a248824a..d842c07f1 100644
--- a/core/main/client/browser.js
+++ b/core/main/client/browser.js
@@ -29,12 +29,20 @@ beef.browser = {
 
     /**
      * Returns true if Iceweasel.
-     * @example: beef.browser.isI()
+     * @example: beef.browser.isIceweasel()
      */
-    isI: function () {
+    isIceweasel: function () {
         return window.navigator.userAgent.match(/Iceweasel\/\d+\.\d/) != null;
     },
 
+    /**
+     * Returns true if Midori.
+     * @example: beef.browser.isMidori()
+     */
+    isMidori: function () {
+        return window.navigator.userAgent.match(/Midori\/\d+\.\d/) != null;
+    },
+
     /**
      * Returns true if IE6.
      * @example: beef.browser.isIE6()
@@ -1843,7 +1851,15 @@ beef.browser = {
             return 'S'
         }
         ;		// Safari any version
-        return 'UNKNOWN';					// Unknown UA
+        if (this.isA()) {
+            return 'A'
+        }
+        ;               // Avant any version
+        if (this.isMidori()) {
+            return 'MI'
+        }
+        ;               // Midori any version
+        return 'UNKNOWN';	// Unknown UA
     },
 
     /**
diff --git a/core/main/constants/browsers.rb b/core/main/constants/browsers.rb
index 710c96362..de28cf7a0 100644
--- a/core/main/constants/browsers.rb
+++ b/core/main/constants/browsers.rb
@@ -17,6 +17,8 @@ module Constants
     K       = 'K'        # Konqueror
     C       = 'C'        # Chrome
     O       = 'O'        # Opera
+    A       = 'A'        # Avant
+    MI      = 'MI'       # Midori
     ALL     = 'ALL'      # ALL
     UNKNOWN = 'UN'       # Unknown
 
@@ -27,6 +29,8 @@ module Constants
     FRIENDLY_K_NAME   = 'Konqueror'
     FRIENDLY_C_NAME   = 'Chrome'
     FRIENDLY_O_NAME   = 'Opera'
+    FRIENDLY_A_NAME   = 'Avant'
+    FRIENDLY_MI_NAME  = 'Midori'
     FRIENDLY_UN_NAME  = 'UNKNOWN'
 
     # Attempt to retrieve a browser's friendly name
@@ -42,6 +46,8 @@ module Constants
         when K ;       return FRIENDLY_K_NAME
         when C ;       return FRIENDLY_C_NAME
         when O ;       return FRIENDLY_O_NAME
+        when A ;       return FRIENDLY_A_NAME
+        when MI ;      return FRIENDLY_MI_NAME
         when UNKNOWN;  return FRIENDLY_UN_NAME
       end