provide disclosure warning on private network page

5 files changed, 40 insertions, 23 deletions

diff --git a/mod/contacts.php b/mod/contacts.php
index 18eedbe9b..a1219f94d 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -274,6 +274,7 @@ function contacts_content(&$a) {
 			'$ignorecont' => t('Ignore contact'),
 			'$altcrepair' => t('Repair contact URL settings'),
 			'$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
+			'$lblrecent' => t('View conversations'),
 			'$delete' => t('Delete contact'),
 			'$poll_interval' => contact_poll_interval($r[0]['priority']),
 			'$lastupdtext' => t('Last updated: '),
diff --git a/mod/network.php b/mod/network.php
index 9d5fb5b84..3e6c5dc4a 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -212,13 +212,17 @@ function network_content(&$a, $update = 0) {
 	}
 	elseif($cid) {
 
-		$r = q("SELECT `id`,`name` FROM `contact` WHERE `id` = %d 
+		$r = q("SELECT `id`,`name`,`network`,`writable` FROM `contact` WHERE `id` = %d 
 				AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
 			intval($cid)
 		);
 		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'))) {
+				notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
+			}
+
 		}
 		else {
 			notice( t('Invalid contact.') . EOL);
diff --git a/util/messages.po b/util/messages.po
index ad81cd886..ac7bb874f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.1.954\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-19 20:49-0700\n"
+"POT-Creation-Date: 2011-04-19 21:09-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -979,15 +979,15 @@ msgstr ""
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:228 ../../mod/contacts.php:362
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:363
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:366
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:367
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:237 ../../mod/contacts.php:370
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:371
 msgid "you are a fan of"
 msgstr ""
 
@@ -1073,71 +1073,75 @@ msgid "Repair contact URL settings (WARNING: Advanced)"
 msgstr ""
 
 #: ../../mod/contacts.php:277
+msgid "View conversations"
+msgstr ""
+
+#: ../../mod/contacts.php:278
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:279
+#: ../../mod/contacts.php:280
 msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:281
 msgid "Update public posts: "
 msgstr ""
 
-#: ../../mod/contacts.php:282
+#: ../../mod/contacts.php:283
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:285
+#: ../../mod/contacts.php:286
 msgid "Unblock this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:285
+#: ../../mod/contacts.php:286
 msgid "Block this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:286
+#: ../../mod/contacts.php:287
 msgid "Unignore this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:286
+#: ../../mod/contacts.php:287
 msgid "Ignore this contact"
 msgstr ""
 
-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:290
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:290
+#: ../../mod/contacts.php:291
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:321 ../../include/nav.php:110
+#: ../../mod/contacts.php:322 ../../include/nav.php:110
 #: ../../include/acl_selectors.php:143 ../../include/acl_selectors.php:158
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:324
 msgid "Show Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:324
 msgid "Hide Blocked Connections"
 msgstr ""
 
-#: ../../mod/contacts.php:325 ../../mod/directory.php:38
+#: ../../mod/contacts.php:326 ../../mod/directory.php:38
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:326 ../../mod/directory.php:40
+#: ../../mod/contacts.php:327 ../../mod/directory.php:40
 msgid "Find"
 msgstr ""
 
-#: ../../mod/contacts.php:386 ../../mod/viewcontacts.php:44
+#: ../../mod/contacts.php:387 ../../mod/viewcontacts.php:44
 msgid "Visit $username's profile"
 msgstr ""
 
-#: ../../mod/contacts.php:387 ../../include/conversation.php:584
+#: ../../mod/contacts.php:388 ../../include/conversation.php:584
 msgid "Edit contact"
 msgstr ""
 
@@ -1550,11 +1554,15 @@ msgstr ""
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:224
+#: ../../mod/network.php:223
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr ""
+
+#: ../../mod/network.php:228
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/network.php:323 ../../mod/register.php:450
+#: ../../mod/network.php:327 ../../mod/register.php:450
 #: ../../mod/profile.php:322 ../../mod/display.php:142
 msgid ""
 "Shared content is covered by the <a href=\"http://creativecommons.org/"
diff --git a/util/strings.php b/util/strings.php
index f5663d8e7..98c20fb26 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -105,6 +105,7 @@ $a->strings['Block/Unblock contact'] = 'Block/Unblock contact';
 $a->strings['Ignore contact'] = 'Ignore contact';
 $a->strings['Repair contact URL settings'] = 'Repair contact URL settings';
 $a->strings["Repair contact URL settings \x28WARNING: Advanced\x29"] = "Repair contact URL settings \x28WARNING: Advanced\x29";
+$a->strings['View conversations'] = 'View conversations';
 $a->strings['Delete contact'] = 'Delete contact';
 $a->strings['Last updated: '] = 'Last updated: ';
 $a->strings['Update public posts: '] = 'Update public posts: ';
@@ -365,6 +366,7 @@ $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
 $a->strings['Group: '] = 'Group: ';
 $a->strings['Contact: '] = 'Contact: ';
+$a->strings['Private messages to this person are at risk of public disclosure.'] = 'Private messages to this person are at risk of public disclosure.';
 $a->strings['Invalid contact.'] = 'Invalid contact.';
 $a->strings['%d member'] = array(
 	0 => '%d member',
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index 5e4f02335..039c8d235 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -42,6 +42,8 @@ $insecure
 $blocked
 $ignored
 
+<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
+
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
 <textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>