Merge pull request #1696 from rabuzarus/acl-var

move jotnets to populate_acl

diff --combined include/acl_selectors.php
index 0e00647379694e7f77844ed74a3b8df68a8663e8,d85f60522c47e4305e89f742176e6629d8ce79a3..8b03a1312cd2b5aa0307cbde49bd3c6a1b2b8bc5
--- 1/include/acl_selectors.php
--- 2/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@@ -283,62 -283,57 +283,57 @@@ function get_acl_permissions($user = nu
  }
  
  
- 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.
- 
- //    $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";*/
+       $jotnets = '';
+       if($show_jotnets) {
+               $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+ 
+               $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;
+                       }
+               }
+ 
+               if (!$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?'));
+               }
  
        $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")
                ),
        ));
  
@@@ -399,7 -394,7 +394,7 @@@ function acl_lookup(&$a, $out_type = 'j
                $search = $_REQUEST['query'];
        }
  
 -      logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
 +//    logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
  
        if ($search!=""){
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";

diff --combined mod/photos.php
index 3ed8e9984c315f0e20deb4a42ff5b04fcb637db4,2823caef56f1508c9665cd8856db098207ccd0bd..b16c4c021018460e89ec2a9427a444127d6ccef7
--- 1/mod/photos.php
--- 2/mod/photos.php
+++ b/mod/photos.php
@@@ -785,7 -785,7 +785,7 @@@ function photos_post(&$a) 
        $maximagesize = get_config('system','maximagesize');
  
        if(($maximagesize) && ($filesize > $maximagesize)) {
 -              notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
 +              notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
                @unlink($src);
                $foo = 0;
                call_hooks('photo_post_end',$foo);
@@@ -1089,8 -1089,6 +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 +1137,11 @@@
  
                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 --combined mod/profile.php
index 04611f583516aa03c4a489f04fc78c8c630d3a8f,81bd5ace8ec8c0c2906e512257dae866e0018556..94e3c0a37f0b4460a3cad33a4ef78f7b32229c19
--- 1/mod/profile.php
--- 2/mod/profile.php
+++ b/mod/profile.php
@@@ -166,6 -166,7 +166,6 @@@ function profile_content(&$a, $update 
  
  
                if($tab === 'profile') {
 -                      require_once('include/profile_advanced.php');
                        $o .= advanced_profile($a);
                        call_hooks('profile_advanced',$o);
                        return $o;
@@@ -181,8 -182,6 +181,6 @@@
                $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) : ''));
  
@@@ -190,18 -189,20 +188,20 @@@
  
                        $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);
                }
  
        }