diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
| commit | 444d82a5328433fbe48e18b928d35218905a756c (patch) | |
| tree | 84bd92072bf37eee3b54ebf7cb9ccaf408562e67 /mod/contacts.php | |
| parent | 6558ee1e2210fb41b1f4d95f806ee441a565087d (diff) | |
| parent | d2dddd995abef2d0805901b278647bef0ce50f88 (diff) | |
| download | volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.gz volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.bz2 volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'mod/contacts.php')
| -rw-r--r-- | mod/contacts.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 7236a200d..177ca9973 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) @@ -177,6 +177,12 @@ function contacts_content(&$a) { } } + if($orig_record[0]['network'] === 'dfrn') { + require_once('include/items.php'); + dfrn_deliver($a->user,$orig_record[0],'placeholder', 1); + } + + contact_remove($contact_id); notice( t('Contact has been removed.') . EOL ); goaway($a->get_baseurl() . '/contacts'); @@ -246,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']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''), '$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''), |