2072 Disable access phpmyadmin on ip (#2227)

* 2072 Disable access phpmyadmin on ip

+ phppgadmin

* Due changes in php8.1 change order of implode

bin/v-change-sys-db-alias

@@ -50,15 +50,14 @@ check_hestia_demo_mode
 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
+    if [ -e "/etc/apache2/conf.d/phpmyadmin.inc" ]; then
+        rm -f /etc/apache2/conf.d/phpmyadmin.inc
+        cp -f $HESTIA_INSTALL_DIR/pma/apache.conf /etc/apache2/conf.d/phpmyadmin.inc
+        sed -i "s|%pma_alias%|$alias|g" /etc/apache2/conf.d/phpmyadmin.inc
         
         # Restart services
         $HESTIA/bin/v-restart-service apache2
@@ -83,10 +82,10 @@ if [ "$type" = "pga" ] || [ "$type" = "PGA" ] || [ "$type" = "phppgadmin" ]; the
     $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 
+    if [ -e "/etc/apache2/conf.d/phppgadmin.inc" ]; then
+        rm -f /etc/apache2/conf.d/phppgadmin.inc
+        cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/phppgadmin.inc
+        sed -i "s|%pga_alias%|$alias|g" /etc/apache2/conf.d/phppgadmin.inc 
         
         # Restart services
         $HESTIA/bin/v-restart-service apache2

func/backup.sh

@@ -434,12 +434,12 @@ b2_backup() {
     echo -e "$(date "+%F %T") Upload to B2: $user/$user.$backup_new_date.tar"
     if [ "$localbackup" = 'yes' ]; then
         cd $BACKUP
-        b2 upload-file $BUCKET $user.$backup_new_date.tar $user/$user.$backup_new_date.tar > /dev/null 2>&1
+        b2 upload-file $BUCKET $user.$backup_new_date.tar $user/$user.tar
     else
         cd $tmpdir
         tar -cf $BACKUP/$user.$backup_new_date.tar .
         cd $BACKUP/
-        b2 upload-file $BUCKET $user.$backup_new_date.tar $user/$user.$backup_new_date.tar > /dev/null 2>&1
+        b2 upload-file $BUCKET $user.$backup_new_date.tar $user/$user.tar
         rc=$?
         rm -f $user.$backup_new_date.tar
         if [ "$rc" -ne 0 ]; then

install/deb/phpmyadmin/hestia-sso.php

@@ -113,7 +113,7 @@ class Hestia_API
                 $user_combined_ip[] = $_SERVER['HTTP_CF_CONNECTING_IP'];
             }
         }
-        return implode($user_combined_ip, '|');
+        return implode('|',$user_combined_ip);
     }
 }
 

install/deb/templates/web/apache2/default.stpl

@@ -44,6 +44,6 @@
     </IfModule>
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/default.tpl

@@ -41,6 +41,6 @@
     </IfModule>
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/hosting.stpl

@@ -50,6 +50,6 @@
     </IfModule>
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc*
 </VirtualHost>
 

install/deb/templates/web/apache2/hosting.tpl

@@ -47,6 +47,6 @@
     </IfModule>
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/php-fpm/default.stpl

@@ -36,6 +36,6 @@
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/php-fpm/default.tpl

@@ -33,6 +33,6 @@
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/phpcgi.stpl

@@ -39,6 +39,6 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/phpcgi.tpl

@@ -35,6 +35,6 @@
         AllowOverride All
     </Directory>
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/phpfcgid.stpl

@@ -40,6 +40,6 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/phpfcgid.tpl

@@ -35,6 +35,6 @@
         AllowOverride All
     </Directory>
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/www-data.stpl

@@ -36,6 +36,6 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/deb/templates/web/apache2/www-data.tpl

@@ -33,6 +33,6 @@
     </Directory>
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
-
+    IncludeOptional /etc/apache2/conf.d/*.inc
 </VirtualHost>
 

install/hst-install-debian.sh

@@ -1549,8 +1549,7 @@ if [ "$mysql" = 'yes' ]; then
 
     # Configuring Apache2 for PHPMYADMIN
     if [ "$apache" = 'yes' ]; then
-        cp -f $HESTIA_INSTALL_DIR/pma/apache.conf /etc/phpmyadmin/
-        ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
+        touch /etc/apache2/conf.d/phpmyadmin.inc
     fi
 
     # Overwrite old files
@@ -1606,7 +1605,7 @@ if [ "$postgresql" = 'yes' ]; then
 
     # Configuring phpPgAdmin
     if [ "$apache" = 'yes' ]; then
-        cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/
+        cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/phppgadmin.conf
     fi
     cp -f $HESTIA_INSTALL_DIR/pga/config.inc.php /etc/phppgadmin/
 

install/hst-install-ubuntu.sh

@@ -1568,8 +1568,7 @@ if [ "$mysql" = 'yes' ]; then
 
     # Configuring Apache2 for PHPMYADMIN
     if [ "$apache" = 'yes' ]; then
-        cp -f $HESTIA_INSTALL_DIR/pma/apache.conf /etc/phpmyadmin/
-        ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
+        touch /etc/apache2/conf.d/phpmyadmin.inc
     fi
 
     # Overwrite old files
@@ -1624,7 +1623,7 @@ if [ "$postgresql" = 'yes' ]; then
 
     # Configuring phpPgAdmin
     if [ "$apache" = 'yes' ]; then
-        cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/
+        cp -f $HESTIA_INSTALL_DIR/pga/phppgadmin.conf /etc/apache2/conf.d/phppgadmin.inc
     fi
     cp -f $HESTIA_INSTALL_DIR/pga/config.inc.php /etc/phppgadmin/
 

install/upgrade/versions/1.5.0.sh

@@ -23,7 +23,16 @@ upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'true'
 
 
 if [ -n "$DB_PMA_ALIAS" ]; then
-    $HESTIA/bin/v-change-sys-db-alias 'pma' "$DB_PMA_ALIAS"
+   if [ -e "/etc/apache2/conf.d/phpmyadmin.conf" ]; then
+      rm /etc/apache2/conf.d/phpmyadmin.conf
+      touch /etc/apache2/conf.d/phpmyadmin.inc
+   fi
+   if [ -e "/etc/apache2/conf.d/phppgadmin.conf" ]; then
+      rm /etc/apache2/conf.d/phppgadmin.conf
+      touch /etc/apache2/conf.d/phppgadmin.inc
+   fi
+   $HESTIA/bin/v-change-sys-db-alias 'pga' "$DB_PGA_ALIAS"
+   $HESTIA/bin/v-change-sys-db-alias 'pma' "$DB_PMA_ALIAS"
 fi
 
 if [ -n "$MAIL_SYSTEM" ]; then