harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow post expiration to be set from a config (and therefore a plugin/addon)

Browse Source
This commit is contained in:
friendica 2015-02-05 19:09:42 -08:00
parent fe8a08a474
commit b948fbaeda
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/conversation.php
View File

@ -1134,6 +1134,9 @@ function status_editor($a,$x,$popup=false) {
if(x($x,'nopreview')) if(x($x,'nopreview'))
$preview = ''; $preview = '';
$defexpire = ((($z = get_pconfig($x['profile_uid'],'system','default_post_expire')) && (! $webpage)) ? $z : '');
$cipher = get_pconfig($x['profile_uid'],'system','default_cipher'); $cipher = get_pconfig($x['profile_uid'],'system','default_cipher');
if(! $cipher) if(! $cipher)
$cipher = 'aes256'; $cipher = 'aes256';
@ -1191,7 +1194,7 @@ function status_editor($a,$x,$popup=false) {
'$preview' => $preview, '$preview' => $preview,
'$source' => ((x($x,'source')) ? $x['source'] : ''), '$source' => ((x($x,'source')) ? $x['source'] : ''),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$defexpire' => '', '$defexpire' => $defexpire,
'$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? true : false), '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? true : false),
'$expires' => t('Set expiration date'), '$expires' => t('Set expiration date'),
'$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false), '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false),