over-ride comment box

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index aee6548fe6a225e9fccb67b28911e9d4aabdf687..c22bc3c836031ca23afb667bcea19edbd9de4a9c 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -180,8 +180,8 @@ function contacts_content(&$a) {
                                        '$type' => 'text',
                                        '$content' => t('stopped following'),
                                        '$nick' => $a->user['nickname'],
-                                       '$verb' => ACTIVITY_UNFOLLOW,
-                                       '$ostat_follow' => '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
+                                       '$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
+                                       '$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
                                ));
 
                                if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {
@@ -261,9 +261,20 @@ function contacts_content(&$a) {
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Contact Editor'),
+                       '$submit' => t('Submit'),
+                       '$lbl_vis1' => t('Profile Visibility'),
+                       '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $r[0]['name']),
+                       '$lbl_info1' => t('Contact Information / Notes'),
+                       '$lbl_rep1' => t('Online Reputation'),
+                       '$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'),
+                       '$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.'),
+                       '$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'),
                        '$visit' => t('Visit $name\'s profile'),
                        '$blockunblock' => t('Block/Unblock contact'),
                        '$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: '),
@@ -274,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'] !== 'dfrn') ? $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>' : ''),