Skip to content

Commit 0062d02

Browse files
author
Kristan Kenney
committed
Ensure database editors load via HTTPS when launched from Web UI
1 parent 9c0ad28 commit 0062d02

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

web/templates/admin/list_db.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
if ($data[$key]['TYPE'] == 'mysql'){
1414
$mysql = 1;
1515

16-
$db_myadmin_link = "http://".$http_host."/phpmyadmin/";
16+
$db_myadmin_link = "https://".$http_host."/phpmyadmin/";
1717
if (!empty($_SESSION['DB_PMA_URL']))
1818
$db_myadmin_link = $_SESSION['DB_PMA_URL'];
1919
}
2020
if ($data[$key]['TYPE'] == 'pgsql'){
2121
$pgsql = 1;
22-
$db_pgadmin_link = "http://".$http_host."/phppgadmin/";
22+
$db_pgadmin_link = "https://".$http_host."/phppgadmin/";
2323
if (!empty($_SESSION['DB_PGA_URL']))
2424
$db_pgadmin_link = $_SESSION['DB_PGA_URL'];
2525
}
@@ -107,10 +107,10 @@
107107
}
108108
if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
109109
if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
110-
if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
110+
if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpmyadmin/";
111111
if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
112112
if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
113-
if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
113+
if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "https://".$http_host."/phppgadmin/";
114114
if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
115115
?>
116116

web/templates/user/list_db.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
if ($data[$key]['TYPE'] == 'mysql'){
1414
$mysql = 1;
1515

16-
$db_myadmin_link = "http://".$http_host."/phpmyadmin/";
16+
$db_myadmin_link = "https://".$http_host."/phpmyadmin/";
1717
if (!empty($_SESSION['DB_PMA_URL']))
1818
$db_myadmin_link = $_SESSION['DB_PMA_URL'];
1919
}
2020
if ($data[$key]['TYPE'] == 'pgsql'){
2121
$pgsql = 1;
22-
$db_pgadmin_link = "http://".$http_host."/phppgadmin/";
22+
$db_pgadmin_link = "https://".$http_host."/phppgadmin/";
2323
if (!empty($_SESSION['DB_PGA_URL']))
2424
$db_pgadmin_link = $_SESSION['DB_PGA_URL'];
2525
}
@@ -106,10 +106,10 @@
106106
}
107107
if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
108108
if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
109-
if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
109+
if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpmyadmin/";
110110
if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
111111
if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
112-
if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
112+
if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "https://".$http_host."/phppgadmin/";
113113
if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
114114
?>
115115

0 commit comments

Comments
 (0)