diff --git a/mod/contacts.php b/mod/contacts.php index 83f73140bd..177ca99734 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -53,9 +53,9 @@ function contacts_post(&$a) { return; } } +logger('contact_edit ' . print_r($_POST,true)); - - $priority = intval($_POST['priority']); + $priority = intval($_POST['poll']); if($priority == (-1)) if($priority > 5 || $priority < 0) @@ -252,7 +252,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') ? '' : load_view_file('view/insecure_net.tpl')), + '$insecure' => (($r[0]['network'] === 'stat') ? load_view_file('view/insecure_net.tpl') : ''), '$info' => $r[0]['info'], '$blocked' => (($r[0]['blocked']) ? '
' . t('Currently blocked') . '
' : ''), '$ignored' => (($r[0]['readonly']) ? '
' . t('Currently ignored') . '
' : ''), diff --git a/mod/follow.php b/mod/follow.php index 946794c877..b4e50fa451 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -48,7 +48,8 @@ function follow_post(&$a) { } } - $network = 'stat'; + $network = 'stat'; + $priority = 0; if($hcard) { $vcard = scrape_vcard($hcard); @@ -110,6 +111,7 @@ function follow_post(&$a) { if((! $vcard['photo']) && strlen($email)) $vcard['photo'] = gravatar_img($email); $network = 'feed'; + $priority = 2; } } @@ -150,7 +152,7 @@ function follow_post(&$a) { } else { // create contact record - $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, + $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`, `blocked`, `readonly`, `pending` ) VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 0 ) ", intval(local_user()), @@ -162,7 +164,8 @@ function follow_post(&$a) { dbesc($vcard['nick']), dbesc($vcard['photo']), dbesc($network), - intval(REL_FAN) + intval(REL_FAN), + intval($priority) ); } diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl index 8455db30cf..fcd3f2d66f 100644 --- a/view/de/contact_edit.tpl +++ b/view/de/contact_edit.tpl @@ -23,6 +23,10 @@ $delete
+ +
+ +
$lastupdtext$last_update
$updpub
@@ -35,8 +39,6 @@ $insecure $blocked $ignored - -

Kontaktinformation / Notizen

diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl index 79a7651c1c..ea546b7842 100644 --- a/view/en/contact_edit.tpl +++ b/view/en/contact_edit.tpl @@ -23,6 +23,10 @@ $delete
+ + + +
$lastupdtext$last_update
$updpub
@@ -35,9 +39,6 @@ $insecure $blocked $ignored - - -

Contact Information / Notes

diff --git a/view/fr/contact_edit.tpl b/view/fr/contact_edit.tpl index 79a7651c1c..c7d2d59752 100644 --- a/view/fr/contact_edit.tpl +++ b/view/fr/contact_edit.tpl @@ -23,6 +23,11 @@ $delete
+ + + + +
$lastupdtext$last_update
$updpub
@@ -35,8 +40,6 @@ $insecure $blocked $ignored - -

Contact Information / Notes

diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl index 4432f496ae..d4217ba8c8 100644 --- a/view/it/contact_edit.tpl +++ b/view/it/contact_edit.tpl @@ -23,6 +23,10 @@ $delete
+ + + +
$lastupdtext$last_update
$updpub
@@ -35,8 +39,6 @@ $insecure $blocked $ignored - -

Informazioni di contatto / Note