diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 7 | ||||
| -rw-r--r-- | include/features.php | 3 | ||||
| -rw-r--r-- | include/notifier.php | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index ebbc6684c..c2d9641ba 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1166,6 +1166,10 @@ function status_editor($a, $x, $popup = false) { if($defexpire) $defexpire = datetime_convert('UTC',date_default_timezone_get(),$defexpire,'Y-m-d H:i'); + $defpublish = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_publish')) && (! $webpage)) ? $z : ''); + if($defpublish) + $defpublish = datetime_convert('UTC',date_default_timezone_get(),$defpublish,'Y-m-d H:i'); + $cipher = get_pconfig($x['profile_uid'], 'system', 'default_cipher'); if(! $cipher) $cipher = 'aes256'; @@ -1237,6 +1241,9 @@ function status_editor($a, $x, $popup = false) { '$defexpire' => $defexpire, '$feature_expire' => ((feature_enabled($x['profile_uid'], 'content_expire') && (! $webpage)) ? true : false), '$expires' => t('Set expiration date'), + '$defpublish' => $defpublish, + '$feature_future' => ((feature_enabled($x['profile_uid'], 'delayed_posting') && (! $webpage)) ? true : false), + '$future_txt' => t('Set publish date'), '$feature_encrypt' => ((feature_enabled($x['profile_uid'], 'content_encrypt') && (! $webpage)) ? true : false), '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, diff --git a/include/features.php b/include/features.php index 993a2e33f..74ae7b3d7 100644 --- a/include/features.php +++ b/include/features.php @@ -58,7 +58,8 @@ function get_features() { array('large_photos', t('Large Photos'), t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),false), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds'),false), array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key'),false), - array('consensus_tools', t('Enable voting tools'), t('Provide a class of post which others can vote on'),false), + array('consensus_tools', t('Enable Voting Tools'), t('Provide a class of post which others can vote on'),false), + array('delayed_posting', t('Delayed Posting'), t('Allow posts to be published at a later date'),false), ), diff --git a/include/notifier.php b/include/notifier.php index 385062f07..0b29146c1 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -366,7 +366,7 @@ function notifier_run($argv, $argc){ logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG); return; } - if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed_publish'])) { + if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed'])) { logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG); return; } |