Переглянути джерело

Ensure database editors load via HTTPS when launched from Web UI

Kristan Kenney 6 роки тому
батько
коміт
0062d0233f
2 змінених файлів з 8 додано та 8 видалено
  1. 4 4
      web/templates/admin/list_db.html
  2. 4 4
      web/templates/user/list_db.html

+ 4 - 4
web/templates/admin/list_db.html

@@ -13,13 +13,13 @@
               if ($data[$key]['TYPE'] == 'mysql'){
               if ($data[$key]['TYPE'] == 'mysql'){
                 $mysql = 1;
                 $mysql = 1;
 
 
-                $db_myadmin_link = "http://".$http_host."/phpmyadmin/";
+                $db_myadmin_link = "https://".$http_host."/phpmyadmin/";
                 if (!empty($_SESSION['DB_PMA_URL']))
                 if (!empty($_SESSION['DB_PMA_URL']))
                   $db_myadmin_link = $_SESSION['DB_PMA_URL'];
                   $db_myadmin_link = $_SESSION['DB_PMA_URL'];
               }
               }
               if ($data[$key]['TYPE'] == 'pgsql'){
               if ($data[$key]['TYPE'] == 'pgsql'){
                 $pgsql = 1;
                 $pgsql = 1;
-                $db_pgadmin_link = "http://".$http_host."/phppgadmin/";
+                $db_pgadmin_link = "https://".$http_host."/phppgadmin/";
                 if (!empty($_SESSION['DB_PGA_URL']))
                 if (!empty($_SESSION['DB_PGA_URL']))
                   $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
                   $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
               }
               }
@@ -107,10 +107,10 @@
           }
           }
           if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
           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 = "phpMyAdmin";
-          if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
+          if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpmyadmin/";
           if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
           if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
           if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
           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') $db_admin_link = "https://".$http_host."/phppgadmin/";
           if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
           if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
       ?>
       ?>
 
 

+ 4 - 4
web/templates/user/list_db.html

@@ -13,13 +13,13 @@
               if ($data[$key]['TYPE'] == 'mysql'){
               if ($data[$key]['TYPE'] == 'mysql'){
                 $mysql = 1;
                 $mysql = 1;
 
 
-                $db_myadmin_link = "http://".$http_host."/phpmyadmin/";
+                $db_myadmin_link = "https://".$http_host."/phpmyadmin/";
                 if (!empty($_SESSION['DB_PMA_URL']))
                 if (!empty($_SESSION['DB_PMA_URL']))
                   $db_myadmin_link = $_SESSION['DB_PMA_URL'];
                   $db_myadmin_link = $_SESSION['DB_PMA_URL'];
               }
               }
               if ($data[$key]['TYPE'] == 'pgsql'){
               if ($data[$key]['TYPE'] == 'pgsql'){
                 $pgsql = 1;
                 $pgsql = 1;
-                $db_pgadmin_link = "http://".$http_host."/phppgadmin/";
+                $db_pgadmin_link = "https://".$http_host."/phppgadmin/";
                 if (!empty($_SESSION['DB_PGA_URL']))
                 if (!empty($_SESSION['DB_PGA_URL']))
                   $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
                   $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
               }
               }
@@ -106,10 +106,10 @@
           }
           }
           if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
           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 = "phpMyAdmin";
-          if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
+          if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpmyadmin/";
           if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
           if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
           if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
           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') $db_admin_link = "https://".$http_host."/phppgadmin/";
           if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
           if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
       ?>
       ?>