Merge branch 'fix-pma-url'

bin/v-change-sys-db-alias

@@ -0,0 +1,106 @@
+#!/bin/bash
+# info: change phpmyadmin/phppgadmin alias url
+# options: type alias
+# example:  v-change-sys-db-alias pma phpmyadmin
+#           Sets phpMyAdmin alias to phpmyadmin
+#
+# example:  v-change-sys-db-alias pga phppgadmin
+#           Sets phpPgAdmin alias to phppgadmin
+#
+# This function changes the database editor url in
+# apache2 or nginx configuration.
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument definition
+type=$1
+alias=$2
+
+# Includes
+source $HESTIA/func/main.sh
+source $HESTIA/conf/hestia.conf
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '2' "$#" 'type alias'
+
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Detect common allowed entries for phpMyAdmin
+if [ "$type" = "pma" ] || [ "$type" = "PMA" ] || [ "$type" = "phpmyadmin" ]; then
+    # Set database editor friendly name
+    db_editor="phpMyAdmin"
+
+    # Set new alias value
+    $BIN/v-change-sys-config-value 'DB_PMA_ALIAS' "$alias"
+
+    # Replace old configuration files and update alias
+    if [ -e "/etc/apache2/conf.d/phpmyadmin.conf" ]; then
+        rm -f /etc/apache2/conf.d/phpmyadmin.conf
+        cp -f $HESTIA_INSTALL_DIR/pma/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
+        sed -i "s|%pma_alias%|$alias|g" /etc/apache2/conf.d/phpmyadmin.conf
+        
+        # Restart services
+        $HESTIA/bin/v-restart-service apache2
+    fi
+
+    if [ -e "/etc/nginx/conf.d/phpmyadmin.inc" ]; then
+        rm -f /etc/nginx/conf.d/phpmyadmin.inc
+        cp -f $HESTIA_INSTALL_DIR/nginx/phpmyadmin.inc /etc/nginx/conf.d/phpmyadmin.inc
+        sed -i "s|%pma_alias%|$alias|g" /etc/nginx/conf.d/phpmyadmin.inc
+        
+        # Restart services
+        $HESTIA/bin/v-restart-service nginx
+    fi
+fi
+
+# Detect common allowed entries for phpPgAdmin
+if [ "$type" = "pga" ] || [ "$type" = "PGA" ] || [ "$type" = "phppgadmin" ]; then
+    # Set database editor friendly name
+    db_editor="phpPgAdmin"
+
+    # Set new alias value
+    $BIN/v-change-sys-config-value 'DB_PGA_ALIAS' "$alias"
+
+    # Replace old configuration files and update alias
+    if [ -e "/etc/apache2/conf.d/phppgadmin.conf" ]; then
+        rm -f /etc/apache2/conf.d/phppgadmin.conf
+        cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/phppgadmin.conf
+        sed -i "s|%pga_alias%|$alias|g" /etc/apache2/conf.d/phppgadmin.conf 
+        
+        # Restart services
+        $HESTIA/bin/v-restart-service apache2
+    fi
+
+    if [ -e "/etc/nginx/conf.d/phppgadmin.inc" ]; then
+        rm -f /etc/nginx/conf.d/phppgadmin.inc
+        cp -f $HESTIA_INSTALL_DIR/nginx/phppgadmin.inc /etc/nginx/conf.d/phppgadmin.inc
+        sed -i "s|%pga_alias%|$alias|g" /etc/nginx/conf.d/phppgadmin.inc
+        
+        # Restart services
+        $HESTIA/bin/v-restart-service nginx
+    fi
+fi
+
+
+#----------------------------------------------------------#
+#                       Hestia                             #
+#----------------------------------------------------------#
+
+# Logging
+log_history "changed $db_editor alias to $alias"
+log_event "$OK" "$ARGUMENTS"
+
+exit

bin/v-change-sys-pma

