make sure that every data set has a 'verified' status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
parent
f3c433af7b
commit
391a989a91
|
@ -134,7 +134,11 @@ class AccountManager {
|
||||||
return $userData;
|
return $userData;
|
||||||
}
|
}
|
||||||
|
|
||||||
return json_decode($result[0]['data'], true);
|
$userDataArray = json_decode($result[0]['data'], true);
|
||||||
|
|
||||||
|
$userDataArray = $this->addMissingDefaultValues($userDataArray);
|
||||||
|
|
||||||
|
return $userDataArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -159,6 +163,23 @@ class AccountManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* make sure that all expected data are set
|
||||||
|
*
|
||||||
|
* @param array $userData
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected function addMissingDefaultValues(array $userData) {
|
||||||
|
|
||||||
|
foreach ($userData as $key => $value) {
|
||||||
|
if (!isset($userData[$key]['verified'])) {
|
||||||
|
$userData[$key]['verified'] = self::NOT_VERIFIED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $userData;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* reset verification status if personal data changed
|
* reset verification status if personal data changed
|
||||||
*
|
*
|
||||||
|
@ -190,19 +211,19 @@ class AccountManager {
|
||||||
if($twitterVerified &&
|
if($twitterVerified &&
|
||||||
$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
|
$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
|
||||||
) {
|
) {
|
||||||
$newData[self::PROPERTY_TWITTER]['value']['verified'] = self::NOT_VERIFIED;
|
$newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($websiteVerified &&
|
if($websiteVerified &&
|
||||||
$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
|
$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
|
||||||
) {
|
) {
|
||||||
$newData[self::PROPERTY_WEBSITE]['value']['verified'] = self::NOT_VERIFIED;
|
$newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($emailVerified &&
|
if($emailVerified &&
|
||||||
$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
|
$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
|
||||||
) {
|
) {
|
||||||
$newData[self::PROPERTY_EMAIL]['value']['verified'] = self::NOT_VERIFIED;
|
$newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $newData;
|
return $newData;
|
||||||
|
@ -263,19 +284,19 @@ class AccountManager {
|
||||||
[
|
[
|
||||||
'value' => '',
|
'value' => '',
|
||||||
'scope' => self::VISIBILITY_PRIVATE,
|
'scope' => self::VISIBILITY_PRIVATE,
|
||||||
'verified' => '0',
|
'verified' => self::NOT_VERIFIED,
|
||||||
],
|
],
|
||||||
self::PROPERTY_WEBSITE =>
|
self::PROPERTY_WEBSITE =>
|
||||||
[
|
[
|
||||||
'value' => '',
|
'value' => '',
|
||||||
'scope' => self::VISIBILITY_PRIVATE,
|
'scope' => self::VISIBILITY_PRIVATE,
|
||||||
'verified' => '0',
|
'verified' => self::NOT_VERIFIED,
|
||||||
],
|
],
|
||||||
self::PROPERTY_EMAIL =>
|
self::PROPERTY_EMAIL =>
|
||||||
[
|
[
|
||||||
'value' => $user->getEMailAddress(),
|
'value' => $user->getEMailAddress(),
|
||||||
'scope' => self::VISIBILITY_CONTACTS_ONLY,
|
'scope' => self::VISIBILITY_CONTACTS_ONLY,
|
||||||
'verified' => '0',
|
'verified' => self::NOT_VERIFIED,
|
||||||
],
|
],
|
||||||
self::PROPERTY_AVATAR =>
|
self::PROPERTY_AVATAR =>
|
||||||
[
|
[
|
||||||
|
@ -285,13 +306,13 @@ class AccountManager {
|
||||||
[
|
[
|
||||||
'value' => '',
|
'value' => '',
|
||||||
'scope' => self::VISIBILITY_PRIVATE,
|
'scope' => self::VISIBILITY_PRIVATE,
|
||||||
'verified' => '0',
|
'verified' => self::NOT_VERIFIED,
|
||||||
],
|
],
|
||||||
self::PROPERTY_TWITTER =>
|
self::PROPERTY_TWITTER =>
|
||||||
[
|
[
|
||||||
'value' => '',
|
'value' => '',
|
||||||
'scope' => self::VISIBILITY_PRIVATE,
|
'scope' => self::VISIBILITY_PRIVATE,
|
||||||
'verified' => '0',
|
'verified' => self::NOT_VERIFIED,
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue