X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=ab11b4d5fe509850c97c48fdc9e4346feb9f9215;hb=f65a7b3130c207939d3a64d77543d5517e8a2a5a;hp=0eec78f23b410d20209f2e5dcc3cdef6e62584f7;hpb=d49f986d1eb6894dd948577288357b6c1755e3d3;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 0eec78f23b..ab11b4d5fe 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,9 +2,11 @@
/**
* @file mod/profile.php
*/
+
use Friendica\App;
-use Friendica\Content\Widget;
use Friendica\Content\Nav;
+use Friendica\Content\Widget;
+use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@@ -12,9 +14,11 @@ use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Group;
+use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Module\Login;
use Friendica\Protocol\DFRN;
+use Friendica\Util\DateTimeFormat;
function profile_init(App $a)
{
@@ -71,9 +75,9 @@ function profile_init(App $a)
}
$a->page['htmlhead'] .= '' . "\r\n";
- $a->page['htmlhead'] .= '' . "\r\n";
- $a->page['htmlhead'] .= '' . "\r\n";
- $a->page['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
$a->page['htmlhead'] .= '' . "\r\n";
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
@@ -113,10 +117,8 @@ function profile_content(App $a, $update = 0)
return Login::form();
}
- require_once 'include/bbcode.php';
require_once 'include/security.php';
require_once 'include/conversation.php';
- require_once 'include/acl_selectors.php';
require_once 'include/items.php';
$groups = [];
@@ -189,7 +191,7 @@ function profile_content(App $a, $update = 0)
$o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
if (x($_SESSION, 'new_member') && $is_owner) {
- $o .= '' . t('Tips for New Members') . '' . EOL;
+ $o .= '' . L10n::t('Tips for New Members') . '' . EOL;
}
$commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;
@@ -197,7 +199,7 @@ function profile_content(App $a, $update = 0)
$a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true);
$a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (x($category) ? xmlify($category) : ''));
- $a->page['aside'] .= tagcloud_wall_widget();
+ $a->page['aside'] .= Widget::tagCloud();
if (can_write_wall($a->profile['profile_uid'])) {
$x = [
@@ -211,7 +213,7 @@ function profile_content(App $a, $update = 0)
|| strlen($a->user['deny_cid'])
|| strlen($a->user['deny_gid'])
) ? 'lock' : 'unlock',
- 'acl' => $is_owner ? populate_acl($a->user, true) : '',
+ 'acl' => $is_owner ? ACL::getFullSelectorHTML($a->user, true) : '',
'bang' => '',
'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
'profile_uid' => $a->profile['profile_uid'],
@@ -234,7 +236,7 @@ function profile_content(App $a, $update = 0)
if ($is_owner || !$last_updated) {
$sql_extra4 = " AND `item`.`unseen`";
} else {
- $gmupdate = gmdate("Y-m-d H:i:s", $last_updated);
+ $gmupdate = gmdate(DateTimeFormat::MYSQL, $last_updated);
$sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
}
@@ -270,10 +272,10 @@ function profile_content(App $a, $update = 0)
}
if ($datequery) {
- $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
+ $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
}
if ($datequery2) {
- $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
+ $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
}
// Belongs the profile page to a forum?
@@ -350,14 +352,14 @@ function profile_content(App $a, $update = 0)
if ($is_owner && !$update && !Config::get('theme', 'hide_eventlist')) {
$o .= Profile::getBirthdays();
- $o .= Profile::getEvents();
+ $o .= Profile::getEventsReminderHTML();
}
if ($is_owner) {
$unseen = dba::exists('item', ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
if ($unseen) {
- $r = dba::update('item', ['unseen' => false],
+ $r = Item::update(['unseen' => false],
['wall' => true, 'unseen' => true, 'uid' => local_user()]);
}
}