Merge pull request #4036 from MrPetovan/task/3878-move-objects-to-model

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 26ef7e48b782af922433c3eb4f1a8fb4515649f2..74b4dec7c6e8253bd11e2dbae7cb6e1a3c9f780a 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,11 +1,16 @@
 <?php
+/**
+ * @file include/common.php
+ */
+use Friendica\App;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
 
-require_once('include/socgraph.php');
-require_once('include/Contact.php');
-require_once('include/contact_selectors.php');
-require_once('mod/contacts.php');
+require_once 'include/contact_selectors.php';
+require_once 'mod/contacts.php';
 
-function common_content(App &$a) {
+function common_content(App $a) {
 
        $o = '';
 
@@ -32,14 +37,14 @@ function common_content(App &$a) {
                        intval($cid),
                        intval($uid)
                );
-               /// @TODO Handle $c with dbm::is_result()
+               /// @TODO Handle $c with DBM::is_result()
                $a->page['aside'] = "";
-               profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
+               profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
        } else {
                $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                        intval($uid)
                );
-               /// @TODO Handle $c with dbm::is_result()
+               /// @TODO Handle $c with DBM::is_result()
 
                $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
                        '$name' => htmlentities($c[0]['name']),
@@ -53,7 +58,7 @@ function common_content(App &$a) {
                $a->page['aside'] .= $vcard_widget;
        }
 
-       if (! dbm::is_result($c)) {
+       if (! DBM::is_result($c)) {
                return;
        }
 
@@ -63,13 +68,13 @@ function common_content(App &$a) {
                                dbesc(normalise_link(get_my_url())),
                                intval($profile_uid)
                        );
-                       if (dbm::is_result($r))
+                       if (DBM::is_result($r))
                                $cid = $r[0]['id'];
                        else {
                                $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
                                        dbesc(normalise_link(get_my_url()))
                                );
-                               if (dbm::is_result($r))
+                               if (DBM::is_result($r))
                                        $zcid = $r[0]['id'];
                        }
                }
@@ -80,27 +85,27 @@ function common_content(App &$a) {
        }
 
        if ($cid) {
-               $t = count_common_friends($uid, $cid);
+               $t = GContact::countCommonFriends($uid, $cid);
        } else {
-               $t = count_common_friends_zcid($uid, $zcid);
+               $t = GContact::countCommonFriendsZcid($uid, $zcid);
        }
 
        if (count($t)) {
                $a->set_pager_total($t);
        } else {
-               notice( t('No contacts in common.') . EOL);
+               notice(t('No contacts in common.') . EOL);
                return $o;
        }
 
 
        if ($cid) {
-               $r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
+               $r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
        } else {
-               $r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
+               $r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
        }
 
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                return $o;
        }
 
@@ -109,14 +114,14 @@ function common_content(App &$a) {
        foreach ($r as $rr) {
 
                //get further details of the contact
-               $contact_details = get_contact_details_by_url($rr['url'], $uid);
+               $contact_details = Contact::getDetailsByURL($rr['url'], $uid);
 
                // $rr['id'] is needed to use contact_photo_menu()
                /// @TODO Adding '/" here avoids E_NOTICE on missing constants
                $rr['id'] = $rr['cid'];
 
                $photo_menu = '';
-               $photo_menu = contact_photo_menu($rr);
+               $photo_menu = Contact::photoMenu($rr);
 
                $entry = array(
                        'url'          => $rr['url'],
@@ -127,7 +132,7 @@ function common_content(App &$a) {
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],
-                       'account_type' => account_type($contact_details),
+                       'account_type' => Contact::getAccountType($contact_details),
                        'network'      => network_to_name($contact_details['network'], $contact_details['url']),
                        'photo_menu'   => $photo_menu,
                        'id'           => ++$id,