Update function calls

update function calls to use profile class

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index aa1bc2436a940d8c5983de6a5425d6f9b5bfb5b7..d5f791fee7d0618eaabc6c7f544fa6b1501bc859 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -223,13 +223,13 @@ function common_friends_visitor_widget($profile_uid)
        }
 
        if (!$cid) {
-               if (get_my_url()) {
+               if (Profile::getMyURL()) {
                        $contact = dba::selectFirst('contact', ['id'],
-                                       ['nurl' => normalise_link(get_my_url()), 'uid' => $profile_uid]);
+                                       ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
                        if (DBM::is_result($contact)) {
                                $cid = $contact['id'];
                        } else {
-                               $gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(get_my_url())]);
+                               $gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
                                if (DBM::is_result($gcontact)) {
                                        $zcid = $gcontact['id'];
                                }

diff --git a/include/conversation.php b/include/conversation.php
index 0e45de5587ecccfb436317a8b29cf0b18163e00a..80ea6a90022aff0c72b5dec71866f92029fd54bf 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -10,6 +10,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 use Friendica\Object\Thread;
 use Friendica\Object\Post;
 
@@ -194,10 +195,10 @@ function localize_item(&$item) {
                        }
                }
 
-               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
-               $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+               $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
+               $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
                if ($Bphoto != "") {
-                       $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
+                       $Bphoto = '[url=' . Profile::zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
                }
 
                $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
@@ -231,10 +232,10 @@ function localize_item(&$item) {
                        }
                }
 
-               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
-               $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+               $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
+               $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
                if ($Bphoto != "") {
-                       $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+                       $Bphoto = '[url=' . Profile::zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
                }
 
                /*
@@ -266,8 +267,8 @@ function localize_item(&$item) {
 
                $obj = $r[0];
 
-               $author  = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
-               $objauthor =  '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
+               $author  = '[url=' . Profile::zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
+               $objauthor =  '[url=' . Profile::zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
 
                switch ($obj['verb']) {
                        case ACTIVITY_POST:
@@ -320,8 +321,8 @@ function localize_item(&$item) {
                                $target = $r[0];
                                $Bname = $target['author-name'];
                                $Blink = $target['author-link'];
-                               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
-                               $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+                               $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
+                               $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
                                $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]';
                                $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n";
                        }
@@ -331,7 +332,7 @@ function localize_item(&$item) {
        if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) {
                foreach ($matches as $mtch) {
                        if (! strpos($mtch[1], 'zrl=')) {
-                               $item['body'] = str_replace($mtch[0], '@[url=' . zrl($mtch[1]) . ']', $item['body']);
+                               $item['body'] = str_replace($mtch[0], '@[url=' . Profile::zrl($mtch[1]) . ']', $item['body']);
                        }
                }
        }
@@ -339,7 +340,7 @@ function localize_item(&$item) {
        // add zrl's to public images
        $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
        if (preg_match($photo_pattern, $item['body'])) {
-               $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5'  . '[/img][/url]';
+               $photo_replace = '[url=' . Profile::zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5'  . '[/img][/url]';
                $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']);
        }
 
@@ -709,7 +710,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                if ($sp) {
                                        $sparkle = ' sparkle';
                                } else {
-                                       $profile_link = zrl($profile_link);
+                                       $profile_link = Profile::zrl($profile_link);
                                }
 
                                if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
@@ -1037,7 +1038,7 @@ function item_photo_menu($item) {
                $photos_link = $profile_link . '?url=photos';
                $profile_link = $profile_link . '?url=profile';
        } else {
-               $profile_link = zrl($profile_link);
+               $profile_link = Profile::zrl($profile_link);
        }
 
        if ($cid && !$item['self']) {
@@ -1130,7 +1131,7 @@ function builtin_activity_puller($item, &$conv_responses) {
                                $url = 'redir/' . $item['contact-id'];
                                $sparkle = ' class="sparkle" ';
                        } else {
-                               $url = zrl($url);
+                               $url = Profile::zrl($url);
                        }
 
                        $url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';

diff --git a/include/event.php b/include/event.php
index a9b82ed50bc90b82606464bdf6fde93c242e7b12..b8b60a86da7d7f15acf0643539f3a81e75e490ce 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -9,6 +9,7 @@ use Friendica\Content\Feature;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 use Friendica\Util\Map;
 
 require_once 'include/bbcode.php';
@@ -964,7 +965,7 @@ function format_event_item($item) {
        $profile_link = best_link_url($item, $sp);
 
        if (!$sp) {
-               $profile_link = zrl($profile_link);
+               $profile_link = Profile::zrl($profile_link);
        }
 
        $event = replace_macros(get_markup_template('event_stream_item.tpl'), array(

diff --git a/include/nav.php b/include/nav.php
index 312e3de521211803d3e0a3b36675ff96d9ab0ca1..5c2d6efa0edf431ba8627b93c538386a24a805b8 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -7,6 +7,7 @@ use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 
 function nav(App $a) {
 
@@ -104,9 +105,9 @@ function nav_info(App $a)
        }
 
        // "Home" should also take you home from an authenticated remote profile connection
-       $homelink = get_my_url();
+       $homelink = Profile::getMyURL();
        if (! $homelink) {
-               $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
+               $homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
        }
 
        if (($a->module != 'home') && (! (local_user()))) {
@@ -145,7 +146,7 @@ function nav_info(App $a)
        if (strlen(Config::get('system', 'singleuser'))) {
                $gdir = Config::get('system', 'directory');
                if (strlen($gdir)) {
-                       $gdirpath = zrl($gdir, true);
+                       $gdirpath = Profile::zrl($gdir, true);
                }
        }
 

diff --git a/include/text.php b/include/text.php
index b34c3e902244f57b7219521dd9d4a957790fdc4d..66918e9a66e1c1fae6412acf91d0d07b7d25a093 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -10,6 +10,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 use Friendica\Model\Term;
 use Friendica\Util\Map;
 
@@ -1011,7 +1012,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                        $url = $redirect_url;
                        $sparkle = ' sparkle';
                } else {
-                       $url = zrl($url);
+                       $url = Profile::zrl($url);
                }
        }
 

diff --git a/index.php b/index.php
index 7436a51125ebbb52a323ca14a16551a311b732c9..3e01b60c33b1b5497bbeba05a48d63795b435a34 100644 (file)
--- a/index.php
+++ b/index.php
@@ -15,6 +15,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Module\Login;
+use Friendica\Module\Profile;
 
 require_once 'boot.php';
 
@@ -128,7 +129,7 @@ if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
        ) {
                $_SESSION['my_url'] = $_GET['zrl'];
                $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is', '', $a->query_string);
-               zrl_init($a);
+               Profile::zrlInit($a);
        } else {
                // Someone came with an invalid parameter, maybe as a DDoS attempt
                // We simply stop processing here

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 88dddb3ee66f9256f0b953d41d81e89e78f6f50a..fc50eb20666e58ecb4f4af1307025faf412cea9d 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/allfriends.php
  */
@@ -9,7 +8,10 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
+use dba;
 
+require_once 'include/dba.php';
 require_once 'mod/contacts.php';
 
 function allfriends_content(App $a)
@@ -31,17 +33,14 @@ function allfriends_content(App $a)
 
        $uid = $a->user['uid'];
 
