From cc6c529562ef5751133d97e3fec067c0072f215b Mon Sep 17 00:00:00 2001
From: berumuron <dev@marienfressinaud.fr>
Date: Fri, 26 Mar 2021 19:41:33 +0100
Subject: tec: Remove data/do-install.txt (#3555)

* Remove file data/do-install.txt

This file was painful during update because we had to remember to delete
it each time. It added a security issue by allowing an attacker to
reinstall FreshRSS during the update process.

The (more powerful) file data/applied_migrations.txt has been introduced
in 8619cf6fa to replace do-install.txt. We had to wait for at least one
release in order to make sure existing instances of FreshRSS created the
migration file. It should be ok now.

* Replace i18n install.not_deleted key

* Update documentation to update FreshRSS
---
 app/install.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/install.php')

diff --git a/app/install.php b/app/install.php
index b7b309e1a..5a4f3359a 100644
--- a/app/install.php
+++ b/app/install.php
@@ -611,7 +611,10 @@ function printStep4() {
 
 function printStep5() {
 ?>
-	<p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.not_deleted', DATA_PATH . '/do-install.txt') ?></p>
+	<p class="alert alert-error">
+		<span class="alert-head"><?= _t('gen.short.damn') ?></span>
+		<?= _t('install.missing_applied_migrations', DATA_PATH . '/applied_migrations.txt') ?>
+	</p>
 <?php
 }
 
@@ -636,7 +639,7 @@ case 3:
 case 4:
 	break;
 case 5:
-	if (setupMigrations() && deleteInstall()) {
+	if (setupMigrations()) {
 		header('Location: index.php');
 	}
 	break;
-- 
cgit v1.2.3