From 3494fddd7c13637c8fb25104002b59448f182e79 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 26 Jan 2016 15:12:34 -0800 Subject: change help text on other channel expiration setting to inform that there is a system limit. Ignore imported feed content that is older than expiration interval. --- mod/settings.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod/settings.php') diff --git a/mod/settings.php b/mod/settings.php index d2ba590a2..cc75bbd56 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -917,6 +917,7 @@ function settings_content(&$a) { $maxreq = $channel['channel_max_friend_req']; $expire = $channel['channel_expire_days']; $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT); + $sys_expire = get_config('system','default_expire_days'); // $unkmail = $a->user['unkmail']; // $cntunkmail = $a->user['cntunkmail']; @@ -1050,7 +1051,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')), + '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,sprintf( t('0 or blank to use the website limit. The website expires after %d days.'),intval($sys_expire))), '$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"), -- cgit v1.2.3 From d83b907cdcb4d7a7638b2be9a8024a43f6012827 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 26 Jan 2016 23:44:15 -0800 Subject: rename collections to privacy groups --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/settings.php') diff --git a/mod/settings.php b/mod/settings.php index cc75bbd56..c1a4b019d 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -354,7 +354,7 @@ function settings_post(&$a) { ); } else { - notice( sprintf('Default privacy collection \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL); + notice( sprintf('Default privacy group \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL); return; } } -- cgit v1.2.3