-       $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-               intval($cid),
-               intval(local_user())
-       );
+       $c = dba::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => local_user()]);
 
        if (!DBM::is_result($c)) {
                return;
        }
 
        $a->page['aside'] = "";
-       profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
+       Profile::load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
 
        $total = GContact::countAllFriends(local_user(), $cid);
 
@@ -71,7 +70,7 @@ function allfriends_content(App $a)
                } else {
                        $connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
                        $photo_menu = array(
-                               'profile' => array(t("View Profile"), zrl($rr['url'])),
+                               'profile' => array(t("View Profile"), Profile::zrl($rr['url'])),
                                'follow' => array(t("Connect/Follow"), $connlnk)
                        );
                }

diff --git a/mod/cal.php b/mod/cal.php
index dece5ac188be2ac0266730e26e787247d0d107b0..3527234a84ba5596d2f84b90904a9383b1ba9ece 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -5,7 +5,6 @@
  *     This calendar is for profile visitors and contains only the events
  *     of the profile owner
  */
-
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Core\Config;
@@ -13,6 +12,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 
 require_once 'include/event.php';
@@ -45,7 +45,7 @@ function cal_init(App $a)
                        return;
                }
 
-               $profile = get_profiledata_by_nick($nick, $a->profile_uid);
+               $profile = Profile::getProfiledataByNick($nick, $a->profile_uid);
 
                $account_type = Contact::getAccountType($profile);
 
@@ -144,7 +144,7 @@ function cal_content(App $a)
        $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
 
        // get the tab navigation bar
-       $tabs = profile_tabs($a, false, $a->data['user']['nickname']);
+       $tabs = Profile::getTabs($a, false, $a->data['user']['nickname']);
 
        // The view mode part is similiar to /mod/events.php
        if ($mode == 'view') {

diff --git a/mod/common.php b/mod/common.php
index 11bddf6b539e64cf474ba10f8d8eb749e63b94d9..472269f406f287700547d10abc727ca87dadde22 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file include/common.php
  */
@@ -8,7 +7,10 @@ use Friendica\Content\ContactSelector;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
+use dba;
 
+require_once 'include/dba.php';
 require_once 'mod/contacts.php';
 
 function common_content(App $a)
@@ -34,40 +36,39 @@ function common_content(App $a)
        }
 
        if ($cmd === 'loc' && $cid) {
-               $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($cid),
-                       intval($uid)
-               );
-               /// @TODO Handle $c with DBM::is_result()
-               $a->page['aside'] = "";
-               profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
+               $c = dba::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => $uid]);
+
+               if (DBM::is_result($c)) {
+                       $a->page['aside'] = "";
+                       Profile::load($a, "", 0, Contact::getDetailsByURL($c["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()
-               $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array(
-                       '$name' => htmlentities($c[0]['name']),
-                       '$photo' => $c[0]['photo'],
-                       'url' => 'contacts/' . $cid
-               ));
-
-               if (!x($a->page, 'aside')) {
-                       $a->page['aside'] = '';
+               $c = dba::selectFirst('contact', ['name', 'url', 'photo'], ['self' => true, 'uid' => $uid]);
+
+               if (DBM::is_result($c)) {
+                       $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array(
+                               '$name' => htmlentities($c['name']),
+                               '$photo' => $c['photo'],
+                               'url' => 'contacts/' . $cid
+                       ));
+       
+                       if (!x($a->page, 'aside')) {
+                               $a->page['aside'] = '';
+                       }
+                       $a->page['aside'] .= $vcard_widget;
                }
-               $a->page['aside'] .= $vcard_widget;
        }
 
        if (!DBM::is_result($c)) {
                return;
        }
 
-       if (!$cid && get_my_url()) {
-               $contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link(get_my_url()), 'uid' => $uid]);
+       if (!$cid && Profile::getMyURL()) {
+               $contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
                if (DBM::is_result($contact)) {
                        $cid = $contact['id'];
                } else {
-                       $gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(get_my_url())]);
+                       $gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
                        if (DBM::is_result($gcontact)) {
                                $zcid = $gcontact['id'];
                        }

diff --git a/mod/contacts.php b/mod/contacts.php
index f213b8370c270fc83591af0c2edb28cc4fc3b80a..22b5b87e766d3739faed5ed198f0d4bb41cef7b5 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,9 +1,7 @@
 <?php
-
 /**
  * @file mod/contacts.php
  */
-
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Core\System;
@@ -12,6 +10,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 
 require_once 'include/contact_widgets.php';
@@ -902,7 +901,7 @@ function contact_posts($a, $contact_id)
        $contact = dba::selectFirst('contact', ['url'], ['id' => $contact_id]);
        if (DBM::is_result($contact)) {
                $a->page['aside'] = "";
-               profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+               Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
                $o .= Contact::getPostsFromUrl($contact["url"]);
        }
 

diff --git a/mod/crepair.php b/mod/crepair.php
index 94d161dc54c5fa57866a3fbbd6dbc258914875b4..cfe0e3e286efd93ed9e88f550e3163e4b243b739 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/crepair.php
  */
@@ -7,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 require_once 'mod/contacts.php';
 
@@ -27,7 +27,7 @@ function crepair_init(App $a)
 
        if (DBM::is_result($contact)) {
                $a->data['contact'] = $contact;
-               profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+               Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
        }
 }
 

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ca43998cbce66907ed12ae889c94b24ef70cdbf6..d42e649bf60cf030729e85950c3818e264ef6d64 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -19,6 +19,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
+use Friendica\Model\Profile;
 use Friendica\Module\Login;
 use Friendica\Network\Probe;
 
@@ -26,10 +27,11 @@ require_once 'include/enotify.php';
 
 function dfrn_request_init(App $a)
 {
-       if ($a->argc > 1)
+       if ($a->argc > 1) {
                $which = $a->argv[1];
+       }
 
-       profile_load($a, $which);
+       Profile::load($a, $which);
        return;
 }
 
@@ -183,7 +185,7 @@ function dfrn_request_post(App $a)
                                }
 
                                // (ignore reply, nothing we can do it failed)
-                               // Old: goaway(zrl($dfrn_url));
+                               // Old: goaway(Profile::zrl($dfrn_url));
                                goaway($forwardurl);
                                return; // NOTREACHED
                        }
@@ -618,7 +620,7 @@ function dfrn_request_content(App $a)
                        }
                } else {
                        // last, try a zrl
-                       $myaddr = get_my_url();
+                       $myaddr = Profile::getMyURL();
                }
 
                $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);

diff --git a/mod/directory.php b/mod/directory.php
index f29e3eb69ba8e057fa375a71d25a3e42de83276d..9dc08f0fbce33612e7efbf07af1d77f193d3b410 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,9 +1,12 @@
 <?php
