diff options
| author | marijus <mario@localhost.localdomain> | 2014-01-30 00:08:40 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-01-30 00:08:40 +0100 |
| commit | a58239b9a8d8c35fa0e0b916617fa53d1014da58 (patch) | |
| tree | 4ebaf732d319efb80d9edebd941fb0be9e35cc06 /mod/editpost.php | |
| parent | b39475db86eca7b5e5615d377d8adc64e6a33056 (diff) | |
| parent | fe2b6f3dfb4a9473905dde49b7741a6c03699c23 (diff) | |
| download | volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.gz volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.bz2 volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.zip | |
Merge branch 'upstream'
Diffstat (limited to 'mod/editpost.php')
| -rw-r--r-- | mod/editpost.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index 7cc33d60d..918a70d36 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -92,6 +92,11 @@ function editpost_content(&$a) { } + $cipher = get_pconfig(get_app()->profile['profile_uid'],'system','default_cipher'); + if(! $cipher) + $cipher = 'aes256'; + + $o .= replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], '$action' => 'item', @@ -128,11 +133,12 @@ function editpost_content(&$a) { '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), '$catsenabled' => $catsenabled, - '$defexpire' => $itm[0]['expires'], - '$feature_expire' => 'none', + '$defexpire' => datetime_convert('UTC', date_default_timezone_get(),$itm[0]['expires']), + '$feature_expire' => ((feature_enabled(get_app()->profile['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'), '$expires' => t('Set expiration date'), - '$feature_encrypt' => 'none', + '$feature_encrypt' => ((feature_enabled(get_app()->profile['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), '$encrypt' => t('Encrypt text'), + '$cipher' => $cipher, '$expiryModalOK' => t('OK'), '$expiryModalCANCEL' => t('Cancel'), )); |