diff --git a/include/acl_selectors.php b/include/acl_selectors.php index c1e62ac36..d85f60522 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -283,62 +283,57 @@ function get_acl_permissions($user = null) { } -function populate_acl($user = null,$celeb = false) { +function populate_acl($user = null, $show_jotnets = false) { $perms = get_acl_permissions($user); - // We shouldn't need to prune deadguys from the block list. Either way they can't get the message. - // Also no point enumerating groups and checking them, that will take place on delivery. + $jotnets = ''; + if($show_jotnets) { + $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); -// $deny_cid = prune_deadguys($deny_cid); + $mail_enabled = false; + $pubmail_enabled = false; + if(! $mail_disabled) { + $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", + intval(local_user()) + ); + if(count($r)) { + $mail_enabled = true; + if(intval($r[0]['pubmail'])) + $pubmail_enabled = true; + } + } - /*$o = ''; - $o .= '
'; - $o .= '
'; - $o .= '
' . t('Visible To:') . '
' . t('everybody') . '
'; - $o .= '
'; - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= group_select('group_allow','group_allow',$allow_gid); - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb,true); - $o .= '
'; - $o .= '
' . "\r\n"; - $o .= '
' . "\r\n"; - $o .= '
'; - $o .= '
'; - $o .= '
' . t('Except For:') . '
'; - $o .= '
'; - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= group_select('group_deny','group_deny', $deny_gid); - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb,true); - $o .= '
'; - $o .= '
' . "\r\n"; - $o .= '
' . "\r\n"; - $o .= '
'; - $o .= '
' . "\r\n"; - $o .= '
' . "\r\n";*/ + if (!$user['hidewall']) { + if($mail_enabled) { + $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); + $jotnets .= '
' . t("Post to Email") . '
'; + } + + call_hooks('jot_networks', $jotnets); + } else + $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'), + t('Hide your profile details from unknown viewers?')); + } $tpl = get_markup_template("acl_selector.tpl"); $o = replace_macros($tpl, array( '$showall'=> t("Visible to everybody"), - '$show' => t("show"), - '$hide' => t("don't show"), + '$show' => t("show"), + '$hide' => t("don't show"), '$allowcid' => json_encode($perms['allow_cid']), '$allowgid' => json_encode($perms['allow_gid']), '$denycid' => json_encode($perms['deny_cid']), '$denygid' => json_encode($perms['deny_gid']), + '$networks' => $show_jotnets, + '$emailcc' => t('CC: email addresses'), + '$emtitle' => t('Example: bob@example.com, mary@example.com'), + '$jotnets' => $jotnets, + '$aclModalTitle' => t('Permissions'), + '$aclModalDismiss' => t('Close'), '$features' => array( - "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false") + "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false") ), )); diff --git a/include/conversation.php b/include/conversation.php index a6ea4da81..cdd3118ce 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1024,43 +1024,9 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$whereareu' => t('Where are you right now?') )); - $jotplugins = ''; - $jotnets = ''; - - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); - - $mail_enabled = false; - $pubmail_enabled = false; - - if(($x['is_owner']) && (! $mail_disabled)) { - $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", - intval(local_user()) - ); - if(count($r)) { - $mail_enabled = true; - if(intval($r[0]['pubmail'])) - $pubmail_enabled = true; - } - } - - if (!$a->user['hidewall']) { - if($mail_enabled) { - $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); - $jotnets .= '
' . t("Post to Email") . '
'; - } - - call_hooks('jot_networks', $jotnets); - } else - $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'), - t('Hide your profile details from unknown viewers?')); - call_hooks('jot_tool', $jotplugins); - if($notes_cid) - $jotnets .= ''; - - // Private/public post links for the non-JS ACL form $private_post = 1; if($_REQUEST['public']) @@ -1115,15 +1081,14 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$defloc' => $x['default_location'], '$visitor' => $x['visitor'], '$pvisit' => (($notes_cid) ? 'none' : $x['visitor']), - '$emailcc' => t('CC: email addresses'), '$public' => t('Public post'), '$jotnets' => $jotnets, - '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $x['lockstate'], '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], '$preview' => ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''), '$jotplugins' => $jotplugins, + '$notes_cid' => $notes_cid, '$sourceapp' => t($a->sourcename), '$cancel' => t('Cancel'), '$rand_num' => random_digits(12), diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php index e1759ab65..650dc9577 100644 --- a/mod/bookmarklet.php +++ b/mod/bookmarklet.php @@ -27,7 +27,7 @@ function bookmarklet_content(&$a) { 'nickname' => $a->user['nickname'], 'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'), 'default_perms' => get_acl_permissions($a->user), - 'acl' => populate_acl($a->user, $celeb), + 'acl' => populate_acl($a->user), 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), diff --git a/mod/display.php b/mod/display.php index c8b72ecc4..60dfdeff2 100644 --- a/mod/display.php +++ b/mod/display.php @@ -345,15 +345,13 @@ function display_content(&$a, $update = 0) { } if ($is_owner) { - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $x = array( 'is_owner' => true, 'allow_location' => $a->user['allow_location'], 'default_location' => $a->user['default-location'], 'nickname' => $a->user['nickname'], 'lockstate' => ( (is_array($a->user)) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'), - 'acl' => populate_acl($a->user, $celeb), + 'acl' => populate_acl($a->user), 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), diff --git a/mod/editpost.php b/mod/editpost.php index 0319f200b..b03934102 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -66,8 +66,6 @@ function editpost_content(&$a) { else $lockstate = 'unlock'; - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $jotplugins = ''; $jotnets = ''; @@ -141,7 +139,7 @@ function editpost_content(&$a) { '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, - '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb), + '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)), '$bang' => (($group) ? '!' : ''), '$profile_uid' => $_SESSION['uid'], '$preview' => t('Preview'), diff --git a/mod/events.php b/mod/events.php index e9e1af05d..242f27f13 100644 --- a/mod/events.php +++ b/mod/events.php @@ -507,7 +507,7 @@ function events_content(&$a) { '$sh_text' => t('Share this event'), '$sh_checked' => $sh_checked, '$preview' => t('Preview'), - '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)), + '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user))), '$submit' => t('Submit') )); diff --git a/mod/group.php b/mod/group.php index 906d649a6..4a447713d 100644 --- a/mod/group.php +++ b/mod/group.php @@ -172,8 +172,6 @@ function group_content(&$a) { '$form_security_token' => get_form_security_token("group_drop"), )); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $context = $context + array( '$title' => t('Group Editor'), diff --git a/mod/network.php b/mod/network.php index 7b3c92e24..556221870 100644 --- a/mod/network.php +++ b/mod/network.php @@ -466,8 +466,6 @@ function network_content(&$a, $update = 0) { nav_set_selected('network'); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $content = ""; if ($cid) { @@ -485,7 +483,7 @@ function network_content(&$a, $update = 0) { ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), 'default_perms' => get_acl_permissions($a->user), - 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb), + 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), true), 'bang' => (($group || $cid || $nets) ? '!' : ''), 'visitor' => 'block', 'profile_uid' => local_user(), diff --git a/mod/notes.php b/mod/notes.php index 09dac72b0..b96092495 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -46,25 +46,21 @@ function notes_content(&$a,$update = false) { $commpage = false; $commvisitor = false; - $celeb = false; - - - $x = array( 'is_owner' => $is_owner, - 'allow_location' => (($a->user['allow_location']) ? true : false), - 'default_location' => $a->user['default-location'], - 'nickname' => $a->user['nickname'], - 'lockstate' => 'lock', - 'acl' => '', - 'bang' => '', - 'visitor' => 'block', - 'profile_uid' => local_user(), + 'allow_location' => (($a->user['allow_location']) ? true : false), + 'default_location' => $a->user['default-location'], + 'nickname' => $a->user['nickname'], + 'lockstate' => 'lock', + 'acl' => '', + 'bang' => '', + 'visitor' => 'block', + 'profile_uid' => local_user(), 'button' => t('Save'), 'acl_data' => '', - ); + ); - $o .= status_editor($a,$x,$a->contact['id']); + $o .= status_editor($a,$x,$a->contact['id']); } diff --git a/mod/photos.php b/mod/photos.php index ca770d95a..2823caef5 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1089,8 +1089,6 @@ function photos_content(&$a) { } } - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $uploader = ''; $ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'], @@ -1139,11 +1137,11 @@ function photos_content(&$a) { if($a->theme['template_engine'] === 'internal') { $albumselect_e = template_escape($albumselect); - $aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))); + $aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user))); } else { $albumselect_e = $albumselect; - $aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb)); + $aclselect_e = (($visitor) ? '' : populate_acl($a->user)); } $o .= replace_macros($tpl,array( diff --git a/mod/profile.php b/mod/profile.php index e81cfd22c..81bd5ace8 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -182,8 +182,6 @@ function profile_content(&$a, $update = 0) { $commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false); $commvisitor = (($commpage && $remote_contact == true) ? true : false); - $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true); $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : '')); @@ -191,18 +189,20 @@ function profile_content(&$a, $update = 0) { $x = array( 'is_owner' => $is_owner, - 'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false), - 'default_location' => (($is_owner) ? $a->user['default-location'] : ''), - 'nickname' => $a->profile['nickname'], - 'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''), - 'bang' => '', - 'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'), - 'profile_uid' => $a->profile['profile_uid'], + 'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false), + 'default_location' => (($is_owner) ? $a->user['default-location'] : ''), + 'nickname' => $a->profile['nickname'], + 'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) || + (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || + (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), + 'acl' => (($is_owner) ? populate_acl($a->user, true) : ''), + 'bang' => '', + 'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'), + 'profile_uid' => $a->profile['profile_uid'], 'acl_data' => ( $is_owner ? construct_acl_data($a, $a->user) : '' ), // For non-Javascript ACL selector - ); + ); - $o .= status_editor($a,$x); + $o .= status_editor($a,$x); } } diff --git a/mod/settings.php b/mod/settings.php index 9d2e28715..a83986267 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1097,8 +1097,6 @@ function settings_content(&$a) { $stpl = get_markup_template('settings.tpl'); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $expire_arr = array( 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), 'advanced' => t('Advanced expiration settings'), @@ -1163,7 +1161,7 @@ function settings_content(&$a) { '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$visibility' => $profile['net-publish'], - '$aclselect' => populate_acl($a->user,$celeb), + '$aclselect' => populate_acl($a->user), '$suggestme' => $suggestme, '$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''), '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''), diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 6b6f1be4a..c1220bc1e 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -15,6 +15,14 @@ {{$hide}} +{{if $networks}} +
+
{{$emailcc}}
+
+{{if $jotnets}} +{{$jotnets}} +{{/if}}{{/if}} +