From 563d00dd0264b191abc4261a4fa43ff4b4e714a4 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sat, 23 Nov 2013 14:56:58 +0200 Subject: [PATCH] custom phpMyAdmin and phpPgAdmin links --- web/list/db/index.php | 5 +++++ web/templates/admin/list_db.html | 2 ++ web/templates/user/list_db.html | 2 ++ 3 files changed, 9 insertions(+) diff --git a/web/list/db/index.php b/web/list/db/index.php index 2a323930..5991f4e8 100644 --- a/web/list/db/index.php +++ b/web/list/db/index.php @@ -11,6 +11,11 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); // Panel top_panel($user,$TAB); +// SYS +exec (VESTA_CMD."v-list-sys-config json", $output, $return_var); +$sys = json_decode(implode('', $output), true); +unset($output); + // Data exec (VESTA_CMD."v-list-databases $user json", $output, $return_var); $data = json_decode(implode('', $output), true); diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html index de868f61..17d7bb8e 100644 --- a/web/templates/admin/list_db.html +++ b/web/templates/admin/list_db.html @@ -45,8 +45,10 @@ if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST']; if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin"; if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/"; + if (($data[$key]['TYPE'] == 'mysql') && (!empty($sys['config']['DB_PMA_URL']))) $db_admin_link = $sys['config']['DB_PMA_URL']; if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin"; if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/"; + if (($data[$key]['TYPE'] == 'pgsql') && (!empty($sys['config']['DB_PGA_URL']))) $db_admin_link = $sys['config']['DB_PGA_URL']; ?> diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html index 4c6ca965..88c83328 100644 --- a/web/templates/user/list_db.html +++ b/web/templates/user/list_db.html @@ -41,8 +41,10 @@ if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST']; if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin"; if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/"; + if (($data[$key]['TYPE'] == 'mysql') && (!empty($sys['config']['DB_PMA_URL']))) $db_admin_link = $sys['config']['DB_PMA_URL']; if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin"; if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/"; + if (($data[$key]['TYPE'] == 'pgsql') && (!empty($sys['config']['DB_PGA_URL']))) $db_admin_link = $sys['config']['DB_PGA_URL']; ?>