use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\ForumManager;
+use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Protocol\Diaspora;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Util\Temporal;
use dba;
require_once 'include/dba.php';
-require_once 'include/bbcode.php';
require_once 'mod/proxy.php';
class Profile
* @param int $block
* @param boolean $show_connect Show connect link
*
- * @return HTML string suitable for sidebar inclusion
+ * @return string HTML sidebar module
*
* @note Returns empty string if passed $profile is wrong type or not populated
*
}
if (isset($p['about'])) {
- $p['about'] = bbcode($p['about']);
+ $p['about'] = BBCode::convert($p['about']);
}
if (isset($p['address'])) {
- $p['address'] = bbcode($p['address']);
+ $p['address'] = BBCode::convert($p['address']);
} else {
- $p['address'] = bbcode($p['location']);
+ $p['address'] = BBCode::convert($p['location']);
}
if (isset($p['photo'])) {
$p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL);
}
+ $p['url'] = self::magicLink($p['url']);
+
$tpl = get_markup_template('profile_vcard.tpl');
$o .= replace_macros($tpl, [
'$profile' => $p,
WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
ORDER BY `start` ASC ",
local_user(),
- datetime_convert('UTC', 'UTC', 'now + 6 days'),
- datetime_convert('UTC', 'UTC', 'now')
+ DateTimeFormat::utc('now + 6 days'),
+ DateTimeFormat::utcNow()
);
if (DBM::is_result($s)) {
$r = dba::inArray($s);
Cache::set($cachekey, $r, CACHE_HOUR);
}
}
+
+ $total = 0;
+ $classtoday = '';
if (DBM::is_result($r)) {
- $total = 0;
$now = strtotime('now');
$cids = [];
$rr['link'] = $url;
$rr['title'] = $rr['name'];
- $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
+ $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
$rr['startime'] = null;
$rr['today'] = $today;
}
]);
}
- public static function getEvents()
+ public static function getEventsReminderHTML()
{
- require_once 'include/bbcode.php';
-
$a = get_app();
+ $o = '';
if (!local_user() || $a->is_mobile || $a->is_tablet) {
return $o;
$classtoday = '';
$s = dba::p(
- "SELECT `event`.* FROM `event`
- WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
- ORDER BY `start` ASC ",
+ "SELECT *
+ FROM `event`
+ WHERE `event`.`uid` = ?
+ AND `event`.`type` != 'birthday'
+ AND `event`.`start` < ?
+ AND `event`.`start` >= ?
+ AND NOT EXISTS (
+ SELECT `id`
+ FROM `item`
+ WHERE `item`.`uid` = `event`.`uid`
+ AND `item`.`parent-uri` = `event`.`uri`
+ AND `item`.`verb` = ?
+ AND `item`.`visible`
+ AND NOT `item`.`deleted`
+ )
+ ORDER BY `event`.`start` ASC",
local_user(),
- datetime_convert('UTC', 'UTC', 'now + 7 days'),
- datetime_convert('UTC', 'UTC', 'now - 1 days')
+ DateTimeFormat::utc('now + 7 days'),
+ DateTimeFormat::utc('now - 1 days'),
+ ACTIVITY_ATTENDNO
);
$r = [];
$total ++;
}
- $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start'], 'Y-m-d');
- if ($strt === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
+ $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
+ if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
$istoday = true;
}
- $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
+ $title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
if (strlen($title) > 35) {
$title = substr($title, 0, 32) . '... ';
}
- $description = substr(strip_tags(bbcode($rr['desc'])), 0, 32) . '... ';
+ $description = substr(strip_tags(BBCode::convert($rr['desc'])), 0, 32) . '... ';
if (!$description) {
$description = L10n::t('[No description]');
}
- $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start']);
+ $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
- if (substr($strt, 0, 10) < datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
+ if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
continue;
}
- $today = ((substr($strt, 0, 10) === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) ? true : false);
+ $today = ((substr($strt, 0, 10) === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) ? true : false);
$rr['title'] = $title;
$rr['description'] = $description;
- $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
+ $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
$rr['startime'] = $strt;
$rr['today'] = $today;
$profile['fullname'] = [L10n::t('Full Name:'), $a->profile['name']];
+ if (Feature::isEnabled($uid, 'profile_membersince')) {
+ $profile['membersince'] = [L10n::t('Member since:'), DateTimeFormat::local($a->profile['register_date'])];
+ }
+
if ($a->profile['gender']) {
$profile['gender'] = [L10n::t('Gender:'), $a->profile['gender']];
}
$year_bd_format = L10n::t('j F, Y');
$short_bd_format = L10n::t('j F');
- $val = intval($a->profile['dob']) ?
- day_translate(datetime_convert('UTC', 'UTC', $a->profile['dob'] . ' 00:00 +00:00', $year_bd_format))
- : day_translate(datetime_convert('UTC', 'UTC', '2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format));
+ $val = day_translate(
+ intval($a->profile['dob']) ?
+ DateTimeFormat::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format)
+ : DateTimeFormat::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)
+ );
$profile['birthday'] = [L10n::t('Birthday:'), $val];
}
if (!empty($a->profile['dob'])
&& $a->profile['dob'] > '0001-01-01'
- && $age = age($a->profile['dob'], $a->profile['timezone'], '')
+ && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '')
) {
$profile['age'] = [L10n::t('Age:'), $age];
}
}
if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
- $profile['howlong'] = relative_date($a->profile['howlong'], L10n::t('for %1$d %2$s'));
+ $profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
}
if ($a->profile['sexual']) {
public static function zrlInit(App $a)
{
$my_url = self::getMyURL();
- $my_url = validate_url($my_url);
+ $my_url = Network::isUrlValid($my_url);
if ($my_url) {
// Is it a DDoS attempt?
// The check fetches the cached value from gprobe to reduce the load for this system
}
}
+ /**
+ * @brief Returns a magic link to authenticate remote visitors
+ *
+ * @param string $contact_url The address of the contact profile
+ * @param integer $uid The user id, "local_user" is the default
+ *
+ * @return string with "redir" link
+ */
+ public static function magicLink($contact_url, $uid = -1)
+ {
+ if ($uid == -1) {
+ $uid = local_user();
+ }
+ $condition = ['pending' => false, 'uid' => $uid,
+ 'nurl' => normalise_link($contact_url),
+ 'network' => NETWORK_DFRN, 'self' => false];
+ $contact = dba::selectFirst('contact', ['id'], $condition);
+ if (DBM::is_result($contact)) {
+ return System::baseUrl() . '/redir/' . $contact['id'];
+ }
+ return self::zrl($contact_url);
+ }
+
public static function zrl($s, $force = false)
{
if (!strlen($s)) {
projects / friendica.git / blobdiff