aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-01 15:40:19 -0700
committerfriendica <info@friendica.com>2014-10-01 15:40:19 -0700
commitbaa0b0f3939c262a1d9722a2e103c35954a5e8b5 (patch)
treee9a83b15bc522605b02340b80b3e012a200639d9
parent467c6c72f0a470173fd9b050137c37c4a59f6934 (diff)
downloadvolse-hubzilla-baa0b0f3939c262a1d9722a2e103c35954a5e8b5.tar.gz
volse-hubzilla-baa0b0f3939c262a1d9722a2e103c35954a5e8b5.tar.bz2
volse-hubzilla-baa0b0f3939c262a1d9722a2e103c35954a5e8b5.zip
only auto-follow the site recommendations if creating the first channel for an account.
-rw-r--r--include/identity.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php
index 2dbc251ce..6b1286ff7 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -27,10 +27,13 @@ function identity_check_service_class($account_id) {
intval(PAGE_REMOVED)
);
if(! ($r && count($r))) {
+ $ret['total_identities'] = 0;
$ret['message'] = t('Unable to obtain identity information from database');
return $ret;
}
+ $ret['total_identities'] = intval($r[0]['total']);
+
if(! service_class_allows($account_id,'total_identities',$r[0]['total'])) {
$result['message'] .= upgrade_message();
return $result;
@@ -170,6 +173,8 @@ function create_identity($arr) {
if (!$ret['success']) {
return $ret;
}
+ // save this for auto_friending
+ $total_identities = $ret['total_identities'];
$nick = mb_strtolower(trim($arr['nickname']));
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');
- if($accts) {
+ if(($accts) && (! $total_identities)) {
if(! is_array($accts))
$accts = array($accts);
foreach($accts as $acct) {