-
+/**
+ * @file mod/directory.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 function directory_init(App $a) {
        $a->set_pager_itemspage(60);
@@ -46,7 +49,7 @@ function directory_content(App $a) {
        $gdirpath = '';
        $dirurl = Config::get('system','directory');
        if(strlen($dirurl)) {
-               $gdirpath = zrl($dirurl,true);
+               $gdirpath = Profile::zrl($dirurl,true);
        }
 
        if($search) {
@@ -146,7 +149,7 @@ function directory_content(App $a) {
                        $location_e = $location;
 
                        $photo_menu = array(
-                               'profile' => array(t("View Profile"), zrl($profile_link))
+                               'profile' => array(t("View Profile"), Profile::zrl($profile_link))
                        );
 
                        $entry = array(

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 06bb1d8da6684a847f6635587939ed1e3eacf915..4260ce827a1bc527187e4e2ddfcfd39eaebc786e 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -9,6 +9,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 
@@ -214,7 +215,7 @@ function dirfind_content(App $a, $prefix = "") {
                                        $connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
                                        $conntxt = t('Connect');
                                        $photo_menu = array(
-                                               'profile' => array(t("View Profile"), zrl($jj->url)),
+                                               'profile' => array(t("View Profile"), Profile::zrl($jj->url)),
                                                'follow' => array(t("Connect/Follow"), $connlnk)
                                        );
                                }
@@ -223,7 +224,7 @@ function dirfind_content(App $a, $prefix = "") {
 
                                $entry = array(
                                        'alt_text' => $alt_text,
-                                       'url' => zrl($jj->url),
+                                       'url' => Profile::zrl($jj->url),
                                        'itemurl' => $itemurl,
                                        'name' => htmlentities($jj->name),
                                        'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),

diff --git a/mod/display.php b/mod/display.php
index 25dd9b3afab8f5ef5374784531be9e47ec47de17..2bd2b9a5d18b4592948413b9397376a48a3a7a29 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,15 +1,19 @@
 <?php
-
+/**
+ * @file mod/display.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 
-function display_init(App $a) {
-       if (Config::get('system','block_public') && !local_user() && !remote_user()) {
+function display_init(App $a)
+{
+       if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
                return;
        }
 
@@ -103,7 +107,7 @@ function display_init(App $a) {
                }
        }
 
-       profile_load($a, $nick, 0, $profiledata);
+       Profile::load($a, $nick, 0, $profiledata);
 }
 
 function display_fetchauthor($a, $item) {

diff --git a/mod/events.php b/mod/events.php
index 0608e8679be8987606666b7d7e03aff5ab9c3adf..b64b6a13403d2ec8c19f03cc4141681eda6c6239 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -3,12 +3,12 @@
  * @file mod/events.php
  * @brief The events module
  */