@@ -1,88 +0,0 @@
-#!/bin/bash
-# info: change phpmyadmin alias url
-# options: PMA
-#
-# This function changes the phpmyadmin url in apache2 or nginx configuration.
-
-
-#----------------------------------------------------------#
-#                    Variable&Function                     #
-#----------------------------------------------------------#
-
-# Argument definition
-PMA=$1
-
-# Includes
-source $HESTIA/func/main.sh
-source $HESTIA/conf/hestia.conf
-
-
-#----------------------------------------------------------#
-#                    Verifications                         #
-#----------------------------------------------------------#
-
-check_args '1' "$#" 'PMA'
-
-# Check if string has leading /
-if [[ ! ${PMA:0:1} == "/" ]]; then
-    PMA="/$PMA"
-fi
-
-# Perform verification if read-only mode is enabled
-check_hestia_demo_mode
-
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-# Get existing apache2 pma alias
-if [ -f /etc/apache2/conf.d/phpmyadmin.conf ]; then
-    apache_pma=$(cat /etc/apache2/conf.d/phpmyadmin.conf | grep "Alias" | { IFS=' '; read -r -a array; echo "${array[1]}"; })
-fi
-
-# Get existing nginx pma alias
-if [ -f /etc/nginx/conf.d/phpmyadmin.inc ]; then
-    nginx_pma=$(cat /etc/nginx/conf.d/phpmyadmin.inc | grep "location" | { IFS=' '; read -r -a array; echo "${array[1]}"; })
-fi
-
-# Check if alias is different for apache2
-if [ ! -z "$apache_pma" ]; then
-    if [ ! "$apache_pma" = "$PMA" ]; then
-        # Replace pma alias in config files.
-        sed -i "s|Alias $apache_pma|Alias $PMA|" /etc/apache2/conf.d/phpmyadmin.conf
-
-        # Replace in Backend UI
-        sed -i "s|$apache_pma/|$PMA/|" /usr/local/hestia/web/templates/admin/list_db.html
-        sed -i "s|$apache_pma/|$PMA/|" /usr/local/hestia/web/templates/user/list_db.html
-
-        # Restart services
-        $HESTIA/bin/v-restart-service apache2
-    fi
-fi
-
-# Check if alias is different for nginx
-if [ ! -z "$nginx_pma" ]; then
-    if [ ! "$nginx_pma" = "$PMA" ]; then
-        # Replace pma alias in config files.
-        sed -i "s|$nginx_pma|$PMA|" /etc/nginx/conf.d/phpmyadmin.inc
-        sed -i "s|/usr/share$PMA|/usr/share/phpmyadmin|" /etc/nginx/conf.d/phpmyadmin.inc
-
-        # Replace in Backend UI
-        sed -i "s|$nginx_pma/|$PMA/|" /usr/local/hestia/web/templates/admin/list_db.html
-        sed -i "s|$nginx_pma/|$PMA/|" /usr/local/hestia/web/templates/user/list_db.html
-
-        # Restart services
-        $HESTIA/bin/v-restart-service nginx
-    fi
-fi
-
-
-#----------------------------------------------------------#
-#                       Hestia                             #
-#----------------------------------------------------------#
-
-# Logging
-#log_event "$OK" "$ARGUMENTS"
-
-exit

bin/v-list-sys-config

@@ -50,8 +50,8 @@ json_list() {
         "BACKUP_GZIP": "'$BACKUP_GZIP'",
         "BACKUP": "'$BACKUP'",
         "WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS'",
-        "DB_PMA_URL": "'$DB_PMA_URL'",
-        "DB_PGA_URL": "'$DB_PGA_URL'",
+        "DB_PMA_ALIAS": "'$DB_PMA_ALIAS'",
+        "DB_PGA_ALIAS": "'$DB_PGA_ALIAS'",
         "SOFTACULOUS": "'$SOFTACULOUS'"
     }
 }'
