Merge remote-tracking branch 'upstream/develop' into item-thread
This commit is contained in:
commit
4ae37c6196
306 changed files with 30223 additions and 24639 deletions
|
|
@ -1,16 +0,0 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
function acctlink_init()
|
||||
{
|
||||
if (x($_GET, 'addr')) {
|
||||
$addr = trim($_GET['addr']);
|
||||
$res = Probe::uri($addr);
|
||||
if ($res['url']) {
|
||||
goaway($res['url']);
|
||||
killme();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -83,8 +83,9 @@ function acl_content(App $a)
|
|||
WHERE `uid` = %d AND NOT `self`
|
||||
AND NOT `blocked` AND NOT `pending` AND NOT `archive`
|
||||
AND `success_update` >= `failure_update`
|
||||
AND `network` IN ('%s', '%s') $sql_extra2",
|
||||
AND `network` IN ('%s', '%s', '%s') $sql_extra2",
|
||||
intval(local_user()),
|
||||
DBA::escape(Protocol::ACTIVITYPUB),
|
||||
DBA::escape(Protocol::DFRN),
|
||||
DBA::escape(Protocol::DIASPORA)
|
||||
);
|
||||
|
|
@ -169,10 +170,11 @@ function acl_content(App $a)
|
|||
} elseif ($type == 'm') {
|
||||
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact`
|
||||
WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive`
|
||||
AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s')
|
||||
AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s', '%s')
|
||||
$sql_extra2
|
||||
ORDER BY `name` ASC ",
|
||||
intval(local_user()),
|
||||
DBA::escape(Protocol::ACTIVITYPUB),
|
||||
DBA::escape(Protocol::DFRN),
|
||||
DBA::escape(Protocol::DIASPORA)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -18,13 +18,14 @@ use Friendica\Database\DBA;
|
|||
use Friendica\Database\DBStructure;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\Register;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Module\Login;
|
||||
use Friendica\Module\Tos;
|
||||
use Friendica\Util\Arrays;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Temporal;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\Temporal;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
require_once 'include/text.php';
|
||||
|
|
@ -33,11 +34,11 @@ require_once 'include/items.php';
|
|||
/**
|
||||
* @brief Process send data from the admin panels subpages
|
||||
*
|
||||
* This function acts as relais for processing the data send from the subpages
|
||||
* This function acts as relay for processing the data send from the subpages
|
||||
* of the admin panel. Depending on the 1st parameter of the url (argv[1])
|
||||
* specialized functions are called to process the data from the subpages.
|
||||
*
|
||||
* The function itself does not return anything, but the subsequencely function
|
||||
* The function itself does not return anything, but the subsequently function
|
||||
* return the HTML for the pages of the admin panel.
|
||||
*
|
||||
* @param App $a
|
||||
|
|
@ -77,7 +78,7 @@ function admin_post(App $a)
|
|||
break;
|
||||
case 'themes':
|
||||
if ($a->argc < 2) {
|
||||
if (is_ajax()) {
|
||||
if ($a->isAjax()) {
|
||||
return;
|
||||
}
|
||||
goaway('admin/');
|
||||
|
|
@ -107,7 +108,7 @@ function admin_post(App $a)
|
|||
}
|
||||
|
||||
info(L10n::t('Theme settings updated.'));
|
||||
if (is_ajax()) {
|
||||
if ($a->isAjax()) {
|
||||
return;
|
||||
}
|
||||
$return_path = 'admin/themes/' . $theme;
|
||||
|
|
@ -286,7 +287,7 @@ function admin_content(App $a)
|
|||
$o = admin_page_summary($a);
|
||||
}
|
||||
|
||||
if (is_ajax()) {
|
||||
if ($a->isAjax()) {
|
||||
echo $o;
|
||||
killme();
|
||||
return '';
|
||||
|
|
@ -475,8 +476,8 @@ function admin_page_contactblock(App $a)
|
|||
|
||||
$total = DBA::count('contact', $condition);
|
||||
|
||||
$a->set_pager_total($total);
|
||||
$a->set_pager_itemspage(30);
|
||||
$a->setPagerTotal($total);
|
||||
$a->setPagerItemsPage(30);
|
||||
|
||||
$statement = DBA::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
|
||||
|
||||
|
|
@ -866,15 +867,15 @@ function admin_page_summary(App $a)
|
|||
// Legacy config file warning
|
||||
if (file_exists('.htconfig.php')) {
|
||||
$showwarning = true;
|
||||
$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->get_baseurl() . '/help/Config');
|
||||
$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
|
||||
}
|
||||
|
||||
// Check server vitality
|
||||
if (!admin_page_server_vital()) {
|
||||
$showwarning = true;
|
||||
$well_known = $a->get_baseurl() . '/.well-known/host-meta';
|
||||
$well_known = $a->getBaseURL() . '/.well-known/host-meta';
|
||||
$warningtext[] = L10n::t('<a href="%s">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href="%s">the installation page</a> for help.',
|
||||
$well_known, $well_known, $a->get_baseurl() . '/help/Install');
|
||||
$well_known, $well_known, $a->getBaseURL() . '/help/Install');
|
||||
}
|
||||
|
||||
$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
|
||||
|
|
@ -895,8 +896,7 @@ function admin_page_summary(App $a)
|
|||
|
||||
logger('accounts: ' . print_r($accounts, true), LOGGER_DATA);
|
||||
|
||||
$r = q("SELECT COUNT(`id`) AS `count` FROM `register`");
|
||||
$pending = $r[0]['count'];
|
||||
$pending = Register::getPendingCount();
|
||||
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1");
|
||||
$queue = (($r) ? $r[0]['total'] : 0);
|
||||
|
|
@ -909,6 +909,15 @@ function admin_page_summary(App $a)
|
|||
$queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue];
|
||||
|
||||
|
||||
$r = q("SHOW variables LIKE 'max_allowed_packet'");
|
||||
$max_allowed_packet = (($r) ? $r[0]['Value'] : 0);
|
||||
|
||||
$server_settings = ['label' => L10n::t('Server Settings'),
|
||||
'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'),
|
||||
'post_max_size' => ini_get('post_max_size'),
|
||||
'memory_limit' => ini_get('memory_limit')],
|
||||
'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
|
||||
|
||||
$t = get_markup_template('admin/summary.tpl');
|
||||
return replace_macros($t, [
|
||||
'$title' => L10n::t('Administration'),
|
||||
|
|
@ -923,6 +932,7 @@ function admin_page_summary(App $a)
|
|||
'$codename' => FRIENDICA_CODENAME,
|
||||
'$build' => Config::get('system', 'build'),
|
||||
'$addons' => [L10n::t('Active addons'), $a->addons],
|
||||
'$serversettings' => $server_settings,
|
||||
'$showwarning' => $showwarning,
|
||||
'$warningtext' => $warningtext
|
||||
]);
|
||||
|
|
@ -1002,7 +1012,7 @@ function admin_page_site_post(App $a)
|
|||
// update config
|
||||
Config::set('system', 'hostname', parse_url($new_url, PHP_URL_HOST));
|
||||
Config::set('system', 'url', $new_url);
|
||||
$a->set_baseurl($new_url);
|
||||
$a->setBaseURL($new_url);
|
||||
|
||||
// send relocate
|
||||
$users = q("SELECT `uid` FROM `user` WHERE `account_removed` = 0 AND `account_expired` = 0");
|
||||
|
|
@ -1114,7 +1124,7 @@ function admin_page_site_post(App $a)
|
|||
Worker::add(PRIORITY_LOW, 'Directory');
|
||||
}
|
||||
|
||||
if ($a->get_path() != "") {
|
||||
if ($a->getURLPath() != "") {
|
||||
$diaspora_enabled = false;
|
||||
}
|
||||
if ($ssl_policy != intval(Config::get('system', 'ssl_policy'))) {
|
||||
|
|
@ -1251,7 +1261,7 @@ function admin_page_site_post(App $a)
|
|||
Config::set('system', 'dbclean-expire-unclaimed', $dbclean_unclaimed);
|
||||
|
||||
if ($itemcache != '') {
|
||||
$itemcache = App::realpath($itemcache);
|
||||
$itemcache = App::getRealPath($itemcache);
|
||||
}
|
||||
|
||||
Config::set('system', 'itemcache', $itemcache);
|
||||
|
|
@ -1259,13 +1269,13 @@ function admin_page_site_post(App $a)
|
|||
Config::set('system', 'max_comments', $max_comments);
|
||||
|
||||
if ($temppath != '') {
|
||||
$temppath = App::realpath($temppath);
|
||||
$temppath = App::getRealPath($temppath);
|
||||
}
|
||||
|
||||
Config::set('system', 'temppath', $temppath);
|
||||
|
||||
if ($basepath != '') {
|
||||
$basepath = App::realpath($basepath);
|
||||
$basepath = App::getRealPath($basepath);
|
||||
}
|
||||
|
||||
Config::set('system', 'basepath', $basepath);
|
||||
|
|
@ -1409,9 +1419,9 @@ function admin_page_site(App $a)
|
|||
];
|
||||
|
||||
if (empty(Config::get('config', 'hostname'))) {
|
||||
Config::set('config', 'hostname', $a->get_hostname());
|
||||
Config::set('config', 'hostname', $a->getHostName());
|
||||
}
|
||||
$diaspora_able = ($a->get_path() == "");
|
||||
$diaspora_able = ($a->getURLPath() == "");
|
||||
|
||||
$optimize_max_tablesize = Config::get('system', 'optimize_max_tablesize', -1);
|
||||
|
||||
|
|
@ -1478,7 +1488,7 @@ function admin_page_site(App $a)
|
|||
'$community_page_style' => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system','community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices],
|
||||
'$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")],
|
||||
'$ostatus_disabled' => ['ostatus_disabled', L10n::t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), L10n::t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")],
|
||||
'$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")],
|
||||
'$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")],
|
||||
'$ostatus_not_able' => L10n::t("OStatus support can only be enabled if threading is enabled."),
|
||||
'$diaspora_able' => $diaspora_able,
|
||||
'$diaspora_not_able' => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),
|
||||
|
|
@ -1782,17 +1792,13 @@ function admin_page_users(App $a)
|
|||
}
|
||||
|
||||
/* get pending */
|
||||
$pending = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
|
||||
FROM `register`
|
||||
INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid`
|
||||
INNER JOIN `user` ON `register`.`uid` = `user`.`uid`;");
|
||||
|
||||
$pending = Register::getPending();
|
||||
|
||||
/* get users */
|
||||
$total = q("SELECT COUNT(*) AS `total` FROM `user` WHERE 1");
|
||||
if (count($total)) {
|
||||
$a->set_pager_total($total[0]['total']);
|
||||
$a->set_pager_itemspage(100);
|
||||
$a->setPagerTotal($total[0]['total']);
|
||||
$a->setPagerItemsPage(100);
|
||||
}
|
||||
|
||||
/* ordering */
|
||||
|
|
@ -1912,7 +1918,7 @@ function admin_page_users(App $a)
|
|||
|
||||
'$h_users' => L10n::t('Users'),
|
||||
'$h_newuser' => L10n::t('New User'),
|
||||
'$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Deleted since')],
|
||||
'$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Delete in')],
|
||||
'$th_users' => $th_users,
|
||||
'$order_users' => $order,
|
||||
'$order_direction_users' => $order_direction,
|
||||
|
|
@ -2526,7 +2532,7 @@ function admin_page_features_post(App $a)
|
|||
*/
|
||||
function admin_page_features(App $a)
|
||||
{
|
||||
if ((argc() > 1) && (argv(1) === 'features')) {
|
||||
if (($a->argc > 1) && ($a->getArgumentValue(1) === 'features')) {
|
||||
$arr = [];
|
||||
$features = Feature::get(false);
|
||||
|
||||
|
|
@ -2557,6 +2563,5 @@ function admin_page_features(App $a)
|
|||
function admin_page_server_vital()
|
||||
{
|
||||
// Fetch the host-meta to check if this really is a vital server
|
||||
$serverret = Network::curl(System::baseUrl() . '/.well-known/host-meta');
|
||||
return $serverret["success"];
|
||||
return Network::curl(System::baseUrl() . '/.well-known/host-meta')->isSuccess();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,12 @@ use Friendica\Content\ContactSelector;
|
|||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GContact;
|
||||
use Friendica\Model\Profile;
|
||||
use Friendica\Model;
|
||||
use Friendica\Module;
|
||||
use Friendica\Util\Proxy as ProxyUtils;
|
||||
|
||||
|
||||
require_once 'include/dba.php';
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
function allfriends_content(App $a)
|
||||
{
|
||||
|
|
@ -42,13 +41,13 @@ function allfriends_content(App $a)
|
|||
}
|
||||
|
||||
$a->page['aside'] = "";
|
||||
Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
|
||||
Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
|
||||
|
||||
$total = GContact::countAllFriends(local_user(), $cid);
|
||||
$total = Model\GContact::countAllFriends(local_user(), $cid);
|
||||
|
||||
$a->set_pager_total($total);
|
||||
$a->setPagerTotal($total);
|
||||
|
||||
$r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||
$r = Model\GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||
if (!DBA::isResult($r)) {
|
||||
$o .= L10n::t('No friends to display.');
|
||||
return $o;
|
||||
|
|
@ -59,7 +58,7 @@ function allfriends_content(App $a)
|
|||
$entries = [];
|
||||
foreach ($r as $rr) {
|
||||
//get further details of the contact
|
||||
$contact_details = Contact::getDetailsByURL($rr['url'], $uid, $rr);
|
||||
$contact_details = Model\Contact::getDetailsByURL($rr['url'], $uid, $rr);
|
||||
|
||||
$photo_menu = '';
|
||||
|
||||
|
|
@ -68,11 +67,11 @@ function allfriends_content(App $a)
|
|||
// If the contact is not common to the user, Connect/Follow' will be added to the photo menu
|
||||
if ($rr['cid']) {
|
||||
$rr['id'] = $rr['cid'];
|
||||
$photo_menu = Contact::photoMenu($rr);
|
||||
$photo_menu = Model\Contact::photoMenu($rr);
|
||||
} else {
|
||||
$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
|
||||
$photo_menu = [
|
||||
'profile' => [L10n::t("View Profile"), Contact::magicLink($rr['url'])],
|
||||
'profile' => [L10n::t("View Profile"), Model\Contact::magicLink($rr['url'])],
|
||||
'follow' => [L10n::t("Connect/Follow"), $connlnk]
|
||||
];
|
||||
}
|
||||
|
|
@ -86,7 +85,7 @@ function allfriends_content(App $a)
|
|||
'details' => $contact_details['location'],
|
||||
'tags' => $contact_details['keywords'],
|
||||
'about' => $contact_details['about'],
|
||||
'account_type' => Contact::getAccountType($contact_details),
|
||||
'account_type' => Model\Contact::getAccountType($contact_details),
|
||||
'network' => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
|
||||
'photo_menu' => $photo_menu,
|
||||
'conntxt' => L10n::t('Connect'),
|
||||
|
|
@ -96,7 +95,7 @@ function allfriends_content(App $a)
|
|||
$entries[] = $entry;
|
||||
}
|
||||
|
||||
$tab_str = contacts_tab($a, $contact, 4);
|
||||
$tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
|
||||
|
||||
$tpl = get_markup_template('viewcontact_template.tpl');
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@
|
|||
use Friendica\Content\Text;
|
||||
use Friendica\Core\L10n;
|
||||
|
||||
function visible_lf($s)
|
||||
function visible_whitespace($s)
|
||||
{
|
||||
return str_replace("\n", '<br />', $s);
|
||||
$s = str_replace(' ', ' ', $s);
|
||||
|
||||
return str_replace(["\r\n", "\n", "\r"], '<br />', $s);
|
||||
}
|
||||
|
||||
function babel_content()
|
||||
|
|
@ -20,19 +22,19 @@ function babel_content()
|
|||
$bbcode = trim($_REQUEST['text']);
|
||||
$results[] = [
|
||||
'title' => L10n::t('Source input'),
|
||||
'content' => visible_lf($bbcode)
|
||||
'content' => visible_whitespace($bbcode)
|
||||
];
|
||||
|
||||
$plain = Text\BBCode::toPlaintext($bbcode, false);
|
||||
$results[] = [
|
||||
'title' => L10n::t('BBCode::toPlaintext'),
|
||||
'content' => visible_lf($plain)
|
||||
'content' => visible_whitespace($plain)
|
||||
];
|
||||
|
||||
$html = Text\BBCode::convert($bbcode);
|
||||
$results[] = [
|
||||
'title' => L10n::t("BBCode::convert \x28raw HTML\x29"),
|
||||
'content' => htmlspecialchars($html)
|
||||
'title' => L10n::t('BBCode::convert (raw HTML)'),
|
||||
'content' => visible_whitespace(htmlspecialchars($html))
|
||||
];
|
||||
|
||||
$results[] = [
|
||||
|
|
@ -43,13 +45,13 @@ function babel_content()
|
|||
$bbcode2 = Text\HTML::toBBCode($html);
|
||||
$results[] = [
|
||||
'title' => L10n::t('BBCode::convert => HTML::toBBCode'),
|
||||
'content' => visible_lf($bbcode2)
|
||||
'content' => visible_whitespace($bbcode2)
|
||||
];
|
||||
|
||||
$markdown = Text\BBCode::toMarkdown($bbcode);
|
||||
$results[] = [
|
||||
'title' => L10n::t('BBCode::toMarkdown'),
|
||||
'content' => visible_lf($markdown)
|
||||
'content' => visible_whitespace($markdown)
|
||||
];
|
||||
|
||||
$html2 = Text\Markdown::convert($markdown);
|
||||
|
|
@ -61,22 +63,33 @@ function babel_content()
|
|||
$bbcode3 = Text\Markdown::toBBCode($markdown);
|
||||
$results[] = [
|
||||
'title' => L10n::t('BBCode::toMarkdown => Markdown::toBBCode'),
|
||||
'content' => visible_lf($bbcode3)
|
||||
'content' => visible_whitespace($bbcode3)
|
||||
];
|
||||
|
||||
$bbcode4 = Text\HTML::toBBCode($html2);
|
||||
$results[] = [
|
||||
'title' => L10n::t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'),
|
||||
'content' => visible_lf($bbcode4)
|
||||
'content' => visible_whitespace($bbcode4)
|
||||
];
|
||||
break;
|
||||
case 'markdown':
|
||||
$markdown = trim($_REQUEST['text']);
|
||||
$results[] = [
|
||||
'title' => L10n::t('Source input \x28Diaspora format\x29'),
|
||||
'title' => L10n::t('Source input (Diaspora format)'),
|
||||
'content' => '<pre>' . $markdown . '</pre>'
|
||||
];
|
||||
|
||||
$html = Text\Markdown::convert($markdown);
|
||||
$results[] = [
|
||||
'title' => L10n::t('Markdown::convert (raw HTML)'),
|
||||
'content' => htmlspecialchars($html)
|
||||
];
|
||||
|
||||
$results[] = [
|
||||
'title' => L10n::t('Markdown::convert'),
|
||||
'content' => $html
|
||||
];
|
||||
|
||||
$bbcode = Text\Markdown::toBBCode($markdown);
|
||||
$results[] = [
|
||||
'title' => L10n::t('Markdown::toBBCode'),
|
||||
|
|
@ -86,7 +99,7 @@ function babel_content()
|
|||
case 'html' :
|
||||
$html = trim($_REQUEST['text']);
|
||||
$results[] = [
|
||||
'title' => L10n::t("Raw HTML input"),
|
||||
'title' => L10n::t('Raw HTML input'),
|
||||
'content' => htmlspecialchars($html)
|
||||
];
|
||||
|
||||
|
|
@ -98,7 +111,24 @@ function babel_content()
|
|||
$bbcode = Text\HTML::toBBCode($html);
|
||||
$results[] = [
|
||||
'title' => L10n::t('HTML::toBBCode'),
|
||||
'content' => visible_lf($bbcode)
|
||||
'content' => visible_whitespace($bbcode)
|
||||
];
|
||||
|
||||
$html2 = Text\BBCode::convert($bbcode);
|
||||
$results[] = [
|
||||
'title' => L10n::t('HTML::toBBCode => BBCode::convert'),
|
||||
'content' => $html2
|
||||
];
|
||||
|
||||
$results[] = [
|
||||
'title' => L10n::t('HTML::toBBCode => BBCode::convert (raw HTML)'),
|
||||
'content' => htmlspecialchars($html2)
|
||||
];
|
||||
|
||||
$markdown = Text\HTML::toMarkdown($html);
|
||||
$results[] = [
|
||||
'title' => L10n::t('HTML::toMarkdown'),
|
||||
'content' => visible_whitespace($markdown)
|
||||
];
|
||||
|
||||
$text = Text\HTML::toPlaintext($html);
|
||||
|
|
@ -111,7 +141,7 @@ function babel_content()
|
|||
|
||||
$tpl = get_markup_template('babel.tpl');
|
||||
$o = replace_macros($tpl, [
|
||||
'$text' => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''],
|
||||
'$text' => ['text', L10n::t('Source text'), htmlentities(defaults($_REQUEST, 'text', '')), ''],
|
||||
'$type_bbcode' => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],
|
||||
'$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'],
|
||||
'$type_html' => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'],
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@ function bookmarklet_content(App $a)
|
|||
$page = normalise_link(System::baseUrl() . "/bookmarklet");
|
||||
|
||||
if (!strstr($referer, $page)) {
|
||||
if (empty($_REQUEST["url"])) {
|
||||
System::httpExit(400, ["title" => L10n::t('Bad Request')]);
|
||||
}
|
||||
|
||||
$content = add_page_info($_REQUEST["url"]);
|
||||
|
||||
$x = [
|
||||
|
|
|
|||
|
|
@ -94,11 +94,6 @@ function cal_content(App $a)
|
|||
'$i18n' => $i18n,
|
||||
]);
|
||||
|
||||
$etpl = get_markup_template('event_end.tpl');
|
||||
$a->page['end'] .= replace_macros($etpl, [
|
||||
'$baseurl' => System::baseUrl(),
|
||||
]);
|
||||
|
||||
$mode = 'view';
|
||||
$y = 0;
|
||||
$m = 0;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,12 @@ use Friendica\App;
|
|||
use Friendica\Content\ContactSelector;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GContact;
|
||||
use Friendica\Model\Profile;
|
||||
use Friendica\Model;
|
||||
use Friendica\Module;
|
||||
use Friendica\Util\Proxy as ProxyUtils;
|
||||
|
||||
|
||||
require_once 'include/dba.php';
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
function common_content(App $a)
|
||||
{
|
||||
|
|
@ -42,16 +41,16 @@ function common_content(App $a)
|
|||
|
||||
if (DBA::isResult($contact)) {
|
||||
$a->page['aside'] = "";
|
||||
Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
|
||||
Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
|
||||
}
|
||||
} else {
|
||||
$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
|
||||
|
||||
if (DBA::isResult($contact)) {
|
||||
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
|
||||
'$name' => htmlentities($contact['name']),
|
||||
'$name' => htmlentities($contact['name']),
|
||||
'$photo' => $contact['photo'],
|
||||
'url' => 'contacts/' . $cid
|
||||
'url' => 'contact/' . $cid
|
||||
]);
|
||||
|
||||
if (!x($a->page, 'aside')) {
|
||||
|
|
@ -65,12 +64,12 @@ function common_content(App $a)
|
|||
return;
|
||||
}
|
||||
|
||||
if (!$cid && Profile::getMyURL()) {
|
||||
$contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
|
||||
if (!$cid && Model\Profile::getMyURL()) {
|
||||
$contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL()), 'uid' => $uid]);
|
||||
if (DBA::isResult($contact)) {
|
||||
$cid = $contact['id'];
|
||||
} else {
|
||||
$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
|
||||
$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL())]);
|
||||
if (DBA::isResult($gcontact)) {
|
||||
$zcid = $gcontact['id'];
|
||||
}
|
||||
|
|
@ -82,22 +81,22 @@ function common_content(App $a)
|
|||
}
|
||||
|
||||
if ($cid) {
|
||||
$t = GContact::countCommonFriends($uid, $cid);
|
||||
$t = Model\GContact::countCommonFriends($uid, $cid);
|
||||
} else {
|
||||
$t = GContact::countCommonFriendsZcid($uid, $zcid);
|
||||
$t = Model\GContact::countCommonFriendsZcid($uid, $zcid);
|
||||
}
|
||||
|
||||
if ($t > 0) {
|
||||
$a->set_pager_total($t);
|
||||
$a->setPagerTotal($t);
|
||||
} else {
|
||||
notice(L10n::t('No contacts in common.') . EOL);
|
||||
return $o;
|
||||
}
|
||||
|
||||
if ($cid) {
|
||||
$r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||
$r = Model\GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||
} else {
|
||||
$r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
|
||||
$r = Model\GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
|
||||
}
|
||||
|
||||
if (!DBA::isResult($r)) {
|
||||
|
|
@ -109,13 +108,13 @@ function common_content(App $a)
|
|||
$entries = [];
|
||||
foreach ($r as $rr) {
|
||||
//get further details of the contact
|
||||
$contact_details = Contact::getDetailsByURL($rr['url'], $uid);
|
||||
$contact_details = Model\Contact::getDetailsByURL($rr['url'], $uid);
|
||||
|
||||
// $rr['id'] is needed to use contact_photo_menu()
|
||||
/// @TODO Adding '/" here avoids E_NOTICE on missing constants
|
||||
$rr['id'] = $rr['cid'];
|
||||
|
||||
$photo_menu = Contact::photoMenu($rr);
|
||||
$photo_menu = Model\Contact::photoMenu($rr);
|
||||
|
||||
$entry = [
|
||||
'url' => $rr['url'],
|
||||
|
|
@ -126,7 +125,7 @@ function common_content(App $a)
|
|||
'details' => $contact_details['location'],
|
||||
'tags' => $contact_details['keywords'],
|
||||
'about' => $contact_details['about'],
|
||||
'account_type' => Contact::getAccountType($contact_details),
|
||||
'account_type' => Model\Contact::getAccountType($contact_details),
|
||||
'network' => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
|
||||
'photo_menu' => $photo_menu,
|
||||
'id' => ++$id,
|
||||
|
|
@ -137,7 +136,7 @@ function common_content(App $a)
|
|||
$title = '';
|
||||
$tab_str = '';
|
||||
if ($cmd === 'loc' && $cid && local_user() == $uid) {
|
||||
$tab_str = contacts_tab($a, $contact, 4);
|
||||
$tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
|
||||
} else {
|
||||
$title = L10n::t('Common Friends');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ function community_content(App $a, $update = 0)
|
|||
$itemspage_network = $a->force_max_items;
|
||||
}
|
||||
|
||||
$a->set_pager_itemspage($itemspage_network);
|
||||
$a->setPagerItemsPage($itemspage_network);
|
||||
|
||||
$r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content, $accounttype);
|
||||
|
||||
|
|
|
|||
1139
mod/contacts.php
1139
mod/contacts.php
File diff suppressed because it is too large
Load diff
|
|
@ -8,10 +8,8 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Profile;
|
||||
|
||||
require_once 'mod/contacts.php';
|
||||
use Friendica\Model;
|
||||
use Friendica\Module;
|
||||
|
||||
function crepair_init(App $a)
|
||||
{
|
||||
|
|
@ -30,7 +28,7 @@ function crepair_init(App $a)
|
|||
|
||||
if (DBA::isResult($contact)) {
|
||||
$a->data['contact'] = $contact;
|
||||
Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
|
||||
Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -82,7 +80,7 @@ function crepair_post(App $a)
|
|||
if ($photo) {
|
||||
logger('mod-crepair: updating photo from ' . $photo);
|
||||
|
||||
Contact::updateAvatar($photo, local_user(), $contact['id']);
|
||||
Model\Contact::updateAvatar($photo, local_user(), $contact['id']);
|
||||
}
|
||||
|
||||
if ($r) {
|
||||
|
|
@ -116,7 +114,7 @@ function crepair_content(App $a)
|
|||
$warning = L10n::t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
|
||||
$info = L10n::t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
|
||||
|
||||
$returnaddr = "contacts/$cid";
|
||||
$returnaddr = "contact/$cid";
|
||||
|
||||
$allow_remote_self = Config::get('system', 'allow_users_remote_self');
|
||||
|
||||
|
|
@ -133,9 +131,9 @@ function crepair_content(App $a)
|
|||
$remote_self_options = ['0' => L10n::t('No mirroring'), '2' => L10n::t('Mirror as my own posting')];
|
||||
}
|
||||
|
||||
$update_profile = in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
|
||||
$update_profile = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
|
||||
|
||||
$tab_str = contacts_tab($a, $contact, 5);
|
||||
$tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
|
||||
|
||||
$tpl = get_markup_template('crepair.tpl');
|
||||
$o = replace_macros($tpl, [
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ use Friendica\Model\Group;
|
|||
use Friendica\Model\User;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
use Friendica\Util\Crypto;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Network;
|
||||
|
|
@ -220,7 +221,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
*
|
||||
*/
|
||||
|
||||
$res = Network::post($dfrn_confirm, $params, null, $redirects, 120);
|
||||
$res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody();
|
||||
|
||||
logger(' Confirm: received data: ' . $res, LOGGER_DATA);
|
||||
|
||||
|
|
@ -335,10 +336,17 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
intval($contact_id)
|
||||
);
|
||||
} else {
|
||||
if ($network == Protocol::ACTIVITYPUB) {
|
||||
ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
|
||||
$pending = true;
|
||||
} else {
|
||||
$pending = false;
|
||||
}
|
||||
|
||||
// $network !== Protocol::DFRN
|
||||
$network = defaults($contact, 'network', Protocol::OSTATUS);
|
||||
|
||||
$arr = Probe::uri($contact['url']);
|
||||
$arr = Probe::uri($contact['url'], $network);
|
||||
|
||||
$notify = defaults($contact, 'notify' , $arr['notify']);
|
||||
$poll = defaults($contact, 'poll' , $arr['poll']);
|
||||
|
|
@ -348,7 +356,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
$new_relation = $contact['rel'];
|
||||
$writable = $contact['writable'];
|
||||
|
||||
if ($network === Protocol::DIASPORA) {
|
||||
if (in_array($network, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
|
||||
if ($duplex) {
|
||||
$new_relation = Contact::FRIEND;
|
||||
} else {
|
||||
|
|
@ -362,30 +370,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
DBA::delete('intro', ['id' => $intro_id]);
|
||||
|
||||
$r = q("UPDATE `contact` SET `name-date` = '%s',
|
||||
`uri-date` = '%s',
|
||||
`addr` = '%s',
|
||||
`notify` = '%s',
|
||||
`poll` = '%s',
|
||||
`blocked` = 0,
|
||||
`pending` = 0,
|
||||
`network` = '%s',
|
||||
`writable` = %d,
|
||||
`hidden` = %d,
|
||||
`rel` = %d
|
||||
WHERE `id` = %d
|
||||
",
|
||||
DBA::escape(DateTimeFormat::utcNow()),
|
||||
DBA::escape(DateTimeFormat::utcNow()),
|
||||
DBA::escape($addr),
|
||||
DBA::escape($notify),
|
||||
DBA::escape($poll),
|
||||
DBA::escape($network),
|
||||
intval($writable),
|
||||
intval($hidden),
|
||||
intval($new_relation),
|
||||
intval($contact_id)
|
||||
);
|
||||
$fields = ['name-date' => DateTimeFormat::utcNow(),
|
||||
'uri-date' => DateTimeFormat::utcNow(), 'addr' => $addr,
|
||||
'notify' => $notify, 'poll' => $poll, 'blocked' => false,
|
||||
'pending' => $pending, 'network' => $network,
|
||||
'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation];
|
||||
DBA::update('contact', $fields, ['id' => $contact_id]);
|
||||
}
|
||||
|
||||
if (!DBA::isResult($r)) {
|
||||
|
|
@ -403,10 +393,14 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
|
||||
|
||||
if ($network == Protocol::ACTIVITYPUB && $duplex) {
|
||||
ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
|
||||
}
|
||||
|
||||
// Let's send our user to the contact editor in case they want to
|
||||
// do anything special with this new friend.
|
||||
if ($handsfree === null) {
|
||||
goaway(System::baseUrl() . '/contacts/' . intval($contact_id));
|
||||
goaway(System::baseUrl() . '/contact/' . intval($contact_id));
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
|
@ -610,7 +604,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
'to_name' => $combined['username'],
|
||||
'to_email' => $combined['email'],
|
||||
'uid' => $combined['uid'],
|
||||
'link' => System::baseUrl() . '/contacts/' . $dfrn_record,
|
||||
'link' => System::baseUrl() . '/contact/' . $dfrn_record,
|
||||
'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')),
|
||||
'source_link' => $combined['url'],
|
||||
'source_photo' => $combined['photo'],
|
||||
|
|
|
|||
|
|
@ -79,13 +79,13 @@ function dfrn_notify_post(App $a) {
|
|||
$condition = [];
|
||||
switch ($direction) {
|
||||
case (-1):
|
||||
$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
|
||||
$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
|
||||
break;
|
||||
case 0:
|
||||
$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
|
||||
$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
|
||||
break;
|
||||
case 1:
|
||||
$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
|
||||
$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
|
||||
break;
|
||||
default:
|
||||
System::xmlExit(3, 'Invalid direction');
|
||||
|
|
@ -182,7 +182,7 @@ function dfrn_notify_post(App $a) {
|
|||
|
||||
function dfrn_dispatch_public($postdata)
|
||||
{
|
||||
$msg = Diaspora::decodeRaw([], $postdata);
|
||||
$msg = Diaspora::decodeRaw([], $postdata, true);
|
||||
if (!$msg) {
|
||||
// We have to fail silently to be able to hand it over to the salmon parser
|
||||
return false;
|
||||
|
|
@ -287,15 +287,15 @@ function dfrn_notify_content(App $a) {
|
|||
$condition = [];
|
||||
switch ($direction) {
|
||||
case (-1):
|
||||
$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
|
||||
$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
|
||||
$my_id = $dfrn_id;
|
||||
break;
|
||||
case 0:
|
||||
$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
|
||||
$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
|
||||
$my_id = '1:' . $dfrn_id;
|
||||
break;
|
||||
case 1:
|
||||
$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
|
||||
$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
|
||||
$my_id = '0:' . $dfrn_id;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -322,8 +322,8 @@ function dfrn_notify_content(App $a) {
|
|||
$encrypted_id = '';
|
||||
$id_str = $my_id . '.' . mt_rand(1000,9999);
|
||||
|
||||
$prv_key = trim($importer['prvkey']);
|
||||
$pub_key = trim($importer['pubkey']);
|
||||
$prv_key = trim($importer['cprvkey']);
|
||||
$pub_key = trim($importer['cpubkey']);
|
||||
$dplx = intval($importer['duplex']);
|
||||
|
||||
if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) {
|
||||
|
|
|
|||
|
|
@ -502,7 +502,7 @@ function dfrn_poll_content(App $a)
|
|||
'dfrn_version' => DFRN_PROTOCOL_VERSION,
|
||||
'challenge' => $challenge,
|
||||
'sec' => $sec
|
||||
]);
|
||||
])->getBody();
|
||||
}
|
||||
|
||||
$profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
|
||||
|
|
|
|||
|
|
@ -173,9 +173,9 @@ function dfrn_request_post(App $a)
|
|||
Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
|
||||
}
|
||||
|
||||
$forwardurl = System::baseUrl() . "/contacts/" . $r[0]['id'];
|
||||
$forwardurl = System::baseUrl() . "/contact/" . $r[0]['id'];
|
||||
} else {
|
||||
$forwardurl = System::baseUrl() . "/contacts";
|
||||
$forwardurl = System::baseUrl() . "/contact";
|
||||
}
|
||||
|
||||
// Allow the blocked remote notification to complete
|
||||
|
|
@ -451,10 +451,10 @@ function dfrn_request_post(App $a)
|
|||
// Diaspora needs the uri in the format user@domain.tld
|
||||
// Diaspora will support the remote subscription in a future version
|
||||
if ($network == Protocol::DIASPORA) {
|
||||
$uri = $nickname . '@' . $a->get_hostname();
|
||||
$uri = $nickname . '@' . $a->getHostName();
|
||||
|
||||
if ($a->get_path()) {
|
||||
$uri .= '/' . $a->get_path();
|
||||
if ($a->getURLPath()) {
|
||||
$uri .= '/' . $a->getURLPath();
|
||||
}
|
||||
|
||||
$uri = urlencode($uri);
|
||||
|
|
@ -609,7 +609,7 @@ function dfrn_request_content(App $a)
|
|||
} elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
|
||||
$myaddr = $_GET['address'];
|
||||
} elseif (local_user()) {
|
||||
if (strlen($a->urlpath)) {
|
||||
if (strlen($a->getURLPath())) {
|
||||
$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
|
||||
} else {
|
||||
$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ use Friendica\Util\Proxy as ProxyUtils;
|
|||
|
||||
function directory_init(App $a)
|
||||
{
|
||||
$a->set_pager_itemspage(60);
|
||||
$a->setPagerItemsPage(60);
|
||||
|
||||
if (local_user()) {
|
||||
$a->page['aside'] .= Widget::findPeople();
|
||||
|
|
@ -87,7 +87,7 @@ function directory_content(App $a)
|
|||
LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||
WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra");
|
||||
if (DBA::isResult($cnt)) {
|
||||
$a->set_pager_total($cnt['total']);
|
||||
$a->setPagerTotal($cnt['total']);
|
||||
}
|
||||
|
||||
$order = " ORDER BY `name` ASC ";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,13 @@ use Friendica\Core\Protocol;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GContact;
|
||||
use Friendica\Model;
|
||||
use Friendica\Module;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Protocol\PortableContact;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\Proxy as ProxyUtils;
|
||||
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
function dirfind_init(App $a) {
|
||||
|
||||
|
|
@ -44,7 +43,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
|
||||
$local = Config::get('system','poco_local_search');
|
||||
|
||||
$search = $prefix.notags(trim($_REQUEST['search']));
|
||||
$search = $prefix.notags(trim(defaults($_REQUEST, 'search', '')));
|
||||
|
||||
$header = '';
|
||||
|
||||
|
|
@ -54,7 +53,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
if ((valid_email($search) && Network::isEmailDomainValid($search)) ||
|
||||
(substr(normalise_link($search), 0, 7) == "http://")) {
|
||||
$user_data = Probe::uri($search);
|
||||
$discover_user = (in_array($user_data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA]));
|
||||
$discover_user = (in_array($user_data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -83,7 +82,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
$objresult->tags = "";
|
||||
$objresult->network = $user_data["network"];
|
||||
|
||||
$contact = Contact::getDetailsByURL($user_data["url"], local_user());
|
||||
$contact = Model\Contact::getDetailsByURL($user_data["url"], local_user());
|
||||
$objresult->cid = $contact["cid"];
|
||||
$objresult->pcid = $contact["zid"];
|
||||
|
||||
|
|
@ -91,7 +90,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
|
||||
// Add the contact to the global contacts if it isn't already in our system
|
||||
if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
|
||||
GContact::update($user_data);
|
||||
Model\GContact::update($user_data);
|
||||
}
|
||||
} elseif ($local) {
|
||||
|
||||
|
|
@ -156,7 +155,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
continue;
|
||||
}
|
||||
|
||||
$result = Contact::getDetailsByURL($result["nurl"], local_user());
|
||||
$result = Model\Contact::getDetailsByURL($result["nurl"], local_user());
|
||||
|
||||
if ($result["name"] == "") {
|
||||
$result["name"] = end(explode("/", $urlparts["path"]));
|
||||
|
|
@ -188,8 +187,8 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
}
|
||||
|
||||
if ($j->total) {
|
||||
$a->set_pager_total($j->total);
|
||||
$a->set_pager_itemspage($j->items_page);
|
||||
$a->setPagerTotal($j->total);
|
||||
$a->setPagerItemsPage($j->items_page);
|
||||
}
|
||||
|
||||
if (!empty($j->results)) {
|
||||
|
|
@ -200,7 +199,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
|
||||
$alt_text = "";
|
||||
|
||||
$contact_details = Contact::getDetailsByURL($jj->url, local_user());
|
||||
$contact_details = Model\Contact::getDetailsByURL($jj->url, local_user());
|
||||
|
||||
$itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
|
||||
|
||||
|
|
@ -210,8 +209,8 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
$conntxt = "";
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $jj->cid]);
|
||||
if (DBA::isResult($contact)) {
|
||||
$photo_menu = Contact::photoMenu($contact);
|
||||
$details = _contact_detail_for_template($contact);
|
||||
$photo_menu = Model\Contact::photoMenu($contact);
|
||||
$details = Module\Contact::getContactTemplateVars($contact);
|
||||
$alt_text = $details['alt_text'];
|
||||
} else {
|
||||
$photo_menu = [];
|
||||
|
|
@ -222,12 +221,12 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $jj->pcid]);
|
||||
if (DBA::isResult($contact)) {
|
||||
$photo_menu = Contact::photoMenu($contact);
|
||||
$photo_menu = Model\Contact::photoMenu($contact);
|
||||
} else {
|
||||
$photo_menu = [];
|
||||
}
|
||||
|
||||
$photo_menu['profile'] = [L10n::t("View Profile"), Contact::magicLink($jj->url)];
|
||||
$photo_menu['profile'] = [L10n::t("View Profile"), Model\Contact::magicLink($jj->url)];
|
||||
$photo_menu['follow'] = [L10n::t("Connect/Follow"), $connlnk];
|
||||
}
|
||||
|
||||
|
|
@ -235,7 +234,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
|
||||
$entry = [
|
||||
'alt_text' => $alt_text,
|
||||
'url' => Contact::magicLink($jj->url),
|
||||
'url' => Model\Contact::magicLink($jj->url),
|
||||
'itemurl' => $itemurl,
|
||||
'name' => htmlentities($jj->name),
|
||||
'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
|
||||
|
|
@ -246,7 +245,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
'details' => $contact_details['location'],
|
||||
'tags' => $contact_details['keywords'],
|
||||
'about' => $contact_details['about'],
|
||||
'account_type' => Contact::getAccountType($contact_details),
|
||||
'account_type' => Model\Contact::getAccountType($contact_details),
|
||||
'network' => ContactSelector::networkToName($jj->network, $jj->url),
|
||||
'id' => ++$id,
|
||||
];
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ use Friendica\Model\Group;
|
|||
use Friendica\Model\Item;
|
||||
use Friendica\Model\Profile;
|
||||
use Friendica\Protocol\DFRN;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
|
||||
function display_init(App $a)
|
||||
{
|
||||
|
|
@ -43,7 +44,7 @@ function display_init(App $a)
|
|||
|
||||
$item = null;
|
||||
|
||||
$fields = ['id', 'parent', 'author-id', 'body', 'uid'];
|
||||
$fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
|
||||
|
||||
// If there is only one parameter, then check if this parameter could be a guid
|
||||
if ($a->argc == 2) {
|
||||
|
|
@ -76,6 +77,10 @@ function display_init(App $a)
|
|||
displayShowFeed($item["id"], false);
|
||||
}
|
||||
|
||||
if (ActivityPub::isRequest()) {
|
||||
goaway(str_replace('display/', 'objects/', $a->query_string));
|
||||
}
|
||||
|
||||
if ($item["id"] != $item["parent"]) {
|
||||
$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
|
||||
}
|
||||
|
|
@ -360,7 +365,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
|
|||
$title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
|
||||
$author_name = $item["author-name"];
|
||||
|
||||
$image = $a->remove_baseurl($item["author-avatar"]);
|
||||
$image = $a->removeBaseURL($item["author-avatar"]);
|
||||
|
||||
if ($title == "") {
|
||||
$title = $author_name;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ function editpost_content(App $a)
|
|||
}
|
||||
|
||||
$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
|
||||
'type', 'body', 'title', 'file', 'wall', 'post-type'];
|
||||
'type', 'body', 'title', 'file', 'wall', 'post-type', 'guid'];
|
||||
|
||||
$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
|
||||
|
||||
|
|
@ -51,15 +51,6 @@ function editpost_content(App $a)
|
|||
'$nickname' => $a->user['nickname']
|
||||
]);
|
||||
|
||||
$tpl = get_markup_template('jot-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, [
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$ispublic' => ' ', // L10n::t('Visible to <strong>everybody</strong>'),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $a->user['nickname']
|
||||
]);
|
||||
|
||||
|
||||
$tpl = get_markup_template("jot.tpl");
|
||||
|
||||
if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
|
||||
|
|
@ -95,7 +86,7 @@ function editpost_content(App $a)
|
|||
|
||||
$o .= replace_macros($tpl, [
|
||||
'$is_edit' => true,
|
||||
'$return_path' => $_SESSION['return_url'],
|
||||
'$return_path' => '/display/' . $item['guid'],
|
||||
'$action' => 'item',
|
||||
'$share' => L10n::t('Save'),
|
||||
'$upload' => L10n::t('Upload photo'),
|
||||
|
|
|
|||
150
mod/events.php
150
mod/events.php
|
|
@ -17,10 +17,12 @@ use Friendica\Model\Item;
|
|||
use Friendica\Model\Profile;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Temporal;
|
||||
use Friendica\Module\Login;
|
||||
|
||||
require_once 'include/items.php';
|
||||
|
||||
function events_init(App $a) {
|
||||
function events_init(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -42,7 +44,8 @@ function events_init(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
function events_post(App $a) {
|
||||
function events_post(App $a)
|
||||
{
|
||||
|
||||
logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
|
||||
|
||||
|
|
@ -50,15 +53,15 @@ function events_post(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
$event_id = (x($_POST, 'event_id') ? intval($_POST['event_id']) : 0);
|
||||
$cid = (x($_POST, 'cid') ? intval($_POST['cid']) : 0);
|
||||
$event_id = !empty($_POST['event_id']) ? intval($_POST['event_id']) : 0;
|
||||
$cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
|
||||
$uid = local_user();
|
||||
|
||||
$start_text = escape_tags($_REQUEST['start_text']);
|
||||
$finish_text = escape_tags($_REQUEST['finish_text']);
|
||||
$start_text = escape_tags(defaults($_REQUEST, 'start_text', ''));
|
||||
$finish_text = escape_tags(defaults($_REQUEST, 'finish_text', ''));
|
||||
|
||||
$adjust = intval($_POST['adjust']);
|
||||
$nofinish = intval($_POST['nofinish']);
|
||||
$adjust = intval(defaults($_POST, 'adjust', 0));
|
||||
$nofinish = intval(defaults($_POST, 'nofinish', 0));
|
||||
|
||||
// The default setting for the `private` field in event_store() is false, so mirror that
|
||||
$private_event = false;
|
||||
|
|
@ -91,9 +94,9 @@ function events_post(App $a) {
|
|||
// and we'll waste a bunch of time responding to it. Time that
|
||||
// could've been spent doing something else.
|
||||
|
||||
$summary = escape_tags(trim($_POST['summary']));
|
||||
$desc = escape_tags(trim($_POST['desc']));
|
||||
$location = escape_tags(trim($_POST['location']));
|
||||
$summary = escape_tags(trim(defaults($_POST, 'summary', '')));
|
||||
$desc = escape_tags(trim(defaults($_POST, 'desc', '')));
|
||||
$location = escape_tags(trim(defaults($_POST, 'location', '')));
|
||||
$type = 'event';
|
||||
|
||||
$action = ($event_id == '') ? 'new' : "event/" . $event_id;
|
||||
|
|
@ -117,7 +120,7 @@ function events_post(App $a) {
|
|||
goaway($onerror_url);
|
||||
}
|
||||
|
||||
$share = (intval($_POST['share']) ? intval($_POST['share']) : 0);
|
||||
$share = intval(defaults($_POST, 'share', 0));
|
||||
|
||||
$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
|
||||
intval(local_user())
|
||||
|
|
@ -137,7 +140,7 @@ function events_post(App $a) {
|
|||
$str_contact_deny = !empty($_POST['contact_deny']) ? perms2str($_POST['contact_deny']) : '';
|
||||
|
||||
// Undo the pseudo-contact of self, since there are real contacts now
|
||||
if (strpos($str_contact_allow, '<' . $self . '>') !== false ) {
|
||||
if (strpos($str_contact_allow, '<' . $self . '>') !== false) {
|
||||
$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
|
||||
}
|
||||
// Make sure to set the `private` field as true. This is necessary to
|
||||
|
|
@ -184,14 +187,14 @@ function events_post(App $a) {
|
|||
Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
|
||||
}
|
||||
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/events');
|
||||
}
|
||||
|
||||
function events_content(App $a) {
|
||||
|
||||
function events_content(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
return Login::form();
|
||||
}
|
||||
|
||||
if ($a->argc == 1) {
|
||||
|
|
@ -229,11 +232,6 @@ function events_content(App $a) {
|
|||
'$i18n' => $i18n,
|
||||
]);
|
||||
|
||||
$etpl = get_markup_template('event_end.tpl');
|
||||
$a->page['end'] .= replace_macros($etpl, [
|
||||
'$baseurl' => System::baseUrl(),
|
||||
]);
|
||||
|
||||
$o = '';
|
||||
$tabs = '';
|
||||
// tabs
|
||||
|
|
@ -244,7 +242,7 @@ function events_content(App $a) {
|
|||
$mode = 'view';
|
||||
$y = 0;
|
||||
$m = 0;
|
||||
$ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0);
|
||||
$ignored = !empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0;
|
||||
|
||||
if ($a->argc > 1) {
|
||||
if ($a->argc > 2 && $a->argv[1] == 'event') {
|
||||
|
|
@ -272,7 +270,6 @@ function events_content(App $a) {
|
|||
|
||||
// The view mode part is similiar to /mod/cal.php
|
||||
if ($mode == 'view') {
|
||||
|
||||
$thisyear = DateTimeFormat::localNow('Y');
|
||||
$thismonth = DateTimeFormat::localNow('m');
|
||||
if (!$y) {
|
||||
|
|
@ -312,10 +309,10 @@ function events_content(App $a) {
|
|||
$finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
|
||||
|
||||
if ($a->argc > 1 && $a->argv[1] === 'json') {
|
||||
if (x($_GET, 'start')) {
|
||||
$start = $_GET['start'];
|
||||
if (!empty($_GET['start'])) {
|
||||
$start = $_GET['start'];
|
||||
}
|
||||
if (x($_GET, 'end')) {
|
||||
if (!empty($_GET['end'])) {
|
||||
$finish = $_GET['end'];
|
||||
}
|
||||
}
|
||||
|
|
@ -349,7 +346,7 @@ function events_content(App $a) {
|
|||
$r = Event::sortByDate($r);
|
||||
foreach ($r as $rr) {
|
||||
$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
|
||||
if (!x($links,$j)) {
|
||||
if (empty($links[$j])) {
|
||||
$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
|
||||
}
|
||||
}
|
||||
|
|
@ -363,12 +360,12 @@ function events_content(App $a) {
|
|||
$events = Event::prepareListForTemplate($r);
|
||||
}
|
||||
|
||||
if ($a->argc > 1 && $a->argv[1] === 'json'){
|
||||
if ($a->argc > 1 && $a->argv[1] === 'json') {
|
||||
echo json_encode($events);
|
||||
killme();
|
||||
}
|
||||
|
||||
if (x($_GET, 'id')) {
|
||||
if (!empty($_GET['id'])) {
|
||||
$tpl = get_markup_template("event.tpl");
|
||||
} else {
|
||||
$tpl = get_markup_template("events_js.tpl");
|
||||
|
|
@ -378,7 +375,7 @@ function events_content(App $a) {
|
|||
foreach ($events as $key => $event) {
|
||||
$event_item = [];
|
||||
foreach ($event['item'] as $k => $v) {
|
||||
$k = str_replace('-' ,'_', $k);
|
||||
$k = str_replace('-', '_', $k);
|
||||
$event_item[$k] = $v;
|
||||
}
|
||||
$events[$key]['item'] = $event_item;
|
||||
|
|
@ -403,7 +400,7 @@ function events_content(App $a) {
|
|||
'$list' => L10n::t('list'),
|
||||
]);
|
||||
|
||||
if (x($_GET, 'id')) {
|
||||
if (!empty($_GET['id'])) {
|
||||
echo $o;
|
||||
killme();
|
||||
}
|
||||
|
|
@ -428,41 +425,45 @@ function events_content(App $a) {
|
|||
}
|
||||
|
||||
// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
|
||||
if (x($_REQUEST, 'nofinish')) {$orig_event['nofinish'] = $_REQUEST['nofinish'];}
|
||||
if (x($_REQUEST, 'adjust')) {$orig_event['adjust'] = $_REQUEST['adjust'];}
|
||||
if (x($_REQUEST, 'summary')) {$orig_event['summary'] = $_REQUEST['summary'];}
|
||||
if (x($_REQUEST, 'description')) {$orig_event['description'] = $_REQUEST['description'];}
|
||||
if (x($_REQUEST, 'location')) {$orig_event['location'] = $_REQUEST['location'];}
|
||||
if (x($_REQUEST, 'start')) {$orig_event['start'] = $_REQUEST['start'];}
|
||||
if (x($_REQUEST, 'finish')) {$orig_event['finish'] = $_REQUEST['finish'];}
|
||||
if (x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
|
||||
if (!empty($_REQUEST['nofinish'])) {$orig_event['nofinish'] = $_REQUEST['nofinish'];}
|
||||
if (!empty($_REQUEST['adjust'])) {$orig_event['adjust'] = $_REQUEST['adjust'];}
|
||||
if (!empty($_REQUEST['summary'])) {$orig_event['summary'] = $_REQUEST['summary'];}
|
||||
if (!empty($_REQUEST['description'])) {$orig_event['description'] = $_REQUEST['description'];}
|
||||
if (!empty($_REQUEST['location'])) {$orig_event['location'] = $_REQUEST['location'];}
|
||||
if (!empty($_REQUEST['start'])) {$orig_event['start'] = $_REQUEST['start'];}
|
||||
if (!empty($_REQUEST['finish'])) {$orig_event['finish'] = $_REQUEST['finish'];}
|
||||
|
||||
$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
|
||||
$a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
|
||||
$n_checked = (!empty($orig_event['nofinish']) ? ' checked="checked" ' : '');
|
||||
$a_checked = (!empty($orig_event['adjust']) ? ' checked="checked" ' : '');
|
||||
|
||||
$t_orig = (x($orig_event) ? $orig_event['summary'] : '');
|
||||
$d_orig = (x($orig_event) ? $orig_event['desc'] : '');
|
||||
$l_orig = (x($orig_event) ? $orig_event['location'] : '');
|
||||
$eid = (x($orig_event) ? $orig_event['id'] : 0);
|
||||
$cid = (x($orig_event) ? $orig_event['cid'] : 0);
|
||||
$uri = (x($orig_event) ? $orig_event['uri'] : '');
|
||||
$t_orig = !empty($orig_event) ? $orig_event['summary'] : '';
|
||||
$d_orig = !empty($orig_event) ? $orig_event['desc'] : '';
|
||||
$l_orig = !empty($orig_event) ? $orig_event['location'] : '';
|
||||
$eid = !empty($orig_event) ? $orig_event['id'] : 0;
|
||||
$cid = !empty($orig_event) ? $orig_event['cid'] : 0;
|
||||
$uri = !empty($orig_event) ? $orig_event['uri'] : '';
|
||||
|
||||
$sh_disabled = '';
|
||||
$sh_checked = '';
|
||||
$sh_checked = '';
|
||||
|
||||
if (x($orig_event)) {
|
||||
$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && !$orig_event['allow_gid'] && !$orig_event['deny_cid'] && !$orig_event['deny_gid']) ? '' : ' checked="checked" ');
|
||||
if (!empty($orig_event)
|
||||
&& ($orig_event['allow_cid'] !== '<' . local_user() . '>'
|
||||
|| $orig_event['allow_gid']
|
||||
|| $orig_event['deny_cid']
|
||||
|| $orig_event['deny_gid']))
|
||||
{
|
||||
$sh_checked = ' checked="checked" ';
|
||||
}
|
||||
|
||||
if ($cid || $mode === 'edit') {
|
||||
$sh_disabled = 'disabled="disabled"';
|
||||
}
|
||||
|
||||
$sdt = (x($orig_event) ? $orig_event['start'] : 'now');
|
||||
$fdt = (x($orig_event) ? $orig_event['finish'] : 'now');
|
||||
$sdt = !empty($orig_event) ? $orig_event['start'] : 'now';
|
||||
$fdt = !empty($orig_event) ? $orig_event['finish'] : 'now';
|
||||
|
||||
$tz = date_default_timezone_get();
|
||||
if (x($orig_event)) {
|
||||
if (!empty($orig_event)) {
|
||||
$tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
|
||||
}
|
||||
|
||||
|
|
@ -470,20 +471,22 @@ function events_content(App $a) {
|
|||
$smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
|
||||
$sday = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
|
||||
|
||||
$shour = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
|
||||
$sminute = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
|
||||
$shour = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00';
|
||||
$sminute = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00';
|
||||
|
||||
$fyear = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
|
||||
$fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
|
||||
$fday = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
|
||||
|
||||
$fhour = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
|
||||
$fminute = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
|
||||
$fhour = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00';
|
||||
$fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
|
||||
|
||||
$perms = ACL::getDefaultUserPermissions($orig_event);
|
||||
|
||||
if ($mode === 'new' || $mode === 'copy') {
|
||||
$acl = ($cid ? '' : ACL::getFullSelectorHTML($a->user, false, $orig_event));
|
||||
if (!$cid && in_array($mode, ['new', 'copy'])) {
|
||||
$acl = ACL::getFullSelectorHTML($a->user, false, $orig_event);
|
||||
} else {
|
||||
$acl = '';
|
||||
}
|
||||
|
||||
// If we copy an old event, we need to remove the ID and URI
|
||||
|
|
@ -495,7 +498,7 @@ function events_content(App $a) {
|
|||
|
||||
$tpl = get_markup_template('event_form.tpl');
|
||||
|
||||
$o .= replace_macros($tpl,[
|
||||
$o .= replace_macros($tpl, [
|
||||
'$post' => System::baseUrl() . '/events',
|
||||
'$eid' => $eid,
|
||||
'$cid' => $cid,
|
||||
|
|
@ -509,11 +512,31 @@ function events_content(App $a) {
|
|||
'$title' => L10n::t('Event details'),
|
||||
'$desc' => L10n::t('Starting date and Title are required.'),
|
||||
'$s_text' => L10n::t('Event Starts:') . ' <span class="required" title="' . L10n::t('Required') . '">*</span>',
|
||||
'$s_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true),
|
||||
'$s_dsel' => Temporal::getDateTimeField(
|
||||
new DateTime(),
|
||||
DateTime::createFromFormat('Y', $syear+5),
|
||||
DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"),
|
||||
L10n::t('Event Starts:'),
|
||||
'start_text',
|
||||
true,
|
||||
true,
|
||||
'',
|
||||
'',
|
||||
true
|
||||
),
|
||||
'$n_text' => L10n::t('Finish date/time is not known or not relevant'),
|
||||
'$n_checked' => $n_checked,
|
||||
'$f_text' => L10n::t('Event Finishes:'),
|
||||
'$f_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
|
||||
'$f_dsel' => Temporal::getDateTimeField(
|
||||
new DateTime(),
|
||||
DateTime::createFromFormat('Y', $fyear+5),
|
||||
DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"),
|
||||
L10n::t('Event Finishes:'),
|
||||
'finish_text',
|
||||
true,
|
||||
true,
|
||||
'start_text'
|
||||
),
|
||||
'$a_text' => L10n::t('Adjust for viewer timezone'),
|
||||
'$a_checked' => $a_checked,
|
||||
'$d_text' => L10n::t('Description:'),
|
||||
|
|
@ -534,7 +557,6 @@ function events_content(App $a) {
|
|||
'$basic' => L10n::t('Basic'),
|
||||
'$advanced' => L10n::t('Advanced'),
|
||||
'$permissions' => L10n::t('Permissions'),
|
||||
|
||||
]);
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -32,8 +32,7 @@ function feedtest_content(App $a)
|
|||
|
||||
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
|
||||
|
||||
$ret = Network::curl($contact['poll']);
|
||||
$xml = $ret['body'];
|
||||
$xml = Network::fetchUrl($contact['poll']);
|
||||
|
||||
$dummy = null;
|
||||
$import_result = Feed::import($xml, $importer, $contact, $dummy, true);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ function fetch_init(App $a)
|
|||
|
||||
// Fetch the item
|
||||
$fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
|
||||
'event-id', 'resource-id', 'author-link', 'owner-link', 'attach'];
|
||||
'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach'];
|
||||
$condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
|
||||
$item = Item::selectFirst($fields, $condition);
|
||||
if (!DBA::isResult($item)) {
|
||||
|
|
|
|||
|
|
@ -25,9 +25,7 @@ function filerm_content(App $a) {
|
|||
file_tag_unsave_file(local_user(),$item_id,$term, $category);
|
||||
}
|
||||
|
||||
if (x($_SESSION,'return_url')) {
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
}
|
||||
//goaway('/network');
|
||||
|
||||
killme();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@ function follow_post(App $a)
|
|||
}
|
||||
|
||||
if (isset($_REQUEST['cancel'])) {
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('contacts');
|
||||
}
|
||||
|
||||
$uid = local_user();
|
||||
$url = notags(trim($_REQUEST['url']));
|
||||
$return_url = $_SESSION['return_url'];
|
||||
$return_url = 'contacts';
|
||||
|
||||
// Makes the connection request for friendica contacts easier
|
||||
// This is just a precaution if maybe this page is called somewhere directly via POST
|
||||
|
|
@ -39,7 +39,7 @@ function follow_post(App $a)
|
|||
}
|
||||
goaway($return_url);
|
||||
} elseif ($result['cid']) {
|
||||
goaway(System::baseUrl() . '/contacts/' . $result['cid']);
|
||||
goaway('contact/' . $result['cid']);
|
||||
}
|
||||
|
||||
info(L10n::t('The contact could not be added.'));
|
||||
|
|
@ -50,9 +50,11 @@ function follow_post(App $a)
|
|||
|
||||
function follow_content(App $a)
|
||||
{
|
||||
$return_url = 'contacts';
|
||||
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.'));
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway($return_url);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
@ -116,7 +118,7 @@ function follow_content(App $a)
|
|||
|
||||
if (!$r) {
|
||||
notice(L10n::t('Permission denied.'));
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway($return_url);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ function fsuggest_post(App $a)
|
|||
|
||||
$hash = random_string();
|
||||
|
||||
$note = escape_tags(trim($_POST['note']));
|
||||
$note = escape_tags(trim(defaults($_POST, 'note', '')));
|
||||
|
||||
if ($new_contact) {
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ use Friendica\Core\L10n;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Group;
|
||||
use Friendica\Model;
|
||||
use Friendica\Module;
|
||||
|
||||
function group_init(App $a) {
|
||||
if (local_user()) {
|
||||
$a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
|
||||
$a->page['aside'] = Model\Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -31,10 +31,10 @@ function group_post(App $a) {
|
|||
check_form_security_token_redirectOnErr('/group/new', 'group_edit');
|
||||
|
||||
$name = notags(trim($_POST['groupname']));
|
||||
$r = Group::create(local_user(), $name);
|
||||
$r = Model\Group::create(local_user(), $name);
|
||||
if ($r) {
|
||||
info(L10n::t('Group created.') . EOL);
|
||||
$r = Group::getIdByName(local_user(), $name);
|
||||
$r = Model\Group::getIdByName(local_user(), $name);
|
||||
if ($r) {
|
||||
goaway(System::baseUrl() . '/group/' . $r);
|
||||
}
|
||||
|
|
@ -54,7 +54,7 @@ function group_post(App $a) {
|
|||
);
|
||||
if (!DBA::isResult($r)) {
|
||||
notice(L10n::t('Group not found.') . EOL);
|
||||
goaway(System::baseUrl() . '/contacts');
|
||||
goaway(System::baseUrl() . '/contact');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
$group = $r[0];
|
||||
|
|
@ -71,7 +71,7 @@ function group_post(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
$a->page['aside'] = Group::sidebarWidget();
|
||||
$a->page['aside'] = Model\Group::sidebarWidget();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -116,8 +116,6 @@ function group_content(App $a) {
|
|||
$nogroup = false;
|
||||
|
||||
if (($a->argc == 2) && ($a->argv[1] === 'none')) {
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
$id = -1;
|
||||
$nogroup = true;
|
||||
$group = [
|
||||
|
|
@ -150,7 +148,7 @@ function group_content(App $a) {
|
|||
$result = null;
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
$result = Group::removeByName(local_user(), $r[0]['name']);
|
||||
$result = Model\Group::removeByName(local_user(), $r[0]['name']);
|
||||
}
|
||||
|
||||
if ($result) {
|
||||
|
|
@ -176,8 +174,6 @@ function group_content(App $a) {
|
|||
}
|
||||
|
||||
if (($a->argc > 1) && intval($a->argv[1])) {
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
|
||||
intval($a->argv[1]),
|
||||
intval(local_user())
|
||||
|
|
@ -185,11 +181,11 @@ function group_content(App $a) {
|
|||
|
||||
if (!DBA::isResult($r)) {
|
||||
notice(L10n::t('Group not found.') . EOL);
|
||||
goaway(System::baseUrl() . '/contacts');
|
||||
goaway(System::baseUrl() . '/contact');
|
||||
}
|
||||
|
||||
$group = $r[0];
|
||||
$members = Contact::getByGroupId($group['id']);
|
||||
$members = Model\Contact::getByGroupId($group['id']);
|
||||
$preselected = [];
|
||||
$entry = [];
|
||||
$id = 0;
|
||||
|
|
@ -202,12 +198,12 @@ function group_content(App $a) {
|
|||
|
||||
if ($change) {
|
||||
if (in_array($change, $preselected)) {
|
||||
Group::removeMember($group['id'], $change);
|
||||
Model\Group::removeMember($group['id'], $change);
|
||||
} else {
|
||||
Group::addMember($group['id'], $change);
|
||||
Model\Group::addMember($group['id'], $change);
|
||||
}
|
||||
|
||||
$members = Contact::getByGroupId($group['id']);
|
||||
$members = Model\Contact::getByGroupId($group['id']);
|
||||
$preselected = [];
|
||||
if (count($members)) {
|
||||
foreach ($members as $member) {
|
||||
|
|
@ -253,7 +249,7 @@ function group_content(App $a) {
|
|||
// Format the data of the group members
|
||||
foreach ($members as $member) {
|
||||
if ($member['url']) {
|
||||
$entry = _contact_detail_for_template($member);
|
||||
$entry = Module\Contact::getContactTemplateVars($member);
|
||||
$entry['label'] = 'members';
|
||||
$entry['photo_menu'] = '';
|
||||
$entry['change_member'] = [
|
||||
|
|
@ -265,12 +261,12 @@ function group_content(App $a) {
|
|||
|
||||
$groupeditor['members'][] = $entry;
|
||||
} else {
|
||||
Group::removeMember($group['id'], $member['id']);
|
||||
Model\Group::removeMember($group['id'], $member['id']);
|
||||
}
|
||||
}
|
||||
|
||||
if ($nogroup) {
|
||||
$r = Contact::getUngroupedList(local_user());
|
||||
$r = Model\Contact::getUngroupedList(local_user());
|
||||
} else {
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
|
||||
intval(local_user())
|
||||
|
|
@ -282,7 +278,7 @@ function group_content(App $a) {
|
|||
// Format the data of the contacts who aren't in the contact group
|
||||
foreach ($r as $member) {
|
||||
if (!in_array($member['id'], $preselected)) {
|
||||
$entry = _contact_detail_for_template($member);
|
||||
$entry = Module\Contact::getContactTemplateVars($member);
|
||||
$entry['label'] = 'contacts';
|
||||
if (!$nogroup)
|
||||
$entry['photo_menu'] = [];
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ function hcard_init(App $a)
|
|||
|
||||
$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->urlpath) ? '/' . $a->urlpath : ''));
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . (($a->getURLPath()) ? '/' . $a->getURLPath() : ''));
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@ function help_content(App $a)
|
|||
$path = '';
|
||||
// looping through the argv keys bigger than 0 to build
|
||||
// a path relative to /help
|
||||
for ($x = 1; $x < argc(); $x ++) {
|
||||
for ($x = 1; $x < $a->argc; $x ++) {
|
||||
if (strlen($path)) {
|
||||
$path .= '/';
|
||||
}
|
||||
|
||||
$path .= argv($x);
|
||||
$path .= $a->getArgumentValue($x);
|
||||
}
|
||||
$title = basename($path);
|
||||
$filename = $path;
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ function home_content(App $a) {
|
|||
$customhome = false;
|
||||
$defaultheader = '<h1>' . (Config::get('config', 'sitename') ? L10n::t('Welcome to %s', Config::get('config', 'sitename')) : '') . '</h1>';
|
||||
|
||||
$homefilepath = $a->basepath . "/home.html";
|
||||
$cssfilepath = $a->basepath . "/home.css";
|
||||
$homefilepath = $a->getBasePath() . "/home.html";
|
||||
$cssfilepath = $a->getBasePath() . "/home.css";
|
||||
if (file_exists($homefilepath)) {
|
||||
$customhome = $homefilepath;
|
||||
if (file_exists($cssfilepath)) {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ function hostxrd_init(App $a)
|
|||
|
||||
$tpl = get_markup_template('xrd_host.tpl');
|
||||
echo replace_macros($tpl, [
|
||||
'$zhost' => $a->get_hostname(),
|
||||
'$zhost' => $a->getHostName(),
|
||||
'$zroot' => System::baseUrl(),
|
||||
'$domain' => System::baseUrl(),
|
||||
'$bigkey' => Salmon::salmonKey(Config::get('system', 'site_pubkey'))]
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ use Friendica\Core\Install;
|
|||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Database\DBStructure;
|
||||
use Friendica\Util\Temporal;
|
||||
|
||||
$install_wizard_pass = 1;
|
||||
|
|
@ -42,7 +43,6 @@ function install_post(App $a) {
|
|||
return;
|
||||
break; // just in case return don't return :)
|
||||
case 3:
|
||||
$urlpath = $a->get_path();
|
||||
$dbhost = notags(trim($_POST['dbhost']));
|
||||
$dbuser = notags(trim($_POST['dbuser']));
|
||||
$dbpass = notags(trim($_POST['dbpass']));
|
||||
|
|
@ -57,7 +57,7 @@ function install_post(App $a) {
|
|||
return;
|
||||
break;
|
||||
case 4:
|
||||
$urlpath = $a->get_path();
|
||||
$urlpath = $a->getURLPath();
|
||||
$dbhost = notags(trim($_POST['dbhost']));
|
||||
$dbuser = notags(trim($_POST['dbuser']));
|
||||
$dbpass = notags(trim($_POST['dbpass']));
|
||||
|
|
@ -70,14 +70,16 @@ function install_post(App $a) {
|
|||
// connect to db
|
||||
DBA::connect($dbhost, $dbuser, $dbpass, $dbdata);
|
||||
|
||||
$errors = Install::createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
|
||||
$install = new Install();
|
||||
|
||||
if ($errors) {
|
||||
$a->data['db_failed'] = $errors;
|
||||
$errors = $install->createConfig($phpath, $urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $timezone, $language, $adminmail, $a->getBasePath());
|
||||
|
||||
if ($errors !== true) {
|
||||
$a->data['data'] = $errors;
|
||||
return;
|
||||
}
|
||||
|
||||
$errors = Install::installDatabaseStructure();
|
||||
$errors = DBStructure::update(false, true, true);
|
||||
|
||||
if ($errors) {
|
||||
$a->data['db_failed'] = $errors;
|
||||
|
|
@ -97,8 +99,6 @@ function install_content(App $a) {
|
|||
$wizard_status = "";
|
||||
$install_title = L10n::t('Friendica Communications Server - Setup');
|
||||
|
||||
|
||||
|
||||
if (x($a->data, 'db_conn_failed')) {
|
||||
$install_wizard_pass = 2;
|
||||
$wizard_status = L10n::t('Could not connect to database.');
|
||||
|
|
@ -125,13 +125,8 @@ function install_content(App $a) {
|
|||
if (DBA::$connected) {
|
||||
$r = q("SELECT COUNT(*) as `total` FROM `user`");
|
||||
if (DBA::isResult($r) && $r[0]['total']) {
|
||||
$tpl = get_markup_template('install.tpl');
|
||||
return replace_macros($tpl, [
|
||||
'$title' => $install_title,
|
||||
'$pass' => '',
|
||||
'$status' => L10n::t('Database already in use.'),
|
||||
'$text' => '',
|
||||
]);
|
||||
$install_wizard_pass = 2;
|
||||
$wizard_status = L10n::t('Database already in use.');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -153,19 +148,21 @@ function install_content(App $a) {
|
|||
|
||||
$phpath = defaults($_POST, 'phpath', 'php');
|
||||
|
||||
list($checks, $checkspassed) = Install::check($phpath);
|
||||
$install = new Install($phpath);
|
||||
|
||||
$status = $install->checkAll($a->getBasePath(), $a->getBaseURL());
|
||||
|
||||
$tpl = get_markup_template('install_checks.tpl');
|
||||
$o .= replace_macros($tpl, [
|
||||
'$title' => $install_title,
|
||||
'$pass' => L10n::t('System check'),
|
||||
'$checks' => $checks,
|
||||
'$passed' => $checkspassed,
|
||||
'$checks' => $install->getChecks(),
|
||||
'$passed' => $status,
|
||||
'$see_install' => L10n::t('Please see the file "INSTALL.txt".'),
|
||||
'$next' => L10n::t('Next'),
|
||||
'$reload' => L10n::t('Check again'),
|
||||
'$phpath' => $phpath,
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$baseurl' => $a->getBaseURL(),
|
||||
]);
|
||||
return $o;
|
||||
}; break;
|
||||
|
|
@ -197,7 +194,7 @@ function install_content(App $a) {
|
|||
|
||||
'$lbl_10' => L10n::t('Please select a default timezone for your website'),
|
||||
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$baseurl' => $a->getBaseURL(),
|
||||
|
||||
'$phpath' => $phpath,
|
||||
|
||||
|
|
@ -235,9 +232,7 @@ function install_content(App $a) {
|
|||
|
||||
'$timezone' => Temporal::getTimezoneField('timezone', L10n::t('Please select a default timezone for your website'), $timezone, ''),
|
||||
'$language' => ['language', L10n::t('System Language:'), 'en', L10n::t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices],
|
||||
'$baseurl' => System::baseUrl(),
|
||||
|
||||
|
||||
'$baseurl' => $a->getBaseURL(),
|
||||
|
||||
'$submit' => L10n::t('Submit'),
|
||||
|
||||
|
|
|
|||
|
|
@ -58,14 +58,9 @@ function invite_post(App $a)
|
|||
}
|
||||
|
||||
if ($invitation_only && ($invites_remaining || is_site_admin())) {
|
||||
$code = autoname(8) . srand(1000, 9999);
|
||||
$code = Friendica\Model\Register::createForInvitation();
|
||||
$nmessage = str_replace('$invite_code', $code, $message);
|
||||
|
||||
$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
|
||||
DBA::escape($code),
|
||||
DBA::escape(DateTimeFormat::utcNow())
|
||||
);
|
||||
|
||||
if (! is_site_admin()) {
|
||||
$invites_remaining --;
|
||||
if ($invites_remaining >= 0) {
|
||||
|
|
|
|||
44
mod/item.php
44
mod/item.php
|
|
@ -39,7 +39,7 @@ require_once 'include/items.php';
|
|||
|
||||
function item_post(App $a) {
|
||||
if (!local_user() && !remote_user()) {
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
require_once 'include/security.php';
|
||||
|
|
@ -154,12 +154,12 @@ function item_post(App $a) {
|
|||
if (($message_id != '') && ($profile_uid != 0)) {
|
||||
if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) {
|
||||
logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Allow commenting if it is an answer to a public post
|
||||
$allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
|
||||
$allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
|
||||
|
||||
// Now check that valid personal details have been provided
|
||||
if (!can_write_wall($profile_uid) && !$allow_comment) {
|
||||
|
|
@ -183,7 +183,7 @@ function item_post(App $a) {
|
|||
$user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
|
||||
|
||||
if (!DBA::isResult($user) && !$parent) {
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
$categories = '';
|
||||
|
|
@ -240,7 +240,7 @@ function item_post(App $a) {
|
|||
$emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , '')));
|
||||
$body = escape_tags(trim(defaults($_REQUEST, 'body' , '')));
|
||||
$network = notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
|
||||
$guid = System::createGUID(32);
|
||||
$guid = System::createUUID();
|
||||
|
||||
$postopts = defaults($_REQUEST, 'postopts', '');
|
||||
|
||||
|
|
@ -343,20 +343,11 @@ function item_post(App $a) {
|
|||
|
||||
$tags = get_tags($body);
|
||||
|
||||
// Add a tag if the parent contact is from OStatus (This will notify them during delivery)
|
||||
if ($parent) {
|
||||
if ($thr_parent_contact['network'] == Protocol::OSTATUS) {
|
||||
$contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
|
||||
if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
|
||||
$tags[] = $contact;
|
||||
}
|
||||
}
|
||||
|
||||
if ($parent_contact['network'] == Protocol::OSTATUS) {
|
||||
$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
|
||||
if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) {
|
||||
$tags[] = $contact;
|
||||
}
|
||||
// Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them)
|
||||
if ($parent && in_array($thr_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
|
||||
$contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
|
||||
if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
|
||||
$tags[] = $contact;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -843,6 +834,10 @@ function item_post(App $a) {
|
|||
|
||||
logger('post_complete');
|
||||
|
||||
if ($api_source) {
|
||||
return $post_id;
|
||||
}
|
||||
|
||||
item_post_return(System::baseUrl(), $api_source, $return_path);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
@ -881,13 +876,13 @@ function item_content(App $a)
|
|||
$o = '';
|
||||
|
||||
if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
|
||||
if (is_ajax()) {
|
||||
if ($a->isAjax()) {
|
||||
$o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
|
||||
} else {
|
||||
$o = drop_item($a->argv[2]);
|
||||
}
|
||||
|
||||
if (is_ajax()) {
|
||||
if ($a->isAjax()) {
|
||||
// ajax return: [<item id>, 0 (no perm) | <owner id>]
|
||||
echo json_encode([intval($a->argv[2]), intval($o)]);
|
||||
killme();
|
||||
|
|
@ -1020,12 +1015,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
|
|||
|
||||
$profile = $contact["url"];
|
||||
$alias = $contact["alias"];
|
||||
$newname = $contact["nick"];
|
||||
|
||||
if (($newname == "") || (($contact["network"] != Protocol::OSTATUS) && ($contact["network"] != Protocol::TWITTER)
|
||||
&& ($contact["network"] != Protocol::STATUSNET))) {
|
||||
$newname = $contact["name"];
|
||||
}
|
||||
$newname = defaults($contact, "name", $contact["nick"]);
|
||||
}
|
||||
|
||||
//if there is an url for this persons profile
|
||||
|
|
|
|||
|
|
@ -8,27 +8,31 @@ use Friendica\Core\L10n;
|
|||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Item;
|
||||
|
||||
function lockview_content(App $a) {
|
||||
|
||||
function lockview_content(App $a)
|
||||
{
|
||||
$type = (($a->argc > 1) ? $a->argv[1] : 0);
|
||||
if (is_numeric($type)) {
|
||||
$item_id = intval($type);
|
||||
$type='item';
|
||||
$type = 'item';
|
||||
} else {
|
||||
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
|
||||
}
|
||||
|
||||
if (!$item_id)
|
||||
if (!$item_id) {
|
||||
killme();
|
||||
}
|
||||
|
||||
if (!in_array($type, ['item','photo','event']))
|
||||
if (!in_array($type, ['item','photo','event'])) {
|
||||
killme();
|
||||
}
|
||||
|
||||
$fields = ['uid', 'private', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
|
||||
$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
|
||||
$condition = ['id' => $item_id];
|
||||
|
||||
if ($type != 'item') {
|
||||
$item = DBA::selectFirst($type, $fields, $condition);
|
||||
} else {
|
||||
$fields[] = 'private';
|
||||
$item = Item::selectFirst($fields, $condition);
|
||||
}
|
||||
|
||||
|
|
@ -43,18 +47,21 @@ function lockview_content(App $a) {
|
|||
killme();
|
||||
}
|
||||
|
||||
|
||||
if (($item['private'] == 1) && empty($item['allow_cid']) && empty($item['allow_gid'])
|
||||
&& empty($item['deny_cid']) && empty($item['deny_gid'])) {
|
||||
|
||||
if (isset($item['private'])
|
||||
&& $item['private'] == 1
|
||||
&& empty($item['allow_cid'])
|
||||
&& empty($item['allow_gid'])
|
||||
&& empty($item['deny_cid'])
|
||||
&& empty($item['deny_gid']))
|
||||
{
|
||||
echo L10n::t('Remote privacy information not available.') . '<br />';
|
||||
killme();
|
||||
}
|
||||
|
||||
$allowed_users = expand_acl($item['allow_cid']);
|
||||
$allowed_users = expand_acl($item['allow_cid']);
|
||||
$allowed_groups = expand_acl($item['allow_gid']);
|
||||
$deny_users = expand_acl($item['deny_cid']);
|
||||
$deny_groups = expand_acl($item['deny_gid']);
|
||||
$deny_users = expand_acl($item['deny_cid']);
|
||||
$deny_groups = expand_acl($item['deny_gid']);
|
||||
|
||||
$o = L10n::t('Visible to:') . '<br />';
|
||||
$l = [];
|
||||
|
|
@ -63,36 +70,44 @@ function lockview_content(App $a) {
|
|||
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
|
||||
DBA::escape(implode(', ', $allowed_groups))
|
||||
);
|
||||
if (DBA::isResult($r))
|
||||
foreach($r as $rr)
|
||||
if (DBA::isResult($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$l[] = '<b>' . $rr['name'] . '</b>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count($allowed_users)) {
|
||||
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
|
||||
DBA::escape(implode(', ',$allowed_users))
|
||||
DBA::escape(implode(', ', $allowed_users))
|
||||
);
|
||||
if (DBA::isResult($r))
|
||||
foreach($r as $rr)
|
||||
if (DBA::isResult($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$l[] = $rr['name'];
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count($deny_groups)) {
|
||||
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
|
||||
DBA::escape(implode(', ', $deny_groups))
|
||||
);
|
||||
if (DBA::isResult($r))
|
||||
foreach($r as $rr)
|
||||
if (DBA::isResult($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count($deny_users)) {
|
||||
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
|
||||
DBA::escape(implode(', ',$deny_users))
|
||||
DBA::escape(implode(', ', $deny_users))
|
||||
);
|
||||
if (DBA::isResult($r))
|
||||
foreach($r as $rr)
|
||||
if (DBA::isResult($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$l[] = '<strike>' . $rr['name'] . '</strike>';
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
echo $o . implode(', ', $l);
|
||||
|
|
|
|||
|
|
@ -59,16 +59,16 @@ function match_content(App $a)
|
|||
}
|
||||
|
||||
if (strlen(Config::get('system', 'directory'))) {
|
||||
$x = Network::post(get_server().'/msearch', $params);
|
||||
$x = Network::post(get_server().'/msearch', $params)->getBody();
|
||||
} else {
|
||||
$x = Network::post(System::baseUrl() . '/msearch', $params);
|
||||
$x = Network::post(System::baseUrl() . '/msearch', $params)->getBody();
|
||||
}
|
||||
|
||||
$j = json_decode($x);
|
||||
|
||||
if ($j->total) {
|
||||
$a->set_pager_total($j->total);
|
||||
$a->set_pager_itemspage($j->items_page);
|
||||
$a->setPagerTotal($j->total);
|
||||
$a->setPagerItemsPage($j->items_page);
|
||||
}
|
||||
|
||||
if (count($j->results)) {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ use Friendica\Model\Mail;
|
|||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Proxy as ProxyUtils;
|
||||
use Friendica\Util\Temporal;
|
||||
use Friendica\Module\Login;
|
||||
|
||||
require_once 'include/conversation.php';
|
||||
|
||||
|
|
@ -46,12 +47,6 @@ function message_init(App $a)
|
|||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
]);
|
||||
|
||||
$end_tpl = get_markup_template('message-end.tpl');
|
||||
$a->page['end'] .= replace_macros($end_tpl, [
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
]);
|
||||
}
|
||||
|
||||
function message_post(App $a)
|
||||
|
|
@ -92,7 +87,7 @@ function message_post(App $a)
|
|||
$a->argc = 2;
|
||||
$a->argv[1] = 'new';
|
||||
} else {
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway($a->cmd . '/' . $ret);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -103,7 +98,7 @@ function message_content(App $a)
|
|||
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
return Login::form();
|
||||
}
|
||||
|
||||
$myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
|
||||
|
|
@ -160,17 +155,28 @@ function message_content(App $a)
|
|||
|
||||
// Now check how the user responded to the confirmation query
|
||||
if (!empty($_REQUEST['canceled'])) {
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/message');
|
||||
}
|
||||
|
||||
$cmd = $a->argv[1];
|
||||
if ($cmd === 'drop') {
|
||||
$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
|
||||
if(!DBA::isResult($message)){
|
||||
info(L10n::t('Conversation not found.') . EOL);
|
||||
goaway('/message');
|
||||
}
|
||||
|
||||
if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
|
||||
info(L10n::t('Message deleted.') . EOL);
|
||||
}
|
||||
|
||||
//goaway(System::baseUrl(true) . '/message' );
|
||||
goaway($_SESSION['return_url']);
|
||||
$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
|
||||
if(!DBA::isResult($conversation)){
|
||||
info(L10n::t('Conversation removed.') . EOL);
|
||||
goaway('/message');
|
||||
}
|
||||
|
||||
goaway('/message/' . $conversation['id'] );
|
||||
} else {
|
||||
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
|
|
@ -184,8 +190,7 @@ function message_content(App $a)
|
|||
info(L10n::t('Conversation removed.') . EOL);
|
||||
}
|
||||
}
|
||||
//goaway(System::baseUrl(true) . '/message' );
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/message' );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -199,13 +204,6 @@ function message_content(App $a)
|
|||
'$linkurl' => L10n::t('Please enter a link URL:')
|
||||
]);
|
||||
|
||||
$tpl = get_markup_template('msg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, [
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => L10n::t('Please enter a link URL:')
|
||||
]);
|
||||
|
||||
$preselect = isset($a->argv[2]) ? [$a->argv[2]] : [];
|
||||
|
||||
$prename = $preurl = $preid = '';
|
||||
|
|
@ -281,7 +279,7 @@ function message_content(App $a)
|
|||
);
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
$a->setPagerTotal($r[0]['total']);
|
||||
}
|
||||
|
||||
$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
|
||||
|
|
@ -344,13 +342,6 @@ function message_content(App $a)
|
|||
'$linkurl' => L10n::t('Please enter a link URL:')
|
||||
]);
|
||||
|
||||
$tpl = get_markup_template('msg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, [
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => L10n::t('Please enter a link URL:')
|
||||
]);
|
||||
|
||||
$mails = [];
|
||||
$seen = 0;
|
||||
$unknown = false;
|
||||
|
|
@ -488,7 +479,7 @@ function render_messages(array $msg, $t)
|
|||
'$id' => $rr['id'],
|
||||
'$from_name' => $participants,
|
||||
'$from_url' => Contact::magicLink($rr['url']),
|
||||
'$from_addr' => $contact['addr'],
|
||||
'$from_addr' => defaults($contact, 'addr', ''),
|
||||
'$sparkle' => ' sparkle',
|
||||
'$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
|
||||
'$subject' => $subject_e,
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ function networkPager($a, $update)
|
|||
$itemspage_network = $a->force_max_items;
|
||||
}
|
||||
|
||||
$a->set_pager_itemspage($itemspage_network);
|
||||
$a->setPagerItemsPage($itemspage_network);
|
||||
|
||||
return sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
}
|
||||
|
|
@ -721,7 +721,7 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
if ($last_received != '') {
|
||||
$last_date = $last_received;
|
||||
$sql_range .= sprintf(" AND $sql_table.`received` < '%s'", DBA::escape($last_received));
|
||||
$a->set_pager_page(1);
|
||||
$a->setPagerPage(1);
|
||||
$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
}
|
||||
break;
|
||||
|
|
@ -729,7 +729,7 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
if ($last_commented != '') {
|
||||
$last_date = $last_commented;
|
||||
$sql_range .= sprintf(" AND $sql_table.`commented` < '%s'", DBA::escape($last_commented));
|
||||
$a->set_pager_page(1);
|
||||
$a->setPagerPage(1);
|
||||
$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
}
|
||||
break;
|
||||
|
|
@ -737,14 +737,14 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
if ($last_created != '') {
|
||||
$last_date = $last_created;
|
||||
$sql_range .= sprintf(" AND $sql_table.`created` < '%s'", DBA::escape($last_created));
|
||||
$a->set_pager_page(1);
|
||||
$a->setPagerPage(1);
|
||||
$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
}
|
||||
break;
|
||||
case 'id':
|
||||
if (($last_id > 0) && ($sql_table == '`thread`')) {
|
||||
$sql_range .= sprintf(" AND $sql_table.`iid` < '%s'", DBA::escape($last_id));
|
||||
$a->set_pager_page(1);
|
||||
$a->setPagerPage(1);
|
||||
$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
}
|
||||
break;
|
||||
|
|
@ -810,7 +810,7 @@ function networkThreadedView(App $a, $update, $parent)
|
|||
}
|
||||
|
||||
// Only show it when unfiltered (no groups, no networks, ...)
|
||||
if (in_array($nets, ['', Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
|
||||
if (in_array($nets, ['', Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
|
||||
if (DBA::isResult($r)) {
|
||||
$top_limit = current($r)['order_date'];
|
||||
$bottom_limit = end($r)['order_date'];
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ function newmember_content(App $a)
|
|||
$o .= '<li>' . '<a target="newmember" href="settings/connectors">' . L10n::t('Importing Emails') . '</a><br />' . L10n::t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</li>' . EOL;
|
||||
}
|
||||
|
||||
$o .= '<li>' . '<a target="newmember" href="contacts">' . L10n::t('Go to Your Contacts Page') . '</a><br />' . L10n::t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog.') . '</li>' . EOL;
|
||||
$o .= '<li>' . '<a target="newmember" href="contact">' . L10n::t('Go to Your Contacts Page') . '</a><br />' . L10n::t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog.') . '</li>' . EOL;
|
||||
$o .= '<li>' . '<a target="newmember" href="directory">' . L10n::t("Go to Your Site's Directory") . '</a><br />' . L10n::t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.') . '</li>' . EOL;
|
||||
$o .= '<li>' . '<a target="newmember" href="contacts">' . L10n::t('Finding New People') . '</a><br />' . L10n::t("On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.") . '</li>' . EOL;
|
||||
$o .= '<li>' . '<a target="newmember" href="contact">' . L10n::t('Finding New People') . '</a><br />' . L10n::t("On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.") . '</li>' . EOL;
|
||||
$o .= '</ul>';
|
||||
$o .= '<h4>' . L10n::t('Groups') . '</h4>';
|
||||
$o .= '<ul>';
|
||||
$o .= '<li>' . '<a target="newmember" href="contacts">' . L10n::t('Group Your Contacts') . '</a><br />' . L10n::t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.') . '</li>' . EOL;
|
||||
$o .= '<li>' . '<a target="newmember" href="contact">' . L10n::t('Group Your Contacts') . '</a><br />' . L10n::t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.') . '</li>' . EOL;
|
||||
|
||||
if (Config::get('system', 'newuser_private')) {
|
||||
$o .= '<li>' . '<a target="newmember" href="help/Groups-and-Privacy">' . L10n::t("Why Aren't My Posts Public?") . '</a><br />' . L10n::t("Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above.") . '</li>' . EOL;
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ function nodeinfo_cron() {
|
|||
logger('local_comments: ' . $local_comments, LOGGER_DEBUG);
|
||||
|
||||
// Now trying to register
|
||||
$url = 'http://the-federation.info/register/'.$a->get_hostname();
|
||||
$url = 'http://the-federation.info/register/'.$a->getHostName();
|
||||
logger('registering url: '.$url, LOGGER_DEBUG);
|
||||
$ret = Network::fetchUrl($url);
|
||||
logger('registering answer: '.$ret, LOGGER_DEBUG);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ function notes_content(App $a, $update = false)
|
|||
$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
|
||||
'wall' => false, 'contact-id'=> $a->contact['id']];
|
||||
|
||||
$a->set_pager_itemspage(40);
|
||||
$a->setPagerItemsPage(40);
|
||||
|
||||
$params = ['order' => ['created' => true],
|
||||
'limit' => [$a->pager['start'], $a->pager['itemspage']]];
|
||||
|
|
@ -70,8 +70,11 @@ function notes_content(App $a, $update = false)
|
|||
$count = 0;
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
$count = count($r);
|
||||
$o .= conversation($a, DBA::toArray($r), 'notes', $update);
|
||||
$notes = DBA::toArray($r);
|
||||
|
||||
$count = count($notes);
|
||||
|
||||
$o .= conversation($a, $notes, 'notes', $update);
|
||||
}
|
||||
|
||||
$o .= alt_pager($a, $count);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ use Friendica\Core\NotificationsManager;
|
|||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Module\Login;
|
||||
|
||||
function notifications_post(App $a)
|
||||
{
|
||||
|
|
@ -21,7 +22,7 @@ function notifications_post(App $a)
|
|||
|
||||
$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
|
||||
|
||||
if ($request_id === "all") {
|
||||
if ($request_id === 'all') {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -65,11 +66,11 @@ function notifications_content(App $a)
|
|||
{
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
return Login::form();
|
||||
}
|
||||
|
||||
$page = (x($_REQUEST,'page') ? $_REQUEST['page'] : 1);
|
||||
$show = (x($_REQUEST,'show') ? $_REQUEST['show'] : 0);
|
||||
$page = defaults($_REQUEST, 'page', 1);
|
||||
$show = defaults($_REQUEST, 'show', 0);
|
||||
|
||||
Nav::setSelected('notifications');
|
||||
|
||||
|
|
@ -87,10 +88,11 @@ function notifications_content(App $a)
|
|||
$perpage = 20;
|
||||
$startrec = ($page * $perpage) - $perpage;
|
||||
|
||||
$notif_header = L10n::t('Notifications');
|
||||
|
||||
// Get introductions
|
||||
if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
|
||||
Nav::setSelected('introductions');
|
||||
$notif_header = L10n::t('Notifications');
|
||||
|
||||
$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
|
||||
|
||||
|
|
@ -115,12 +117,10 @@ function notifications_content(App $a)
|
|||
} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
|
||||
$notif_header = L10n::t('Home Notifications');
|
||||
$notifs = $nm->homeNotifs($show, $startrec, $perpage);
|
||||
|
||||
}
|
||||
|
||||
|
||||
// Set the pager
|
||||
$a->set_pager_itemspage($perpage);
|
||||
$a->setPagerItemsPage($perpage);
|
||||
|
||||
// Add additional informations (needed for json output)
|
||||
$notifs['items_page'] = $a->pager['itemspage'];
|
||||
|
|
@ -133,14 +133,15 @@ function notifications_content(App $a)
|
|||
|
||||
$notif_tpl = get_markup_template('notifications.tpl');
|
||||
|
||||
if (!isset($notifs['ident'])) {
|
||||
logger('Missing data in notifs: ' . System::callstack(20), LOGGER_DEBUG);
|
||||
}
|
||||
$notif_show_lnk = [
|
||||
'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
|
||||
'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
|
||||
];
|
||||
|
||||
// Process the data for template creation
|
||||
if ($notifs['ident'] === 'introductions') {
|
||||
if (defaults($notifs, 'ident', '') === 'introductions') {
|
||||
$sugg = get_markup_template('suggestions.tpl');
|
||||
$tpl = get_markup_template("intros.tpl");
|
||||
$tpl = get_markup_template('intros.tpl');
|
||||
|
||||
// The link to switch between ignored and normal connection requests
|
||||
$notif_show_lnk = [
|
||||
|
|
@ -150,127 +151,121 @@ function notifications_content(App $a)
|
|||
|
||||
// Loop through all introduction notifications.This creates an array with the output html for each
|
||||
// introduction
|
||||
foreach ($notifs['notifications'] as $it) {
|
||||
foreach ($notifs['notifications'] as $notif) {
|
||||
|
||||
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
|
||||
// We have to distinguish between these two because they use different data.
|
||||
switch ($it['label']) {
|
||||
switch ($notif['label']) {
|
||||
case 'friend_suggestion':
|
||||
$notif_content[] = replace_macros($sugg, [
|
||||
'$type' => $it['label'],
|
||||
'$type' => $notif['label'],
|
||||
'$str_notifytype' => L10n::t('Notification type:'),
|
||||
'$notify_type' => $it['notify_type'],
|
||||
'$intro_id' => $it['intro_id'],
|
||||
'$notify_type'=> $notif['notify_type'],
|
||||
'$intro_id' => $notif['intro_id'],
|
||||
'$lbl_madeby' => L10n::t('Suggested by:'),
|
||||
'$madeby' => $it['madeby'],
|
||||
'$madeby_url' => $it['madeby_url'],
|
||||
'$madeby_zrl' => $it['madeby_zrl'],
|
||||
'$madeby_addr' => $it['madeby_addr'],
|
||||
'$contact_id' => $it['contact_id'],
|
||||
'$photo' => $it['photo'],
|
||||
'$fullname' => $it['name'],
|
||||
'$url' => $it['url'],
|
||||
'$zrl' => $it['zrl'],
|
||||
'$lbl_url' => L10n::t('Profile URL'),
|
||||
'$addr' => $it['addr'],
|
||||
'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
|
||||
|
||||
'$knowyou' => $it['knowyou'],
|
||||
'$approve' => L10n::t('Approve'),
|
||||
'$note' => $it['note'],
|
||||
'$request' => $it['request'],
|
||||
'$ignore' => L10n::t('Ignore'),
|
||||
'$discard' => L10n::t('Discard'),
|
||||
'$madeby' => $notif['madeby'],
|
||||
'$madeby_url' => $notif['madeby_url'],
|
||||
'$madeby_zrl' => $notif['madeby_zrl'],
|
||||
'$madeby_addr'=> $notif['madeby_addr'],
|
||||
'$contact_id' => $notif['contact_id'],
|
||||
'$photo' => $notif['photo'],
|
||||
'$fullname' => $notif['name'],
|
||||
'$url' => $notif['url'],
|
||||
'$zrl' => $notif['zrl'],
|
||||
'$lbl_url' => L10n::t('Profile URL'),
|
||||
'$addr' => $notif['addr'],
|
||||
'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
|
||||
'$knowyou' => $notif['knowyou'],
|
||||
'$approve' => L10n::t('Approve'),
|
||||
'$note' => $notif['note'],
|
||||
'$request' => $notif['request'],
|
||||
'$ignore' => L10n::t('Ignore'),
|
||||
'$discard' => L10n::t('Discard'),
|
||||
]);
|
||||
break;
|
||||
|
||||
// Normal connection requests
|
||||
default:
|
||||
$friend_selected = (($it['network'] !== Protocol::OSTATUS) ? ' checked="checked" ' : ' disabled ');
|
||||
$fan_selected = (($it['network'] === Protocol::OSTATUS) ? ' checked="checked" disabled ' : '');
|
||||
$dfrn_tpl = get_markup_template('netfriend.tpl');
|
||||
$friend_selected = (($notif['network'] !== Protocol::OSTATUS) ? ' checked="checked" ' : ' disabled ');
|
||||
$fan_selected = (($notif['network'] === Protocol::OSTATUS) ? ' checked="checked" disabled ' : '');
|
||||
|
||||
$knowyou = '';
|
||||
$lbl_knowyou = '';
|
||||
$dfrn_text = '';
|
||||
$helptext = '';
|
||||
$helptext2 = '';
|
||||
$helptext3 = '';
|
||||
$knowyou = '';
|
||||
$helptext = '';
|
||||
$helptext2 = '';
|
||||
$helptext3 = '';
|
||||
|
||||
if ($it['network'] === Protocol::DFRN || $it['network'] === Protocol::DIASPORA) {
|
||||
if ($it['network'] === Protocol::DFRN) {
|
||||
$lbl_knowyou = L10n::t('Claims to be known to you: ');
|
||||
$knowyou = (($it['knowyou']) ? L10n::t('yes') : L10n::t('no'));
|
||||
$helptext = L10n::t('Shall your connection be bidirectional or not?');
|
||||
$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
|
||||
$helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $it['name']);
|
||||
} else {
|
||||
$knowyou = '';
|
||||
$helptext = L10n::t('Shall your connection be bidirectional or not?');
|
||||
$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
|
||||
$helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $it['name']);
|
||||
}
|
||||
if ($notif['network'] === Protocol::DFRN) {
|
||||
$lbl_knowyou = L10n::t('Claims to be known to you: ');
|
||||
$knowyou = (($notif['knowyou']) ? L10n::t('yes') : L10n::t('no'));
|
||||
$helptext = L10n::t('Shall your connection be bidirectional or not?');
|
||||
$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
|
||||
$helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
|
||||
} elseif ($notif['network'] === Protocol::DIASPORA) {
|
||||
$helptext = L10n::t('Shall your connection be bidirectional or not?');
|
||||
$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
|
||||
$helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
|
||||
}
|
||||
|
||||
$dfrn_text = replace_macros($dfrn_tpl,[
|
||||
'$intro_id' => $it['intro_id'],
|
||||
$dfrn_tpl = get_markup_template('netfriend.tpl');
|
||||
$dfrn_text = replace_macros($dfrn_tpl, [
|
||||
'$intro_id' => $notif['intro_id'],
|
||||
'$friend_selected' => $friend_selected,
|
||||
'$fan_selected' => $fan_selected,
|
||||
'$fan_selected'=> $fan_selected,
|
||||
'$approve_as1' => $helptext,
|
||||
'$approve_as2' => $helptext2,
|
||||
'$approve_as3' => $helptext3,
|
||||
'$as_friend' => L10n::t('Friend'),
|
||||
'$as_fan' => (($it['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
|
||||
'$as_friend' => L10n::t('Friend'),
|
||||
'$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
|
||||
]);
|
||||
|
||||
$header = $it["name"];
|
||||
$header = $notif['name'];
|
||||
|
||||
if ($it["addr"] != "") {
|
||||
$header .= " <".$it["addr"].">";
|
||||
if ($notif['addr'] != '') {
|
||||
$header .= ' <' . $notif['addr'] . '>';
|
||||
}
|
||||
|
||||
$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
|
||||
$header .= ' (' . ContactSelector::networkToName($notif['network'], $notif['url']) . ')';
|
||||
|
||||
if ($it['network'] != Protocol::DIASPORA) {
|
||||
if ($notif['network'] != Protocol::DIASPORA) {
|
||||
$discard = L10n::t('Discard');
|
||||
} else {
|
||||
$discard = '';
|
||||
}
|
||||
|
||||
$notif_content[] = replace_macros($tpl, [
|
||||
'$type' => $it['label'],
|
||||
'$header' => htmlentities($header),
|
||||
'$type' => $notif['label'],
|
||||
'$header' => htmlentities($header),
|
||||
'$str_notifytype' => L10n::t('Notification type:'),
|
||||
'$notify_type' => $it['notify_type'],
|
||||
'$dfrn_text' => $dfrn_text,
|
||||
'$dfrn_id' => $it['dfrn_id'],
|
||||
'$uid' => $it['uid'],
|
||||
'$intro_id' => $it['intro_id'],
|
||||
'$contact_id' => $it['contact_id'],
|
||||
'$photo' => $it['photo'],
|
||||
'$fullname' => $it['name'],
|
||||
'$location' => $it['location'],
|
||||
'$lbl_location' => L10n::t('Location:'),
|
||||
'$about' => $it['about'],
|
||||
'$lbl_about' => L10n::t('About:'),
|
||||
'$keywords' => $it['keywords'],
|
||||
'$lbl_keywords' => L10n::t('Tags:'),
|
||||
'$gender' => $it['gender'],
|
||||
'$lbl_gender' => L10n::t('Gender:'),
|
||||
'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
|
||||
'$url' => $it['url'],
|
||||
'$zrl' => $it['zrl'],
|
||||
'$lbl_url' => L10n::t('Profile URL'),
|
||||
'$addr' => $it['addr'],
|
||||
'$notify_type' => $notif['notify_type'],
|
||||
'$dfrn_text' => $dfrn_text,
|
||||
'$dfrn_id' => $notif['dfrn_id'],
|
||||
'$uid' => $notif['uid'],
|
||||
'$intro_id' => $notif['intro_id'],
|
||||
'$contact_id' => $notif['contact_id'],
|
||||
'$photo' => $notif['photo'],
|
||||
'$fullname' => $notif['name'],
|
||||
'$location' => $notif['location'],
|
||||
'$lbl_location'=> L10n::t('Location:'),
|
||||
'$about' => $notif['about'],
|
||||
'$lbl_about' => L10n::t('About:'),
|
||||
'$keywords' => $notif['keywords'],
|
||||
'$lbl_keywords'=> L10n::t('Tags:'),
|
||||
'$gender' => $notif['gender'],
|
||||
'$lbl_gender' => L10n::t('Gender:'),
|
||||
'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
|
||||
'$url' => $notif['url'],
|
||||
'$zrl' => $notif['zrl'],
|
||||
'$lbl_url' => L10n::t('Profile URL'),
|
||||
'$addr' => $notif['addr'],
|
||||
'$lbl_knowyou' => $lbl_knowyou,
|
||||
'$lbl_network' => L10n::t('Network:'),
|
||||
'$network' => ContactSelector::networkToName($it['network'], $it['url']),
|
||||
'$knowyou' => $knowyou,
|
||||
'$approve' => L10n::t('Approve'),
|
||||
'$note' => $it['note'],
|
||||
'$ignore' => L10n::t('Ignore'),
|
||||
'$discard' => $discard,
|
||||
|
||||
'$network' => ContactSelector::networkToName($notif['network'], $notif['url']),
|
||||
'$knowyou' => $knowyou,
|
||||
'$approve' => L10n::t('Approve'),
|
||||
'$note' => $notif['note'],
|
||||
'$ignore' => L10n::t('Ignore'),
|
||||
'$discard' => $discard,
|
||||
]);
|
||||
break;
|
||||
}
|
||||
|
|
@ -280,57 +275,47 @@ function notifications_content(App $a)
|
|||
info(L10n::t('No introductions.') . EOL);
|
||||
}
|
||||
|
||||
// Normal notifications (no introductions)
|
||||
} else {
|
||||
// The template files we need in different cases for formatting the content
|
||||
$tpl_item_like = 'notifications_likes_item.tpl';
|
||||
$tpl_item_dislike = 'notifications_dislikes_item.tpl';
|
||||
$tpl_item_attend = 'notifications_attend_item.tpl';
|
||||
$tpl_item_attendno = 'notifications_attend_item.tpl';
|
||||
$tpl_item_attendmaybe = 'notifications_attend_item.tpl';
|
||||
$tpl_item_friend = 'notifications_friends_item.tpl';
|
||||
$tpl_item_comment = 'notifications_comments_item.tpl';
|
||||
$tpl_item_post = 'notifications_posts_item.tpl';
|
||||
$tpl_item_notify = 'notify.tpl';
|
||||
|
||||
// Normal notifications (no introductions)
|
||||
} elseif (!empty($notifs['notifications'])) {
|
||||
// Loop trough ever notification This creates an array with the output html for each
|
||||
// notification and apply the correct template according to the notificationtype (label).
|
||||
foreach ($notifs['notifications'] as $it) {
|
||||
foreach ($notifs['notifications'] as $notif) {
|
||||
$notification_templates = [
|
||||
'like' => 'notifications_likes_item.tpl',
|
||||
'dislike' => 'notifications_dislikes_item.tpl',
|
||||
'attend' => 'notifications_attend_item.tpl',
|
||||
'attendno' => 'notifications_attend_item.tpl',
|
||||
'attendmaybe' => 'notifications_attend_item.tpl',
|
||||
'friend' => 'notifications_friends_item.tpl',
|
||||
'comment' => 'notifications_comments_item.tpl',
|
||||
'post' => 'notifications_posts_item.tpl',
|
||||
'notify' => 'notify.tpl',
|
||||
];
|
||||
|
||||
// We use the notification label to get the correct template file
|
||||
$tpl_var_name = 'tpl_item_'.$it['label'];
|
||||
$tpl_notif = get_markup_template($$tpl_var_name);
|
||||
$tpl_notif = get_markup_template($notification_templates[$notif['label']]);
|
||||
|
||||
$notif_content[] = replace_macros($tpl_notif,[
|
||||
'$item_label' => $it['label'],
|
||||
'$item_link' => $it['link'],
|
||||
'$item_image' => $it['image'],
|
||||
'$item_url' => $it['url'],
|
||||
'$item_text' => $it['text'],
|
||||
'$item_when' => $it['when'],
|
||||
'$item_ago' => $it['ago'],
|
||||
'$item_seen' => $it['seen'],
|
||||
$notif_content[] = replace_macros($tpl_notif, [
|
||||
'$item_label' => $notif['label'],
|
||||
'$item_link' => $notif['link'],
|
||||
'$item_image' => $notif['image'],
|
||||
'$item_url' => $notif['url'],
|
||||
'$item_text' => $notif['text'],
|
||||
'$item_when' => $notif['when'],
|
||||
'$item_ago' => $notif['ago'],
|
||||
'$item_seen' => $notif['seen'],
|
||||
]);
|
||||
}
|
||||
|
||||
$notif_show_lnk = [
|
||||
'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
|
||||
'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
|
||||
];
|
||||
|
||||
// Output if there aren't any notifications available
|
||||
if (count($notifs['notifications']) == 0) {
|
||||
$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
|
||||
}
|
||||
} else {
|
||||
$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
|
||||
}
|
||||
|
||||
$o .= replace_macros($notif_tpl, [
|
||||
'$notif_header' => $notif_header,
|
||||
'$tabs' => $tabs,
|
||||
'$notif_content' => $notif_content,
|
||||
'$notif_header' => $notif_header,
|
||||
'$tabs' => $tabs,
|
||||
'$notif_content' => $notif_content,
|
||||
'$notif_nocontent' => $notif_nocontent,
|
||||
'$notif_show_lnk' => $notif_show_lnk,
|
||||
'$notif_paginate' => alt_pager($a, count($notif_content))
|
||||
'$notif_show_lnk' => $notif_show_lnk,
|
||||
'$notif_paginate' => alt_pager($a, count($notif_content))
|
||||
]);
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function notify_init(App $a)
|
|||
$nm->setSeen($note);
|
||||
|
||||
// The friendica client has problems with the GUID. this is some workaround
|
||||
if ($a->is_friendica_app()) {
|
||||
if ($a->isFriendicaApp()) {
|
||||
require_once("include/items.php");
|
||||
$urldata = parse_url($note['link']);
|
||||
$guid = basename($urldata["path"]);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ function openid_content(App $a) {
|
|||
|
||||
if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
|
||||
|
||||
$openid = new LightOpenID($a->get_hostname());
|
||||
$openid = new LightOpenID($a->getHostName());
|
||||
|
||||
if($openid->validate()) {
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ function opensearch_content(App $a) {
|
|||
|
||||
$o = replace_macros($tpl, [
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$nodename' => $a->get_hostname(),
|
||||
'$nodename' => $a->getHostName(),
|
||||
]);
|
||||
|
||||
echo $o;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function ostatus_subscribe_content(App $a) {
|
|||
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/ostatus_subscribe');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
@ -44,14 +44,14 @@ function ostatus_subscribe_content(App $a) {
|
|||
$api = $contact["baseurl"]."/api/";
|
||||
|
||||
// Fetching friends
|
||||
$data = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
|
||||
$curlResult = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
|
||||
|
||||
if (!$data["success"]) {
|
||||
if (!$curlResult->isSuccess()) {
|
||||
PConfig::delete($uid, "ostatus", "legacy_contact");
|
||||
return $o.L10n::t("Couldn't fetch friends for contact.");
|
||||
}
|
||||
|
||||
PConfig::set($uid, "ostatus", "legacy_friends", $data["body"]);
|
||||
PConfig::set($uid, "ostatus", "legacy_friends", $curlResult->getBody());
|
||||
}
|
||||
|
||||
$friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends"));
|
||||
|
|
@ -72,8 +72,8 @@ function ostatus_subscribe_content(App $a) {
|
|||
|
||||
$o .= "<p>".$counter."/".$total.": ".$url;
|
||||
|
||||
$data = Probe::uri($url);
|
||||
if ($data["network"] == Protocol::OSTATUS) {
|
||||
$curlResult = Probe::uri($url);
|
||||
if ($curlResult["network"] == Protocol::OSTATUS) {
|
||||
$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
|
||||
if ($result["success"]) {
|
||||
$o .= " - ".L10n::t("success");
|
||||
|
|
|
|||
|
|
@ -8,128 +8,128 @@
|
|||
* information and does format this information to BBCode
|
||||
*
|
||||
* @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
|
||||
*/
|
||||
|
||||
*/
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Addon;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\ParseUrl;
|
||||
|
||||
require_once("include/items.php");
|
||||
|
||||
function parse_url_content(App $a) {
|
||||
require_once 'include/items.php';
|
||||
|
||||
function parse_url_content(App $a)
|
||||
{
|
||||
$text = null;
|
||||
$str_tags = "";
|
||||
$str_tags = '';
|
||||
|
||||
$br = "\n";
|
||||
|
||||
if (!empty($_GET["binurl"])) {
|
||||
$url = trim(hex2bin($_GET["binurl"]));
|
||||
if (!empty($_GET['binurl'])) {
|
||||
$url = trim(hex2bin($_GET['binurl']));
|
||||
} else {
|
||||
$url = trim($_GET["url"]);
|
||||
$url = trim($_GET['url']);
|
||||
}
|
||||
|
||||
if (!empty($_GET["title"])) {
|
||||
$title = strip_tags(trim($_GET["title"]));
|
||||
if (!empty($_GET['title'])) {
|
||||
$title = strip_tags(trim($_GET['title']));
|
||||
}
|
||||
|
||||
if (!empty($_GET["description"])) {
|
||||
$text = strip_tags(trim($_GET["description"]));
|
||||
if (!empty($_GET['description'])) {
|
||||
$text = strip_tags(trim($_GET['description']));
|
||||
}
|
||||
|
||||
if (!empty($_GET["tags"])) {
|
||||
$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
|
||||
if (!empty($_GET['tags'])) {
|
||||
$arr_tags = ParseUrl::convertTagsToArray($_GET['tags']);
|
||||
if (count($arr_tags)) {
|
||||
$str_tags = $br . implode(" ", $arr_tags) . $br;
|
||||
$str_tags = $br . implode(' ', $arr_tags) . $br;
|
||||
}
|
||||
}
|
||||
|
||||
// Add url scheme if it is missing
|
||||
$arrurl = parse_url($url);
|
||||
if (!x($arrurl, "scheme")) {
|
||||
if (x($arrurl, "host")) {
|
||||
$url = "http:".$url;
|
||||
if (!x($arrurl, 'scheme')) {
|
||||
if (x($arrurl, 'host')) {
|
||||
$url = 'http:' . $url;
|
||||
} else {
|
||||
$url = "http://".$url;
|
||||
$url = 'http://' . $url;
|
||||
}
|
||||
}
|
||||
|
||||
logger("prse_url: " . $url);
|
||||
logger($url);
|
||||
|
||||
// Check if the URL is an image, video or audio file. If so format
|
||||
// the URL with the corresponding BBCode media tag
|
||||
$redirects = 0;
|
||||
// Fetch the header of the URL
|
||||
$result = Network::curl($url, false, $redirects, ["novalidate" => true, "nobody" => true]);
|
||||
if($result["success"]) {
|
||||
$curlResponse = Network::curl($url, false, $redirects, ['novalidate' => true, 'nobody' => true]);
|
||||
|
||||
if ($curlResponse->isSuccess()) {
|
||||
// Convert the header fields into an array
|
||||
$hdrs = [];
|
||||
$h = explode("\n", $result["header"]);
|
||||
$h = explode("\n", $curlResponse->getHeader());
|
||||
foreach ($h as $l) {
|
||||
$header = array_map("trim", explode(":", trim($l), 2));
|
||||
$header = array_map('trim', explode(':', trim($l), 2));
|
||||
if (count($header) == 2) {
|
||||
list($k,$v) = $header;
|
||||
list($k, $v) = $header;
|
||||
$hdrs[$k] = $v;
|
||||
}
|
||||
}
|
||||
if (array_key_exists("Content-Type", $hdrs)) {
|
||||
$type = $hdrs["Content-Type"];
|
||||
$type = null;
|
||||
if (array_key_exists('Content-Type', $hdrs)) {
|
||||
$type = $hdrs['Content-Type'];
|
||||
}
|
||||
if ($type) {
|
||||
if(stripos($type, "image/") !== false) {
|
||||
echo $br . "[img]" . $url . "[/img]" . $br;
|
||||
killme();
|
||||
if (stripos($type, 'image/') !== false) {
|
||||
echo $br . '[img]' . $url . '[/img]' . $br;
|
||||
exit();
|
||||
}
|
||||
if (stripos($type, "video/") !== false) {
|
||||
echo $br . "[video]" . $url . "[/video]" . $br;
|
||||
killme();
|
||||
if (stripos($type, 'video/') !== false) {
|
||||
echo $br . '[video]' . $url . '[/video]' . $br;
|
||||
exit();
|
||||
}
|
||||
if (stripos($type, "audio/") !== false) {
|
||||
echo $br . "[audio]" . $url . "[/audio]" . $br;
|
||||
killme();
|
||||
if (stripos($type, 'audio/') !== false) {
|
||||
echo $br . '[audio]' . $url . '[/audio]' . $br;
|
||||
exit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$template = "[bookmark=%s]%s[/bookmark]%s";
|
||||
$template = '[bookmark=%s]%s[/bookmark]%s';
|
||||
|
||||
$arr = ["url" => $url, "text" => ""];
|
||||
$arr = ['url' => $url, 'text' => ''];
|
||||
|
||||
Addon::callHooks("parse_link", $arr);
|
||||
Addon::callHooks('parse_link', $arr);
|
||||
|
||||
if (strlen($arr["text"])) {
|
||||
echo $arr["text"];
|
||||
killme();
|
||||
if (strlen($arr['text'])) {
|
||||
echo $arr['text'];
|
||||
exit();
|
||||
}
|
||||
|
||||
// If there is already some content information submitted we don't
|
||||
// need to parse the url for content.
|
||||
if (!empty($url) && !empty($title) && !empty($text)) {
|
||||
$title = str_replace(["\r", "\n"], ['', ''], $title);
|
||||
|
||||
$title = str_replace(["\r","\n"],["",""],$title);
|
||||
|
||||
$text = "[quote]" . trim($text) . "[/quote]" . $br;
|
||||
$text = '[quote]' . trim($text) . '[/quote]' . $br;
|
||||
|
||||
$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
|
||||
|
||||
logger("parse_url (unparsed): returns: " . $result);
|
||||
logger('(unparsed): returns: ' . $result);
|
||||
|
||||
echo $result;
|
||||
killme();
|
||||
exit();
|
||||
}
|
||||
|
||||
// Fetch the information directly from the webpage
|
||||
$siteinfo = ParseUrl::getSiteinfo($url);
|
||||
|
||||
unset($siteinfo["keywords"]);
|
||||
unset($siteinfo['keywords']);
|
||||
|
||||
// Format it as BBCode attachment
|
||||
$info = add_page_info_data($siteinfo);
|
||||
|
||||
echo $info;
|
||||
|
||||
killme();
|
||||
exit();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -151,7 +151,8 @@ function parse_url_content(App $a) {
|
|||
* @todo Remove this function after all Addons has been changed to use
|
||||
* ParseUrl::getSiteinfoCached
|
||||
*/
|
||||
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
|
||||
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true)
|
||||
{
|
||||
$siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed);
|
||||
return $siteinfo;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ function photo_init(App $a)
|
|||
// If the photo is public and there is an existing photo directory store the photo there
|
||||
if ($public and $file != '') {
|
||||
// If the photo path isn't there, try to create it
|
||||
$basepath = $a->get_basepath();
|
||||
$basepath = $a->getBasePath();
|
||||
if (!is_dir($basepath . "/photo")) {
|
||||
if (is_writable($basepath)) {
|
||||
mkdir($basepath . "/photo");
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ function photos_post(App $a)
|
|||
}
|
||||
|
||||
// Check if the user has responded to a delete confirmation query
|
||||
if ($_REQUEST['canceled']) {
|
||||
if (!empty($_REQUEST['canceled'])) {
|
||||
goaway($_SESSION['photo_return']);
|
||||
}
|
||||
|
||||
|
|
@ -472,7 +472,7 @@ function photos_post(App $a)
|
|||
$uri = Item::newURI($page_owner_uid);
|
||||
|
||||
$arr = [];
|
||||
$arr['guid'] = System::createGUID(32);
|
||||
$arr['guid'] = System::createUUID();
|
||||
$arr['uid'] = $page_owner_uid;
|
||||
$arr['uri'] = $uri;
|
||||
$arr['parent-uri'] = $uri;
|
||||
|
|
@ -651,7 +651,7 @@ function photos_post(App $a)
|
|||
$uri = Item::newURI($page_owner_uid);
|
||||
|
||||
$arr = [];
|
||||
$arr['guid'] = System::createGUID(32);
|
||||
$arr['guid'] = System::createUUID();
|
||||
$arr['uid'] = $page_owner_uid;
|
||||
$arr['uri'] = $uri;
|
||||
$arr['parent-uri'] = $uri;
|
||||
|
|
@ -762,12 +762,14 @@ function photos_post(App $a)
|
|||
$filesize = $ret['filesize'];
|
||||
$type = $ret['type'];
|
||||
$error = UPLOAD_ERR_OK;
|
||||
} else {
|
||||
} elseif (!empty($_FILES['userfile'])) {
|
||||
$src = $_FILES['userfile']['tmp_name'];
|
||||
$filename = basename($_FILES['userfile']['name']);
|
||||
$filesize = intval($_FILES['userfile']['size']);
|
||||
$type = $_FILES['userfile']['type'];
|
||||
$error = $_FILES['userfile']['error'];
|
||||
} else {
|
||||
$error = UPLOAD_ERR_NO_FILE;
|
||||
}
|
||||
|
||||
if ($error !== UPLOAD_ERR_OK) {
|
||||
|
|
@ -887,7 +889,7 @@ function photos_post(App $a)
|
|||
$arr['coord'] = $lat . ' ' . $lon;
|
||||
}
|
||||
|
||||
$arr['guid'] = System::createGUID(32);
|
||||
$arr['guid'] = System::createUUID();
|
||||
$arr['uid'] = $page_owner_uid;
|
||||
$arr['uri'] = $uri;
|
||||
$arr['parent-uri'] = $uri;
|
||||
|
|
@ -1141,8 +1143,8 @@ function photos_content(App $a)
|
|||
DBA::escape($album)
|
||||
);
|
||||
if (DBA::isResult($r)) {
|
||||
$a->set_pager_total(count($r));
|
||||
$a->set_pager_itemspage(20);
|
||||
$a->setPagerTotal(count($r));
|
||||
$a->setPagerItemsPage(20);
|
||||
}
|
||||
|
||||
/// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
|
||||
|
|
@ -1391,7 +1393,7 @@ function photos_content(App $a)
|
|||
$link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]);
|
||||
|
||||
$condition = ["`parent` = ? AND `parent` != `id`", $link_item['parent']];
|
||||
$a->set_pager_total(DBA::count('item', $condition));
|
||||
$a->setPagerTotal(DBA::count('item', $condition));
|
||||
|
||||
$params = ['order' => ['id'], 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
|
||||
$result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
|
||||
|
|
@ -1633,7 +1635,7 @@ function photos_content(App $a)
|
|||
'$paginate' => $paginate,
|
||||
]);
|
||||
|
||||
$a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="photo" />' . "\n";
|
||||
$a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="summary_large_image" />' . "\n";
|
||||
$a->page['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
|
||||
$a->page['htmlhead'] .= '<meta name="twitter:image" content="' . $photo["href"] . '" />' . "\n";
|
||||
$a->page['htmlhead'] .= '<meta name="twitter:image:width" content="' . $photo["width"] . '" />' . "\n";
|
||||
|
|
@ -1653,8 +1655,8 @@ function photos_content(App $a)
|
|||
);
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
$a->set_pager_total(count($r));
|
||||
$a->set_pager_itemspage(20);
|
||||
$a->setPagerTotal(count($r));
|
||||
$a->setPagerItemsPage(20);
|
||||
}
|
||||
|
||||
$r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
|
||||
|
|
|
|||
25
mod/ping.php
25
mod/ping.php
|
|
@ -202,11 +202,7 @@ function ping_init(App $a)
|
|||
$mail_count = count($mails);
|
||||
|
||||
if (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE && is_site_admin()) {
|
||||
$regs = q(
|
||||
"SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`
|
||||
FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
|
||||
WHERE `contact`.`self` = 1"
|
||||
);
|
||||
$regs = Friendica\Model\Register::getPending();
|
||||
|
||||
if (DBA::isResult($regs)) {
|
||||
$register_count = count($regs);
|
||||
|
|
@ -350,7 +346,7 @@ function ping_init(App $a)
|
|||
$regularnotifications = (!empty($_GET['uid']) && !empty($_GET['_']));
|
||||
|
||||
foreach ($notifs as $notif) {
|
||||
if ($a->is_friendica_app() || !$regularnotifications) {
|
||||
if ($a->isFriendicaApp() || !$regularnotifications) {
|
||||
$notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
|
||||
}
|
||||
|
||||
|
|
@ -510,16 +506,17 @@ function ping_get_notifications($uid)
|
|||
* @brief Backward-compatible XML formatting for ping.php output
|
||||
* @deprecated
|
||||
*
|
||||
* @param array $data The initial ping data array
|
||||
* @param int $sysnotify Number of unseen system notifications
|
||||
* @param array $notifs Complete list of notification
|
||||
* @param array $sysmsgs List of system notice messages
|
||||
* @param array $sysmsgs_info List of system info messages
|
||||
* @param int $groups_unseen Number of unseen group items
|
||||
* @param int $forums_unseen Number of unseen forum items
|
||||
* @param array $data The initial ping data array
|
||||
* @param int $sysnotify_count Number of unseen system notifications
|
||||
* @param array $notifs Complete list of notification
|
||||
* @param array $sysmsgs List of system notice messages
|
||||
* @param array $sysmsgs_info List of system info messages
|
||||
* @param int $groups_unseen Number of unseen group items
|
||||
* @param int $forums_unseen Number of unseen forum items
|
||||
*
|
||||
* @return array XML-transform ready data array
|
||||
*/
|
||||
function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
|
||||
function ping_format_xml_data($data, $sysnotify_count, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
|
||||
{
|
||||
$notifications = [];
|
||||
foreach ($notifs as $key => $notif) {
|
||||
|
|
|
|||
39
mod/poke.php
39
mod/poke.php
|
|
@ -24,19 +24,20 @@ use Friendica\Model\Item;
|
|||
require_once 'include/security.php';
|
||||
require_once 'include/items.php';
|
||||
|
||||
function poke_init(App $a) {
|
||||
|
||||
function poke_init(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$uid = local_user();
|
||||
$verb = notags(trim($_GET['verb']));
|
||||
|
||||
if (!$verb) {
|
||||
if (empty($_GET['verb'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$verb = notags(trim($_GET['verb']));
|
||||
|
||||
$verbs = get_poke_verbs();
|
||||
|
||||
if (!array_key_exists($verb, $verbs)) {
|
||||
|
|
@ -96,10 +97,10 @@ function poke_init(App $a) {
|
|||
|
||||
$arr = [];
|
||||
|
||||
$arr['guid'] = System::createGUID(32);
|
||||
$arr['guid'] = System::createUUID();
|
||||
$arr['uid'] = $uid;
|
||||
$arr['uri'] = $uri;
|
||||
$arr['parent-uri'] = ($parent_uri ? $parent_uri : $uri);
|
||||
$arr['parent-uri'] = (!empty($parent_uri) ? $parent_uri : $uri);
|
||||
$arr['wall'] = 1;
|
||||
$arr['contact-id'] = $poster['id'];
|
||||
$arr['owner-name'] = $poster['name'];
|
||||
|
|
@ -121,7 +122,7 @@ function poke_init(App $a) {
|
|||
$arr['origin'] = 1;
|
||||
$arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . L10n::t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
|
||||
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . System::baseUrl() . '/contact/' . $target['id'] . '</id>';
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $target['url'] . '</id>';
|
||||
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
|
||||
|
||||
$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
|
||||
|
|
@ -137,10 +138,8 @@ function poke_init(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
function poke_content(App $a) {
|
||||
|
||||
function poke_content(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
|
|
@ -149,17 +148,17 @@ function poke_content(App $a) {
|
|||
$name = '';
|
||||
$id = '';
|
||||
|
||||
if (intval($_GET['c'])) {
|
||||
$r = q("SELECT `id`,`name` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($_GET['c']),
|
||||
intval(local_user())
|
||||
);
|
||||
if (DBA::isResult($r)) {
|
||||
$name = $item['name'];
|
||||
$id = $item['id'];
|
||||
}
|
||||
if (empty($_GET['c'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$contact = DBA::selectFirst('contact', ['id', 'name'], ['id' => $_GET['c'], 'uid' => local_user()]);
|
||||
if (!DBA::isResult($contact)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$name = $contact['name'];
|
||||
$id = $contact['id'];
|
||||
|
||||
$base = System::baseUrl();
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use Friendica\Model\Profile;
|
|||
use Friendica\Module\Login;
|
||||
use Friendica\Protocol\DFRN;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
|
||||
function profile_init(App $a)
|
||||
{
|
||||
|
|
@ -49,6 +50,16 @@ function profile_init(App $a)
|
|||
DFRN::autoRedir($a, $which);
|
||||
}
|
||||
|
||||
if (ActivityPub::isRequest()) {
|
||||
$user = DBA::selectFirst('user', ['uid'], ['nickname' => $which]);
|
||||
if (DBA::isResult($user)) {
|
||||
$data = ActivityPub\Transmitter::getProfile($user['uid']);
|
||||
echo json_encode($data);
|
||||
header('Content-Type: application/activity+json');
|
||||
exit();
|
||||
}
|
||||
}
|
||||
|
||||
Profile::load($a, $which, $profile);
|
||||
|
||||
$blocked = !local_user() && !remote_user() && Config::get('system', 'block_public');
|
||||
|
|
@ -80,7 +91,7 @@ function profile_init(App $a)
|
|||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''));
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''));
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
|
||||
|
|
@ -296,7 +307,7 @@ function profile_content(App $a, $update = 0)
|
|||
$itemspage_network = $a->force_max_items;
|
||||
}
|
||||
|
||||
$a->set_pager_itemspage($itemspage_network);
|
||||
$a->setPagerItemsPage($itemspage_network);
|
||||
|
||||
$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
|
||||
|
|
|
|||
|
|
@ -317,7 +317,6 @@ function profile_photo_crop_ui_head(App $a, Image $image)
|
|||
}
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
|
||||
$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
|
||||
|
||||
$imagecrop = [
|
||||
'hash' => $hash,
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use Friendica\Model\Profile;
|
|||
use Friendica\Network\Probe;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Temporal;
|
||||
use Friendica\Module\Login;
|
||||
|
||||
function profiles_init(App $a) {
|
||||
|
||||
|
|
@ -509,7 +510,7 @@ function profiles_content(App $a) {
|
|||
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
return Login::form();
|
||||
}
|
||||
|
||||
$o = '';
|
||||
|
|
@ -527,9 +528,6 @@ function profiles_content(App $a) {
|
|||
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), [
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
]);
|
||||
$a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), [
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
]);
|
||||
|
||||
$opt_tpl = get_markup_template("profile-hide-friends.tpl");
|
||||
$hide_friends = replace_macros($opt_tpl,[
|
||||
|
|
@ -618,10 +616,10 @@ function profiles_content(App $a) {
|
|||
'$country_name' => ['country_name', L10n::t('Country:'), $r[0]['country-name']],
|
||||
'$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
|
||||
'$gender' => ContactSelector::gender($r[0]['gender']),
|
||||
'$marital' => ContactSelector::maritalStatus($r[0]['marital']),
|
||||
'$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => $r[0]['marital']],
|
||||
'$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
|
||||
'$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))],
|
||||
'$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
|
||||
'$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => $r[0]['sexual']],
|
||||
'$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
|
||||
'$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
|
||||
'$homepage' => ['homepage', L10n::t('Homepage URL:'), $r[0]['homepage']],
|
||||
|
|
@ -669,7 +667,7 @@ function profiles_content(App $a) {
|
|||
$profiles = '';
|
||||
foreach ($r as $rr) {
|
||||
$profiles .= replace_macros($tpl, [
|
||||
'$photo' => $a->remove_baseurl($rr['thumb']),
|
||||
'$photo' => $a->removeBaseURL($rr['thumb']),
|
||||
'$id' => $rr['id'],
|
||||
'$alt' => L10n::t('Profile Image'),
|
||||
'$profile_name' => $rr['profile-name'],
|
||||
|
|
|
|||
|
|
@ -104,8 +104,9 @@ function pubsubhubbub_init(App $a) {
|
|||
// we don't actually enforce the lease time because GNU
|
||||
// Social/StatusNet doesn't honour it (yet)
|
||||
|
||||
$body = Network::fetchUrl($hub_callback . "?" . $params);
|
||||
$ret = $a->get_curl_code();
|
||||
$fetchResult = Network::fetchUrlFull($hub_callback . "?" . $params);
|
||||
$body = $fetchResult->getBody();
|
||||
$ret = $fetchResult->getReturnCode();
|
||||
|
||||
// give up if the HTTP return code wasn't a success (2xx)
|
||||
if ($ret < 200 || $ret > 299) {
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ function redir_init(App $a) {
|
|||
}
|
||||
|
||||
if (remote_user()) {
|
||||
$host = substr(System::baseUrl() . ($a->urlpath ? '/' . $a->urlpath : ''), strpos(System::baseUrl(), '://') + 3);
|
||||
$host = substr(System::baseUrl() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos(System::baseUrl(), '://') + 3);
|
||||
$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
|
||||
|
||||
// On a local instance we have to check if the local user has already authenticated
|
||||
|
|
|
|||
|
|
@ -11,10 +11,8 @@ use Friendica\Core\L10n;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Model;
|
||||
use Friendica\Module\Tos;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
|
||||
|
|
@ -67,7 +65,7 @@ function register_post(App $a)
|
|||
$arr['language'] = L10n::getBrowserLanguage();
|
||||
|
||||
try {
|
||||
$result = User::create($arr);
|
||||
$result = Model\User::create($arr);
|
||||
} catch (Exception $e) {
|
||||
notice($e->getMessage());
|
||||
return;
|
||||
|
|
@ -76,7 +74,7 @@ function register_post(App $a)
|
|||
$user = $result['user'];
|
||||
|
||||
if ($netpublish && intval(Config::get('config', 'register_policy')) !== REGISTER_APPROVE) {
|
||||
$url = System::baseUrl() . '/profile/' . $user['nickname'];
|
||||
$url = $a->getBaseUrl() . '/profile/' . $user['nickname'];
|
||||
Worker::add(PRIORITY_LOW, "Directory", $url);
|
||||
}
|
||||
|
||||
|
|
@ -86,18 +84,22 @@ function register_post(App $a)
|
|||
|
||||
if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
|
||||
if ($using_invites && $invite_id) {
|
||||
q("delete * from register where hash = '%s' limit 1", DBA::escape($invite_id));
|
||||
Model\Register::deleteByHash($invite_id);
|
||||
PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
|
||||
}
|
||||
|
||||
// Only send a password mail when the password wasn't manually provided
|
||||
if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
|
||||
$res = User::sendRegisterOpenEmail(
|
||||
$user['email'], Config::get('config', 'sitename'), System::baseUrl(), $user['username'], $result['password'], $user);
|
||||
$res = Model\User::sendRegisterOpenEmail(
|
||||
$user,
|
||||
Config::get('config', 'sitename'),
|
||||
$a->getBaseUrl(),
|
||||
$result['password']
|
||||
);
|
||||
|
||||
if ($res) {
|
||||
info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
goaway();
|
||||
} else {
|
||||
notice(
|
||||
L10n::t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
|
||||
|
|
@ -108,27 +110,19 @@ function register_post(App $a)
|
|||
}
|
||||
} else {
|
||||
info(L10n::t('Registration successful.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
goaway();
|
||||
}
|
||||
} elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) {
|
||||
if (!strlen(Config::get('config', 'admin_email'))) {
|
||||
notice(L10n::t('Your registration can not be processed.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
goaway();
|
||||
}
|
||||
|
||||
$hash = random_string();
|
||||
$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ",
|
||||
DBA::escape($hash),
|
||||
DBA::escape(DateTimeFormat::utcNow()),
|
||||
intval($user['uid']),
|
||||
DBA::escape($result['password']),
|
||||
DBA::escape(Config::get('system', 'language')),
|
||||
DBA::escape($_POST['permonlybox'])
|
||||
);
|
||||
Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']);
|
||||
|
||||
// invite system
|
||||
if ($using_invites && $invite_id) {
|
||||
q("DELETE * FROM `register` WHERE `hash` = '%s' LIMIT 1", DBA::escape($invite_id));
|
||||
Model\Register::deleteByHash($invite_id);
|
||||
PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
|
||||
}
|
||||
|
||||
|
|
@ -146,9 +140,9 @@ function register_post(App $a)
|
|||
'source_name' => $user['username'],
|
||||
'source_mail' => $user['email'],
|
||||
'source_nick' => $user['nickname'],
|
||||
'source_link' => System::baseUrl() . "/admin/users/",
|
||||
'link' => System::baseUrl() . "/admin/users/",
|
||||
'source_photo' => System::baseUrl() . "/photo/avatar/" . $user['uid'] . ".jpg",
|
||||
'source_link' => $a->getBaseUrl() . "/admin/users/",
|
||||
'link' => $a->getBaseUrl() . "/admin/users/",
|
||||
'source_photo' => $a->getBaseUrl() . "/photo/avatar/" . $user['uid'] . ".jpg",
|
||||
'to_email' => $admin['email'],
|
||||
'uid' => $admin['uid'],
|
||||
'language' => $admin['language'] ? $admin['language'] : 'en',
|
||||
|
|
@ -156,11 +150,15 @@ function register_post(App $a)
|
|||
]);
|
||||
}
|
||||
// send notification to the user, that the registration is pending
|
||||
User::sendRegisterPendingEmail(
|
||||
$user['email'], Config::get('config', 'sitename'), $user['username']);
|
||||
Model\User::sendRegisterPendingEmail(
|
||||
$user,
|
||||
Config::get('config', 'sitename'),
|
||||
$a->getBaseURL(),
|
||||
$result['password']
|
||||
);
|
||||
|
||||
info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
goaway();
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
@ -274,7 +272,7 @@ function register_content(App $a)
|
|||
'$passwords' => $passwords,
|
||||
'$password1' => ['password1', L10n::t('New Password:'), '', L10n::t('Leave empty for an auto generated password.')],
|
||||
'$password2' => ['confirm', L10n::t('Confirm:'), '', ''],
|
||||
'$nickdesc' => L10n::t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@%s</strong>\'.', $a->get_hostname()),
|
||||
'$nickdesc' => L10n::t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@%s</strong>\'.', $a->getHostName()),
|
||||
'$nicklabel' => L10n::t('Choose a nickname: '),
|
||||
'$photo' => $photo,
|
||||
'$publish' => $profile_publish,
|
||||
|
|
@ -283,7 +281,7 @@ function register_content(App $a)
|
|||
'$email' => $email,
|
||||
'$nickname' => $nickname,
|
||||
'$license' => $license,
|
||||
'$sitename' => $a->get_hostname(),
|
||||
'$sitename' => $a->getHostName(),
|
||||
'$importh' => L10n::t('Import'),
|
||||
'$importt' => L10n::t('Import your profile to this friendica instance'),
|
||||
'$showtoslink' => Config::get('system', 'tosdisplay'),
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ use Friendica\Core\L10n;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Register;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Module\Login;
|
||||
|
||||
|
|
@ -18,51 +19,35 @@ function user_allow($hash)
|
|||
{
|
||||
$a = get_app();
|
||||
|
||||
$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
|
||||
DBA::escape($hash)
|
||||
);
|
||||
|
||||
|
||||
$register = Register::getByHash($hash);
|
||||
if (!DBA::isResult($register)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||
intval($register[0]['uid'])
|
||||
);
|
||||
|
||||
$user = User::getById($register['uid']);
|
||||
if (!DBA::isResult($user)) {
|
||||
killme();
|
||||
exit();
|
||||
}
|
||||
|
||||
$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
|
||||
DBA::escape($register[0]['hash'])
|
||||
);
|
||||
Register::deleteByHash($hash);
|
||||
|
||||
DBA::update('user', ['blocked' => false, 'verified' => true], ['uid' => $register['uid']]);
|
||||
|
||||
$r = q("UPDATE `user` SET `blocked` = 0, `verified` = 1 WHERE `uid` = %d",
|
||||
intval($register[0]['uid'])
|
||||
);
|
||||
$profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid'], 'is-default' => true]);
|
||||
|
||||
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1",
|
||||
intval($user[0]['uid'])
|
||||
);
|
||||
if (DBA::isResult($r) && $r[0]['net-publish']) {
|
||||
$url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
|
||||
if ($url && strlen(Config::get('system', 'directory'))) {
|
||||
Worker::add(PRIORITY_LOW, "Directory", $url);
|
||||
}
|
||||
if (DBA::isResult($profile) && $profile['net-publish'] && Config::get('system', 'directory')) {
|
||||
$url = System::baseUrl() . '/profile/' . $user['nickname'];
|
||||
Worker::add(PRIORITY_LOW, "Directory", $url);
|
||||
}
|
||||
|
||||
L10n::pushLang($register[0]['language']);
|
||||
L10n::pushLang($register['language']);
|
||||
|
||||
$res = User::sendRegisterOpenEmail(
|
||||
$user[0]['email'],
|
||||
$user,
|
||||
Config::get('config', 'sitename'),
|
||||
System::baseUrl(),
|
||||
$user[0]['username'],
|
||||
$register[0]['password'],
|
||||
$user[0]);
|
||||
$a->getBaseUrl(),
|
||||
defaults($register, 'password', 'Sent in a previous email')
|
||||
);
|
||||
|
||||
L10n::popLang();
|
||||
|
||||
|
|
@ -77,22 +62,21 @@ function user_allow($hash)
|
|||
// allowed to have friends on this system
|
||||
function user_deny($hash)
|
||||
{
|
||||
$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
|
||||
DBA::escape($hash)
|
||||
);
|
||||
|
||||
$register = Register::getByHash($hash);
|
||||
if (!DBA::isResult($register)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||
intval($register[0]['uid'])
|
||||
);
|
||||
$user = User::getById($register['uid']);
|
||||
if (!DBA::isResult($user)) {
|
||||
exit();
|
||||
}
|
||||
|
||||
DBA::delete('user', ['uid' => $register[0]['uid']]);
|
||||
DBA::delete('register', ['hash' => $register[0]['hash']]);
|
||||
DBA::delete('user', ['uid' => $register['uid']]);
|
||||
|
||||
notice(L10n::t('Registration revoked for %s', $user[0]['username']) . EOL);
|
||||
Register::deleteByHash($register['hash']);
|
||||
|
||||
notice(L10n::t('Registration revoked for %s', $user['username']) . EOL);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -100,17 +84,16 @@ function regmod_content(App $a)
|
|||
{
|
||||
if (!local_user()) {
|
||||
info(L10n::t('Please login.') . EOL);
|
||||
$o = '<br /><br />' . Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
|
||||
return $o;
|
||||
return Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
|
||||
}
|
||||
|
||||
if ((!is_site_admin()) || (x($_SESSION, 'submanage') && intval($_SESSION['submanage']))) {
|
||||
if (!is_site_admin() || !empty($_SESSION['submanage'])) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return '';
|
||||
}
|
||||
|
||||
if ($a->argc != 3) {
|
||||
killme();
|
||||
exit();
|
||||
}
|
||||
|
||||
$cmd = $a->argv[1];
|
||||
|
|
@ -118,13 +101,11 @@ function regmod_content(App $a)
|
|||
|
||||
if ($cmd === 'deny') {
|
||||
user_deny($hash);
|
||||
goaway(System::baseUrl() . "/admin/users/");
|
||||
killme();
|
||||
goaway('admin/users/');
|
||||
}
|
||||
|
||||
if ($cmd === 'allow') {
|
||||
user_allow($hash);
|
||||
goaway(System::baseUrl() . "/admin/users/");
|
||||
killme();
|
||||
goaway('admin/users/');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ function repair_ostatus_content(App $a) {
|
|||
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway($_SESSION['return_url']);
|
||||
goaway('/ostatus_repair');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@ function salmon_post(App $a, $xml = '') {
|
|||
$base = null;
|
||||
|
||||
// figure out where in the DOM tree our data is hiding
|
||||
if($dom->provenance->data)
|
||||
if (!empty($dom->provenance->data))
|
||||
$base = $dom->provenance;
|
||||
elseif($dom->env->data)
|
||||
elseif (!empty($dom->env->data))
|
||||
$base = $dom->env;
|
||||
elseif($dom->data)
|
||||
elseif (!empty($dom->data))
|
||||
$base = $dom;
|
||||
|
||||
if(! $base) {
|
||||
if (empty($base)) {
|
||||
logger('unable to locate salmon data in xml ');
|
||||
System::httpExit(400);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ use Friendica\Model\User;
|
|||
use Friendica\Protocol\Email;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\Temporal;
|
||||
use Friendica\Module\Login;
|
||||
|
||||
function get_theme_config_file($theme)
|
||||
{
|
||||
|
|
@ -546,7 +547,7 @@ function settings_post(App $a)
|
|||
if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
|
||||
if (Network::isUrlValid($openid)) {
|
||||
logger('updating openidserver');
|
||||
$open_id_obj = new LightOpenID($a->get_hostname());
|
||||
$open_id_obj = new LightOpenID($a->getHostName());
|
||||
$open_id_obj->identity = $openid;
|
||||
$openidserver = $open_id_obj->discover($open_id_obj->identity);
|
||||
} else {
|
||||
|
|
@ -658,7 +659,7 @@ function settings_content(App $a)
|
|||
|
||||
if (!local_user()) {
|
||||
//notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
return Login::form();
|
||||
}
|
||||
|
||||
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
|
||||
|
|
@ -982,11 +983,6 @@ function settings_content(App $a)
|
|||
'$theme_config' => $theme_config,
|
||||
]);
|
||||
|
||||
$tpl = get_markup_template('settings/display_end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, [
|
||||
'$theme' => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes]
|
||||
]);
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
@ -1140,8 +1136,8 @@ function settings_content(App $a)
|
|||
$tpl_addr = get_markup_template('settings/nick_set.tpl');
|
||||
|
||||
$prof_addr = replace_macros($tpl_addr,[
|
||||
'$desc' => L10n::t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname),
|
||||
'$basepath' => $a->get_hostname()
|
||||
'$desc' => L10n::t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->getHostName() . $a->getURLPath(), System::baseUrl() . '/profile/' . $nickname),
|
||||
'$basepath' => $a->getHostName()
|
||||
]);
|
||||
|
||||
$stpl = get_markup_template('settings/settings.tpl');
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ EOT;
|
|||
|
||||
$arr = [];
|
||||
|
||||
$arr['guid'] = System::createGUID(32);
|
||||
$arr['guid'] = System::createUUID();
|
||||
$arr['uri'] = $uri;
|
||||
$arr['uid'] = $owner_uid;
|
||||
$arr['contact-id'] = $contact['id'];
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ EOT;
|
|||
|
||||
$arr = [];
|
||||
|
||||
$arr['guid'] = System::createGUID(32);
|
||||
$arr['guid'] = System::createUUID();
|
||||
$arr['uri'] = $uri;
|
||||
$arr['uid'] = $owner_uid;
|
||||
$arr['contact-id'] = $contact['id'];
|
||||
|
|
|
|||
168
mod/unfollow.php
168
mod/unfollow.php
|
|
@ -10,132 +10,144 @@ use Friendica\Core\System;
|
|||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Profile;
|
||||
use Friendica\Model\User;
|
||||
|
||||
function unfollow_post(App $a)
|
||||
function unfollow_post()
|
||||
{
|
||||
$return_url = 'contacts';
|
||||
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway($_SESSION['return_url']);
|
||||
notice(L10n::t('Permission denied.'));
|
||||
goaway('/login');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
if ($_REQUEST['cancel']) {
|
||||
goaway($_SESSION['return_url']);
|
||||
}
|
||||
|
||||
$uid = local_user();
|
||||
$url = notags(trim($_REQUEST['url']));
|
||||
$return_url = $_SESSION['return_url'];
|
||||
$url = notags(trim(defaults($_REQUEST, 'url', '')));
|
||||
|
||||
$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
|
||||
$uid, Contact::FRIEND, normalise_link($url),
|
||||
normalise_link($url), $url, Protocol::STATUSNET];
|
||||
$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
|
||||
$uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
|
||||
normalise_link($url), $url];
|
||||
$contact = DBA::selectFirst('contact', [], $condition);
|
||||
|
||||
if (!DBA::isResult($contact)) {
|
||||
notice(L10n::t("Contact wasn't found or can't be unfollowed."));
|
||||
} else {
|
||||
if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
|
||||
$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||
WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
if (DBA::isResult($r)) {
|
||||
Contact::terminateFriendship($r[0], $contact);
|
||||
}
|
||||
}
|
||||
DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
|
||||
|
||||
info(L10n::t('Contact unfollowed').EOL);
|
||||
goaway(System::baseUrl().'/contacts/'.$contact['id']);
|
||||
notice(L10n::t("You aren't following this contact."));
|
||||
goaway($return_url);
|
||||
// NOTREACHED
|
||||
}
|
||||
goaway($return_url);
|
||||
|
||||
if (!empty($_REQUEST['cancel'])) {
|
||||
goaway($return_url . '/' . $contact['id']);
|
||||
}
|
||||
|
||||
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
|
||||
notice(L10n::t('Unfollowing is currently not supported by your network.'));
|
||||
goaway($return_url . '/' . $contact['id']);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
$dissolve = ($contact['rel'] == Contact::SHARING);
|
||||
|
||||
$owner = User::getOwnerDataById($uid);
|
||||
if ($owner) {
|
||||
Contact::terminateFriendship($owner, $contact, $dissolve);
|
||||
}
|
||||
|
||||
// Sharing-only contacts get deleted as there no relationship any more
|
||||
if ($dissolve) {
|
||||
Contact::remove($contact['id']);
|
||||
$return_path = 'contacts';
|
||||
} else {
|
||||
DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
|
||||
$return_path = 'contact/' . $contact['id'];
|
||||
}
|
||||
|
||||
info(L10n::t('Contact unfollowed'));
|
||||
goaway($return_path);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
function unfollow_content(App $a)
|
||||
{
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway($_SESSION['return_url']);
|
||||
$return_url = 'contacts';
|
||||
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.'));
|
||||
goaway('/login');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
$uid = local_user();
|
||||
$url = notags(trim($_REQUEST['url']));
|
||||
|
||||
$submit = L10n::t('Submit Request');
|
||||
|
||||
$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
|
||||
local_user(), Contact::FRIEND, normalise_link($url),
|
||||
normalise_link($url), $url, Protocol::STATUSNET];
|
||||
$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
|
||||
local_user(), Contact::SHARING, Contact::FRIEND, normalise_link($url),
|
||||
normalise_link($url), $url];
|
||||
|
||||
$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
|
||||
|
||||
if (!DBA::isResult($contact)) {
|
||||
notice(L10n::t("You aren't a friend of this contact.").EOL);
|
||||
$submit = "";
|
||||
notice(L10n::t("You aren't following this contact."));
|
||||
goaway($return_url);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
if (!in_array($contact['network'], [Protocol::DIASPORA, Protocol::OSTATUS, Protocol::DFRN])) {
|
||||
notice(L10n::t("Unfollowing is currently not supported by your network.").EOL);
|
||||
$submit = "";
|
||||
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
|
||||
notice(L10n::t('Unfollowing is currently not supported by your network.'));
|
||||
goaway('contact/' . $contact['id']);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
$request = System::baseUrl()."/unfollow";
|
||||
$request = System::baseUrl() . '/unfollow';
|
||||
$tpl = get_markup_template('auto_request.tpl');
|
||||
|
||||
$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
|
||||
$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
|
||||
|
||||
if (!$r) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
goaway($_SESSION['return_url']);
|
||||
if (!DBA::isResult($self)) {
|
||||
notice(L10n::t('Permission denied.'));
|
||||
goaway($return_url);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
$myaddr = $r[0]["url"];
|
||||
|
||||
// Makes the connection request for friendica contacts easier
|
||||
$_SESSION["fastlane"] = $contact["url"];
|
||||
$_SESSION['fastlane'] = $contact['url'];
|
||||
|
||||
$header = L10n::t("Disconnect/Unfollow");
|
||||
$header = L10n::t('Disconnect/Unfollow');
|
||||
|
||||
$o = replace_macros($tpl, [
|
||||
'$header' => htmlentities($header),
|
||||
'$desc' => "",
|
||||
'$pls_answer' => "",
|
||||
'$does_know_you' => "",
|
||||
'$add_note' => "",
|
||||
'$page_desc' => "",
|
||||
'$friendica' => "",
|
||||
'$statusnet' => "",
|
||||
'$diaspora' => "",
|
||||
'$diasnote' => "",
|
||||
'$your_address' => L10n::t('Your Identity Address:'),
|
||||
'$invite_desc' => "",
|
||||
'$emailnet' => "",
|
||||
'$submit' => $submit,
|
||||
'$cancel' => L10n::t('Cancel'),
|
||||
'$nickname' => "",
|
||||
'$name' => $contact["name"],
|
||||
'$url' => $contact["url"],
|
||||
'$zrl' => Contact::magicLink($contact["url"]),
|
||||
'$url_label' => L10n::t("Profile URL"),
|
||||
'$myaddr' => $myaddr,
|
||||
'$request' => $request,
|
||||
'$keywords' => "",
|
||||
'$keywords_label' => ""
|
||||
$o = replace_macros($tpl, [
|
||||
'$header' => htmlentities($header),
|
||||
'$desc' => '',
|
||||
'$pls_answer' => '',
|
||||
'$does_know_you' => '',
|
||||
'$add_note' => '',
|
||||
'$page_desc' => '',
|
||||
'$friendica' => '',
|
||||
'$statusnet' => '',
|
||||
'$diaspora' => '',
|
||||
'$diasnote' => '',
|
||||
'$your_address' => L10n::t('Your Identity Address:'),
|
||||
'$invite_desc' => '',
|
||||
'$emailnet' => '',
|
||||
'$submit' => L10n::t('Submit Request'),
|
||||
'$cancel' => L10n::t('Cancel'),
|
||||
'$nickname' => '',
|
||||
'$name' => $contact['name'],
|
||||
'$url' => $contact['url'],
|
||||
'$zrl' => Contact::magicLink($contact['url']),
|
||||
'$url_label' => L10n::t('Profile URL'),
|
||||
'$myaddr' => $self['url'],
|
||||
'$request' => $request,
|
||||
'$keywords' => '',
|
||||
'$keywords_label'=> ''
|
||||
]);
|
||||
|
||||
$a->page['aside'] = "";
|
||||
Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
|
||||
$a->page['aside'] = '';
|
||||
Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
|
||||
|
||||
$o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
|
||||
|
||||
// Show last public posts
|
||||
$o .= Contact::getPostsFromUrl($contact["url"]);
|
||||
$o .= Contact::getPostsFromUrl($contact['url']);
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
38
mod/update_contacts.php
Normal file
38
mod/update_contacts.php
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<?php
|
||||
|
||||
// See update_profile.php for documentation
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Module\Contact;
|
||||
|
||||
function update_contacts_content(App $a)
|
||||
{
|
||||
header("Content-type: text/html");
|
||||
echo "<!DOCTYPE html><html><body>\r\n";
|
||||
echo "<section>";
|
||||
|
||||
if ($_GET["force"] == 1) {
|
||||
$text = Contact::content($a, true);
|
||||
} else {
|
||||
$text = '';
|
||||
}
|
||||
|
||||
if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
|
||||
$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
|
||||
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
}
|
||||
|
||||
echo str_replace("\t", " ", $text);
|
||||
echo "</section>";
|
||||
echo "</body></html>\r\n";
|
||||
killme();
|
||||
}
|
||||
|
|
@ -105,12 +105,6 @@ function videos_init(App $a)
|
|||
$a->page['htmlhead'] .= replace_macros($tpl,[
|
||||
'$baseurl' => System::baseUrl(),
|
||||
]);
|
||||
|
||||
$tpl = get_markup_template("videos_end.tpl");
|
||||
$a->page['end'] .= replace_macros($tpl,[
|
||||
'$baseurl' => System::baseUrl(),
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
@ -347,8 +341,8 @@ function videos_content(App $a)
|
|||
);
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
$a->set_pager_total(count($r));
|
||||
$a->set_pager_itemspage(20);
|
||||
$a->setPagerTotal(count($r));
|
||||
$a->setPagerItemsPage(20);
|
||||
}
|
||||
|
||||
$r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`,
|
||||
|
|
@ -367,11 +361,12 @@ function videos_content(App $a)
|
|||
foreach ($r as $rr) {
|
||||
$alt_e = $rr['filename'];
|
||||
/// @todo The album isn't part of the above query. This seems to be some unfinished code that needs to be reworked completely.
|
||||
$rr['album'] = '';
|
||||
$name_e = $rr['album'];
|
||||
|
||||
$videos[] = [
|
||||
'id' => $rr['id'],
|
||||
'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
|
||||
'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'],
|
||||
'title' => L10n::t('View Video'),
|
||||
'src' => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
|
||||
'alt' => $alt_e,
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ function viewcontacts_content(App $a)
|
|||
DBA::escape(Protocol::OSTATUS)
|
||||
);
|
||||
if (DBA::isResult($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
$a->setPagerTotal($r[0]['total']);
|
||||
}
|
||||
|
||||
$r = q("SELECT * FROM `contact`
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ function viewsrc_content(App $a)
|
|||
$item = Item::selectFirst(['body'], ['uid' => local_user(), 'id' => $item_id]);
|
||||
|
||||
if (DBA::isResult($item)) {
|
||||
if (is_ajax()) {
|
||||
if ($a->isAjax()) {
|
||||
echo str_replace("\n", '<br />', $item['body']);
|
||||
killme();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -120,13 +120,6 @@ function wallmessage_content(App $a) {
|
|||
'$linkurl' => L10n::t('Please enter a link URL:')
|
||||
]);
|
||||
|
||||
$tpl = get_markup_template('wallmsg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, [
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$nickname' => $user['nickname'],
|
||||
'$linkurl' => L10n::t('Please enter a link URL:')
|
||||
]);
|
||||
|
||||
$tpl = get_markup_template('wallmessage.tpl');
|
||||
$o = replace_macros($tpl, [
|
||||
'$header' => L10n::t('Send Private Message'),
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ function webfinger_content(App $a)
|
|||
$o = '<h3>Webfinger Diagnostic</h3>';
|
||||
|
||||
$o .= '<form action="webfinger" method="get">';
|
||||
$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
|
||||
$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') .'" />';
|
||||
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
|
||||
|
||||
$o .= '<br /><br />';
|
||||
|
|
|
|||
14
mod/xrd.php
14
mod/xrd.php
|
|
@ -13,7 +13,7 @@ function xrd_init(App $a)
|
|||
{
|
||||
if ($a->argv[0] == 'xrd') {
|
||||
if (empty($_GET['uri'])) {
|
||||
killme();
|
||||
System::httpExit(404);
|
||||
}
|
||||
|
||||
$uri = urldecode(notags(trim($_GET['uri'])));
|
||||
|
|
@ -24,7 +24,7 @@ function xrd_init(App $a)
|
|||
}
|
||||
} else {
|
||||
if (empty($_GET['resource'])) {
|
||||
killme();
|
||||
System::httpExit(404);
|
||||
}
|
||||
|
||||
$uri = urldecode(notags(trim($_GET['resource'])));
|
||||
|
|
@ -48,16 +48,16 @@ function xrd_init(App $a)
|
|||
|
||||
$user = DBA::selectFirst('user', [], ['nickname' => $name]);
|
||||
if (!DBA::isResult($user)) {
|
||||
killme();
|
||||
System::httpExit(404);
|
||||
}
|
||||
|
||||
$profile_url = System::baseUrl().'/profile/'.$user['nickname'];
|
||||
|
||||
$alias = str_replace('/profile/', '/~', $profile_url);
|
||||
|
||||
$addr = 'acct:'.$user['nickname'].'@'.$a->get_hostname();
|
||||
if ($a->get_path()) {
|
||||
$addr .= '/'.$a->get_path();
|
||||
$addr = 'acct:'.$user['nickname'].'@'.$a->getHostName();
|
||||
if ($a->getURLPath()) {
|
||||
$addr .= '/'.$a->getURLPath();
|
||||
}
|
||||
|
||||
if ($mode == 'xml') {
|
||||
|
|
@ -80,6 +80,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
|
|||
['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
|
||||
['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
|
||||
['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
|
||||
['rel' => 'self', 'type' => 'application/activity+json', 'href' => $profile_url],
|
||||
['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
|
||||
['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
|
||||
['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
|
||||
|
|
@ -92,6 +93,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
|
|||
['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
|
||||
]
|
||||
];
|
||||
|
||||
echo json_encode($json);
|
||||
killme();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue