more enotify

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index c3e26082e3eb498f1c1a88d0fbeef724a1c86398..d8f530daf61366f9bf59fd64fe3fff0d6e56dee2 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -96,7 +96,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
        $sql_extra = '';
 
        if($x['mutual']) {
-               $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
+               $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
        }
 
        if(intval($x['exclude']))
@@ -163,14 +163,14 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
        $sql_extra = '';
 
        if($privmail || $celeb) {
-               $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
+               $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
        }
 
        if($privmail) {
-               $sql_extra .= " AND `network` IN ( 'dfrn' ) ";
+               $sql_extra .= " AND `network` IN ( 'dfrn', 'dspr' ) ";
        }
        elseif($privatenet) {   
-               $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) ";
+               $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face', 'dspr' ) ";
        }
 
 
@@ -239,7 +239,7 @@ function populate_acl($user = null,$celeb = false) {
                array_walk($deny_gid,'fixacl');
        }
 
-       $o = '';
+       /*$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>';
@@ -272,7 +272,20 @@ function populate_acl($user = null,$celeb = false) {
        $o .= '<div id="acl-deny-end"></div>' . "\r\n";
        $o .= '</div>';
        $o .= '</div>' . "\r\n";
-       $o .= '<div id="acl-wrapper-end"></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"),
+               '$allowcid' => json_encode($allow_cid),
+               '$allowgid' => json_encode($allow_gid),
+               '$denycid' => json_encode($deny_cid),
+               '$denygid' => json_encode($deny_gid),
+       ));
+       
+       
        return $o;
 
 }