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 /include/items.php | |
| parent | aa3a14ec36db5f9df9d0ec27c607a994451fc845 (diff) | |
| download | volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.tar.gz volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.tar.bz2 volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.zip | |
cleanup
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/items.php b/include/items.php index 047dd4442..4c0e8312c 100644 --- a/include/items.php +++ b/include/items.php @@ -915,7 +915,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $postvars['dissolve'] = '1'; - if((($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) { + if((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) { $postvars['data'] = $atom; $postvars['perm'] = 'rw'; } @@ -1448,9 +1448,9 @@ function new_follower($importer,$contact,$datarray,$item) { $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']; if(is_array($contact)) { - if($contact['network'] == 'stat' && $contact['rel'] == REL_FAN) { + if($contact['network'] == 'stat' && $contact['rel'] == CONTACT_IS_SHARING) { $r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval(REL_BUD), + intval(CONTACT_IS_FRIEND), intval($contact['id']), intval($importer['uid']) ); @@ -1472,12 +1472,12 @@ function new_follower($importer,$contact,$datarray,$item) { dbesc($nick), dbesc($photo), dbesc('stat'), - intval(REL_VIP) + intval(CONTACT_IS_FOLLOWER) ); $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 AND `rel` = %d LIMIT 1", intval($importer['uid']), dbesc($url), - intval(REL_VIP) + intval(CONTACT_IS_FOLLOWER) ); if(count($r)) $contact_record = $r[0]; @@ -1522,9 +1522,9 @@ function new_follower($importer,$contact,$datarray,$item) { function lose_follower($importer,$contact,$datarray,$item) { - if(($contact['rel'] == REL_BUD) || ($contact['rel'] == REL_FAN)) { + if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) { q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1", - intval(REL_FAN), + intval(CONTACT_IS_SHARING), intval($contact['id']) ); } |