diff options
| author | Friendika <info@friendika.com> | 2011-08-07 16:15:54 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-07 16:15:54 -0700 |
| commit | 48ffa880f099b19052f18e399bf6af50780a24b0 (patch) | |
| tree | 48f5e9b52b425af937b5ae2511aaaf6968e0b666 /mod/dfrn_confirm.php | |
| parent | aa3a14ec36db5f9df9d0ec27c607a994451fc845 (diff) | |
| download | volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.tar.gz volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.tar.bz2 volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.zip | |
cleanup
Diffstat (limited to 'mod/dfrn_confirm.php')
| -rw-r--r-- | mod/dfrn_confirm.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 91333284b..869bde3bf 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -306,11 +306,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if($network === 'dfrn') { - $new_relation = REL_VIP; - if(($relation == REL_FAN) || ($duplex)) - $new_relation = REL_BUD; + $new_relation = CONTACT_IS_FOLLOWER; + if(($relation == CONTACT_IS_SHARING) || ($duplex)) + $new_relation = CONTACT_IS_FRIEND; - if(($relation == REL_FAN) && ($duplex)) + if(($relation == CONTACT_IS_SHARING) && ($duplex)) $duplex = 0; $r = q("UPDATE `contact` SET `photo` = '%s', @@ -401,7 +401,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", intval($uid) ); - if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) && isset($new_relation) && ($new_relation == REL_BUD)) { + if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) && isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) { require_once('include/items.php'); @@ -592,11 +592,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { logger('dfrn_confirm: request - photos imported'); - $new_relation = REL_FAN; - if(($relation == REL_VIP) || ($duplex)) - $new_relation = REL_BUD; + $new_relation = CONTACT_IS_SHARING; + if(($relation == CONTACT_IS_FOLLOWER) || ($duplex)) + $new_relation = CONTACT_IS_FRIEND; - if(($relation == REL_VIP) && ($duplex)) + if(($relation == CONTACT_IS_FOLLOWER) && ($duplex)) $duplex = 0; $r = q("UPDATE `contact` SET @@ -639,7 +639,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { push_lang($r[0]['language']); - $tpl = (($new_relation == REL_BUD) + $tpl = (($new_relation == CONTACT_IS_FRIEND) ? get_intltext_template('friend_complete_eml.tpl') : get_intltext_template('intro_complete_eml.tpl')); |