From a42595a30c6f6644674e3827c2867af37788b2d1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 7 Dec 2017 09:04:24 -0500 Subject: [PATCH] Move Object\Contact to Model\Contact --- boot.php | 3 +-- include/acl_selectors.php | 2 +- include/api.php | 2 +- include/bb2diaspora.php | 2 +- include/bbcode.php | 2 +- include/follow.php | 2 +- include/identity.php | 2 +- include/items.php | 2 +- include/like.php | 2 +- include/post_update.php | 2 +- include/tags.php | 20 ++++++++++---------- include/threads.php | 2 +- mod/admin.php | 2 +- mod/allfriends.php | 2 +- mod/cal.php | 2 +- mod/common.php | 2 +- mod/contacts.php | 2 +- mod/crepair.php | 2 +- mod/dfrn_confirm.php | 2 +- mod/dfrn_notify.php | 2 +- mod/dfrn_request.php | 2 +- mod/directory.php | 2 +- mod/dirfind.php | 2 +- mod/display.php | 2 +- mod/follow.php | 2 +- mod/hovercard.php | 2 +- mod/item.php | 2 +- mod/match.php | 2 +- mod/message.php | 2 +- mod/network.php | 2 +- mod/nogroup.php | 2 +- mod/photos.php | 2 +- mod/ping.php | 2 +- mod/suggest.php | 2 +- mod/unfollow.php | 2 +- mod/videos.php | 2 +- mod/viewcontacts.php | 2 +- src/Core/NotificationsManager.php | 2 +- src/{Object => Model}/Contact.php | 9 ++++----- src/Model/GlobalContact.php | 2 +- src/Model/User.php | 2 +- src/Protocol/DFRN.php | 2 +- src/Protocol/Diaspora.php | 2 +- src/Protocol/OStatus.php | 2 +- src/Worker/CronJobs.php | 2 +- src/Worker/Delivery.php | 2 +- src/Worker/Notifier.php | 2 +- src/Worker/OnePoll.php | 2 +- util/global_community_block.php | 2 +- 49 files changed, 61 insertions(+), 63 deletions(-) rename src/{Object => Model}/Contact.php (99%) diff --git a/boot.php b/boot.php index 148ca5e6e2..fa26028113 100644 --- a/boot.php +++ b/boot.php @@ -27,8 +27,7 @@ use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\Worker; use Friendica\Database\DBM; -use Friendica\Object\Contact; -use Friendica\Util\Lock; +use Friendica\Model\Contact; require_once 'include/network.php'; require_once 'include/plugin.php'; diff --git a/include/acl_selectors.php b/include/acl_selectors.php index f971d462b2..4ef6733035 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -6,8 +6,8 @@ use Friendica\App; use Friendica\Content\Feature; use Friendica\Core\Config; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; require_once "include/contact_selectors.php"; require_once "include/contact_widgets.php"; diff --git a/include/api.php b/include/api.php index 37cf1eba05..e5963fb8fa 100644 --- a/include/api.php +++ b/include/api.php @@ -12,6 +12,7 @@ use Friendica\Core\Config; use Friendica\Core\NotificationsManager; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Model\User; use Friendica\Network\FKOAuth1; @@ -24,7 +25,6 @@ use Friendica\Network\HTTPException\NotFoundException; use Friendica\Network\HTTPException\NotImplementedException; use Friendica\Network\HTTPException\UnauthorizedException; use Friendica\Network\HTTPException\TooManyRequestsException; -use Friendica\Object\Contact; use Friendica\Object\Image; use Friendica\Protocol\Diaspora; use Friendica\Util\XML; diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 3b1540473a..e1a67d432d 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -2,8 +2,8 @@ use Friendica\App; use Friendica\Core\System; +use Friendica\Model\Contact; use Friendica\Network\Probe; -use Friendica\Object\Contact; use League\HTMLToMarkdown\HtmlConverter; diff --git a/include/bbcode.php b/include/bbcode.php index 196c3ca3c1..b445fd01b0 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -5,7 +5,7 @@ use Friendica\Content\Smilies; use Friendica\Core\Cache; use Friendica\Core\System; use Friendica\Core\Config; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/oembed.php'; require_once 'include/event.php'; diff --git a/include/follow.php b/include/follow.php index 14b9c68ed5..e08136cab1 100644 --- a/include/follow.php +++ b/include/follow.php @@ -7,8 +7,8 @@ use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Network\Probe; -use Friendica\Object\Contact; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\PortableContact; diff --git a/include/identity.php b/include/identity.php index a3a007cc18..9a0900dc1f 100644 --- a/include/identity.php +++ b/include/identity.php @@ -12,7 +12,7 @@ use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/bbcode.php'; require_once 'mod/proxy.php'; diff --git a/include/items.php b/include/items.php index c32b4a0ba5..44fca51d8f 100644 --- a/include/items.php +++ b/include/items.php @@ -10,8 +10,8 @@ use Friendica\Core\PConfig; use Friendica\Core\Worker; use Friendica\Core\System; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; use Friendica\Object\Image; use Friendica\Protocol\DFRN; use Friendica\Protocol\OStatus; diff --git a/include/like.php b/include/like.php index 1dcadde705..9a8b9b957b 100644 --- a/include/like.php +++ b/include/like.php @@ -4,7 +4,7 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; use Friendica\Protocol\Diaspora; /** diff --git a/include/post_update.php b/include/post_update.php index f67c064daf..7cbc6ece0d 100644 --- a/include/post_update.php +++ b/include/post_update.php @@ -5,8 +5,8 @@ use Friendica\Core\Config; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; /** * @brief Calls the post update functions diff --git a/include/tags.php b/include/tags.php index 45a17f9c96..8d8fb76559 100644 --- a/include/tags.php +++ b/include/tags.php @@ -6,7 +6,7 @@ use Friendica\App; use Friendica\Content\Feature; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; function create_tags_from_item($itemid) { $profile_base = System::baseUrl(); @@ -157,13 +157,13 @@ function update_items() { /** * @brief Get alphabetical sorted array of used tags/terms of an user including * a weighting by frequency of use. - * + * * @param int $uid The user ID. * @param int $count Max number of displayed tags/terms. * @param int $owner_id The contact id of the owner of the tagged items. * @param string $flags Special item flags. * @param int $type The tag/term type. - * + * * @return arr Alphabetical sorted array of used tags of an user. */ function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG) { @@ -197,19 +197,19 @@ function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HA if(!DBM::is_result($r)) { return array(); } - + return tag_calc($r); } /** * @brief Construct a tag/term cloud block for an user. - * + * * @param int $uid The user ID. * @param int $count Max number of displayed tags/terms. * @param int $owner_id The contact ID of the owner of the tagged items. * @param string $flags Special item flags. * @param int $type The tag/term type. - * + * * @return string HTML formatted output. */ function wtagblock($uid, $count = 0,$owner_id = 0, $flags = '', $type = TERM_HASHTAG) { @@ -244,7 +244,7 @@ function wtagblock($uid, $count = 0,$owner_id = 0, $flags = '', $type = TERM_HAS /** * @brief Calculate weighting of tags according to the frequency of use. - * + * * @param array $arr Array of tags/terms with tag/term name and total count of use. * @return array Alphabetical sorted array of used tags/terms of an user. */ @@ -279,10 +279,10 @@ function tag_calc($arr) { /** * @brief Compare function to sort tags/terms alphabetically. - * + * * @param type $a * @param type $b - * + * * @return int */ function tags_sort($a, $b) { @@ -294,7 +294,7 @@ function tags_sort($a, $b) { /** * @brief Insert a tag cloud widget for the present profile. - * + * * @param int $limit Max number of displayed tags. * @return string HTML formattat output. */ diff --git a/include/threads.php b/include/threads.php index 00848ccc6e..494fbe1ce3 100644 --- a/include/threads.php +++ b/include/threads.php @@ -3,7 +3,7 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; function add_thread($itemid, $onlyshadow = false) { $items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, diff --git a/mod/admin.php b/mod/admin.php index 29e10bda83..321e7b6172 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -10,8 +10,8 @@ use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\User; -use Friendica\Object\Contact; require_once 'include/enotify.php'; require_once 'include/text.php'; diff --git a/mod/allfriends.php b/mod/allfriends.php index 3cfe6c0f9e..1eb4b0e1c4 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -5,8 +5,8 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; require_once 'include/contact_selectors.php'; require_once 'mod/contacts.php'; diff --git a/mod/cal.php b/mod/cal.php index 7eb31905b8..cef9857ea9 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -11,7 +11,7 @@ use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/event.php'; require_once 'include/redir.php'; diff --git a/mod/common.php b/mod/common.php index 9933c3f51f..d50dfcba78 100644 --- a/mod/common.php +++ b/mod/common.php @@ -4,8 +4,8 @@ */ use Friendica\App; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; require_once 'include/contact_selectors.php'; require_once 'mod/contacts.php'; diff --git a/mod/contacts.php b/mod/contacts.php index 9feacaf5e3..e9e55570df 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -6,9 +6,9 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; use Friendica\Network\Probe; -use Friendica\Object\Contact; require_once 'include/contact_selectors.php'; require_once 'mod/proxy.php'; diff --git a/mod/crepair.php b/mod/crepair.php index 7e1921f304..32db9be92c 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -5,7 +5,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/contact_selectors.php'; require_once 'mod/contacts.php'; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 18d9f25bf5..c999013eff 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -24,8 +24,8 @@ use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Network\Probe; -use Friendica\Object\Contact; use Friendica\Protocol\Diaspora; require_once 'include/enotify.php'; diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 61be7966e0..b81f26db9d 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -9,7 +9,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; use Friendica\Protocol\DFRN; require_once 'include/items.php'; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 67395a9fcc..bff1464ae4 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -15,8 +15,8 @@ use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Network\Probe; -use Friendica\Object\Contact; require_once 'include/enotify.php'; require_once 'include/group.php'; diff --git a/mod/directory.php b/mod/directory.php index d8ad6aeaba..f29e3eb69b 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -3,7 +3,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; function directory_init(App $a) { $a->set_pager_itemspage(60); diff --git a/mod/dirfind.php b/mod/dirfind.php index 4ba122b566..52dbf7512e 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -6,9 +6,9 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; use Friendica\Network\Probe; -use Friendica\Object\Contact; use Friendica\Protocol\PortableContact; require_once 'include/contact_widgets.php'; diff --git a/mod/display.php b/mod/display.php index e81e654acb..2d22637ece 100644 --- a/mod/display.php +++ b/mod/display.php @@ -4,7 +4,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; use Friendica\Protocol\DFRN; function display_init(App $a) { diff --git a/mod/follow.php b/mod/follow.php index b5e73ca9a4..f0cffff4a1 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -3,8 +3,8 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\System; +use Friendica\Model\Contact; use Friendica\Network\Probe; -use Friendica\Object\Contact; require_once 'include/follow.php'; require_once 'include/contact_selectors.php'; diff --git a/mod/hovercard.php b/mod/hovercard.php index 5542fe5b98..496c5e0290 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -10,8 +10,8 @@ use Friendica\App; use Friendica\Core\Config; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; function hovercard_init(App $a) { // Just for testing purposes diff --git a/mod/item.php b/mod/item.php index ffac1c8e44..c6478d99a0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -22,9 +22,9 @@ use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; use Friendica\Network\Probe; -use Friendica\Object\Contact; use Friendica\Protocol\Diaspora; use Friendica\Protocol\Email; use Friendica\Util\Emailer; diff --git a/mod/match.php b/mod/match.php index 3a0d10c319..563ce5bedc 100644 --- a/mod/match.php +++ b/mod/match.php @@ -6,7 +6,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/text.php'; require_once 'include/contact_widgets.php'; diff --git a/mod/message.php b/mod/message.php index cefc44356f..7bb17f3906 100644 --- a/mod/message.php +++ b/mod/message.php @@ -4,7 +4,7 @@ use Friendica\App; use Friendica\Content\Smilies; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/acl_selectors.php'; require_once 'include/message.php'; diff --git a/mod/network.php b/mod/network.php index 7e61d083f6..3ac13b24e0 100644 --- a/mod/network.php +++ b/mod/network.php @@ -9,7 +9,7 @@ use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/conversation.php'; require_once 'include/group.php'; diff --git a/mod/nogroup.php b/mod/nogroup.php index 5fb9afc2ac..d7df8cb187 100644 --- a/mod/nogroup.php +++ b/mod/nogroup.php @@ -4,7 +4,7 @@ */ use Friendica\App; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/contact_selectors.php'; diff --git a/mod/photos.php b/mod/photos.php index 36a7d925d2..cc3ec71a65 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -8,9 +8,9 @@ use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Network\Probe; -use Friendica\Object\Contact; use Friendica\Object\Image; require_once 'include/photos.php'; diff --git a/mod/ping.php b/mod/ping.php index 0f2a9584b8..883129d14f 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -9,7 +9,7 @@ use Friendica\Core\Cache; use Friendica\Core\System; use Friendica\Core\PConfig; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; use Friendica\Util\XML; require_once 'include/datetime.php'; diff --git a/mod/suggest.php b/mod/suggest.php index f05c76ceda..716f796248 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -5,8 +5,8 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; require_once 'include/contact_widgets.php'; diff --git a/mod/unfollow.php b/mod/unfollow.php index 3f94fb5760..907982cd8a 100644 --- a/mod/unfollow.php +++ b/mod/unfollow.php @@ -3,7 +3,7 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/follow.php'; require_once 'include/contact_selectors.php'; diff --git a/mod/videos.php b/mod/videos.php index 412966f862..bb0e0c237f 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -5,7 +5,7 @@ use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once('include/items.php'); require_once('include/acl_selectors.php'); diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 30ae92f8e3..1b4ff69c00 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -3,7 +3,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once('include/contact_selectors.php'); diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 42d514e618..9adac10c92 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -9,7 +9,7 @@ namespace Friendica\Core; use Friendica\Core\Pconfig; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; require_once 'include/html2plain.php'; require_once 'include/datetime.php'; diff --git a/src/Object/Contact.php b/src/Model/Contact.php similarity index 99% rename from src/Object/Contact.php rename to src/Model/Contact.php index f72ec025a4..3708603ba3 100644 --- a/src/Object/Contact.php +++ b/src/Model/Contact.php @@ -1,19 +1,18 @@