diff --git a/CHANGELOG b/CHANGELOG index 568f873e4..86a527218 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== +- Enable use of TLSv1.1 and TLSv1.2 for IMAP. +- Save copy of original .htaccess file when using installto.sh script (1490623) - Fix regression where some message attachments could be missing on edit/forward (#1490608) - Fix regression in displaying contents of message/rfc822 parts (#1490606) - Fix handling of message/rfc822 attachments on replies and forwards (#1490607) @@ -12,7 +14,6 @@ CHANGELOG Roundcube Webmail - Fix PHP7 warning "session_start(): Session callback expects true/false return value" (#1490624) - Fix XSS issue in SVG images handling (#1490625) - Fix missing language name in "Add to Dictionary" request in HTML mode (#1490634) -- Enable use of TLSv1.1 and TLSv1.2 for IMAP. RELEASE 1.2-beta ---------------- diff --git a/bin/installto.sh b/bin/installto.sh index bd8e97b60..4bbf46280 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -44,6 +44,12 @@ $input = trim(fgets(STDIN)); if (strtolower($input) == 'y') { $err = false; echo "Copying files to target location..."; + + // Save a copy of original .htaccess file (#1490623) + if (file_exists("$target_dir/.htaccess")) { + $htaccess_copied = copy("$target_dir/.htaccess", "$target_dir/.htaccess.orig"); + } + $dirs = array('program','installer','bin','SQL','plugins','skins'); if (is_dir(INSTALL_PATH . 'vendor') && !is_file(INSTALL_PATH . 'composer.json')) { $dirs[] = 'vendor'; @@ -60,9 +66,22 @@ if (strtolower($input) == 'y') { break; } } + // remove old (<1.0) .htaccess file @unlink("$target_dir/program/.htaccess"); - echo "done.\n\n"; + echo "done."; + + // Inform the user about .htaccess change + if (!empty($htaccess_copied)) { + if (file_get_contents("$target_dir/.htaccess") != file_get_contents("$target_dir/.htaccess.orig")) { + echo "\n!! Old .htaccess file saved as .htaccess.orig !!"; + } + else { + @unlink("$target_dir/.htaccess.orig"); + } + } + + echo "\n\n"; if (is_dir("$target_dir/skins/default")) { echo "Removing old default skin...";