The expiry of conversations can now be configured in the admin panel

diff --git a/mod/admin.php b/mod/admin.php
index 91b21ace5574eb6df1965a688c03b85a63afc8f8..7af47110a6482fd0ab4932975dae239b3b33bb83 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1139,6 +1139,7 @@ function admin_page_site_post(App $a)
        $dbclean                =       ((x($_POST,'dbclean'))                  ? True                                          : False);
        $dbclean_expire_days    =       ((x($_POST,'dbclean_expire_days'))      ? intval($_POST['dbclean_expire_days'])         : 0);
        $dbclean_unclaimed      =       ((x($_POST,'dbclean_unclaimed'))        ? intval($_POST['dbclean_unclaimed'])           : 0);
+       $dbclean_expire_conv    =       ((x($_POST,'dbclean_expire_conv'))      ? intval($_POST['dbclean_expire_conv'])         : 0);
        $suppress_tags          =       ((x($_POST,'suppress_tags'))            ? True                                          : False);
        $itemcache              =       ((x($_POST,'itemcache'))                ? Strings::escapeTags(trim($_POST['itemcache']))                : '');
        $itemcache_duration     =       ((x($_POST,'itemcache_duration'))       ? intval($_POST['itemcache_duration'])          : 0);
@@ -1298,6 +1299,7 @@ function admin_page_site_post(App $a)
 
        Config::set('system', 'dbclean', $dbclean);
        Config::set('system', 'dbclean-expire-days', $dbclean_expire_days);
+       Config::set('system', 'dbclean_expire_conversation', $dbclean_expire_conv);
 
        if ($dbclean_unclaimed == 0) {
                $dbclean_unclaimed = $dbclean_expire_days;
@@ -1562,6 +1564,7 @@ function admin_page_site(App $a)
                '$dbclean'              => ['dbclean', L10n::t("Clean database"), Config::get('system','dbclean', false), L10n::t("Remove old remote items, orphaned database records and old content from some other helper tables.")],
                '$dbclean_expire_days'  => ['dbclean_expire_days', L10n::t("Lifespan of remote items"), Config::get('system','dbclean-expire-days', 0), L10n::t("When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.")],
                '$dbclean_unclaimed'    => ['dbclean_unclaimed', L10n::t("Lifespan of unclaimed items"), Config::get('system','dbclean-expire-unclaimed', 90), L10n::t("When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.")],
+               '$dbclean_expire_conv'  => ['dbclean_expire_conv', L10n::t("Lifespan of raw conversation data"), Config::get('system','dbclean_expire_conversation', 90), L10n::t("The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It is save to remove it after some days, default is 90 days.")],
                '$itemcache'            => ['itemcache', L10n::t("Path to item cache"), Config::get('system','itemcache'), L10n::t("The item caches buffers generated bbcode and external images.")],
                '$itemcache_duration'   => ['itemcache_duration', L10n::t("Cache duration in seconds"), Config::get('system','itemcache_duration'), L10n::t("How long should the cache files be hold? Default value is 86400 seconds \x28One day\x29. To disable the item cache, set the value to -1.")],
                '$max_comments'         => ['max_comments', L10n::t("Maximum numbers of comments per post"), Config::get('system','max_comments'), L10n::t("How much comments should be shown for each post? Default value is 100.")],

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index c2a6f73c4440b0e9a8e2ed7ccb3149a9c8bcd5c7..2b03bb1d4d074b30d5bbb663690b3d71a38ac6b8 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -142,6 +142,7 @@
        {{include file="field_checkbox.tpl" field=$dbclean}}
        {{include file="field_input.tpl" field=$dbclean_expire_days}}
        {{include file="field_input.tpl" field=$dbclean_unclaimed}}
+       {{include file="field_input.tpl" field=$dbclean_expire_conv}}
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
        <h3>{{$worker_title}}</h3>