diff options
| author | Friendika <info@friendika.com> | 2011-04-26 05:45:53 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-26 05:45:53 -0700 |
| commit | a01c40a845ae96d44ca58859cb2bc54ad6cd0b3d (patch) | |
| tree | 9761b981716716c37ffc847ceb7576ba7c4de322 | |
| parent | 7bf85eadb2cabedf955046722d1ff45e0f160421 (diff) | |
| download | volse-hubzilla-a01c40a845ae96d44ca58859cb2bc54ad6cd0b3d.tar.gz volse-hubzilla-a01c40a845ae96d44ca58859cb2bc54ad6cd0b3d.tar.bz2 volse-hubzilla-a01c40a845ae96d44ca58859cb2bc54ad6cd0b3d.zip | |
no insecure warning on FB connections
| -rw-r--r-- | include/group.php | 2 | ||||
| -rw-r--r-- | mod/contacts.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/group.php b/include/group.php index 5dca08c76..8866104fc 100644 --- a/include/group.php +++ b/include/group.php @@ -124,7 +124,7 @@ function group_public_members($gid) { $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` WHERE `gid` = %d AND `group_member`.`uid` = %d - AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' ", + AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' AND `contact`.`network` != 'face' ", intval($gid), intval(local_user()) ); diff --git a/mod/contacts.php b/mod/contacts.php index a1219f94d..c22bc3c83 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -285,7 +285,7 @@ function contacts_content(&$a) { '$contact_id' => $r[0]['id'], '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ), '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ), - '$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL) ? $insecure : ''), + '$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK) ? $insecure : ''), '$info' => $r[0]['info'], '$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''), '$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''), diff --git a/mod/network.php b/mod/network.php index f40d34353..ae991e6ee 100644 --- a/mod/network.php +++ b/mod/network.php @@ -149,7 +149,7 @@ function network_content(&$a, $update = 0) { if(count($r)) { $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( " . intval($cid) . " )) "; $o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o; - if($r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_DFRN && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { + if($r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { notice( t('Private messages to this person are at risk of public disclosure.') . EOL); } |