Merge branch 'fix-fm-0629'

Author: Kristan Kenney

func/upgrade.sh

@@ -159,7 +159,7 @@ upgrade_start_routine() {
         upgrade_refresh_config
     fi
 
-    # Upgrade to Version 1.1.2
+    # Upgrade to Version 1.2.0
     if [ $VERSION = "1.1.1" ]; then
         source $HESTIA/install/upgrade/versions/latest.sh
         VERSION="$new_version"
@@ -214,6 +214,13 @@ upgrade_phpmyadmin() {
     fi
 }
 
+upgrade_fm_configuration() {
+    if [ -e "$HESTIA/web/fm/configuration.php" ]; then
+        echo "(*) Updating File Manager Configuration..."
+        cp -f $HESTIA_INSTALL_DIR/filemanager/filegator/configuration.php $HESTIA/web/fm/configuration.php
+    fi
+}
+
 upgrade_get_version() {
     # Retrieve new version number for Hestia Control Panel from .deb package
     new_version=$(dpkg -l | awk '$2=="hestia" { print $3 }')

install/deb/filemanager/filegator/configuration.php

@@ -3,8 +3,8 @@
 $dist_config = require __DIR__.'/configuration_sample.php';
 
 $dist_config['public_path'] = '/fm/';
-$dist_config['frontend_config']['app_name'] = 'Hestia FM';
-$dist_config['frontend_config']['logo'] = 'https://raw.githubusercontent.com/filegator/filegator/master/dist/img/logo.png';
+$dist_config['frontend_config']['app_name'] = 'File Manager - Hestia Control Panel';
+$dist_config['frontend_config']['logo'] = '../images/logo.png';
 $dist_config['frontend_config']['editable'] = ['.txt', '.css', '.js', '.ts', '.html', '.php', '.py',
         '.yml', '.xml', '.md', '.log', '.csv', '.conf', '.config', '.ini', '.scss', '.sh', '.env', '.example' ];
 $dist_config['frontend_config']['guest_redirection'] = '/login/' ;
@@ -57,7 +57,7 @@
         if (document.getElementsByClassName("navbar-item").length) {
             clearInterval(checkVueLoaded);
             var navProfile = document.getElementsByClassName("navbar-item profile")[0]; navProfile.replaceWith(navProfile.cloneNode(true))
-            document.getElementsByClassName("navbar-item logout")[0].text="Back to Hestia";
+            document.getElementsByClassName("navbar-item logout")[0].text="Exit to Control Panel \u00BB";
         }
     }, 200);
 </script>',

install/upgrade/versions/latest.sh

@@ -134,14 +134,9 @@ fi
 
 # Install Filegator FileManager during upgrade
 if [ ! -e "$HESTIA/web/fm/configuration.php" ]; then
-    echo "(*) Configuring Filegator FileManager..."
-
+    echo "(*) Installing File Manager..."
     # Install the FileManager
     source $HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
-else 
-    echo "(*) Update Filegator Configuration..."
-    # Update configuration.php
-    cp -f $HESTIA_INSTALL_DIR/filemanager/filegator/configuration.php $HESTIA/web/fm/configuration.php
 fi
 
 # Enable nginx module loading

src/deb/hestia/postinst

@@ -37,6 +37,9 @@ upgrade_start_routine
 # Upgrade phpMyAdmin if applicable
 upgrade_phpmyadmin
 
+# Ensure that File Manager configuration is up-to-date
+upgrade_fm_configuration
+
 # Set new version number in hestia.conf
 upgrade_set_version