multiple small bug fixes (hestiacp#3364)

* Fix: Show / Hide certificate text

* Fixed upgrade text typo + Missing phpmyadmin version

* Fix redirect on delete system logs

* Update update text

* Remove white line

* Update .pot file

* Update translations

* Fix delete log behavouir

* See suggestion

Author: jaapmarcus

func/upgrade.sh

@@ -601,7 +601,7 @@ upgrade_phpmyadmin() {
 	if [ -n "$(echo $DB_SYSTEM | grep -w 'mysql')" ]; then
 		pma_version=$(jq -r .version /usr/share/phpmyadmin/package.json)
 		if version_ge "$pma_version" "$pma_v"; then
-			echo "[ * ] phpMyAdmin is up to date (${pma_release_file##*-})..."
+			echo "[ * ] phpMyAdmin is up to date (${pma_version})..."
 			# Update permissions
 			if [ -e /var/lib/phpmyadmin/blowfish_secret.inc.php ]; then
 				chown root:www-data /var/lib/phpmyadmin/blowfish_secret.inc.php
@@ -706,7 +706,7 @@ upgrade_rainloop() {
 }
 
 upgrade_dependencies() {
-	echo "[ ! ] Update Hesita PHP dependencies"
+	echo "[ ! ] Update Hestia PHP dependencies..."
 	$BIN/v-add-sys-dependencies
 }
 
@@ -734,7 +734,7 @@ upgrade_rebuild_dns_templates() {
 upgrade_rebuild_users() {
 	if [ "$UPGRADE_REBUILD_USERS" = "true" ]; then
 		if [ "$DEBUG_MODE" = "true" ]; then
-			echo "[ * ] Rebuilding user accounts and domains:"
+			echo "[ * ] Rebuilding user accounts and domains:..."
 		else
 			echo "[ * ] Rebuilding user accounts and domains, this may take a few minutes..."
 		fi

install/upgrade/versions/1.7.0.sh

@@ -69,18 +69,18 @@ fi
 # rename /var/run/xx to /run/
 for file in /etc/dovecot/dovecot.conf /etc/clamav/clamd.conf /etc/exim/exim.conf.template /etc/logrotate.d/apache2 /etc/logrotate.d/nginx /etc/mysql/my.cnf /etc/nginx/nginx.conf; do
 	if [ -f "$file" ]; then
-		echo "[ * ] Update $file legacy /var/run/ to /run/"
+		echo "[ * ] Update $file legacy /var/run/ to /run/..."
 		sed -i 's|/var/run/|/run/|g' $file
 	fi
 done
 # Update any custom php templates
 for file in $HESTIA/data/templates/web/php-fpm/*; do
-	echo "[ * ] Update $file legacy /var/run/ to /run/"
+	echo "[ * ] Update $file legacy /var/run/ to /run/..."
 	sed -i 's|/var/run/|/run/|g' $file
 done
 
 for file in /etc/php/*/fpm/pool.d/www.conf; do
-	echo "[ * ] Update $file legacy /var/run/ to /run/"
+	echo "[ * ] Update $file legacy /var/run/ to /run/..."
 	sed -i 's|/var/run/|/run/|g' $file
 done
 
@@ -101,7 +101,7 @@ if echo "$BACKUP_SYSTEM" | grep "google" > /dev/null; then
 fi
 
 if [ -f /etc/logrotate.d/httpd-prerotate/awstats ]; then
-	echo "[ * ] Update Awstats prerotate to Hestia update method"
+	echo "[ * ] Update Awstats prerotate to Hestia update method..."
 	# Replace awstatst function
 	cp -f $HESTIA_INSTALL_DIR/logrotate/httpd-prerotate/awstats /etc/logrotate.d/httpd-prerotate/
 fi
@@ -113,7 +113,7 @@ if [ "$PHPMYADMIN_KEY" != "" ]; then
 fi
 
 if [ -f /etc/nginx/nginx.conf ] && [ ! -f /etc/nginx/conf.d/cloudflare.inc ]; then
-	echo "[ * ] Enable support for updating Cloudflare Ips"
+	echo "[ * ] Enable support for updating Cloudflare Ips..."
 	sed -i '/set_real_ip_from/d' /etc/nginx/nginx.conf
 	sed -i '/real_ip_header/d' /etc/nginx/nginx.conf
 	sed -i 's|# Cloudflare https://www.cloudflare.com/ips|# Cloudflare https://www.cloudflare.com/ips\n    include /etc/nginx/conf.d/cloudflare.inc;|g' /etc/nginx/nginx.conf

web/delete/log/index.php

@@ -16,7 +16,6 @@
 exec(HESTIA_CMD . "v-delete-user-log " . $user, $output, $return_var);
 check_return_code($return_var, $output);
 unset($output);
-unset($token);
 
 if ($return_var > 0) {
 	header("Location: /list/log/");