Просмотр исходного кода

Fix/update bugs (#2354)

* Fixed bug in 1.5.5 upgrade script

cp: cannot create regular file '/etc/php//etc/php/5.6/fpm/php-fpm.conf/fpm/': No such file or directory
13s
52	sed: -e expression #1, char 11: unknown option to `s'

* Add check if /vendor/autoload exists

* return exit code 1 when not working
Jaap Marcus 4 лет назад
Родитель
Сommit
83eb1b9db3
2 измененных файлов с 7 добавлено и 2 удалено
  1. 1 1
      install/upgrade/versions/1.5.5.sh
  2. 6 1
      web/inc/main.php

+ 1 - 1
install/upgrade/versions/1.5.5.sh

@@ -22,7 +22,7 @@ upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'true'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 
 
 # Update php-fpm.conf
 # Update php-fpm.conf
-for version in /etc/php/*/fpm/php-fpm.conf; do
+for version in $($BIN/v-list-sys-php plain); do
     cp -f $HESTIA_INSTALL_DIR/php-fpm/php-fpm.conf /etc/php/$version/fpm/
     cp -f $HESTIA_INSTALL_DIR/php-fpm/php-fpm.conf /etc/php/$version/fpm/
     sed -i "s/fpm_v/$version/g" /etc/php/$version/fpm/php-fpm.conf
     sed -i "s/fpm_v/$version/g" /etc/php/$version/fpm/php-fpm.conf
 done
 done

+ 6 - 1
web/inc/main.php

@@ -4,8 +4,13 @@ use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\Exception;
 use PHPMailer\PHPMailer\Exception;
 
 
-require 'vendor/autoload.php';
+if(!file_exists('vendor/autoload.php')){
+    trigger_error('Unable able to load required libaries. Please run v-add-sys-phpmailer in command line');
+    echo 'Unable able to load required libaries. Please run v-add-sys-phpmailer in command line';
+    exit(1);
+}
 
 
+require 'vendor/autoload.php';
 session_start();
 session_start();