limit privacy ACL's to networks which can handle privacy

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index d0952421ea3b92aa78d4a9b79f5a0d42f3481034..554782a82632f9ff7c32c60024abdc0aa2aee5d9 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -30,7 +30,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 
 
-function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false) {
+function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) {
 
        $o = '';
 
@@ -43,6 +43,10 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
        }
 
+       if($privmail || $privatenet) {
+               $sql_extra .= " AND `network` IN ( 'dfrn' ) ";
+       }       
+
        if($privmail)
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
        else 
@@ -61,11 +65,8 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                                $selected = " selected=\"selected\" ";
                        else
                                $selected = '';
-                       if(($privmail) && ($rr['network'] === 'stat'))
-                               $disabled = ' disabled="true" ' ;
-                       else
-                               $disabled = '';
-                       $o .= "<option value=\"{$rr['id']}\" $selected  $disabled title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
+
+                       $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
                }
        
        }
@@ -110,7 +111,7 @@ function populate_acl($user = null,$celeb = false) {
        $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);
+       $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";
@@ -125,7 +126,7 @@ function populate_acl($user = null,$celeb = false) {
        $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);
+       $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";

diff --git a/include/main.js b/include/main.js
index a24f0ae08ca00d143b357c81b363ca50cccfb8db..63b34bd21aa0bd9acc889541ad974595708d51bf 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -45,6 +45,7 @@
                                }
                        }
 // this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
+// update: incompatible usage of onKeyDown vs onKeyPress
 //                     if(event.keyCode == '36' && event.shiftKey == true) {
 //                             if(homebase !== undefined) {
 //                                     event.preventDefault();