-
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -237,7 +237,7 @@ function events_content(App $a) {
        $tabs = '';
        // tabs
        if ($a->theme_events_in_profile) {
-               $tabs = profile_tabs($a, true);
+               $tabs = Profile::getTabs($a, true);
        }
 
        $mode = 'view';

diff --git a/mod/follow.php b/mod/follow.php
index 2194321de8bad5fb4cac601caaab46d82c367e66..f1a53e953f0a523832a7108d9818c66f617baaa4 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -6,9 +6,9 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 
-
 function follow_post(App $a) {
 
        if (!local_user()) {
@@ -163,7 +163,7 @@ function follow_content(App $a) {
                        '$nickname' => "",
                        '$name' => $ret["name"],
                        '$url' => $ret["url"],
-                       '$zrl' => zrl($ret["url"]),
+                       '$zrl' => Profile::zrl($ret["url"]),
                        '$url_label' => t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,
@@ -177,7 +177,7 @@ function follow_content(App $a) {
 
        $a->page['aside'] = "";
 
-       profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
+       Profile::load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
 
        if ($gcontact_id <> 0) {
                $o .= replace_macros(get_markup_template('section_title.tpl'),

diff --git a/mod/hcard.php b/mod/hcard.php
index f8d4cfc3bfd30274a57c00b0343302847cc8c6ec..5e8831920e8d44aed15c8a507cba3ab412bfca9b 100644 (file)
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -1,18 +1,19 @@
 <?php
-
+/**
+ * @file mod/hcard.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 
-function hcard_init(App $a) {
-
-       $blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+function hcard_init(App $a)
+{
+       $blocked = (((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
        if ($a->argc > 1) {
                $which = $a->argv[1];
-       }
-       else {
-               notice( t('No profile') . EOL );
+       } else {
+               notice(t('No profile') . EOL);
                $a->error = 404;
                return;
        }
@@ -23,22 +24,22 @@ function hcard_init(App $a) {
                $profile = $a->argv[1];
        }
 
-       profile_load($a,$which,$profile);
+       Profile::load($a, $which, $profile);
 
-       if ((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+       if ((x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
                $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
        }
-       if (x($a->profile,'openidserver')) {
+       if (x($a->profile, 'openidserver')) {
                $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
        }
-       if (x($a->profile,'openid')) {
-               $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+       if (x($a->profile, 'openid')) {
+               $delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
                $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
        }
 
        if (! $blocked) {
-               $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-               $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+               $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+               $keywords = str_replace(array(',',' ',',,'), array(' ',',',','), $keywords);
                if (strlen($keywords)) {
                        $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
                }
@@ -54,5 +55,4 @@ function hcard_init(App $a) {
        foreach ($dfrn_pages as $dfrn) {
                $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".System::baseUrl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        }
-
 }

diff --git a/mod/hovercard.php b/mod/hovercard.php
index d7ba0f4f583e3b05618c4260bff68feefa5a6708..840ed5e6b66e25e24042c6a4cd0eb6d2eff1099b 100644 (file)
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -70,7 +70,7 @@ function hovercard_content()
                'nick'     => $contact['nick'],
                'addr'     => defaults($contact, 'addr', $contact['url']),
                'thumb'    => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
-               'url'      => $cid ? ('redir/' . $cid) : zrl($contact['url']),
+               'url'      => $cid ? ('redir/' . $cid) : Profile::zrl($contact['url']),
                'nurl'     => $contact['nurl'], // We additionally store the nurl as identifier
                'location' => $contact['location'],
                'gender'   => $contact['gender'],

diff --git a/mod/match.php b/mod/match.php
index 563ce5bedcbcb3aaac8190b6edf553cf7f5bd8ee..7da56bffaed11e0eee45c1d95380ec13c5e2d609 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -7,6 +7,7 @@ use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 require_once 'include/text.php';
 require_once 'include/contact_widgets.php';
@@ -83,14 +84,14 @@ function match_content(App $a)
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
                                        $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
                                        $photo_menu = array(
-                                               'profile' => array(t("View Profile"), zrl($jj->url)),
+                                               'profile' => array(t("View Profile"), Profile::zrl($jj->url)),
                                                'follow' => array(t("Connect/Follow"), $connlnk)
                                        );
 
                                        $contact_details = Contact::getDetailsByURL($jj->url, local_user());
 
                                        $entry = array(
-                                               'url' => zrl($jj->url),
+                                               'url' => Profile::zrl($jj->url),
                                                'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
                                                'name' => $jj->name,
                                                'details'       => $contact_details['location'],

diff --git a/mod/network.php b/mod/network.php
index 9b6e3f1c30cfb647a5d11c2ca839c6d4043baf6c..870bb75536bddf2b5cad929b23154a6265c8e296 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -11,6 +11,7 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Profile;
 use Friendica\Module\Login;
 
 require_once 'include/conversation.php';
@@ -459,9 +460,9 @@ function networkFlatView(App $a, $update = 0) {
 
                $o .= status_editor($a, $x);
 
-               if (!Config::get('theme','hide_eventlist')) {
-                       $o .= get_birthdays();
-                       $o .= get_events();
+               if (!Config::get('theme', 'hide_eventlist')) {
+                       $o .= Profile::getBirthdays();
+                       $o .= Profile::getEvents();
                }
        }
 
@@ -700,9 +701,9 @@ function networkThreadedView(App $a, $update = 0) {
                }
        }
 
-       if (!$gid && !$cid && !$update && !Config::get('theme','hide_eventlist')) {
-               $o .= get_birthdays();
-               $o .= get_events();
+       if (!$gid && !$cid && !$update && !Config::get('theme', 'hide_eventlist')) {
+               $o .= Profile::getBirthdays();
+               $o .= Profile::getEvents();
        }
 
        if ($datequery) {

diff --git a/mod/noscrape.php b/mod/noscrape.php
index fb5dea872b325f6770797b0b0a73579b6b877c85..8702f034a26b92bba642f48f554ac8441ff50425 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,23 +1,26 @@
 <?php
-
+/**
+ * @file mod/noscrape.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-function noscrape_init(App $a) {
-
-       if($a->argc > 1)
+function noscrape_init(App $a)
+{
+       if ($a->argc > 1) {
                $which = $a->argv[1];
-       else
+       } else {
                killme();
+       }
 
        $profile = 0;
-       if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+       if ((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
                $which = $a->user['nickname'];
                $profile = $a->argv[1];
        }
 
-       profile_load($a,$which,$profile);
+       Profile::load($a, $which, $profile);
 
        if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
                header('Content-type: application/json; charset=utf-8');
@@ -26,12 +29,11 @@ function noscrape_init(App $a) {
                exit;
        }
 
-       $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
-       $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
+       $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+       $keywords = str_replace(array('#',',',' ',',,'), array('',' ',',',','), $keywords);
        $keywords = explode(',', $keywords);
 
-       $r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
-               intval($a->profile['uid']));
+       $r = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
 
        $json_info = array(
                'fn'       => $a->profile['name'],
@@ -40,8 +42,8 @@ function noscrape_init(App $a) {
                'guid'     => $a->profile['guid'],
                'key'      => $a->profile['pubkey'],
                'homepage' => System::baseUrl()."/profile/{$which}",
-               'comm'     => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-               'photo'    => $r[0]["photo"],
+               'comm'     => (x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
+               'photo'    => $r["photo"],
                'tags'     => $keywords
        );
 
@@ -99,5 +101,4 @@ function noscrape_init(App $a) {
        header('Content-type: application/json; charset=utf-8');
        echo json_encode($json_info);
        exit;
-
 }

diff --git a/mod/notes.php b/mod/notes.php
index c5c45be7243c8a7081b9d5de0056df7d55d15267..dbf84337eff440b6ff2d29c69e2987290afe8e13 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,7 +1,10 @@
 <?php
-
+/**
+ * @file mod/notes.php
+ */
 use Friendica\App;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 
 function notes_init(App $a) {
 
@@ -15,7 +18,7 @@ function notes_init(App $a) {
 
        nav_set_selected('home');
 
-//     profile_load($a,$which,$profile);
+       //Profile::load($a, $which, $profile);
 
 }
 
@@ -44,7 +47,7 @@ function notes_content(App $a, $update = false) {
        $is_owner = true;
 
        $o ="";
-       $o .= profile_tabs($a,True);
+       $o .= Profile::getTabs($a, true);
 
        if(! $update) {
                $o .= '<h3>' . t('Personal Notes') . '</h3>';

diff --git a/mod/photos.php b/mod/photos.php
index bc8734798630d8d9ca25b86f9812e16fe9ac6b3c..5da7de838716722341b9393389ec55a9b7ccdbe8 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Photo;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
@@ -48,7 +49,7 @@ function photos_init(App $a) {
                $a->profile_uid = $user[0]['uid'];
                $is_owner = (local_user() && (local_user() == $a->profile_uid));
 
-               $profile = get_profiledata_by_nick($nick, $a->profile_uid);
+               $profile = Profile::getProfiledataByNick($nick, $a->profile_uid);
 
                $account_type = Contact::getAccountType($profile);
 
@@ -1074,7 +1075,7 @@ function photos_content(App $a)
 
        // tabs
        $is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= profile_tabs($a, $is_owner, $a->data['user']['nickname']);
+       $o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
 
        // Display upload form
        if ($datatype === 'upload') {

diff --git a/mod/profile.php b/mod/profile.php
index 0dd723379c433ba96a3f421f14e8f21c4fe2ab39..59762f4790b18a39677ebedb5253957cb1eacbbe 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -8,6 +8,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Group;
+use Friendica\Model\Profile;
 use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 
@@ -41,7 +42,7 @@ function profile_init(App $a)
                DFRN::autoRedir($a, $which);
        }
 
-       profile_load($a, $which, $profile);
+       Profile::load($a, $which, $profile);
 
        $blocked   = !local_user() && !remote_user() && Config::get('system', 'block_public');
        $userblock = !local_user() && !remote_user() && $a->profile['hidewall'];
@@ -175,10 +176,10 @@ function profile_content(App $a, $update = 0)
                        $tab = notags(trim($_GET['tab']));
                }
 
-               $o .= profile_tabs($a, $is_owner, $a->profile['nickname']);
+               $o .= Profile::getTabs($a, $is_owner, $a->profile['nickname']);
 
                if ($tab === 'profile') {
-                       $o .= advanced_profile($a);
+                       $o .= Profile::getAdvanced($a);
                        call_hooks('profile_advanced', $o);
                        return $o;
                }
@@ -346,8 +347,8 @@ function profile_content(App $a, $update = 0)
        }
 
        if ($is_owner && !$update && !Config::get('theme', 'hide_eventlist')) {
-               $o .= get_birthdays();
-               $o .= get_events();
+               $o .= Profile::getBirthdays();
+               $o .= Profile::getEvents();
        }
 
 

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 5b75e654dff95a08a635533f18cf91a30793bc19..8cd1fcb6a34ce063535059141f7e7acc009140bf 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -8,15 +8,16 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Photo;
+use Friendica\Model\Profile;
 use Friendica\Object\Image;
 
-function profile_photo_init(App $a) {
-
+function profile_photo_init(App $a)
+{
        if (! local_user()) {
                return;
        }
 
-       profile_load($a,$a->user['nickname']);
+       Profile::load($a, $a->user['nickname']);
 }
 
 function profile_photo_post(App $a) {

diff --git a/mod/profiles.php b/mod/profiles.php
index cc01f74dd884799f7f7423715d0f268259ae4601..279a198aa524764053794c39c49e637350f2a1ce 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -142,7 +142,7 @@ function profiles_init(App $a) {
                        return;
                }
 
-               profile_load($a,$a->user['nickname'], $r[0]['id']);
+               Profile::load($a, $a->user['nickname'], $r[0]['id']);
        }
 
 

diff --git a/mod/profperm.php b/mod/profperm.php
index 99b58516d3e420b4e1dda7402d8f179d8a979948..0a3cfd5b1844c0edb97d2113c8e8be56449052d8 100644 (file)
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -1,12 +1,14 @@
 <?php
-
+/**
+ * @file mod/profperm.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 
-function profperm_init(App $a) {
-
+function profperm_init(App $a)
+{
        if (! local_user()) {
                return;
        }
@@ -14,8 +16,7 @@ function profperm_init(App $a) {
        $which = $a->user['nickname'];
        $profile = $a->argv[1];
 
-       profile_load($a,$which,$profile);
-
+       Profile::load($a, $which, $profile);
 }
 
 

diff --git a/mod/randprof.php b/mod/randprof.php
index 40ad09271d67b25811c3c1ffff10ba250b83ca38..c5154c12d0b1292ef39fced53c93ef88aadc3e66 100644 (file)
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -1,14 +1,18 @@
 <?php
-
+/**
+ * @file mod/randprof.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
 
-function randprof_init(App $a) {
+function randprof_init(App $a)
+{
        $x = GContact::getRandomUrl();
 
        if ($x) {
-               goaway(zrl($x));
+               goaway(Profile::zrl($x));
        }
 
        goaway(System::baseUrl() . '/profile');

diff --git a/mod/suggest.php b/mod/suggest.php
index 05a720f7b986704c48c5471c3d4f3fd2417bdbf6..a3da9a445e624e57549c02fa1cbe45dd29c41250 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -8,6 +8,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
 
 require_once 'include/contact_widgets.php';
 
@@ -82,7 +83,7 @@ function suggest_content(App $a) {
                $connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
                $ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
                $photo_menu = array(
-                       'profile' => array(t("View Profile"), zrl($rr["url"])),
+                       'profile' => array(t("View Profile"), Profile::zrl($rr["url"])),
                        'follow' => array(t("Connect/Follow"), $connlnk),
                        'hide' => array(t('Ignore/Hide'), $ignlnk)
                );
@@ -90,7 +91,7 @@ function suggest_content(App $a) {
                $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
 
                $entry = array(
-                       'url' => zrl($rr['url']),
+                       'url' => Profile::zrl($rr['url']),
                        'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
                        'img_hover' => $rr['url'],
                        'name' => $contact_details['name'],

diff --git a/mod/unfollow.php b/mod/unfollow.php
index a68c4de90ef2a6ae57ba6ca7ae1aa9118618cf2f..b84e1079d27923b135ad8826a317fea89907fc38 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -6,9 +6,10 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
-function unfollow_post(App $a) {
-
+function unfollow_post(App $a)
+{
        if (!local_user()) {
                notice(t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
@@ -116,7 +117,7 @@ function unfollow_content(App $a) {
                        '$nickname' => "",
                        '$name' => $contact["name"],
                        '$url' => $contact["url"],
-                       '$zrl' => zrl($contact["url"]),
+                       '$zrl' => Profile::zrl($contact["url"]),
                        '$url_label' => t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,
@@ -125,11 +126,9 @@ function unfollow_content(App $a) {
        ));
 
        $a->page['aside'] = "";
-       profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+       Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 
-       $o .= replace_macros(get_markup_template('section_title.tpl'),
-                                       array('$title' => t('Status Messages and Posts')
-       ));
+       $o .= replace_macros(get_markup_template('section_title.tpl'), array('$title' => t('Status Messages and Posts')));
 
        // Show last public posts
        $o .= Contact::getPostsFromUrl($contact["url"]);

diff --git a/mod/videos.php b/mod/videos.php
index 640c2a3b5592b165a163596e4e6ba31bad8a1881..9fab38b86a6b2ef4521dc61b210b68caad45817a 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -9,6 +9,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 
 require_once 'include/items.php';
@@ -41,7 +42,7 @@ function videos_init(App $a) {
                $a->data['user'] = $user[0];
                $a->profile_uid = $user[0]['uid'];
 
-               $profile = get_profiledata_by_nick($nick, $a->profile_uid);
+               $profile = Profile::getProfiledataByNick($nick, $a->profile_uid);
 
                $account_type = Contact::getAccountType($profile);
 
@@ -327,7 +328,7 @@ function videos_content(App $a) {
 
        // tabs
        $_is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);
+       $o .= Profile::getTabs($a, $_is_owner, $a->data['user']['nickname']);
 
        //
        // dispatch request

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index e4ebe3abb2d7e3e4095080ce168d548f225bd7cd..64dd24e16c2cdac31d51947378e29590f4d243a8 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,10 +1,13 @@
 <?php
-
+/**
+ * @file mod/viewcontacts.php
+ */
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 function viewcontacts_init(App $a) {
 
@@ -28,7 +31,7 @@ function viewcontacts_init(App $a) {
                $a->profile_uid = $r[0]['uid'];
                $is_owner = (local_user() && (local_user() == $a->profile_uid));
 
-               profile_load($a,$a->argv[1]);
+               Profile::load($a, $a->argv[1]);
        }
 }
 
@@ -44,7 +47,7 @@ function viewcontacts_content(App $a) {
        $o = "";
 
        // tabs
-       $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
+       $o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
 
        if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
                notice( t('Permission denied.') . EOL);
@@ -97,7 +100,7 @@ function viewcontacts_content(App $a) {
                if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
                        $url = 'redir/' . $rr['id'];
                else
-                       $url = zrl($url);
+                       $url = Profile::zrl($url);
 
                $contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
 

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 1ac54c9f8a035e01e7b72cea3355b9ca3cad223d..5c7ebca9fa98234b0ede3571714b0039fa14d566 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,14 +1,17 @@
 <?php
-
+/**
+ * @file mod/wallmessage.php
+ */
 use Friendica\App;
-use \Friendica\Core\System;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 
-require_once('include/message.php');
+require_once 'include/message.php';
 
 function wallmessage_post(App $a) {
 
-       $replyto = get_my_url();
+       $replyto = Profile::getMyURL();
        if(! $replyto) {
                notice( t('Permission denied.') . EOL);
                return;
@@ -73,8 +76,8 @@ function wallmessage_post(App $a) {
 
 function wallmessage_content(App $a) {
 
-       if(! get_my_url()) {
-               notice( t('Permission denied.') . EOL);
+       if (!Profile::getMyURL()) {
+               notice(t('Permission denied.') . EOL);
                return;
        }
 

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 6efd17ddf257438d4f5ff4cac90510eb0a3b7163..e3f3da49830036d7beb9fc260891421212eac770 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -13,6 +13,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 require_once 'include/dba.php';
 require_once 'include/html2plain.php';
@@ -814,7 +815,7 @@ class NotificationsManager extends BaseObject
                                        'contact_id' => $it['contact-id'],
                                        'photo' => ((x($it, 'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
                                        'name' => $it['fname'],
-                                       'url' => zrl($it['furl']),
+                                       'url' => Profile::zrl($it['furl']),
                                        'hidden' => $it['hidden'] == 1,
                                        'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
                                        'knowyou' => $knowyou,
@@ -848,7 +849,7 @@ class NotificationsManager extends BaseObject
                                        'hidden' => $it['hidden'] == 1,
                                        'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
                                        'url' => $it['url'],
-                                       'zrl' => zrl($it['url']),
+                                       'zrl' => Profile::zrl($it['url']),
                                        'addr' => $it['gaddr'],
                                        'network' => $it['gnetwork'],
                                        'knowyou' => $it['knowyou'],

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 99183295b5e71d8c63b1596bf3bf1929e2f615be..96a2e32c6d24959c03e8dfb34b90fbf5fd57c002 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1,9 +1,7 @@
 <?php
-
 /**
  * @file src/Model/Contact.php
  */
-
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
@@ -14,6 +12,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Model\Photo;
+use Friendica\Model\Profile;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
@@ -490,7 +489,7 @@ class Contact extends BaseObject
 
                if ($contact['uid'] != $uid) {
                        if ($uid == 0) {
-                               $profile_link = zrl($contact['url']);
+                               $profile_link = Profile::zrl($contact['url']);
                                $menu = array('profile' => array(t('View Profile'), $profile_link, true));
 
                                return $menu;
@@ -501,7 +500,7 @@ class Contact extends BaseObject
                        if (DBM::is_result($contact_own)) {
                                return self::photoMenu($contact_own, $uid);
                        } else {
-                               $profile_link = zrl($contact['url']);
+                               $profile_link = Profile::zrl($contact['url']);
                                $connlnk = 'follow/?url=' . $contact['url'];
                                $menu = array(
                                        'profile' => array(t('View Profile'), $profile_link, true),

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index a7f35f578213442158381d6a5ad0f7ed15ace67b..7df1623e1a7dd5ff1050894d5566af7596533954 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file src/Model/Profile.php
  */
@@ -17,7 +16,9 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
+use dba;
 
+require_once 'include/dba.php';
 require_once 'include/bbcode.php';
 require_once 'mod/proxy.php';
 
@@ -76,18 +77,15 @@ class Profile
         *      the theme is chosen before the _init() function of a theme is run, which will usually
         *      load a lot of theme-specific content
         *
-        * @param object $a           App
-        * @param string $nickname    string
-        * @param int    $profile     int
-        * @param array  $profiledata array
+        * @param object  $a            App
+        * @param string  $nickname     string
+        * @param int     $profile      int
+        * @param array   $profiledata  array
         * @param boolean $show_connect Show connect link
         */
-       function profile_load(App $a, $nickname, $profile = 0, $profiledata = array(), $show_connect = true)
+       public static function load(App $a, $nickname, $profile = 0, $profiledata = array(), $show_connect = true)
        {
-               $user = q(
-                       "SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
-                       dbesc($nickname)
-               );
+               $user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 
                if (!$user && !count($user) && !count($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
@@ -101,14 +99,14 @@ class Profile
                }
 
                if ($profiledata) {
-                       $a->page['aside'] .= profile_sidebar($profiledata, true, $show_connect);
+                       $a->page['aside'] .= self::sidebar($profiledata, true, $show_connect);
 
                        if (!DBM::is_result($user)) {
                                return;
                        }
                }
 
-               $pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile);
+               $pdata = self::getProfiledataByNick($nickname, $user[0]['uid'], $profile);
 
                if (empty($pdata) && empty($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
@@ -176,7 +174,7 @@ class Profile
                 * But: When this profile was on the same server, then we could display the contacts
                 */
                if (!$profiledata) {
-                       $a->page['aside'] .= profile_sidebar($a->profile, $block, $show_connect);
+                       $a->page['aside'] .= self::sidebar($a->profile, $block, $show_connect);
                }
 
                return;
@@ -197,7 +195,7 @@ class Profile
         * @param int    $profile_id  ID of the profile
         * @returns array
         */
-       function get_profiledata_by_nick($nickname, $uid = 0, $profile_id = 0)
+       public static function getProfiledataByNick($nickname, $uid = 0, $profile_id = 0)
        {
                if (remote_user() && count($_SESSION['remote'])) {
                        foreach ($_SESSION['remote'] as $visitor) {
@@ -263,7 +261,7 @@ class Profile
         * @hooks 'profile_sidebar'
         *      array $arr
         */
-       function profile_sidebar($profile, $block = 0, $show_connect = true)
+       private static function sidebar($profile, $block = 0, $show_connect = true)
        {
                $a = get_app();
 
@@ -333,7 +331,7 @@ class Profile
                        $subscribe_feed = false;
                }
 
-               if (remote_user() || (get_my_url() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
+               if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
                        $wallmessage = t('Message');
                        $wallmessage_link = 'wallmessage/' . $profile['nickname'];
 
@@ -348,7 +346,7 @@ class Profile
                                $r = q(
                                        "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
                                        intval($profile['uid']),
-                                       dbesc(normalise_link(get_my_url())),
+                                       dbesc(normalise_link(self::getMyURL())),
                                        intval(CONTACT_IS_FRIEND)
                                );
                        }
@@ -524,7 +522,7 @@ class Profile
                return $o;
        }
 
-       function get_birthdays()
+       public static function getBirthdays()
        {
                $a = get_app();
                $o = '';
@@ -615,7 +613,7 @@ class Profile
                ));
        }
 
-       function get_events()
+       public static function getEvents()
        {
                require_once 'include/bbcode.php';
 
@@ -700,7 +698,7 @@ class Profile
                ));
        }
 
-       function advanced_profile(App $a)
+       public static function getAdvanced(App $a)
        {
                $o = '';
                $uid = $a->profile['uid'];
@@ -844,7 +842,7 @@ class Profile
                return '';
        }
 
-       function profile_tabs($a, $is_owner = false, $nickname = null)
+       public static function getTabs($a, $is_owner = false, $nickname = null)
        {
                if (is_null($nickname)) {
                        $nickname = $a->user['nickname'];
@@ -950,7 +948,7 @@ class Profile
         *
         * @return string
         */
-       function get_my_url()
+       public static function getMyURL()
        {
                if (x($_SESSION, 'my_url')) {
                        return $_SESSION['my_url'];
@@ -958,9 +956,9 @@ class Profile
                return null;
        }
 
-       function zrl_init(App $a)
+       public static function zrlInit(App $a)
        {
-               $my_url = get_my_url();
+               $my_url = self::getMyURL();
                $my_url = validate_url($my_url);
                if ($my_url) {
                        // Is it a DDoS attempt?
@@ -979,7 +977,7 @@ class Profile
                }
        }
 
-       function zrl($s, $force = false)
+       public static function zrl($s, $force = false)
        {
                if (!strlen($s)) {
                        return $s;
@@ -991,7 +989,7 @@ class Profile
                        $s = $s . '/';
                }
                $achar = strpos($s, '?') ? '&' : '?';
-               $mine = get_my_url();
+               $mine = self::getMyURL();
                if ($mine && !link_compare($mine, $s)) {
                        return $s . $achar . 'zrl=' . urlencode($mine);
                }
@@ -1012,7 +1010,7 @@ class Profile
         * @note Returns local_user instead of user ID if "always_my_theme"
         *      is set to true
         */
-       function get_theme_uid()
+       public static function getThemeUid()
        {
                $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
                if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) {
@@ -1021,5 +1019,4 @@ class Profile
 
                return $uid;
        }
-
 }

diff --git a/src/Object/Post.php b/src/Object/Post.php
index dada4dd651ae3bab35ab510c4d3888201b683da8..9a131e90375d0dca2d74bc43a144427b533c64b8 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -10,6 +10,7 @@ use Friendica\Content\Feature;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 use dba;
 
 require_once 'include/dba.php';
@@ -190,7 +191,7 @@ class Post extends BaseObject
                if ($sp) {
                        $sparkle = ' sparkle';
                } else {
-                       $profile_link = zrl($profile_link);
+                       $profile_link = Profile::zrl($profile_link);
                }
 
                if (!isset($item['author-thumb']) || ($item['author-thumb'] == "")) {
@@ -832,7 +833,7 @@ class Post extends BaseObject
                                        // This will have been stored in $a->page_contact by our calling page.
                                        // Put this person as the wall owner of the wall-to-wall notice.
 
-                                       $this->owner_url = zrl($a->page_contact['url']);
+                                       $this->owner_url = Profile::zrl($a->page_contact['url']);
                                        $this->owner_photo = $a->page_contact['thumb'];
                                        $this->owner_name = $a->page_contact['name'];
                                        $this->wall_to_wall = true;
@@ -860,7 +861,7 @@ class Post extends BaseObject
                                                ) {
                                                        $this->owner_url = $this->getRedirectUrl();
                                                } else {
-                                                       $this->owner_url = zrl($this->getDataValue('owner-link'));
+                                                       $this->owner_url = Profile::zrl($this->getDataValue('owner-link'));
                                                }
                                        }
                                }

diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index 48be1e02653ff5fc8763b6a243d959caaab99cfa..5d841f1084b85af746d6ef90f655878e6aa223b5 100644 (file)
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -1,31 +1,48 @@
 <?php
-
+/**
+ * @file view/theme/duepuntozero/style.php
+ */
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Model\Profile;
 
-if (file_exists("$THEMEPATH/style.css")){
-    echo file_get_contents("$THEMEPATH/style.css");
+if (file_exists("$THEMEPATH/style.css")) {
+       echo file_get_contents("$THEMEPATH/style.css");
 }
-$uid = get_theme_uid();
 
-$s_colorset = Config::get('duepuntozero','colorset');
-$colorset = PConfig::get( $uid, 'duepuntozero', 'colorset');
-if (!x($colorset))
-    $colorset = $s_colorset;
+$uid = Profile::getThemeUid();
+
+$s_colorset = Config::get('duepuntozero', 'colorset');
+$colorset = PConfig::get($uid, 'duepuntozero', 'colorset');
+
+if (!x($colorset)) {
+       $colorset = $s_colorset;
+}
 
 if ($colorset) {
-    if ($colorset == 'greenzero')
-       $setcss = file_get_contents('view/theme/duepuntozero/deriv/greenzero.css');
-    if ($colorset == 'purplezero')
-       $setcss = file_get_contents('view/theme/duepuntozero/deriv/purplezero.css');
-    if ($colorset == 'easterbunny')
-       $setcss = file_get_contents('view/theme/duepuntozero/deriv/easterbunny.css');
-    if ($colorset == 'darkzero')
-       $setcss = file_get_contents('view/theme/duepuntozero/deriv/darkzero.css');
-    if ($colorset == 'comix')
-       $setcss = file_get_contents('view/theme/duepuntozero/deriv/comix.css');
-    if ($colorset == 'slackr')
-       $setcss = file_get_contents('view/theme/duepuntozero/deriv/slackr.css');
+       if ($colorset == 'greenzero') {
+               $setcss = file_get_contents('view/theme/duepuntozero/deriv/greenzero.css');
+       }
+
+       if ($colorset == 'purplezero') {
+               $setcss = file_get_contents('view/theme/duepuntozero/deriv/purplezero.css');
+       }
+       
+       if ($colorset == 'easterbunny') {
+               $setcss = file_get_contents('view/theme/duepuntozero/deriv/easterbunny.css');
+       }
+
+       if ($colorset == 'darkzero') {
+               $setcss = file_get_contents('view/theme/duepuntozero/deriv/darkzero.css');
+       }
+
+       if ($colorset == 'comix') {
+               $setcss = file_get_contents('view/theme/duepuntozero/deriv/comix.css');
+       }
+
+       if ($colorset == 'slackr') {
+               $setcss = file_get_contents('view/theme/duepuntozero/deriv/slackr.css');
+       }
 }
 
 echo $setcss;

diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index bf141099486298dad9ffd164c976c8adb58ae544..c78fdd265cda6634b36fd014c2d8d7b9ae198538 100644 (file)
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -10,6 +10,7 @@
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Model\Profile;
 
 require_once 'view/theme/frio/php/frio_boot.php';
 
@@ -38,7 +39,7 @@ if (!isset($minimal)) {
        // It makes mobile Chrome UI match Frio's top bar color.
        $uid = $a->profile_uid;
        if (is_null($uid)) {
-               $uid = get_theme_uid();
+               $uid = Profile::getThemeUid();
        }
        $schema = PConfig::get($uid, 'frio', 'schema');
        if (($schema) && ($schema != '---')) {

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 5d820af520d47ff90ef7033431309cb8bb44217c..3f907d54970b5bce2cd86d1a9f255c6c95397bfd 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -1,16 +1,20 @@
 <?php
-require_once 'view/theme/frio/php/PHPColors/Color.php';
+/**
+ * @file view/theme/frio/style.php
+ */
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 
+require_once 'view/theme/frio/php/PHPColors/Color.php';
+
 $schemecss = "";
 $schemecssfile = false;
 $scheme_modified = 0;
 
 if ($a->module !== 'install') {
        // Get the UID of the profile owner.
-       $uid = get_theme_uid();
+       $uid = Profile::getThemeUid();
        if ($uid) {
                PConfig::load($uid, 'frio');
 
@@ -80,11 +84,11 @@ if (($schema) && ($schema != '---')) {
 // should leave it for admins to define for themselves.
 // default.php and default.css MUST be symlinks to existing schema files.
 if (! $schema) {
-       if(file_exists('view/theme/frio/schema/default.php')) {
+       if (file_exists('view/theme/frio/schema/default.php')) {
                $schemefile = 'view/theme/frio/schema/default.php';
                require_once $schemefile;
        }
-       if(file_exists('view/theme/frio/schema/default.css')) {
+       if (file_exists('view/theme/frio/schema/default.css')) {
                $schemecssfile = 'view/theme/frio/schema/default.css';
        }
 }
@@ -135,7 +139,6 @@ if (!isset($link_hover_color)) {
        } else {
                $link_hover_color = '#' . $lhc->lighten(5);
        }
-
 }
 
 // Convert $bg_image_options into css.

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 559fc94a27020e06c3047aa6a3a1abe5b1fb3dfb..b135fa0d6604edc3ae56ec23f04ca4923fd9245e 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -13,6 +13,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 use Friendica\Object\Image;
 
 $frio = "view/theme/frio";
@@ -197,7 +198,7 @@ function frio_contact_photo_menu(App $a, &$args)
 function frio_remote_nav($a, &$nav)
 {
        // get the homelink from $_XSESSION
-       $homelink = get_my_url();
+       $homelink = Profile::getMyURL();
        if (!$homelink) {
                $homelink = defaults($_SESSION, 'visitor_home', '');
        }
@@ -234,7 +235,7 @@ function frio_remote_nav($a, &$nav)
        } elseif (!local_user() && remote_user()) {
                $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
                $nav['remote'] = t("Guest");
-       } elseif (get_my_url()) {
+       } elseif (Profile::getMyURL()) {
                $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
                                WHERE `addr` = '%s' AND `network` = 'dfrn'",
                        dbesc($webbie));

diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index 2aaf3af50894b74103e44d25340ac293caf27e81..8158468327ac39ae9c10fc2eb5471da60c471000 100644 (file)
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -1,65 +1,68 @@
 <?php
+/**
+ * @file view/theme/quattro/style.php
+ */
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Model\Profile;
 
-       use Friendica\Core\Config;
-       use Friendica\Core\PConfig;
+$uid = Profile::getThemeUid();
 
-       $uid = get_theme_uid();
+$color = false;
+$quattro_align = false;
+$site_color = Config::get("quattro", "color", "dark");
+$site_quattro_align = Config::get("quattro", "align", false);
 
-       $color = false;
-       $quattro_align = false;
-       $site_color = Config::get("quattro", "color", "dark");
-       $site_quattro_align = Config::get("quattro", "align", false);
+if ($uid) {
+       $color = PConfig::get($uid, "quattro", "color", false);
+       $quattro_align = PConfig::get($uid, 'quattro', 'align', false);
+}
 
-       if ($uid) {
-               $color = PConfig::get($uid, "quattro", "color", false);
-               $quattro_align = PConfig::get($uid, 'quattro', 'align', false);
-       }
+if ($color === false) {
+       $color = $site_color;
+}
 
-       if ($color === false) {
-               $color = $site_color;
-       }
+if ($quattro_align === false) {
+       $quattro_align = $site_quattro_align;
+}
 
-       if ($quattro_align === false) {
-               $quattro_align = $site_quattro_align;
-       }
+if (file_exists("$THEMEPATH/$color/style.css")) {
+       echo file_get_contents("$THEMEPATH/$color/style.css");
+}
 
-       if (file_exists("$THEMEPATH/$color/style.css")){
-               echo file_get_contents("$THEMEPATH/$color/style.css");
-       }
 
-
-       if ($quattro_align == "center"){
-               echo "
-                       html { width: 100%; margin:0px; padding:0px; }
-                       body {
-                               margin: 50px auto;
-                               width: 900px;
-                       }
-               ";
-       }
+if ($quattro_align == "center") {
+       echo "
+               html { width: 100%; margin:0px; padding:0px; }
+               body {
+                       margin: 50px auto;
+                       width: 900px;
+               }
+       ";
+}
 
 
-       $textarea_font_size = false;
-       $post_font_size = false;
+$textarea_font_size = false;
+$post_font_size = false;
 
-       $site_textarea_font_size = Config::get("quattro", "tfs", "20");
-       $site_post_font_size = Config::get("quattro", "pfs", "12");
+$site_textarea_font_size = Config::get("quattro", "tfs", "20");
+$site_post_font_size = Config::get("quattro", "pfs", "12");
 
-       if ($uid) {
-               $textarea_font_size = PConfig::get($uid, "quattro", "tfs", false);
-               $post_font_size = PConfig::get($uid, "quattro", "pfs", false);
-       }
+if ($uid) {
+       $textarea_font_size = PConfig::get($uid, "quattro", "tfs", false);
+       $post_font_size = PConfig::get($uid, "quattro", "pfs", false);
+}
 
-       if ($textarea_font_size === false) {
-               $textarea_font_size = $site_textarea_font_size;
-       }
-       if ($post_font_size === false) {
-               $post_font_size = $site_post_font_size;
-       }
+if ($textarea_font_size === false) {
+       $textarea_font_size = $site_textarea_font_size;
+}
+if ($post_font_size === false) {
+       $post_font_size = $site_post_font_size;
+}
 
-       echo "
-               textarea { font-size: ${textarea_font_size}px; }
-               .wall-item-comment-wrapper .comment-edit-text-full { font-size: ${textarea_font_size}px; }
-               #jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; }
-               .wall-item-container .wall-item-content  { font-size: ${post_font_size}px; }
-       ";
+echo "
+       textarea { font-size: ${textarea_font_size}px; }
+       .wall-item-comment-wrapper .comment-edit-text-full { font-size: ${textarea_font_size}px; }
+       #jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; }
+       .wall-item-container .wall-item-content  { font-size: ${post_font_size}px; }
+";

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index b1386ad7076dbebf7c48631b553251086a21fe00..407e080550e13d31a23b0e91f031c8aa6c6a0d32 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,30 +1,36 @@
 <?php
-
+/**
+ * @file view/theme/vier/style.php
+ */
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Model\Profile;
 
-$uid = get_theme_uid();
+$uid = Profile::getThemeUid();
 
 $style = PConfig::get($uid, 'vier', 'style');
 
-if ($style == "")
+if ($style == "") {
        $style = Config::get('vier', 'style');
+}
 
-if ($style == "")
+if ($style == "") {
        $style = "plus";
+}
 
-if ($style == "flat")
+if ($style == "flat") {
        $stylecssfile = 'view/theme/vier/flat.css';
-else if ($style == "netcolour")
+} else if ($style == "netcolour") {
        $stylecssfile = 'view/theme/vier/netcolour.css';
-else if ($style == "breathe")
+} else if ($style == "breathe") {
        $stylecssfile = 'view/theme/vier/breathe.css';
-else if ($style == "plus")
+} else if ($style == "plus") {
        $stylecssfile = 'view/theme/vier/plus.css';
-else if ($style == "dark")
+} else if ($style == "dark") {
        $stylecssfile = 'view/theme/vier/dark.css';
-else if ($style == "plusminus")
+} else if ($style == "plusminus") {
        $stylecssfile = 'view/theme/vier/plusminus.css';
+}
 
 if (file_exists($THEMEPATH."//style.css")) {
        $stylecss = file_get_contents($THEMEPATH."//style.css")."\n";
@@ -34,8 +40,9 @@ if (file_exists($THEMEPATH."//style.css")) {
 $stylemodified = filemtime($stylecssfile);
 $stylecss .= file_get_contents($stylecssfile);
 
-if ($stylemodified > $modified)
+if ($stylemodified > $modified) {
        $modified = $stylemodified;
+}
 
 $modified = gmdate('r', $modified);
 

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index b7c76b02ef0fafc93797d558db3e71d109801947..26066ccb048c9d8ccd06b99536682d946437d5bb 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -16,6 +16,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
 
 require_once "include/plugin.php";
 require_once "mod/proxy.php";
@@ -150,7 +151,7 @@ function vier_community_info() {
                        foreach ($r as $rr) {
                                $entry = replace_macros($tpl,array(
                                        '$id' => $rr['id'],
-                                       //'$profile_link' => zrl($rr['url']),
+                                       //'$profile_link' => Profile::zrl($rr['url']),
                                        '$profile_link' => 'follow/?url='.urlencode($rr['url']),
                                        '$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_MICRO),
                                        '$alt_text' => $rr['name'],
@@ -280,7 +281,7 @@ function vier_community_info() {
                }
 
                foreach ($r AS $index => $helper)
-                       $r[$index]["url"] = zrl($helper["url"]);
+                       $r[$index]["url"] = Profile::zrl($helper["url"]);
 
                $r[] = array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));