strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some small changes

Browse source
This commit is contained in:
Michael Vogel 2016-10-01 20:20:27 +00:00
parent 60a0235af0
commit 9dee3cc809
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
include/Contact.php
View file

@ -687,12 +687,13 @@ function formatted_location($profile) {
/** /**
* @brief Returns the account type name * @brief Returns the account type name
* *
* The function be called with either the profile or the contct array * The function can be called with either the user or the contact array
* *
* @param array $contact contact or profile array * @param array $contact contact or user array
*/ */
function account_type($contact) { function account_type($contact) {
// There are several fields that indicate that the contact or user is a forum
if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
|| (isset($contact['forum']) && intval($contact['forum'])) || (isset($contact['forum']) && intval($contact['forum']))
@ -702,23 +703,26 @@ function account_type($contact) {
else else
$type = ACCOUNT_TYPE_PERSON; $type = ACCOUNT_TYPE_PERSON;
// The field is named differently in the user and the contact record
if (isset($contact["contact-type"])) if (isset($contact["contact-type"]))
$type = $contact["contact-type"]; $type = $contact["contact-type"];
if (isset($contact["account-type"])) if (isset($contact["account-type"]))
$type = $contact["account-type"]; $type = $contact["account-type"];
if ($type != 0) switch($type) {
switch($type) { case ACCOUNT_TYPE_ORGANISATION:
case ACCOUNT_TYPE_ORGANISATION: $account_type = t("Organisation");
$account_type = t("Organisation"); break;
break; case ACCOUNT_TYPE_NEWS:
case ACCOUNT_TYPE_NEWS: $account_type = t('News');
$account_type = t('News'); break;
break; case ACCOUNT_TYPE_COMMUNITY:
case ACCOUNT_TYPE_COMMUNITY: $account_type = t("Forum");
$account_type = t("Forum"); break;
break; default:
} $account_type = "";
break;
}
return $account_type; return $account_type;
} }