From cc0db9af4f980829faa4bf0960617807b32fb4fa Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <aledeg@users.noreply.github.com>
Date: Wed, 23 Oct 2019 00:52:15 +0200
Subject: Feature/new archiving (#2335)

* Change archiving config page layout

I've changed some wording and moved actions into a
maintenance section.

* Update purge action

Now we have more control on the purge action. The configuration allows
us to choose what to keep and what to discard in a more precise way.
At the moment, the configuration applies for all feeds.

* Add purge configuration on feed level

Now the extend purge configuration is available on feed level.
It is stored as attributes and will be used in the purge action.

* Update purge action

Now the purge action uses the feed configuration if it exists and
defaults on user configuration if not.

* Add empty option in period list

* Fix configuration warnings

* Add archiving configuration on categories

See #2369

* Add user info back

* Add explanations in UI

* Fixes for SQLite + error + misc.

* Fix invalid feed reference

* Short array syntax

Only for new code, so far

* Fix prefix error

* Query performance, default values

Work in progress

* Fix default values and confirm before leaving

Form cancel and confirm changes before leaving were broken.
And start taking advantage of the short echo syntax `<?= ?>` as we have
moved to PHP 5.4+

* More work

* Tuning SQL

* Fix MariaDB + performance issue

* SQL performance

* Fix SQLite bug

* Fix some attributes JSON encoding bugs

Especially for SQLite export/import

* More uniform, fix bugs

More uniform between global, category, feed settings

* Drop special cases for old articles during refresh

Instead will use lastSeen date with the new archiving logic.
This was generating problems anyway
https://github.com/FreshRSS/FreshRSS/issues/2154

* Draft drop index keep_history

Not needed anymore

* MySQL typo

Now properly tested with MySQL, PostgreSQL, SQLite

* More work for legacy values

Important to avoid overriding user's preference and risking deleting
data erroneously

* Fix PHP 7.3 / 7.4 warnings

@aledeg "Trying to use values of type null, bool, int, float or resource
as an array (such as $null["key"]) will now generate a notice. "
https://php.net/migration74.incompatible

* Reintroduce min articles and take care of legacy parameters

* A few changes forgotten

* Draft of migration + DROP of feed.keep_history

* Fix several errors

And give up using const for SQL to allow multiple database types (and we
cannot redefine a const)

* Add keep_min to categories + factorise archiving logic

* Legacy fix

* Fix bug yield from

* Minor: Use JSON_UNESCAPED_SLASHE for attributes

And make more uniform

* Fix sign and missing variable

* Fine tune the logic
---
 app/install.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'app/install.php')

diff --git a/app/install.php b/app/install.php
index 366fb0cfc..f8bc6dd4e 100644
--- a/app/install.php
+++ b/app/install.php
@@ -86,7 +86,6 @@ function saveStep1() {
 		// Then, we set $_SESSION vars
 		$_SESSION['title'] = $system_conf->title;
 		$_SESSION['auth_type'] = $system_conf->auth_type;
-		$_SESSION['old_entries'] = $user_conf->old_entries;
 		$_SESSION['default_user'] = $current_user;
 		$_SESSION['passwordHash'] = $user_conf->passwordHash;
 
@@ -184,14 +183,12 @@ function saveStep3() {
 	if (!empty($_POST)) {
 		$system_default_config = Minz_Configuration::get('default_system');
 		$_SESSION['title'] = $system_default_config->title;
-		$_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries);
 		$_SESSION['auth_type'] = param('auth_type', 'form');
 		if (FreshRSS_user_Controller::checkUsername(param('default_user', ''))) {
 			$_SESSION['default_user'] = param('default_user', '');
 		}
 
-		if (empty($_SESSION['old_entries']) ||
-		    empty($_SESSION['auth_type']) ||
+		if (empty($_SESSION['auth_type']) ||
 		    empty($_SESSION['default_user'])) {
 			return false;
 		}
@@ -208,10 +205,6 @@ function saveStep3() {
 		FreshRSS_Context::$system_conf->default_user = $_SESSION['default_user'];
 		FreshRSS_Context::$system_conf->save();
 
-		if ((!ctype_digit($_SESSION['old_entries'])) ||($_SESSION['old_entries'] < 1)) {
-			$_SESSION['old_entries'] = $user_default_config->old_entries;
-		}
-
 		// Create default user files but first, we delete previous data to
 		// avoid access right problems.
 		recursive_unlink(USERS_PATH . '/' . $_SESSION['default_user']);
@@ -225,7 +218,6 @@ function saveStep3() {
 				'',
 				[
 					'language' => $_SESSION['language'],
-					'old_entries' => $_SESSION['old_entries'],
 				]
 			);
 		} catch (Exception $e) {
@@ -317,8 +309,7 @@ function checkStep2() {
 }
 
 function checkStep3() {
-	$conf = !empty($_SESSION['old_entries']) &&
-	        !empty($_SESSION['default_user']);
+	$conf = !empty($_SESSION['default_user']);
 
 	$form = isset($_SESSION['auth_type']);
 
@@ -593,13 +584,6 @@ function printStep3() {
 	<form action="index.php?step=3" method="post">
 		<legend><?php echo _t('install.conf'); ?></legend>
 
-		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo _t('install.delete_articles_after'); ?></label>
-			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" required="required" min="1" max="1200" value="<?php echo isset($_SESSION['old_entries']) ? $_SESSION['old_entries'] : $user_default_config->old_entries; ?>" tabindex="2" /> <?php echo _t('gen.date.month'); ?>
-			</div>
-		</div>
-
 		<div class="form-group">
 			<label class="group-name" for="default_user"><?php echo _t('install.default_user'); ?></label>
 			<div class="group-controls">
-- 
cgit v1.2.3