Merge branch 'master' into plugins-and-OOP

export.php

@@ -444,9 +444,9 @@ if (! $save_on_server) {
         }
 
         foreach ($_REQUEST as $name => $value) {
-            $back_button .= '&' . urlencode($name) . '=' . urlencode($value);
+            $back_button .= '&' . urlencode($name) . '=' . urlencode($value);
         }
-        $back_button .= '&repopulate=1">Back</a> ]</p>';
+        $back_button .= '&amp;repopulate=1">Back</a> ]</p>';
 
         echo $back_button;
         echo '    <form name="nofunction">' . "\n"
@@ -754,8 +754,8 @@ if (! empty($asfile)) {
     if ($compression == 'zip') {
         if (@function_exists('gzcompress')) {
             $zipfile = new ZipFile();
-            $zipfile -> addFile($dump_buffer, substr($filename, 0, -4));
-            $dump_buffer = $zipfile -> file();
+            $zipfile->addFile($dump_buffer, substr($filename, 0, -4));
+            $dump_buffer = $zipfile->file();
         }
     } elseif ($compression == 'bzip2') {
         // 2. as a bzipped file
@@ -774,7 +774,7 @@ if (! empty($asfile)) {
     if ($save_on_server) {
         $write_result = @fwrite($file_handle, $dump_buffer);
         fclose($file_handle);
-        if (strlen($dump_buffer) !=0
+        if (strlen($dump_buffer) > 0
             && (! $write_result || ($write_result != strlen($dump_buffer)))
         ) {
             $message = new PMA_Message(
@@ -821,22 +821,10 @@ if (! empty($asfile)) {
 ?>
 <script type="text/javascript">
 //<![CDATA[
-    var bodyWidth=null; var bodyHeight=null;
-    if (document.getElementById('textSQLDUMP')) {
-        bodyWidth  = self.innerWidth;
-        bodyHeight = self.innerHeight;
-        if (! bodyWidth && ! bodyHeight) {
-            if (document.compatMode && document.compatMode == "BackCompat") {
-                bodyWidth  = document.body.clientWidth;
-                bodyHeight = document.body.clientHeight;
-            } else if (document.compatMode && document.compatMode == "CSS1Compat") {
-                bodyWidth  = document.documentElement.clientWidth;
-                bodyHeight = document.documentElement.clientHeight;
-            }
-        }
-        document.getElementById('textSQLDUMP').style.width=(bodyWidth-50) + 'px';
-        document.getElementById('textSQLDUMP').style.height=(bodyHeight-100) + 'px';
-    }
+    var $body = $("body");
+    $("#textSQLDUMP")
+        .width($body.width() - 50)
+        .height($body.height() - 100);
 //]]>
 </script>
 <?php

test/classes/PMA_Footer_test.php

@@ -14,7 +14,7 @@ require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/core.lib.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
-require_once 'libraries/common.lib.php';
+require_once 'libraries/CommonFunctions.class.php';
 require_once 'libraries/Theme.class.php';
 
 class PMA_Footer_test extends PHPUnit_Framework_TestCase

user_password.php

@@ -192,7 +192,7 @@ function PMA_changePassAuthType($_url_params, $password)
     
     //    include_once "libraries/plugins/auth/AuthenticationCookie.class.php";
     //    $auth_plugin = new AuthenticationCookie();
-    // the $auth_plugin is already defined in common.lib.php when this is used
+    // the $auth_plugin is already defined in common.inc.php when this is used
     global $auth_plugin;
     
     if ($GLOBALS['cfg']['Server']['auth_type'] == 'cookie') {