@@ -94,11 +94,11 @@ shell_list() {
     fi
     if [ ! -z "$DB_SYSTEM" ]; then
         echo "Database:         ${DB_SYSTEM//,/, }"
-        if [ ! -z "$DB_PMA_URL" ]; then
-            echo "PMA URL:          $DB_PMA_URL"
+        if [ ! -z "$DB_PMA_ALIAS" ]; then
+            echo "PMA ALIAS:          $DB_PMA_ALIAS"
         fi
-        if [ ! -z "$DB_PGA_URL" ]; then
-            echo "PGA URL:          $DB_PGA_URL"
+        if [ ! -z "$DB_PGA_ALIAS" ]; then
+            echo "PGA ALIAS:          $DB_PGA_ALIAS"
         fi
     fi
     if [ ! -z "$DNS_SYSTEM" ]; then
@@ -147,7 +147,7 @@ plain_list() {
     echo -ne "$DNS_SYSTEM\t$DNS_CLUSTER\t$STATS_SYSTEM\t$BACKUP_SYSTEM\t"
     echo -ne "$CRON_SYSTEM\t$DISK_QUOTA\t$FIREWALL_SYSTEM\t$FIREWALL_EXTENSION\t"
     echo -ne "$REPOSITORY\t$VERSION\t$DEMO_MODE\t$RELEASE_BRANCH\t$THEME\t$LANGUAGE\t"
-    echo -e "$BACKUP_GZIP\t$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL"
+    echo -e "$BACKUP_GZIP\t$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_ALIAS\t$DB_PGA_ALIAS"
 }
 
 
@@ -161,7 +161,7 @@ csv_list() {
     echo -n "'CRON_SYSTEM','DISK_QUOTA','FIREWALL_SYSTEM',"
     echo -n "'FIREWALL_EXTENSION','REPOSITORY',"
     echo -n "'VERSION','LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
-    echo -n "'DB_PMA_URL','DB_PGA_URL'"
+    echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS'"
     echo
     echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
     echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT',"
@@ -170,7 +170,7 @@ csv_list() {
     echo -n "'$DNS_CLUSTER','$STATS_SYSTEM','$BACKUP_SYSTEM','$CRON_SYSTEM',"
     echo -n "'$DISK_QUOTA','$FIREWALL_SYSTEM','$REPOSITORY','$FIREWALL_EXTENSION',"
     echo -n "'$VERSION','$DEMO_MODE','$RELEASE_BRANCH','$THEME','$LANGUAGE',"
-    echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
+    echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_ALIAS','$DB_PGA_ALIAS'"
     echo
 }
 

install/deb/nginx/phpmyadmin.inc

@@ -1,4 +1,4 @@
-location /phpmyadmin {
+location /%pma_alias% {
     alias /usr/share/phpmyadmin/;
 
     location ~ /(libraries|setup) {

install/deb/nginx/phppgadmin.inc

@@ -1,4 +1,4 @@
-location /phppgadmin {
+location /%pga_alias% {
     alias /usr/share/phppgadmin/;
 
     location ~ ^/phppgadmin/(.*\.php)$ {

install/deb/pga/phppgadmin.conf

@@ -1,4 +1,4 @@
-Alias /phppgadmin /usr/share/phppgadmin
+Alias /%pga_alias% /usr/share/phppgadmin
 
 <Directory /usr/share/phppgadmin>
 

install/deb/pma/apache.conf

@@ -1,6 +1,6 @@
 # phpMyAdmin default Apache configuration
 
-Alias /phpmyadmin /usr/share/phpmyadmin
+Alias /%pma_alias% /usr/share/phpmyadmin
 
 <Directory /usr/share/phpmyadmin>
 	Options FollowSymLinks

install/hst-install-debian.sh

@@ -1425,6 +1425,9 @@ if [ "$mysql" = 'yes' ]; then
     # Clear Up
     rm -fr phpMyAdmin-$pma_v-all-languages
     rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
+
+    echo "DB_PMA_ALIAS='phpmyadmin'" >> $HESTIA/conf/hestia.conf
+    $HESTIA/bin/v-change-sys-db-alias 'pma' "phpmyadmin"
 fi
 
 
@@ -1444,6 +1447,9 @@ if [ "$postgresql" = 'yes' ]; then
         cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/
     fi
     cp -f $HESTIA_INSTALL_DIR/pga/config.inc.php /etc/phppgadmin/
+
+    echo "DB_PGA_ALIAS='phppgadmin'" >> $HESTIA/conf/hestia.conf
+    $HESTIA/bin/v-change-sys-db-alias 'pga' "phppgadmin"
 fi
 
 

install/hst-install-ubuntu.sh

@@ -1457,6 +1457,9 @@ if [ "$mysql" = 'yes' ]; then
     # Clear Up
     rm -fr phpMyAdmin-$pma_v-all-languages
     rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
+
+    echo "DB_PMA_ALIAS='phpmyadmin'" >> $HESTIA/conf/hestia.conf
+    $HESTIA/bin/v-change-sys-db-alias 'pma' "phpmyadmin"
 fi
 
 
@@ -1476,6 +1479,9 @@ if [ "$postgresql" = 'yes' ]; then
         cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/
     fi
     cp -f $HESTIA_INSTALL_DIR/pga/config.inc.php /etc/phppgadmin/
+
+    echo "DB_PMA_ALIAS='phppgadmin'" >> $HESTIA/conf/hestia.conf
+    $HESTIA/bin/v-change-sys-db-alias 'pga' "phppgadmin"
 fi
 
 

install/upgrade/versions/latest.sh

@@ -173,4 +173,22 @@ done
 if [ -e /var/lib/phpmyadmin/blowfish_secret.inc.php ]; then
     echo "(*) Updating phpMyAdmin permissions..."
     chmod 0644 /var/lib/phpmyadmin/blowfish_secret.inc.php
-fi
+fi
+
+# Add phpMyAdmin/phpPgAdmin aliases to hestia.conf and correct configuration/templates
+if [ -e "/var/lib/phpmyadmin" ]; then
+PMA_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep DB_PMA_ALIAS)
+    if [ -z "$PMA_ALIAS_CHECK" ]; then
+        echo "(*) Updating phpMyAdmin alias..."
+        $HESTIA/bin/v-change-sys-db-alias "pma" "phpmyadmin"
+    fi
+fi
+
+if [ -e "/var/lib/phppgadmin" ]; then
+PGA_ALIAS_CHECK=$(cat $HESTIA/conf/hestia.conf | grep DB_PGA_ALIAS)
+    if [ -z "$PGA_ALIAS_CHECK" ]; then
+        echo "(*) Updating phpPgAdmin alias..."
+        $HESTIA/bin/v-change-sys-db-alias "pga" "phppgadmin"
+    fi
+fi
+

web/add/db/index.php

@@ -79,10 +79,10 @@ if (!empty($_POST['ok'])) {
         if ($_POST['v_host'] != 'localhost' ) $http_host = $_POST['v_host'];
         if ($_POST['v_type'] == 'mysql') $db_admin = "phpMyAdmin";
         if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
-        if (($_POST['v_type'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL'];
+        if (($_POST['v_type'] == 'mysql') && (!empty($_SESSION['DB_PMA_ALIAS']))) $db_admin_link = "http://".$http_host."/".$_SESSION['DB_PMA_ALIAS'];
         if ($_POST['v_type'] == 'pgsql') $db_admin = "phpPgAdmin";
         if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
-        if (($_POST['v_type'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL'];
+        if (($_POST['v_type'] == 'pgsql') && (!empty($_SESSION['DB_PGA_ALIAS']))) $db_admin_link = "http://".$http_host."/".$_SESSION['DB_PGA_ALIAS'];
     }
 
     // Email login credentials

web/edit/server/index.php

@@ -312,8 +312,8 @@ if (!empty($_POST['save'])) {
 
     // Update phpMyAdmin url
     if (empty($_SESSION['error_msg'])) {
-        if ($_POST['v_mysql_url'] != $_SESSION['DB_PMA_URL']) {
-            exec (HESTIA_CMD."v-change-sys-config-value DB_PMA_URL ".escapeshellarg($_POST['v_mysql_url']), $output, $return_var);
+        if ($_POST['v_mysql_url'] != $_SESSION['DB_PMA_ALIAS']) {
+            exec (HESTIA_CMD."v-change-sys-db-alias pma ".escapeshellarg($_POST['v_mysql_url']), $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_db_adv = 'yes';
@@ -322,8 +322,8 @@ if (!empty($_POST['save'])) {
 
     // Update phpPgAdmin url
     if (empty($_SESSION['error_msg'])) {
-        if ($_POST['v_pgsql_url'] != $_SESSION['DB_PGA_URL']) {
-            exec (HESTIA_CMD."v-change-sys-config-value DB_PGA_URL ".escapeshellarg($_POST['v_pgsql_url']), $output, $return_var);
+        if ($_POST['v_pgsql_url'] != $_SESSION['DB_PGA_ALIAS']) {
+            exec (HESTIA_CMD."v-change-sys-db-alias pga ".escapeshellarg($_POST['v_pgsql_url']), $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_db_adv = 'yes';

web/inc/i18n/en.php

@@ -567,9 +567,9 @@ $LANG['en'] = array(
     'AntiSpam' => 'Spam Filter',
     'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
-    'phpMyAdmin URL' => 'phpMyAdmin URL',
+    'phpMyAdmin URL' => 'phpMyAdmin Alias',
     'PostgreSQL Support' => 'PostgreSQL Support',
-    'phpPgAdmin URL' => 'phpPgAdmin URL',
+    'phpPgAdmin URL' => 'phpPgAdmin Alias',
     'Maximum Number Of Databases' => 'Maximum Number of Databases',
     'Current Number Of Databases' => 'Current Number of Databases',
     'Local backup' => 'Local backup',

web/templates/admin/edit_server.html

@@ -440,7 +440,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_mysql_url" value="<?php echo $_SESSION['DB_PMA_URL']; ?>">
+                                                <input type="text" size="20" class="vst-input" name="v_mysql_url" value="<?php echo $_SESSION['DB_PMA_ALIAS']; ?>">
                                                 <br><br>
                                             </td>
                                         </tr>
@@ -520,7 +520,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_pgsql_url" value="<?php echo $_SESSION['DB_PGA_URL']; ?>">
+                                                <input type="text" size="20" class="vst-input" name="v_pgsql_url" value="<?php echo $_SESSION['DB_PGA_ALIAS']; ?>">
                                                 <br><br>
                                             </td>
                                         </tr>

web/templates/admin/list_db.html

@@ -11,16 +11,15 @@
             foreach ($data as $key => $value) {
               if ($data[$key]['TYPE'] == 'mysql'){
                 $mysql = 1;
-
                 $db_myadmin_link = "//".$http_host."/phpmyadmin/";
-                if (!empty($_SESSION['DB_PMA_URL']))
-                  $db_myadmin_link = $_SESSION['DB_PMA_URL'];
+                if (!empty($_SESSION['DB_PMA_ALIAS']))
+                  $db_myadmin_link = "//".$http_host."/".$_SESSION['DB_PMA_ALIAS'];
               }
               if ($data[$key]['TYPE'] == 'pgsql'){
                 $pgsql = 1;
                 $db_pgadmin_link = "//".$http_host."/phppgadmin/";
-                if (!empty($_SESSION['DB_PGA_URL']))
-                  $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
+                if (!empty($_SESSION['DB_PGA_ALIAS']))
+                  $db_pgadmin_link = "//".$http_host."/".$_SESSION['DB_PGA_ALIAS'];
               }
             }
             if($mysql){
@@ -107,10 +106,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 = "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_ALIAS']))) $db_admin_link = $_SESSION['DB_PMA_ALIAS'];
           if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "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_ALIAS']))) $db_admin_link = $_SESSION['DB_PGA_ALIAS'];
       ?>
 
 

web/templates/user/list_db.html

@@ -6,22 +6,20 @@
             $mysql = 0;
             $pgsql = 0;
 
-
             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
 
             foreach ($data as $key => $value) {
               if ($data[$key]['TYPE'] == 'mysql'){
                 $mysql = 1;
-
-                $db_myadmin_link = "https://".$http_host."/phpmyadmin/";
-                if (!empty($_SESSION['DB_PMA_URL']))
-                  $db_myadmin_link = $_SESSION['DB_PMA_URL'];
+                $db_myadmin_link = "//".$http_host."/phpmyadmin/";
+                if (!empty($_SESSION['DB_PMA_ALIAS']))
+                  $db_myadmin_link = "//".$http_host."/".$_SESSION['DB_PMA_ALIAS'];
               }
               if ($data[$key]['TYPE'] == 'pgsql'){
                 $pgsql = 1;
-                $db_pgadmin_link = "https://".$http_host."/phppgadmin/";
-                if (!empty($_SESSION['DB_PGA_URL']))
-                  $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
+                $db_pgadmin_link = "//".$http_host."/phppgadmin/";
+                if (!empty($_SESSION['DB_PGA_ALIAS']))
+                  $db_pgadmin_link = "//".$http_host."/".$_SESSION['DB_PGA_ALIAS'];
               }
             }
             if($mysql){
@@ -107,10 +105,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 = "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_ALIAS']))) $db_admin_link = $_SESSION['DB_PMA_ALIAS'];
           if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "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_ALIAS']))) $db_admin_link = $_SESSION['DB_PGA_ALIAS'];
       ?>