diff --git a/bin/v-add-sys-rainloop b/bin/v-add-sys-rainloop index e1baaed2b57..d144689a4fb 100755 --- a/bin/v-add-sys-rainloop +++ b/bin/v-add-sys-rainloop @@ -22,12 +22,12 @@ MODE=$1 UPDATE="no" # Version and Download paths # Version to be moved to upgrade script -RL_FILE="rainloop-community-latest.zip" +RL_FILE="rainloop-latest.zip" # For removal of folder RL_EXTRACT_MAIN="rainloop" # Downloading full version -RL_URL="https://www.rainloop.net/repository/webmail/rainloop-community-latest.zip" +RL_URL="https://www.rainloop.net/repository/webmail/rainloop-latest.zip" # Folder paths RL_INSTALL_DIR="/var/lib/rainloop" @@ -155,7 +155,7 @@ else [ ! -f "${RC_INSTALL_DIR}/${RC_FILE}" ] && wget "$RL_URL" --quiet -O "${RL_INSTALL_DIR}/${RL_FILE}" version=$(cat $RL_INSTALL_DIR/data/VERSION); - unzip -q -j rainloop-community-latest.zip "data/VERSION" -d $RL_INSTALL_DIR/ + unzip -q -j rainloop-latest.zip "data/VERSION" -d $RL_INSTALL_DIR/ version_source=$(cat $RL_INSTALL_DIR/VERSION); # Check version inside .zip file in case hestia didn't update yet diff --git a/install/upgrade/upgrade.conf b/install/upgrade/upgrade.conf index f90bc1208c9..4294f7c1f30 100644 --- a/install/upgrade/upgrade.conf +++ b/install/upgrade/upgrade.conf @@ -50,7 +50,7 @@ pma_v='5.2.0' rc_v='1.6.0' # Set version of Rainloop (Webmail) to update during upgrade if not already installed -rl_v='1.16.0' +rl_v='1.17.0' # Update the File Manager or it's configuration file # Check if Filegator requires an update based on current version and setting below diff --git a/web/inc/composer.lock b/web/inc/composer.lock index 2a0b2f654cf..410d133e70e 100644 --- a/web/inc/composer.lock +++ b/web/inc/composer.lock @@ -46,16 +46,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.6.5", + "version": "v6.7.1", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627" + "reference": "49cd7ea3d2563f028d7811f06864a53b1f15ff55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8b6386d7417526d1ea4da9edb70b8352f7543627", - "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/49cd7ea3d2563f028d7811f06864a53b1f15ff55", + "reference": "49cd7ea3d2563f028d7811f06864a53b1f15ff55", "shasum": "" }, "require": { @@ -65,17 +65,19 @@ "php": ">=5.5.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "doctrine/annotations": "^1.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2", + "doctrine/annotations": "^1.2.6 || ^1.13.3", "php-parallel-lint/php-console-highlighter": "^1.0.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^9.3.5", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.6.2", - "yoast/phpunit-polyfills": "^1.0.0" + "squizlabs/php_codesniffer": "^3.7.1", + "yoast/phpunit-polyfills": "^1.0.4" }, "suggest": { "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", + "ext-openssl": "Needed for secure SMTP sending and DKIM signing", + "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication", "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", "league/oauth2-google": "Needed for Google XOAUTH2 authentication", "psr/log": "For optional PSR-3 debug logging", @@ -112,7 +114,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.5" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.7.1" }, "funding": [ { @@ -120,7 +122,7 @@ "type": "github" } ], - "time": "2022-10-07T12:23:10+00:00" + "time": "2022-12-08T13:30:06+00:00" } ], "packages-dev": [],