Merge pull request #186 from s0m30n3/master

Specify MySQL socket file via PMA_SOCKET and PMA_SOCKETS environment …

Author: nijel

etc/phpmyadmin/config.inc.php

@@ -11,6 +11,8 @@
     'PMA_VERBOSES',
     'PMA_PORT',
     'PMA_PORTS',
+    'PMA_SOCKET',
+    'PMA_SOCKETS',
     'PMA_USER',
     'PMA_PASSWORD',
     'PMA_ABSOLUTE_URI',
@@ -56,6 +58,11 @@
     $verbose = explode(',', $_ENV['PMA_VERBOSES']);
     $ports = explode(',', $_ENV['PMA_PORTS']);
 }
+if (!empty($_ENV['PMA_SOCKET'])) {
+    $sockets = array($_ENV['PMA_SOCKET']);
+} elseif (!empty($_ENV['PMA_SOCKETS'])) {
+    $sockets = explode(',', $_ENV['PMA_SOCKETS']);
+}
 
 /* Server settings */
 for ($i = 1; isset($hosts[$i - 1]); $i++) {
@@ -110,6 +117,10 @@
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
+for ($i = 1; isset($sockets[$i - 1]); $i++) {
+    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
+    $cfg['Servers'][$i]['host'] = 'localhost';
+}
 /*
  * Revert back to last configured server to make
  * it easier in config.user.inc.php