Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 03:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update function calls

Browse source 
update function calls to use profile class
This commit is contained in:
Adam Magness 2018-01-14 21:22:39 -05:00
parent 4cfa46186a
commit 4fb2547df8
45 changed files with 360 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/contact_widgets.php
View file

@ -223,13 +223,13 @@ function common_friends_visitor_widget($profile_uid)
} }
if (!$cid) { if (!$cid) {
if (get_my_url()) { if (Profile::getMyURL()) {
$contact = dba::selectFirst('contact', ['id'], $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)) { if (DBM::is_result($contact)) {
$cid = $contact['id']; $cid = $contact['id'];
} else { } 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)) { if (DBM::is_result($gcontact)) {
$zcid = $gcontact['id']; $zcid = $gcontact['id'];
} }

31
include/conversation.php
View file

@ -10,6 +10,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Object\Thread; use Friendica\Object\Thread;
use Friendica\Object\Post; use Friendica\Object\Post;
@ -194,10 +195,10 @@ function localize_item(&$item) {
} }
} }
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
if ($Bphoto != "") { 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; $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]'; $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
if ($Bphoto != "") { 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]; $obj = $r[0];
$author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; $author = '[url=' . Profile::zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
$objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; $objauthor = '[url=' . Profile::zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
switch ($obj['verb']) { switch ($obj['verb']) {
case ACTIVITY_POST: case ACTIVITY_POST:
@ -320,8 +321,8 @@ function localize_item(&$item) {
$target = $r[0]; $target = $r[0];
$Bname = $target['author-name']; $Bname = $target['author-name'];
$Blink = $target['author-link']; $Blink = $target['author-link'];
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
$P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/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"; $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)) { if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
if (! strpos($mtch[1], 'zrl=')) { 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 // add zrl's to public images
$photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is"; $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
if (preg_match($photo_pattern, $item['body'])) { 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']); $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) { if ($sp) {
$sparkle = ' sparkle'; $sparkle = ' sparkle';
} else { } else {
$profile_link = zrl($profile_link); $profile_link = Profile::zrl($profile_link);
} }
if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) { if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
@ -1037,7 +1038,7 @@ function item_photo_menu($item) {
$photos_link = $profile_link . '?url=photos'; $photos_link = $profile_link . '?url=photos';
$profile_link = $profile_link . '?url=profile'; $profile_link = $profile_link . '?url=profile';
} else { } else {
$profile_link = zrl($profile_link); $profile_link = Profile::zrl($profile_link);
} }
if ($cid && !$item['self']) { if ($cid && !$item['self']) {
@ -1130,7 +1131,7 @@ function builtin_activity_puller($item, &$conv_responses) {
$url = 'redir/' . $item['contact-id']; $url = 'redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" '; $sparkle = ' class="sparkle" ';
} else { } else {
$url = zrl($url); $url = Profile::zrl($url);
} }
$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>'; $url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';

3
include/event.php
View file

@ -9,6 +9,7 @@ use Friendica\Content\Feature;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Profile;
use Friendica\Util\Map; use Friendica\Util\Map;
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
@ -964,7 +965,7 @@ function format_event_item($item) {
$profile_link = best_link_url($item, $sp); $profile_link = best_link_url($item, $sp);
if (!$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( $event = replace_macros(get_markup_template('event_stream_item.tpl'), array(

7
include/nav.php
View file

@ -7,6 +7,7 @@ use Friendica\Content\Feature;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Profile;
function nav(App $a) { 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 // "Home" should also take you home from an authenticated remote profile connection
$homelink = get_my_url(); $homelink = Profile::getMyURL();
if (! $homelink) { if (! $homelink) {
$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); $homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
} }
if (($a->module != 'home') && (! (local_user()))) { if (($a->module != 'home') && (! (local_user()))) {
@ -145,7 +146,7 @@ function nav_info(App $a)
if (strlen(Config::get('system', 'singleuser'))) { if (strlen(Config::get('system', 'singleuser'))) {
$gdir = Config::get('system', 'directory'); $gdir = Config::get('system', 'directory');
if (strlen($gdir)) { if (strlen($gdir)) {
$gdirpath = zrl($gdir, true); $gdirpath = Profile::zrl($gdir, true);
} }
} }

3
include/text.php
View file

@ -10,6 +10,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Profile;
use Friendica\Model\Term; use Friendica\Model\Term;
use Friendica\Util\Map; use Friendica\Util\Map;
@ -1011,7 +1012,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
$url = $redirect_url; $url = $redirect_url;
$sparkle = ' sparkle'; $sparkle = ' sparkle';
} else { } else {
$url = zrl($url); $url = Profile::zrl($url);
} }
} }

3
index.php
View file

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

13
mod/allfriends.php
View file

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

6
mod/cal.php
View file

@ -5,7 +5,6 @@
* This calendar is for profile visitors and contains only the events * This calendar is for profile visitors and contains only the events
* of the profile owner * of the profile owner
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -13,6 +12,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Profile;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
require_once 'include/event.php'; require_once 'include/event.php';
@ -45,7 +45,7 @@ function cal_init(App $a)
return; return;
} }
$profile = get_profiledata_by_nick($nick, $a->profile_uid); $profile = Profile::getProfiledataByNick($nick, $a->profile_uid);
$account_type = Contact::getAccountType($profile); $account_type = Contact::getAccountType($profile);
@ -144,7 +144,7 @@ function cal_content(App $a)
$sql_extra = " AND `event`.`cid` = 0 " . $sql_perms; $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
// get the tab navigation bar // 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 // The view mode part is similiar to /mod/events.php
if ($mode == 'view') { if ($mode == 'view') {

33
mod/common.php
View file

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

5
mod/contacts.php
View file

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

4
mod/crepair.php
View file

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

10
mod/dfrn_request.php
View file

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

9
mod/directory.php
View file

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

5
mod/dirfind.php
View file

@ -9,6 +9,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact; 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); $connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
$conntxt = t('Connect'); $conntxt = t('Connect');
$photo_menu = array( $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) 'follow' => array(t("Connect/Follow"), $connlnk)
); );
} }
@ -223,7 +224,7 @@ function dirfind_content(App $a, $prefix = "") {
$entry = array( $entry = array(
'alt_text' => $alt_text, 'alt_text' => $alt_text,
'url' => zrl($jj->url), 'url' => Profile::zrl($jj->url),
'itemurl' => $itemurl, 'itemurl' => $itemurl,
'name' => htmlentities($jj->name), 'name' => htmlentities($jj->name),
'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),

12
mod/display.php
View file

@ -1,15 +1,19 @@
<?php <?php
/**
* @file mod/display.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Profile;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
function display_init(App $a) { function display_init(App $a)
if (Config::get('system','block_public') && !local_user() && !remote_user()) { {
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
return; 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) { function display_fetchauthor($a, $item) {

4
mod/events.php
View file

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

6
mod/follow.php
View file

@ -6,9 +6,9 @@ use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Network\Probe; use Friendica\Network\Probe;
function follow_post(App $a) { function follow_post(App $a) {
if (!local_user()) { if (!local_user()) {
@ -163,7 +163,7 @@ function follow_content(App $a) {
'$nickname' => "", '$nickname' => "",
'$name' => $ret["name"], '$name' => $ret["name"],
'$url' => $ret["url"], '$url' => $ret["url"],
'$zrl' => zrl($ret["url"]), '$zrl' => Profile::zrl($ret["url"]),
'$url_label' => t("Profile URL"), '$url_label' => t("Profile URL"),
'$myaddr' => $myaddr, '$myaddr' => $myaddr,
'$request' => $request, '$request' => $request,
@ -177,7 +177,7 @@ function follow_content(App $a) {
$a->page['aside'] = ""; $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) { if ($gcontact_id <> 0) {
$o .= replace_macros(get_markup_template('section_title.tpl'), $o .= replace_macros(get_markup_template('section_title.tpl'),

30
mod/hcard.php
View file

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

2
mod/hovercard.php
View file

@ -70,7 +70,7 @@ function hovercard_content()
'nick' => $contact['nick'], 'nick' => $contact['nick'],
'addr' => defaults($contact, 'addr', $contact['url']), 'addr' => defaults($contact, 'addr', $contact['url']),
'thumb' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB), '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 'nurl' => $contact['nurl'], // We additionally store the nurl as identifier
'location' => $contact['location'], 'location' => $contact['location'],
'gender' => $contact['gender'], 'gender' => $contact['gender'],

5
mod/match.php
View file

@ -7,6 +7,7 @@ use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile;
require_once 'include/text.php'; require_once 'include/text.php';
require_once 'include/contact_widgets.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); $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url; $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
$photo_menu = array( $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) 'follow' => array(t("Connect/Follow"), $connlnk)
); );
$contact_details = Contact::getDetailsByURL($jj->url, local_user()); $contact_details = Contact::getDetailsByURL($jj->url, local_user());
$entry = array( $entry = array(
'url' => zrl($jj->url), 'url' => Profile::zrl($jj->url),
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url), 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
'name' => $jj->name, 'name' => $jj->name,
'details' => $contact_details['location'], 'details' => $contact_details['location'],

13
mod/network.php
View file

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

29
mod/noscrape.php
View file

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

9
mod/notes.php
View file

@ -1,7 +1,10 @@
<?php <?php
/**
* @file mod/notes.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Profile;
function notes_init(App $a) { function notes_init(App $a) {
@ -15,7 +18,7 @@ function notes_init(App $a) {
nav_set_selected('home'); 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; $is_owner = true;
$o =""; $o ="";
$o .= profile_tabs($a,True); $o .= Profile::getTabs($a, true);
if(! $update) { if(! $update) {
$o .= '<h3>' . t('Personal Notes') . '</h3>'; $o .= '<h3>' . t('Personal Notes') . '</h3>';

5
mod/photos.php
View file

@ -11,6 +11,7 @@ use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
@ -48,7 +49,7 @@ function photos_init(App $a) {
$a->profile_uid = $user[0]['uid']; $a->profile_uid = $user[0]['uid'];
$is_owner = (local_user() && (local_user() == $a->profile_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); $account_type = Contact::getAccountType($profile);
@ -1074,7 +1075,7 @@ function photos_content(App $a)
// tabs // tabs
$is_owner = (local_user() && (local_user() == $owner_uid)); $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 // Display upload form
if ($datatype === 'upload') { if ($datatype === 'upload') {

11
mod/profile.php
View file

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

7
mod/profile_photo.php
View file

@ -8,15 +8,16 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Object\Image; use Friendica\Object\Image;
function profile_photo_init(App $a) { function profile_photo_init(App $a)
{
if (! local_user()) { if (! local_user()) {
return; return;
} }
profile_load($a,$a->user['nickname']); Profile::load($a, $a->user['nickname']);
} }
function profile_photo_post(App $a) { function profile_photo_post(App $a) {

2
mod/profiles.php
View file

@ -142,7 +142,7 @@ function profiles_init(App $a) {
return; return;
} }
profile_load($a,$a->user['nickname'], $r[0]['id']); Profile::load($a, $a->user['nickname'], $r[0]['id']);
} }

11
mod/profperm.php
View file

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

10
mod/randprof.php
View file

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

5
mod/suggest.php
View file

@ -8,6 +8,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Profile;
require_once 'include/contact_widgets.php'; 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']); $connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id']; $ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
$photo_menu = array( $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), 'follow' => array(t("Connect/Follow"), $connlnk),
'hide' => array(t('Ignore/Hide'), $ignlnk) 'hide' => array(t('Ignore/Hide'), $ignlnk)
); );
@ -90,7 +91,7 @@ function suggest_content(App $a) {
$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr); $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
$entry = array( $entry = array(
'url' => zrl($rr['url']), 'url' => Profile::zrl($rr['url']),
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
'img_hover' => $rr['url'], 'img_hover' => $rr['url'],
'name' => $contact_details['name'], 'name' => $contact_details['name'],

13
mod/unfollow.php
View file

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

5
mod/videos.php
View file

@ -9,6 +9,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Profile;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
require_once 'include/items.php'; require_once 'include/items.php';
@ -41,7 +42,7 @@ function videos_init(App $a) {
$a->data['user'] = $user[0]; $a->data['user'] = $user[0];
$a->profile_uid = $user[0]['uid']; $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); $account_type = Contact::getAccountType($profile);
@ -327,7 +328,7 @@ function videos_content(App $a) {
// tabs // tabs
$_is_owner = (local_user() && (local_user() == $owner_uid)); $_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 // dispatch request

11
mod/viewcontacts.php
View file

@ -1,10 +1,13 @@
<?php <?php
/**
* @file mod/viewcontacts.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Content\ContactSelector; use Friendica\Content\ContactSelector;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile;
function viewcontacts_init(App $a) { function viewcontacts_init(App $a) {
@ -28,7 +31,7 @@ function viewcontacts_init(App $a) {
$a->profile_uid = $r[0]['uid']; $a->profile_uid = $r[0]['uid'];
$is_owner = (local_user() && (local_user() == $a->profile_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 = ""; $o = "";
// tabs // 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']))) { if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
@ -97,7 +100,7 @@ function viewcontacts_content(App $a) {
if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
$url = 'redir/' . $rr['id']; $url = 'redir/' . $rr['id'];
else else
$url = zrl($url); $url = Profile::zrl($url);
$contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr); $contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);

15
mod/wallmessage.php
View file

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

5
src/Core/NotificationsManager.php
View file

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

7
src/Model/Contact.php
View file

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

45
src/Model/Profile.php
View file

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

7
src/Object/Post.php
View file

@ -10,6 +10,7 @@ use Friendica\Content\Feature;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile;
use dba; use dba;
require_once 'include/dba.php'; require_once 'include/dba.php';
@ -190,7 +191,7 @@ class Post extends BaseObject
if ($sp) { if ($sp) {
$sparkle = ' sparkle'; $sparkle = ' sparkle';
} else { } else {
$profile_link = zrl($profile_link); $profile_link = Profile::zrl($profile_link);
} }
if (!isset($item['author-thumb']) || ($item['author-thumb'] == "")) { 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. // 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. // 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_photo = $a->page_contact['thumb'];
$this->owner_name = $a->page_contact['name']; $this->owner_name = $a->page_contact['name'];
$this->wall_to_wall = true; $this->wall_to_wall = true;
@ -860,7 +861,7 @@ class Post extends BaseObject
) { ) {
$this->owner_url = $this->getRedirectUrl(); $this->owner_url = $this->getRedirectUrl();
} else { } else {
$this->owner_url = zrl($this->getDataValue('owner-link')); $this->owner_url = Profile::zrl($this->getDataValue('owner-link'));
} }
} }
} }

41
view/theme/duepuntozero/style.php
View file

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

3
view/theme/frio/php/default.php
View file

@ -10,6 +10,7 @@
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Model\Profile;
require_once 'view/theme/frio/php/frio_boot.php'; 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. // It makes mobile Chrome UI match Frio's top bar color.
$uid = $a->profile_uid; $uid = $a->profile_uid;
if (is_null($uid)) { if (is_null($uid)) {
$uid = get_theme_uid(); $uid = Profile::getThemeUid();
} }
$schema = PConfig::get($uid, 'frio', 'schema'); $schema = PConfig::get($uid, 'frio', 'schema');
if (($schema) && ($schema != '---')) { if (($schema) && ($schema != '---')) {

13
view/theme/frio/style.php
View file

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

5
view/theme/frio/theme.php
View file

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

63
view/theme/quattro/style.php
View file

@ -1,34 +1,37 @@
<?php <?php
/**
* @file view/theme/quattro/style.php
*/
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Model\Profile;
use Friendica\Core\Config; $uid = Profile::getThemeUid();
use Friendica\Core\PConfig;
$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; if ($uid) {
$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); $color = PConfig::get($uid, "quattro", "color", false);
$quattro_align = PConfig::get($uid, 'quattro', 'align', false); $quattro_align = PConfig::get($uid, 'quattro', 'align', false);
} }
if ($color === false) { if ($color === false) {
$color = $site_color; $color = $site_color;
} }
if ($quattro_align === false) { if ($quattro_align === false) {
$quattro_align = $site_quattro_align; $quattro_align = $site_quattro_align;
} }
if (file_exists("$THEMEPATH/$color/style.css")){ if (file_exists("$THEMEPATH/$color/style.css")) {
echo file_get_contents("$THEMEPATH/$color/style.css"); echo file_get_contents("$THEMEPATH/$color/style.css");
} }
if ($quattro_align == "center"){ if ($quattro_align == "center") {
echo " echo "
html { width: 100%; margin:0px; padding:0px; } html { width: 100%; margin:0px; padding:0px; }
body { body {
@ -36,30 +39,30 @@
width: 900px; width: 900px;
} }
"; ";
} }
$textarea_font_size = false; $textarea_font_size = false;
$post_font_size = false; $post_font_size = false;
$site_textarea_font_size = Config::get("quattro", "tfs", "20"); $site_textarea_font_size = Config::get("quattro", "tfs", "20");
$site_post_font_size = Config::get("quattro", "pfs", "12"); $site_post_font_size = Config::get("quattro", "pfs", "12");
if ($uid) { if ($uid) {
$textarea_font_size = PConfig::get($uid, "quattro", "tfs", false); $textarea_font_size = PConfig::get($uid, "quattro", "tfs", false);
$post_font_size = PConfig::get($uid, "quattro", "pfs", false); $post_font_size = PConfig::get($uid, "quattro", "pfs", false);
} }
if ($textarea_font_size === false) { if ($textarea_font_size === false) {
$textarea_font_size = $site_textarea_font_size; $textarea_font_size = $site_textarea_font_size;
} }
if ($post_font_size === false) { if ($post_font_size === false) {
$post_font_size = $site_post_font_size; $post_font_size = $site_post_font_size;
} }
echo " echo "
textarea { font-size: ${textarea_font_size}px; } textarea { font-size: ${textarea_font_size}px; }
.wall-item-comment-wrapper .comment-edit-text-full { 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; } #jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; }
.wall-item-container .wall-item-content { font-size: ${post_font_size}px; } .wall-item-container .wall-item-content { font-size: ${post_font_size}px; }
"; ";

29
view/theme/vier/style.php
View file

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

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

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