check if the env is set

phpmyadmin · Mar 21, 2018 · 93e2be7 · 93e2be7
1 parent 85198de
commit 93e2be7
Showing 1 changed file with 36 additions and 26 deletions.
diff --git a/etc/phpmyadmin/config.inc.php b/etc/phpmyadmin/config.inc.php
@@ -73,32 +73,42 @@
     } else {
         $cfg['Servers'][$i]['auth_type'] = 'cookie';
     }
-    $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
-    $cfg['Servers'][$i]['controlport'] = $_ENV['PMA_CONTROLPORT'];
-    $cfg['Servers'][$i]['controluser'] = $_ENV['PMA_CONTROLUSER'];
-    $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
-    $cfg['Servers'][$i]['pmadb'] = $_ENV['PMA_PMADB'];
-    $cfg['Servers'][$i]['relation'] = 'pma__relation';
-    $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-    $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-    $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-    $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-    $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-    $cfg['Servers'][$i]['history'] = 'pma__history';
-    $cfg['Servers'][$i]['recent'] = 'pma__recent';
-    $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-    $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-    $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-    $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-    $cfg['Servers'][$i]['users'] = 'pma__users';
-    $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-    $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-    $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-    $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-    $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-    $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-    $cfg['Servers'][$i]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
+    if (isset($_ENV['PMA_PMADB'])) {
+      $cfg['Servers'][$i]['pmadb'] = $_ENV['PMA_PMADB'];
+      $cfg['Servers'][$i]['relation'] = 'pma__relation';
+      $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
+      $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
+      $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
+      $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
+      $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
+      $cfg['Servers'][$i]['history'] = 'pma__history';
+      $cfg['Servers'][$i]['recent'] = 'pma__recent';
+      $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
+      $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
+      $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
+      $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+      $cfg['Servers'][$i]['users'] = 'pma__users';
+      $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
+      $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
+      $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
+      $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
+      $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
+      $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
+      $cfg['Servers'][$i]['compress'] = false;
+      $cfg['Servers'][$i]['AllowNoPassword'] = true;
+    }
+    if (isset($_ENV['PMA_CONTROLHOST'])) {
+      $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
+    }
+    if (isset($_ENV['PMA_CONTROLPORT'])) {
+      $cfg['Servers'][$i]['controlport'] = $_ENV['PMA_CONTROLPORT'];
+    }
+    if (isset($_ENV['PMA_CONTROLUSER'])) {
+      $cfg['Servers'][$i]['controluser'] = $_ENV['PMA_CONTROLUSER'];
+    }
+    if (isset($_ENV['PMA_CONTROLPASS'])) {
+      $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
+    }
 }
 /*
  * Revert back to last configured server to make