admin config for default expiration

3 files changed, 15 insertions, 14 deletions

diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index c6181b9dd..b992c5487 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -88,9 +88,6 @@ This document assumes you're an administrator.
         are running, but also keeps things a bit faster while it's not.  
         There also exist CLI utilities for performing this operation, which you
         may prefer, especially if you're a large site.
-    [b]system > default_expire_days[/b]
-        set the default expiration of connections' (matrix/network)
-        posts to this number of days.
 	[b]system > expire_limit
 		Don't expire any more than this number of posts per channel per
 		expiration run to keep from exhausting memory. Default 5000.
@@ -110,7 +107,7 @@ This document assumes you're an administrator.
     [b]system > auto_follow[/b]
         Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses).
     [b]system > admin_email[/b]
-        Specifies the administrators email for this site.  This is initially set during install.
+        Specifies the administrator's email for this site.  This is initially set during install.
     [b]system > cron_hour[/b]
         Specify an hour in which to run cron_daily.  By default with no config, this will run at midnight UTC.
     [b]system > minimum_feedcheck_minutes[/b]
@@ -120,7 +117,7 @@ This document assumes you're an administrator.
     [b]system > ignore_imagick[/b]
         Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick.
     [b]system > no_age_restriction[/b]
-        Do not restric registration to people over the age of 13
+        Do not restrict registration to people over the age of 13. This carries legal responsibilities in many countries to require that age be provided and to block all personal information from minors, so please check your local laws before changing.  
     [b]system > override_poll_lockfile[/b]
         Ignore the lock file in the poller process to allow more than one process to run at a time.
     [b]system > projecthome[/b]
diff --git a/mod/admin.php b/mod/admin.php
index e991fee27..a48d984e0 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -277,15 +277,16 @@ function admin_page_site_post(&$a){
 
 	$register_text		=	((x($_POST,'register_text'))	? notags(trim($_POST['register_text']))		: '');
 
-	$allowed_sites		=	((x($_POST,'allowed_sites'))	? notags(trim($_POST['allowed_sites']))		: '');
-	$allowed_email		=	((x($_POST,'allowed_email'))	? notags(trim($_POST['allowed_email']))		: '');
-	$not_allowed_email		=	((x($_POST,'not_allowed_email'))	? notags(trim($_POST['not_allowed_email']))		: '');
-	$block_public		=	((x($_POST,'block_public'))		? True	:	False);
-	$force_publish		=	((x($_POST,'publish_all'))		? True	:	False);
-	$disable_discover_tab		=	((x($_POST,'disable_discover_tab'))		? True	:	False);
-	$no_login_on_homepage	=	((x($_POST,'no_login_on_homepage'))		? True	:	False);
-	$global_directory	= ((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
-	$no_community_page	= !((x($_POST,'no_community_page'))	? True	:	False);
+	$allowed_sites        =	((x($_POST,'allowed_sites'))	? notags(trim($_POST['allowed_sites']))		: '');
+	$allowed_email        =	((x($_POST,'allowed_email'))	? notags(trim($_POST['allowed_email']))		: '');
+	$not_allowed_email    =	((x($_POST,'not_allowed_email'))	? notags(trim($_POST['not_allowed_email']))		: '');
+	$block_public		  =	((x($_POST,'block_public'))		? True	: False);
+	$force_publish		  =	((x($_POST,'publish_all'))		? True	: False);
+	$disable_discover_tab =	((x($_POST,'disable_discover_tab'))		? True	:	False);
+	$no_login_on_homepage =	((x($_POST,'no_login_on_homepage'))		? True	:	False);
+	$global_directory	  = ((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
+	$no_community_page	  = !((x($_POST,'no_community_page'))	? True	:	False);
+	$default_expire_days  = ((array_key_exists('default_expire_days',$_POST)) ? intval($_POST['default_expire_days']) : 0);
 
 	$verifyssl         = ((x($_POST,'verifyssl'))        ? True : False);
 	$proxyuser         = ((x($_POST,'proxyuser'))        ? notags(trim($_POST['proxyuser']))  : '');
@@ -306,6 +307,7 @@ function admin_page_site_post(&$a){
 	set_config('system', 'sitename', $sitename);
 	set_config('system', 'no_login_on_homepage', $no_login_on_homepage);
 	set_config('system', 'verify_email', $verify_email);
+	set_config('system','default_expire_days', $default_expire_days);
 
 	if ($banner == '') {
 		del_config('system', 'banner');
@@ -475,6 +477,7 @@ function admin_page_site(&$a) {
 		'$delivery_interval'			=> array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")),
 		'$poll_interval'			=> array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
 		'$maxloadavg'			=> array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
+		'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
 		'$form_security_token' => get_form_security_token("admin_site"),
 	));
 
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 1bcdba473..225b281cc 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -80,6 +80,7 @@
 	{{include file="field_input.tpl" field=$poll_interval}}
 	{{include file="field_input.tpl" field=$maxloadavg}}
 	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$default_expire_days}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>