harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only auto-follow the site recommendations if creating the first channel for an account.

Browse Source
This commit is contained in:
friendica 2014-10-01 15:40:19 -07:00
parent 467c6c72f0
commit baa0b0f393
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/identity.php
View File

@ -27,10 +27,13 @@ function identity_check_service_class($account_id) {
intval(PAGE_REMOVED) intval(PAGE_REMOVED)
); );
if(! ($r && count($r))) { if(! ($r && count($r))) {
$ret['total_identities'] = 0;
$ret['message'] = t('Unable to obtain identity information from database'); $ret['message'] = t('Unable to obtain identity information from database');
return $ret; return $ret;
} }
$ret['total_identities'] = intval($r[0]['total']);
if(! service_class_allows($account_id,'total_identities',$r[0]['total'])) { if(! service_class_allows($account_id,'total_identities',$r[0]['total'])) {
$result['message'] .= upgrade_message(); $result['message'] .= upgrade_message();
return $result; return $result;
@ -170,6 +173,8 @@ function create_identity($arr) {
if (!$ret['success']) { if (!$ret['success']) {
return $ret; return $ret;
} }
// save this for auto_friending
$total_identities = $ret['total_identities'];
$nick = mb_strtolower(trim($arr['nickname'])); $nick = mb_strtolower(trim($arr['nickname']));
if(! $nick) { if(! $nick) {
@ -389,8 +394,13 @@ function create_identity($arr) {
} }
} }
// auto-follow any of the hub's pre-configured channel choices.
// Only do this if it's the first channel for this account;
// otherwise it could get annoying. Don't make this list too big
// or it will impact registration time.
$accts = get_config('system','auto_follow'); $accts = get_config('system','auto_follow');
if($accts) { if(($accts) && (! $total_identities)) {
if(! is_array($accts)) if(! is_array($accts))
$accts = array($accts); $accts = array($accts);
foreach($accts as $acct) { foreach($accts as $acct) {