diff options
| author | root <root@diekershoff.homeunix.net> | 2010-12-30 07:58:18 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2010-12-30 07:58:18 +0100 |
| commit | ed6416b4ffcadf8b1a8a5f9d877b506b0e34d6bf (patch) | |
| tree | 231f1b6ee875012f8d2c05cc8238f1f2380d1c72 /mod/contacts.php | |
| parent | 8e07525dfb47cfb8bf04d51ebcde51c83b8d41ca (diff) | |
| parent | f632a4a53ac5da48c5ed6ee08f05c4d847029698 (diff) | |
| download | volse-hubzilla-ed6416b4ffcadf8b1a8a5f9d877b506b0e34d6bf.tar.gz volse-hubzilla-ed6416b4ffcadf8b1a8a5f9d877b506b0e34d6bf.tar.bz2 volse-hubzilla-ed6416b4ffcadf8b1a8a5f9d877b506b0e34d6bf.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/contacts.php')
| -rw-r--r-- | mod/contacts.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 29ef8a8cd..33d1955a5 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -65,12 +65,15 @@ function contacts_post(&$a) { $reason = notags(trim($_POST['reason'])); - $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s' + $info = escape_tags(trim($_POST['info'])); + + $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `info` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($profile_id), intval($priority), intval($rating), dbesc($reason), + dbesc($info), intval($contact_id), intval(local_user()) ); @@ -190,6 +193,8 @@ function contacts_content(&$a) { return; } + $tpl = load_view_file('view/contact_head.tpl'); + $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl())); require_once('include/contact_selectors.php'); @@ -239,6 +244,7 @@ function contacts_content(&$a) { '$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')), + '$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>' : ''), '$rating' => contact_reputation($r[0]['rating']), |