Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

ChangeLog

@@ -72,6 +72,7 @@ explanation
 - bug #4788 Inline edit of DATE fields with NULL, NULL checkbox is under datepicker
 - bug #4790 DROP TABLE/VIEW IF EXISTS are not tracked
 - bug       Compatibility with central columns of version 4.4
+- bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore
 
 4.3.11.1 (2015-03-04)
 - bug       [security] Risk of BREACH attack, see PMASA-2015-1

js/makegrid.js

@@ -1033,11 +1033,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
 
                     $input_field.datepicker("show");
 
-                    var datepicker_top = parseInt(document.getElementById("ui-datepicker-div").style.getPropertyValue("top"), 10);
+                    //move ui-datepicker-div inside cEdit div
+                    var datepicker_div = $('#ui-datepicker-div');
+                    datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'});
+                    $('.cEdit').append(datepicker_div);
 
-                    if (datepicker_top > 370 && !is_null) {
-                        document.getElementById("ui-datepicker-div").style.marginTop = "30px";
-                    }
+                    var edit_area_top = $('#ui-datepicker-div').height()+32;
+                    $('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'});
 
                     if (is_null){
                         $(g.cEdit).find('.edit_area').hide();

libraries/plugins/auth/AuthenticationHttp.class.php

@@ -22,7 +22,7 @@ require_once 'libraries/plugins/AuthenticationPlugin.class.php';
 class AuthenticationHttp extends AuthenticationPlugin
 {
     /**
-     * Displays authentication form
+     * Displays authentication form and redirect as necessary
      *
      * @global  string    the font face to use in case of failure
      * @global  string    the default font size to use in case of failure
@@ -44,6 +44,16 @@ class AuthenticationHttp extends AuthenticationPlugin
             }
         }
 
+        return $this->authForm();
+    }
+
+    /**
+     * Displays authentication form
+     *
+     * @return boolean
+     */
+    public function authForm()
+    {
         /* Perform logout to custom URL */
         if (! empty($_REQUEST['old_usr'])
             && ! empty($GLOBALS['cfg']['Server']['LogoutURL'])
@@ -261,7 +271,7 @@ class AuthenticationHttp extends AuthenticationPlugin
         if ($error && $GLOBALS['errno'] != 1045) {
             PMA_fatalError($error);
         } else {
-            $this->auth();
+            $this->authForm();
             return true;
         }
     }

test/classes/plugin/auth/PMA_AuthenticationHttp_test.php

@@ -452,12 +452,13 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase
 
         $this->object = $this->getMockBuilder('AuthenticationHttp')
             ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
+            ->setMethods(array('authForm'))
             ->getMock();
 
         $this->object->expects($this->exactly(2))
-            ->method('auth');
+            ->method('authForm');
         // case 2
+        $GLOBALS['cfg']['Server']['host'] = 'host';
         $GLOBALS['errno'] = 1045;
 
         $this->assertTrue(