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

Rename Model\GlobalContact to Model\GContact

Browse source
This commit is contained in:
Hypolite Petovan 2017-12-07 09:09:28 -05:00
parent 294689bf94
commit cd84bf8963
23 changed files with 71 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/acl_selectors.php
View file

@ -7,7 +7,7 @@ use Friendica\Content\Feature;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
require_once "include/contact_selectors.php";
require_once "include/contact_widgets.php";
@ -774,7 +774,7 @@ function navbar_complete(App $a) {
}
if ($localsearch) {
$x = GlobalContact::searchByName($search, $mode);
$x = GContact::searchByName($search, $mode);
return $x;
}

10
include/contact_widgets.php
View file

@ -7,7 +7,7 @@ use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
require_once 'include/contact_selectors.php';
@ -250,18 +250,18 @@ function common_friends_visitor_widget($profile_uid) {
}
if ($cid) {
$t = GlobalContact::countCommonFriends($profile_uid, $cid);
$t = GContact::countCommonFriends($profile_uid, $cid);
} else {
$t = GlobalContact::countCommonFriendsZcid($profile_uid, $zcid);
$t = GContact::countCommonFriendsZcid($profile_uid, $zcid);
}
if (! $t) {
return;
}
if ($cid) {
$r = GlobalContact::commonFriends($profile_uid, $cid, 0, 5, true);
$r = GContact::commonFriends($profile_uid, $cid, 0, 5, true);
} else {
$r = GlobalContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
$r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
}
return replace_macros(get_markup_template('remote_friends_common.tpl'), array(

6
include/items.php
View file

@ -11,7 +11,7 @@ use Friendica\Core\Worker;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Object\Image;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus;
@ -742,10 +742,10 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
* On comments the author is the better choice.
*/
if ($arr['parent-uri'] === $arr['uri']) {
$arr["gcontact-id"] = GlobalContact::getId(array("url" => $arr['owner-link'], "network" => $arr['network'],
$arr["gcontact-id"] = GContact::getId(array("url" => $arr['owner-link'], "network" => $arr['network'],
"photo" => $arr['owner-avatar'], "name" => $arr['owner-name']));
} else {
$arr["gcontact-id"] = GlobalContact::getId(array("url" => $arr['author-link'], "network" => $arr['network'],
$arr["gcontact-id"] = GContact::getId(array("url" => $arr['author-link'], "network" => $arr['network'],
"photo" => $arr['author-avatar'], "name" => $arr['author-name']));
}
}

4
include/post_update.php
View file

@ -6,7 +6,7 @@
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
/**
* @brief Calls the post update functions
@ -74,7 +74,7 @@ function post_update_1192() {
// Set the "gcontact-id" in the item table and add a new gcontact entry if needed
foreach ($item_arr AS $item) {
$gcontact_id = GlobalContact::getId(array("url" => $item['author-link'], "network" => $item['network'],
$gcontact_id = GContact::getId(array("url" => $item['author-link'], "network" => $item['network'],
"photo" => $item['author-avatar'], "name" => $item['author-name']));
q("UPDATE `item` SET `gcontact-id` = %d WHERE `uid` = %d AND `author-link` = '%s' AND `gcontact-id` = 0",
intval($gcontact_id), intval($item["uid"]), dbesc($item["author-link"]));

6
mod/allfriends.php
View file

@ -6,7 +6,7 @@ use Friendica\App;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
require_once 'include/contact_selectors.php';
require_once 'mod/contacts.php';
@ -41,12 +41,12 @@ function allfriends_content(App $a) {
$a->page['aside'] = "";
profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
$total = GlobalContact::countAllFriends(local_user(), $cid);
$total = GContact::countAllFriends(local_user(), $cid);
if(count($total))
$a->set_pager_total($total);
$r = GlobalContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
$r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
if (! DBM::is_result($r)) {
$o .= t('No friends to display.');

10
mod/common.php
View file

@ -5,7 +5,7 @@
use Friendica\App;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
require_once 'include/contact_selectors.php';
require_once 'mod/contacts.php';
@ -85,9 +85,9 @@ function common_content(App $a) {
}
if ($cid) {
$t = GlobalContact::countCommonFriends($uid, $cid);
$t = GContact::countCommonFriends($uid, $cid);
} else {
$t = GlobalContact::countCommonFriendsZcid($uid, $zcid);
$t = GContact::countCommonFriendsZcid($uid, $zcid);
}
if (count($t)) {
@ -99,9 +99,9 @@ function common_content(App $a) {
if ($cid) {
$r = GlobalContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
$r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
} else {
$r = GlobalContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
$r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
}

8
mod/contacts.php
View file

@ -7,7 +7,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Network\Probe;
require_once 'include/contact_selectors.php';
@ -313,7 +313,7 @@ function _contact_update_profile($contact_id) {
Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
// Update the entry in the gcontact table
GlobalContact::updateFromProbe($data["url"]);
GContact::updateFromProbe($data["url"]);
}
function _contact_block($contact_id, $orig_record) {
@ -887,7 +887,7 @@ function contacts_tab($a, $contact_id, $active_tab) {
);
// Show this tab only if there is visible friend list
$x = GlobalContact::countAllFriends(local_user(), $contact_id);
$x = GContact::countAllFriends(local_user(), $contact_id);
if ($x)
$tabs[] = array('label'=>t('Contacts'),
'url' => "allfriends/".$contact_id,
@ -897,7 +897,7 @@ function contacts_tab($a, $contact_id, $active_tab) {
'accesskey' => 't');
// Show this tab only if there is visible common friend list
$common = GlobalContact::countCommonFriends(local_user(), $contact_id);
$common = GContact::countCommonFriends(local_user(), $contact_id);
if ($common)
$tabs[] = array('label'=>t('Common Friends'),
'url' => "common/loc/".local_user()."/".$contact_id,

4
mod/dirfind.php
View file

@ -7,7 +7,7 @@ use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact;
@ -82,7 +82,7 @@ function dirfind_content(App $a, $prefix = "") {
// Add the contact to the global contacts if it isn't already in our system
if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
GlobalContact::update($user_data);
GContact::update($user_data);
}
} elseif ($local) {

4
mod/hovercard.php
View file

@ -11,7 +11,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
function hovercard_init(App $a) {
// Just for testing purposes
@ -47,7 +47,7 @@ function hovercard_content() {
}
// if it's the url containing https it should be converted to http
$nurl = normalise_link(GlobalContact::cleanContactUrl($profileurl));
$nurl = normalise_link(GContact::cleanContactUrl($profileurl));
if($nurl) {
// Search for contact data
$contact = Contact::getDetailsByURL($nurl);

6
mod/item.php
View file

@ -23,7 +23,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Network\Probe;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
@ -743,7 +743,7 @@ function item_post(App $a) {
$datarray['postopts'] = $postopts;
$datarray['origin'] = $origin;
$datarray['moderated'] = $allow_moderated;
$datarray['gcontact-id'] = GlobalContact::getId(array("url" => $datarray['author-link'], "network" => $datarray['network'],
$datarray['gcontact-id'] = GContact::getId(array("url" => $datarray['author-link'], "network" => $datarray['network'],
"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']));
$datarray['object'] = $object;
@ -1244,7 +1244,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
if (!DBM::is_result($r)) {
$probed = Probe::uri($name);
if ($result['network'] != NETWORK_PHANTOM) {
GlobalContact::update($probed);
GContact::update($probed);
$r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($probed["url"])));
}

4
mod/profiles.php
View file

@ -9,7 +9,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Network\Probe;
@ -509,7 +509,7 @@ function profiles_post(App $a) {
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
// Update the global contact for the user
GlobalContact::updateForUser(local_user());
GContact::updateForUser(local_user());
}
}
}

4
mod/randprof.php
View file

@ -2,10 +2,10 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
function randprof_init(App $a) {
$x = GlobalContact::getRandomUrl();
$x = GContact::getRandomUrl();
if ($x) {
goaway(zrl($x));

4
mod/settings.php
View file

@ -9,7 +9,7 @@ use Friendica\Core\Worker;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Model\User;
use Friendica\Protocol\Email;
@ -650,7 +650,7 @@ function settings_post(App $a) {
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
// Update the global contact for the user
GlobalContact::updateForUser(local_user());
GContact::updateForUser(local_user());
//$_SESSION['theme'] = $theme;
if ($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {

4
mod/suggest.php
View file

@ -6,7 +6,7 @@ use Friendica\App;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
require_once 'include/contact_widgets.php';
@ -69,7 +69,7 @@ function suggest_content(App $a) {
$a->page['aside'] .= follow_widget();
$r = GlobalContact::suggestionQuery(local_user());
$r = GContact::suggestionQuery(local_user());
if (! DBM::is_result($r)) {
$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');

2
src/Model/GlobalContact.php → src/Model/GContact.php
View file

@ -23,7 +23,7 @@ require_once 'include/html2bbcode.php';
/**
* @brief This class handles GlobalContact related functions
*/
class GlobalContact
class GContact
{
/**
* @brief Search global contact table by nick or name

6
src/Protocol/DFRN.php
View file

@ -14,7 +14,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Object\Image;
use Friendica\Protocol\OStatus;
@ -1678,9 +1678,9 @@ class DFRN
$poco["photo"] = $author["avatar"];
$poco["hide"] = $hide;
$poco["contact-type"] = $contact["contact-type"];
$gcid = GlobalContact::update($poco);
$gcid = GContact::update($poco);
GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
GContact::link($gcid, $importer["uid"], $contact["id"]);
}
return($author);

6
src/Protocol/Diaspora.php
View file

@ -17,7 +17,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Network\Probe;
use Friendica\Util\XML;
@ -2245,9 +2245,9 @@ class Diaspora
"addr" => $author, "nick" => $nick, "keywords" => $keywords,
"hide" => !$searchable, "nsfw" => $nsfw);
$gcid = GlobalContact::update($gcontact);
$gcid = GContact::update($gcontact);
GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
GContact::link($gcid, $importer["uid"], $contact["id"]);
logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);

6
src/Protocol/OStatus.php
View file

@ -10,7 +10,7 @@ use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Util\Lock;
@ -226,9 +226,9 @@ class OStatus
$contact["generation"] = 2;
$contact["hide"] = false; // OStatus contacts are never hidden
$contact["photo"] = $author["author-avatar"];
$gcid = GlobalContact::update($contact);
$gcid = GContact::update($contact);
GlobalContact::link($gcid, $contact["uid"], $contact["id"]);
GContact::link($gcid, $contact["uid"], $contact["id"]);
}
return $author;

22
src/Protocol/PortableContact.php
View file

@ -12,7 +12,7 @@ namespace Friendica\Protocol;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Network\Probe;
use dba;
@ -192,10 +192,10 @@ class PortableContact
"generation" => $generation);
try {
$gcontact = GlobalContact::sanitize($gcontact);
$gcid = GlobalContact::update($gcontact);
$gcontact = GContact::sanitize($gcontact);
$gcid = GContact::update($gcontact);
GlobalContact::link($gcid, $uid, $cid, $zcid);
GContact::link($gcid, $uid, $cid, $zcid);
} catch (Exception $e) {
logger($e->getMessage(), LOGGER_DEBUG);
}
@ -424,7 +424,7 @@ class PortableContact
$contact = array_merge($contact, $noscrape);
GlobalContact::update($contact);
GContact::update($contact);
if (trim($noscrape["updated"]) != "") {
q(
@ -446,7 +446,7 @@ class PortableContact
if (!$force && !self::updateNeeded($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) {
logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG);
GlobalContact::update($contact);
GContact::update($contact);
return $gcontacts[0]["updated"];
}
@ -467,8 +467,8 @@ class PortableContact
$gcontact["server_url"] = $data["baseurl"];
try {
$gcontact = GlobalContact::sanitize($gcontact);
GlobalContact::update($gcontact);
$gcontact = GContact::sanitize($gcontact);
GContact::update($gcontact);
self::lastUpdated($data["url"], $force);
} catch (Exception $e) {
@ -494,7 +494,7 @@ class PortableContact
$contact["server_url"] = $data["baseurl"];
GlobalContact::update($contact);
GContact::update($contact);
$feedret = z_fetch_url($data["poll"]);
@ -1600,8 +1600,8 @@ class PortableContact
"generation" => $generation);
try {
$gcontact = GlobalContact::sanitize($gcontact);
GlobalContact::update($gcontact);
$gcontact = GContact::sanitize($gcontact);
GContact::update($gcontact);
} catch (Exception $e) {
logger($e->getMessage(), LOGGER_DEBUG);
}

4
src/Worker/CronJobs.php
View file

@ -11,7 +11,7 @@ use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact;
use dba;
@ -280,7 +280,7 @@ class CronJobs
$r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
if (DBM::is_result($r)) {
foreach ($r AS $user) {
GlobalContact::updateForUser($user["uid"]);
GContact::updateForUser($user["uid"]);
}
}

10
src/Worker/DiscoverPoCo.php
View file

@ -8,7 +8,7 @@ use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact;
@ -90,7 +90,7 @@ class DiscoverPoCo {
}
logger($result, LOGGER_DEBUG);
} elseif ($mode == 3) {
GlobalContact::updateSuggestions();
GContact::updateSuggestions();
} elseif (($mode == 2) && Config::get('system', 'poco_completion')) {
self::discoverUsers();
} elseif (($mode == 1) && ($search != "") && Config::get('system', 'poco_local_search')) {
@ -102,7 +102,7 @@ class DiscoverPoCo {
// Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
if (!Config::get('system', 'ostatus_disabled')) {
GlobalContact::discoverGsUsers();
GContact::discoverGsUsers();
}
}
@ -256,7 +256,7 @@ class DiscoverPoCo {
$data["server_url"] = $data["baseurl"];
GlobalContact::update($data);
GContact::update($data);
} else {
logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);
}
@ -297,7 +297,7 @@ class DiscoverPoCo {
$contact = Probe::uri($user->site_address."/".$user->name);
if ($contact["network"] != NETWORK_PHANTOM) {
$contact["about"] = $user->description;
GlobalContact::update($contact);
GContact::update($contact);
}
}
}

4
src/Worker/GProbe.php
View file

@ -8,7 +8,7 @@ namespace Friendica\Worker;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact;
@ -47,7 +47,7 @@ class GProbe {
}
if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
GlobalContact::update($arr);
GContact::update($arr);
}
$r = q(

4
view/theme/vier/theme.php
View file

@ -15,7 +15,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Model\GContact;
require_once "include/plugin.php";
require_once "mod/proxy.php";
@ -139,7 +139,7 @@ function vier_community_info() {
// comunity_profiles
if ($show_profiles) {
$r = GlobalContact::suggestionQuery(local_user(), 0, 9);
$r = GContact::suggestionQuery(local_user(), 0, 9);
$tpl = get_markup_template('ch_directory_item.tpl');
if (DBM::is_result($r)) {