aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorhubzilla <git@macgirvin.com>2016-08-14 21:24:24 +1000
committerGitHub <noreply@github.com>2016-08-14 21:24:24 +1000
commitd1cb925b5902e01eb1580921260faf3362279249 (patch)
tree36b38379936da4c70d300443fb8176e2fe48ec50 /include
parent993b182f811a6e7f3287c9554b00abd72517954d (diff)
parent229cc2ac431cdcef80cc45a42178fe7a1e4233e4 (diff)
downloadvolse-hubzilla-d1cb925b5902e01eb1580921260faf3362279249.tar.gz
volse-hubzilla-d1cb925b5902e01eb1580921260faf3362279249.tar.bz2
volse-hubzilla-d1cb925b5902e01eb1580921260faf3362279249.zip
Merge pull request #482 from anaqreon/nocomment
Added an optional post editor button to toggle comments
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php10
-rw-r--r--include/features.php1
2 files changed, 11 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php
index b53498d20..7d1473fe2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1121,6 +1121,10 @@ function status_editor($a, $x, $popup = false) {
$feature_voting = feature_enabled($x['profile_uid'], 'consensus_tools');
if(x($x, 'hide_voting'))
$feature_voting = false;
+
+ $feature_nocomment = feature_enabled($x['profile_uid'], 'disable_comments');
+ if(x($x, 'disable_comments'))
+ $feature_nocomment = false;
$feature_expire = ((feature_enabled($x['profile_uid'], 'content_expire') && (! $webpage)) ? true : false);
if(x($x, 'hide_expire'))
@@ -1190,6 +1194,8 @@ function status_editor($a, $x, $popup = false) {
'$modalerrorlist' => t('Error getting album list'),
'$modalerrorlink' => t('Error getting photo link'),
'$modalerroralbum' => t('Error getting album'),
+ '$nocomment_enabled' => t('Comments enabled'),
+ '$nocomment_disabled' => t('Comments disabled'),
));
$tpl = get_markup_template('jot.tpl');
@@ -1239,6 +1245,10 @@ function status_editor($a, $x, $popup = false) {
'$voting' => t('Toggle voting'),
'$feature_voting' => $feature_voting,
'$consensus' => 0,
+ '$nocommenttitle' => t('Disable comments'),
+ '$nocommenttitlesub' => t('Toggle comments'),
+ '$feature_nocomment' => $feature_nocomment,
+ '$nocomment' => 0,
'$clearloc' => $clearloc,
'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
'$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')),
diff --git a/include/features.php b/include/features.php
index 041c028c6..f9001d7be 100644
--- a/include/features.php
+++ b/include/features.php
@@ -74,6 +74,7 @@ function get_features($filtered = true) {
array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds'),false,get_config('feature_lock','channel_sources')),
array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key'),false,get_config('feature_lock','content_encrypt')),
array('consensus_tools', t('Enable Voting Tools'), t('Provide a class of post which others can vote on'),false,get_config('feature_lock','consensus_tools')),
+ array('disable_comments', t('Enable Disabling Comments'), t('Provide the option to disable comments for a post'),false,get_config('feature_lock','disable_comments')),
array('delayed_posting', t('Delayed Posting'), t('Allow posts to be published at a later date'),false,get_config('feature_lock','delayed_posting')),
array('suppress_duplicates', t('Suppress Duplicate Posts/Comments'), t('Prevent posts with identical content to be published with less than two minutes in between submissions.'),true,get_config('feature_lock','suppress_duplicates')),