MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Review and Use statements

Browse source 
use statements and review changes.
This commit is contained in:
Adam Magness 2017-11-29 17:29:11 -05:00
commit 0373056448
15 changed files with 83 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/contacts.php
View file

@ -9,7 +9,6 @@ use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Network\Probe;
use Friendica\Object\Contact;
use Friendica\Object\Photo;
require_once 'include/contact_selectors.php';
require_once 'mod/proxy.php';
@ -311,7 +310,7 @@ function _contact_update_profile($contact_id) {
);
// Update the entry in the contact table
Photo::updateContactAvatar($data['photo'], local_user(), $contact_id, true);
Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
// Update the entry in the gcontact table
GlobalContact::updateFromProbe($data["url"]);

3
mod/crepair.php
View file

@ -6,7 +6,6 @@ use Friendica\App;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Object\Contact;
use Friendica\Object\Photo;
require_once 'include/contact_selectors.php';
require_once 'mod/contacts.php';
@ -90,7 +89,7 @@ function crepair_post(App $a) {
if ($photo) {
logger('mod-crepair: updating photo from ' . $photo);
Photo::updateContactAvatar($photo, local_user(), $contact['id']);
Contact::updateAvatar($photo, local_user(), $contact['id']);
}
if ($r) {

6
mod/dfrn_confirm.php
View file

@ -25,7 +25,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Network\Probe;
use Friendica\Object\Photo;
use Friendica\Object\Contact;
use Friendica\Protocol\Diaspora;
require_once 'include/enotify.php';
@ -326,7 +326,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
*
*/
Photo::updateContactAvatar($contact['photo'],$uid,$contact_id);
Contact::updateAvatar($contact['photo'], $uid, $contact_id);
logger('dfrn_confirm: confirm - imported photos');
@ -675,7 +675,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
$photo = System::baseUrl() . '/images/person-175.jpg';
}
Photo::updateContactAvatar($photo,$local_uid,$dfrn_record);
Contact::updateAvatar($photo,$local_uid,$dfrn_record);
logger('dfrn_confirm: request - photos imported');

6
mod/dfrn_request.php
View file

@ -16,7 +16,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Network\Probe;
use Friendica\Object\Photo;
use Friendica\Object\Contact;
require_once 'include/enotify.php';
require_once 'include/group.php';
@ -195,7 +195,7 @@ function dfrn_request_post(App $a) {
group_add_member(local_user(), '', $r[0]['id'], $def_gid);
if (isset($photo))
Photo::updateContactAvatar($photo, local_user(), $r[0]["id"], true);
Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
$forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
} else {
@ -586,7 +586,7 @@ function dfrn_request_post(App $a) {
);
if (DBM::is_result($r)) {
$contact_record = $r[0];
Photo::updateContactAvatar($photo, $uid, $contact_record["id"], true);
Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
}
}