diff options
| -rw-r--r-- | Zotlabs/Module/Channel.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Display.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Hq.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 6 | ||||
| -rwxr-xr-x | util/add_addon_repo | 4 | ||||
| -rwxr-xr-x | util/add_theme_repo | 4 | ||||
| -rwxr-xr-x | util/add_widget_repo | 4 | ||||
| -rwxr-xr-x | util/update_addon_repo | 4 | ||||
| -rwxr-xr-x | util/update_theme_repo | 4 | ||||
| -rwxr-xr-x | util/update_widget_repo | 4 |
10 files changed, 29 insertions, 16 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 9ce57d6eb..327ca53db 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -152,7 +152,8 @@ class Channel extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); $o .= status_editor($a,$x); diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 06c9479b2..a127ab196 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -67,8 +67,7 @@ class Display extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - - 'acl' => populate_acl($channel_acl), + 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, @@ -78,7 +77,8 @@ class Display extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); $o = '<div id="jot-popup">'; diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index baeba82e8..fee4246c0 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -120,8 +120,7 @@ class Hq extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - - 'acl' => populate_acl($channel_acl), + 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, @@ -131,7 +130,8 @@ class Hq extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ]; $o = replace_macros(get_markup_template("hq.tpl"), diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 571118201..f0e87f468 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -66,8 +66,7 @@ class Pubstream extends \Zotlabs\Web\Controller { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - - 'acl' => populate_acl($channel_acl), + 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => $channel_acl, 'bang' => '', 'visitor' => true, @@ -77,7 +76,8 @@ class Pubstream extends \Zotlabs\Web\Controller { 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true, - 'jotnets' => true + 'jotnets' => true, + 'reset' => t('Reset form') ); $o = '<div id="jot-popup">'; diff --git a/util/add_addon_repo b/util/add_addon_repo index 6bd9686a1..d82081470 100755 --- a/util/add_addon_repo +++ b/util/add_addon_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_theme_repo b/util/add_theme_repo index 30898dc01..7ae9cdb02 100755 --- a/util/add_theme_repo +++ b/util/add_theme_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_widget_repo b/util/add_widget_repo index a8e888cdc..77774587c 100755 --- a/util/add_widget_repo +++ b/util/add_widget_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -lt 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/update_addon_repo b/util/update_addon_repo index efa46c668..0e471eb4f 100755 --- a/util/update_addon_repo +++ b/util/update_addon_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -ne 1 ]; then echo usage: $0 repository diff --git a/util/update_theme_repo b/util/update_theme_repo index 609e0cde0..b4de55568 100755 --- a/util/update_theme_repo +++ b/util/update_theme_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -ne 1 ]; then diff --git a/util/update_widget_repo b/util/update_widget_repo index c88a1e637..70d09f959 100755 --- a/util/update_widget_repo +++ b/util/update_widget_repo @@ -1,4 +1,6 @@ -#!/usr/bin/env bash -f +#!/usr/bin/env bash + +set -f if [ $# -ne 1 ]; then echo usage: $0 repository |