From 2dda5d6c708a8fb6e20b1f722510d8f174e1e328 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 19 Mar 2014 20:40:35 -0700
Subject: [PATCH] add expire setting, take out unknown mailers and max friend
 requests per day which aren't implemented

---
 mod/settings.php      | 1 +
 view/tpl/settings.tpl | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index 1d2a5ecf9..cc4842725 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -956,6 +956,7 @@ function settings_content(&$a) {
 
 			'$lbl_p2macro' => t('Advanced Privacy Settings'),
 
+			'$expire' => array('expire',t('Expire other channel content after this many days'),$expire,t('0 or blank prevents expiration')),
 			'$maxreq' 	=> array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
 			'$permissions' => t('Default Post Permissions'),
 			'$permdesc' => t("\x28click to open/close\x29"),
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 49dff4822..acea86015 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -67,9 +67,9 @@
 
 {{include file="field_yesno.tpl" field=$blocktags}}
 
-{{include file="field_input.tpl" field=$maxreq}}
 
-{{include file="field_input.tpl" field=$cntunkmail}}
+{{include file="field_input.tpl" field=$expire}}
+
 </div>
 
 <div id="settings-default-perms" class="settings-default-perms" >