cleanup of some unused code

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 88f11b2b008f942dd755a478c0eeff8dc6f26086..1f0dba655346a95f5a2b9533b3b398a938b9ef25 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -283,7 +283,7 @@ function get_acl_permissions($user = null) {
 }
 
 
-function populate_acl($user = null,$celeb = false,$show_jotnets = false) {
+function populate_acl($user = null, $show_jotnets = false) {
 
        $perms = get_acl_permissions($user);
 
@@ -317,52 +317,11 @@ function populate_acl($user = null,$celeb = false,$show_jotnets = false) {
                                            t('Hide your profile details from unknown viewers?'));
                }
 
-       // 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.
-
-//     $deny_cid = prune_deadguys($deny_cid);
-
-
-       /*$o = '';
-       $o .= '<div id="acl-wrapper">';
-       $o .= '<div id="acl-permit-outer-wrapper">';
-       $o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div><div id="jot-public">' . t('everybody') . '</div>';
-       $o .= '<div id="acl-permit-text-end"></div>';
-       $o .= '<div id="acl-permit-wrapper">';
-       $o .= '<div id="group_allow_wrapper">';
-       $o .= '<label id="acl-allow-group-label" for="group_allow" >' . t('Groups') . '</label>';
-       $o .= group_select('group_allow','group_allow',$allow_gid);
-       $o .= '</div>';
-       $o .= '<div id="contact_allow_wrapper">';
-       $o .= '<label id="acl-allow-contact-label" for="contact_allow" >' . t('Contacts') . '</label>';
-       $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb,true);
-       $o .= '</div>';
-       $o .= '</div>' . "\r\n";
-       $o .= '<div id="acl-allow-end"></div>' . "\r\n";
-       $o .= '</div>';
-       $o .= '<div id="acl-deny-outer-wrapper">';
-       $o .= '<div id="acl-deny-text">' . t('Except For:') . '</div>';
-       $o .= '<div id="acl-deny-text-end"></div>';
-       $o .= '<div id="acl-deny-wrapper">';
-       $o .= '<div id="group_deny_wrapper" >';
-       $o .= '<label id="acl-deny-group-label" for="group_deny" >' . t('Groups') . '</label>';
-       $o .= group_select('group_deny','group_deny', $deny_gid);
-       $o .= '</div>';
-       $o .= '<div id="contact_deny_wrapper" >';
-       $o .= '<label id="acl-deny-contact-label" for="contact_deny" >' . t('Contacts') . '</label>';
-       $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb,true);
-       $o .= '</div>';
-       $o .= '</div>' . "\r\n";
-       $o .= '<div id="acl-deny-end"></div>' . "\r\n";
-       $o .= '</div>';
-       $o .= '</div>' . "\r\n";
-       $o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/
-
        $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']),

diff --git a/include/conversation.php b/include/conversation.php
index f6da55c4f14c98f40757ddf51f10910f86824a9e..aa211b809f4e5637111d014eddcc02e1cf181368 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1025,42 +1025,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
        ));
 
 
-       $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 .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
-               }
-
-               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 .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
-
-
        // Private/public post links for the non-JS ACL form
        $private_post = 1;
        if($_REQUEST['public'])
@@ -1115,10 +1081,8 @@ 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'],

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index e1759ab6556105b3622425fcfa9feec1f56b9a18..650dc9577166204dfa3becd3efb4dc32ab55bee6 100644 (file)
--- 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 02ff37bf8348cd2256dc99a298b351dde4f52de8..93a240935b31e853323632c42e7016c0df9c54ef 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -336,15 +336,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 0319f200b3f9168628189f726e07fb5f39c41ef7..b039341023c7e00140e23d295f32af321087797d 100644 (file)
--- 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 e9e1af05d8044bd26b86ddfd99a50f736fddbdca..242f27f135b59b3cf987bfe402037a053b361372 100644 (file)
--- 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 906d649a6b602127b7c0cb17b45c1f2188a26a67..4a447713dc055d5c9ea5f7a0f5322cb40088159f 100644 (file)
--- 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 c3de76413be998c7f736b92c1bf3a0b655342342..5562218701e7a4555d8d611dd4b9febd64501197 100644 (file)
--- 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, true),
+                       '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 09dac72b0c9437dec1a7ee1063dd79ef4370eddf..b96092495607996af5a2172b25b5dc4b0d68df36 100644 (file)
--- 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 02ae0e76d24181233f1e955024fe4b2c4772cc78..9f79d421de8881a179dbd1f2176d8dbf97deaec5 100644 (file)
--- 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 9eb2d34b6c371d4db96858ad10686ed384e2d70d..81bd5ace8ec8c0c2906e512257dae866e0018556 100644 (file)
--- 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, true) : ''),
-                   '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 a003401dffeccd39c3ebfa387a415120713d19f6..bf803df8bb98282fc0d1ec1ada72d558be48c32f 100644 (file)
--- 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, ''),
@@ -1208,9 +1206,9 @@ function settings_content(&$a) {
                '$notify8'  => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
 
                '$desktop_notifications' => t('Activate desktop notifications'),
-                '$desktop_notifications_note' => t('Note: This is an experimental feature, as being not supported by each browser'),
-                '$desktop_notifications_success_message' => t('You will now receive desktop notifications!'),
-                
+               '$desktop_notifications_note' => t('Note: This is an experimental feature, as being not supported by each browser'),
+               '$desktop_notifications_success_message' => t('You will now receive desktop notifications!'),
+
                '$email_textonly' => array('email_textonly', t('Text-only notification emails'),
                                                                        get_pconfig(local_user(),'system','email_textonly'),
                                                                        t('Send text only notification emails, without the html part')),