mirror of
https://github.com/friendica/friendica
synced 2025-04-22 19:10:12 +00:00
Improve dba::selectFirst calls
- Fix remaining $r[0] references - Rename $r to meaningful names
This commit is contained in:
Hypolite Petovan
parent
465e1d6a5c
commit
5fc4927764
29 changed files with 228 additions and 250 deletions
|
|
@ -145,13 +145,12 @@ class Contact extends BaseObject
|
|||
public static function remove($id)
|
||||
{
|
||||
// We want just to make sure that we don't delete our "self" contact
|
||||
$r = dba::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
|
||||
|
||||
if (!DBM::is_result($r) || !intval($r['uid'])) {
|
||||
$contact = dba::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
|
||||
if (!DBM::is_result($contact) || !intval($contact['uid'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$archive = PConfig::get($r['uid'], 'system', 'archive_removed_contacts');
|
||||
$archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
|
||||
if ($archive) {
|
||||
dba::update('contact', array('archive' => true, 'network' => 'none', 'writable' => false), array('id' => $id));
|
||||
return;
|
||||
|
|
@ -490,9 +489,10 @@ class Contact extends BaseObject
|
|||
return $menu;
|
||||
}
|
||||
|
||||
$r = dba::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
|
||||
if ($r) {
|
||||
return self::photoMenu($r, $uid);
|
||||
// Look for our own contact if the uid doesn't match and isn't public
|
||||
$contact_own = dba::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
|
||||
if (DBM::is_result($contact_own)) {
|
||||
return self::photoMenu($contact_own, $uid);
|
||||
} else {
|
||||
$profile_link = zrl($contact['url']);
|
||||
$connlnk = 'follow/?url=' . $contact['url'];
|
||||
|
|
@ -664,9 +664,8 @@ class Contact extends BaseObject
|
|||
if (!DBM::is_result($contact)) {
|
||||
// The link could be provided as http although we stored it as https
|
||||
$ssl_url = str_replace('http://', 'https://', $url);
|
||||
$r = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid]);
|
||||
$contact = dba::fetch($r);
|
||||
dba::close($r);
|
||||
$condition = ['`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid];
|
||||
$contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
|
||||
}
|
||||
|
||||
if (DBM::is_result($contact)) {
|
||||
|
|
@ -697,12 +696,12 @@ class Contact extends BaseObject
|
|||
}
|
||||
|
||||
// Get data from the gcontact table
|
||||
$gcontacts = dba::selectFirst('gcontact', ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'], ['nurl' => normalise_link($url)]);
|
||||
if (!DBM::is_result($gcontacts)) {
|
||||
$gcontact = dba::selectFirst('gcontact', ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'], ['nurl' => normalise_link($url)]);
|
||||
if (!DBM::is_result($gcontact)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
$data = array_merge($data, $gcontacts);
|
||||
$data = array_merge($data, $gcontact);
|
||||
}
|
||||
|
||||
if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) {
|
||||
|
|
@ -726,7 +725,7 @@ class Contact extends BaseObject
|
|||
'readonly' => 0, 'pending' => 0)
|
||||
);
|
||||
|
||||
$s = dba::select('contact', array('id'), array('nurl' => normalise_link($data["url"]), 'uid' => $uid), array('order' => array('id'), 'limit' => 2));
|
||||
$s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
|
||||
$contacts = dba::inArray($s);
|
||||
if (!DBM::is_result($contacts)) {
|
||||
return 0;
|
||||
|
|
@ -979,15 +978,14 @@ class Contact extends BaseObject
|
|||
*/
|
||||
public static function updateAvatar($avatar, $uid, $cid, $force = false)
|
||||
{
|
||||
// Limit = 1 returns the row so no need for dba:inArray()
|
||||
$r = dba::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
|
||||
if (!DBM::is_result($r)) {
|
||||
$contact = dba::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
|
||||
if (!DBM::is_result($contact)) {
|
||||
return false;
|
||||
} else {
|
||||
$data = array($r["photo"], $r["thumb"], $r["micro"]);
|
||||
$data = array($contact["photo"], $contact["thumb"], $contact["micro"]);
|
||||
}
|
||||
|
||||
if (($r["avatar"] != $avatar) || $force) {
|
||||
if (($contact["avatar"] != $avatar) || $force) {
|
||||
$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
|
||||
|
||||
if ($photos) {
|
||||
|
|
@ -999,7 +997,7 @@ class Contact extends BaseObject
|
|||
|
||||
// Update the public contact (contact id = 0)
|
||||
if ($uid != 0) {
|
||||
$pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $r[0]['nurl']]);
|
||||
$pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl']]);
|
||||
if (DBM::is_result($pcontact)) {
|
||||
self::updateAvatar($avatar, 0, $pcontact['id'], $force);
|
||||
}
|
||||
|
|
@ -1023,15 +1021,16 @@ class Contact extends BaseObject
|
|||
This will reliably kill your communication with Friendica contacts.
|
||||
*/
|
||||
|
||||
$r = dba::selectFirst('contact', ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'], ['id' => $id]);
|
||||
if (!DBM::is_result($r)) {
|
||||
$fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'];
|
||||
$contact = dba::selectFirst('contact', $fields, ['id' => $id]);
|
||||
if (!DBM::is_result($contact)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$ret = Probe::uri($r["url"]);
|
||||
$ret = Probe::uri($contact["url"]);
|
||||
|
||||
// If Probe::uri fails the network code will be different
|
||||
if ($ret["network"] != $r["network"]) {
|
||||
if ($ret["network"] != $contact["network"]) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1039,11 +1038,13 @@ class Contact extends BaseObject
|
|||
|
||||
// make sure to not overwrite existing values with blank entries
|
||||
foreach ($ret as $key => $val) {
|
||||
if (isset($r[$key]) && ($r[$key] != "") && ($val == ""))
|
||||
$ret[$key] = $r[$key];
|
||||
if (isset($contact[$key]) && ($contact[$key] != "") && ($val == "")) {
|
||||
$ret[$key] = $contact[$key];
|
||||
}
|
||||
|
||||
if (isset($r[$key]) && ($ret[$key] != $r[$key]))
|
||||
if (isset($contact[$key]) && ($ret[$key] != $contact[$key])) {
|
||||
$update = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$update) {
|
||||
|
|
|
|||
|
|
@ -766,7 +766,7 @@ class GContact
|
|||
return false;
|
||||
}
|
||||
|
||||
$r = q(
|
||||
$public_contact = q(
|
||||
"SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`,
|
||||
`contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
|
||||
FROM `gcontact` WHERE `id` = %d LIMIT 1",
|
||||
|
|
@ -775,7 +775,7 @@ class GContact
|
|||
|
||||
// Get all field names
|
||||
$fields = array();
|
||||
foreach ($r[0] as $field => $data) {
|
||||
foreach ($public_contact[0] as $field => $data) {
|
||||
$fields[$field] = $data;
|
||||
}
|
||||
|
||||
|
|
@ -789,22 +789,22 @@ class GContact
|
|||
unset($contact["keywords"]);
|
||||
}
|
||||
|
||||
if ($r[0]["keywords"] == "0") {
|
||||
$r[0]["keywords"] = "";
|
||||
if ($public_contact[0]["keywords"] == "0") {
|
||||
$public_contact[0]["keywords"] = "";
|
||||
}
|
||||
|
||||
// assign all unassigned fields from the database entry
|
||||
foreach ($fields as $field => $data) {
|
||||
if (!isset($contact[$field]) || ($contact[$field] == "")) {
|
||||
$contact[$field] = $r[0][$field];
|
||||
$contact[$field] = $public_contact[0][$field];
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($contact["hide"])) {
|
||||
$contact["hide"] = $r[0]["hide"];
|
||||
$contact["hide"] = $public_contact[0]["hide"];
|
||||
}
|
||||
|
||||
$fields["hide"] = $r[0]["hide"];
|
||||
$fields["hide"] = $public_contact[0]["hide"];
|
||||
|
||||
if ($contact["network"] == NETWORK_STATUSNET) {
|
||||
$contact["network"] = NETWORK_OSTATUS;
|
||||
|
|
@ -839,16 +839,16 @@ class GContact
|
|||
$update = false;
|
||||
unset($fields["generation"]);
|
||||
|
||||
if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) {
|
||||
if ((($contact["generation"] > 0) && ($contact["generation"] <= $public_contact[0]["generation"])) || ($public_contact[0]["generation"] == 0)) {
|
||||
foreach ($fields as $field => $data) {
|
||||
if ($contact[$field] != $r[0][$field]) {
|
||||
logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
|
||||
if ($contact[$field] != $public_contact[0][$field]) {
|
||||
logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$public_contact[0][$field]."'", LOGGER_DEBUG);
|
||||
$update = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ($contact["generation"] < $r[0]["generation"]) {
|
||||
logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$r[0]["generation"]."'", LOGGER_DEBUG);
|
||||
if ($contact["generation"] < $public_contact[0]["generation"]) {
|
||||
logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$public_contact[0]["generation"]."'", LOGGER_DEBUG);
|
||||
$update = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -874,21 +874,18 @@ class GContact
|
|||
|
||||
// Now update the contact entry with the user id "0" as well.
|
||||
// This is used for the shadow copies of public items.
|
||||
$r = q(
|
||||
"SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1",
|
||||
dbesc(normalise_link($contact["url"]))
|
||||
);
|
||||
|
||||
$public_contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
|
||||
if (DBM::is_result($public_contact)) {
|
||||
logger("Update public contact ".$public_contact["id"], LOGGER_DEBUG);
|
||||
|
||||
if (DBM::is_result($r)) {
|
||||
logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
|
||||
|
||||
Contact::updateAvatar($contact["photo"], 0, $r[0]["id"]);
|
||||
Contact::updateAvatar($contact["photo"], 0, $public_contact["id"]);
|
||||
|
||||
$fields = array('name', 'nick', 'addr',
|
||||
'network', 'bd', 'gender',
|
||||
'keywords', 'alias', 'contact-type',
|
||||
'url', 'location', 'about');
|
||||
$old_contact = dba::selectFirst('contact', $fields, ['id' => $r[0]["id"]]);
|
||||
$old_contact = dba::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
|
||||
|
||||
// Update it with the current values
|
||||
$fields = array('name' => $contact['name'], 'nick' => $contact['nick'],
|
||||
|
|
@ -898,7 +895,7 @@ class GContact
|
|||
'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
|
||||
'location' => $contact['location'], 'about' => $contact['about']);
|
||||
|
||||
dba::update('contact', $fields, array('id' => $r[0]["id"]), $old_contact);
|
||||
dba::update('contact', $fields, array('id' => $public_contact["id"]), $old_contact);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,16 +38,16 @@ class Photo
|
|||
*/
|
||||
public static function store(Image $Image, $uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '')
|
||||
{
|
||||
$r = dba::selectFirst('photo', ['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
|
||||
if (DBM::is_result($r)) {
|
||||
$guid = $r['guid'];
|
||||
$photo = dba::selectFirst('photo', ['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
|
||||
if (DBM::is_result($photo)) {
|
||||
$guid = $photo['guid'];
|
||||
} else {
|
||||
$guid = get_guid();
|
||||
}
|
||||
|
||||
$x = dba::selectFirst('photo', ['id'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]);
|
||||
$existing_photo = dba::selectFirst('photo', ['id'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]);
|
||||
|
||||
$fields = array(
|
||||
$fields = [
|
||||
'uid' => $uid,
|
||||
'contact-id' => $cid,
|
||||
'guid' => $guid,
|
||||
|
|
@ -68,10 +68,10 @@ class Photo
|
|||
'deny_cid' => $deny_cid,
|
||||
'deny_gid' => $deny_gid,
|
||||
'desc' => $desc
|
||||
);
|
||||
];
|
||||
|
||||
if (DBM::is_result($x)) {
|
||||
$r = dba::update('photo', $fields, array('id' => $x['id']));
|
||||
if (DBM::is_result($existing_photo)) {
|
||||
$r = dba::update('photo', $fields, ['id' => $existing_photo['id']]);
|
||||
} else {
|
||||
$r = dba::insert('photo', $fields);
|
||||
}
|
||||
|
|
@ -80,34 +80,33 @@ class Photo
|
|||
}
|
||||
|
||||
/**
|
||||
* @param string $photo photo
|
||||
* @param string $image_url Remote URL
|
||||
* @param integer $uid user id
|
||||
* @param integer $cid contact id
|
||||
* @param boolean $quit_on_error optional, default false
|
||||
* @return array
|
||||
*/
|
||||
public static function importProfilePhoto($photo, $uid, $cid, $quit_on_error = false)
|
||||
public static function importProfilePhoto($image_url, $uid, $cid, $quit_on_error = false)
|
||||
{
|
||||
$r = dba::selectFirst(
|
||||
$photo = dba::selectFirst(
|
||||
'photo', ['resource-id'], ['uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos']
|
||||
);
|
||||
|
||||
if (DBM::is_result($r) && strlen($r['resource-id'])) {
|
||||
$hash = $r['resource-id'];
|
||||
if (x($photo['resource-id'])) {
|
||||
$hash = $photo['resource-id'];
|
||||
} else {
|
||||
$hash = photo_new_resource();
|
||||
}
|
||||
|
||||
$photo_failure = false;
|
||||
|
||||
$filename = basename($photo);
|
||||
$img_str = fetch_url($photo, true);
|
||||
$filename = basename($image_url);
|
||||
$img_str = fetch_url($image_url, true);
|
||||
|
||||
if ($quit_on_error && ($img_str == "")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$type = Image::guessType($photo, true);
|
||||
$type = Image::guessType($image_url, true);
|
||||
$Image = new Image($img_str, $type);
|
||||
if ($Image->isValid()) {
|
||||
$Image->scaleToSquare(175);
|
||||
|
|
@ -136,7 +135,7 @@ class Photo
|
|||
|
||||
$suffix = '?ts=' . time();
|
||||
|
||||
$photo = System::baseUrl() . '/photo/' . $hash . '-4.' . $Image->getExt() . $suffix;
|
||||
$image_url = System::baseUrl() . '/photo/' . $hash . '-4.' . $Image->getExt() . $suffix;
|
||||
$thumb = System::baseUrl() . '/photo/' . $hash . '-5.' . $Image->getExt() . $suffix;
|
||||
$micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $Image->getExt() . $suffix;
|
||||
|
||||
|
|
@ -167,12 +166,12 @@ class Photo
|
|||
}
|
||||
|
||||
if ($photo_failure) {
|
||||
$photo = System::baseUrl() . '/images/person-175.jpg';
|
||||
$image_url = System::baseUrl() . '/images/person-175.jpg';
|
||||
$thumb = System::baseUrl() . '/images/person-80.jpg';
|
||||
$micro = System::baseUrl() . '/images/person-48.jpg';
|
||||
}
|
||||
|
||||
return array($photo, $thumb, $micro);
|
||||
return array($image_url, $thumb, $micro);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue