mirror of
https://github.com/friendica/friendica
synced 2024-12-29 16:42:18 +00:00
61693419e8
* [diaspora]: Maybe SimpleXMLElement is the right type-hint? * Changes proposed + pre-renaming: - pre-renamed $db -> $connection - added TODOs for not allowing bad method invocations (there is a BadMethodCallException in SPL) * If no record is found, below $r[0] will fail with a E_NOTICE and the code doesn't behave as expected. * Ops, one more left ... * Continued: - added documentation for Contact::updateSslPolicy() method - added type-hint for $contact of same method - empty lines added + TODO where the bug origins that $item has no element 'body' * Added empty lines for better readability * Cleaned up: - no more x() (deprecated) usage but empty() instead - fixed mixing of space/tab indending - merged else/if block goether in elseif() (lesser nested code blocks) * Re-fixed DBM -> DBA switch * Fixes/rewrites: - use empty()/isset() instead of deprecated x() - merged 2 nested if() blocks into one - avoided nested if() block inside else block by rewriting it to elseif() - $contact_id is an integer, let's test on > 0 here - added a lot spaces and some empty lines for better readability * Rewrite: - moved all CONTACT_* constants from boot.php to Contact class * CR request: - renamed Contact::CONTACT_IS_* -> Contact::* ;-) * Rewrites: - moved PAGE_* to Friendica\Model\Profile class - fixed mixure with "Contact::* rewrite" * Ops, one still there (return is no function) * Rewrite to Proxy class: - introduced new Friendica\Network\Proxy class for in exchange of proxy_*() functions - moved also all PROXY_* constants there as Proxy::* - removed now no longer needed mod/proxy.php loading as composer's auto-load will do this for us - renamed those proxy_*() functions to better names: + proxy_init() -> Proxy::init() (public) + proxy_url() -> Proxy::proxifyUrl() (public) + proxy_parse_html() -> Proxy::proxifyHtml() (public) + proxy_is_local_image() -> Proxy::isLocalImage() (private) + proxy_parse_query() -> Proxy::parseQuery() (private) + proxy_img_cb() -> Proxy::replaceUrl() (private) * CR request: - moved all PAGE_* constants to Friendica\Model\Contact class - fixed all references of both classes * Ops, need to set $a here ... * CR request: - moved Proxy class to Friendica\Module - extended BaseModule * Ops, no need for own instance of $a when self::getApp() is around. * Proxy-rewrite: - proxy_url() and proxy_parse_html() are both non-module functions (now methods) - so they must be splitted into a seperate class - also the SIZE_* and DEFAULT_TIME constants are both not relevant to module * No instances from utility classes * Fixed error: - proxify*() is now located in `Friendica\Util\ProxyUtils` * Moved back to original place, ops? How did they move here? Well, it was not intended by me. * Removed duplicate (left-over from split) constants and static array. Thank to MrPetovan finding it. * Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils. * Rewrite: - stopped using deprecated NETWORK_* constants, now Protocol::* should be used - still left them intact for slow/lazy developers ... * Ops, was added accidentally ... * Ops, why these wrong moves? * Ops, one to much (thanks to MrPetovan) * Ops, wrong moving ... * moved back to original place ... * spaces added * empty lines add for better readability. * convertered spaces -> tab for code indenting. * CR request: Add space between if and brace. * CR requests fixed + move reverted - ops, src/Module/*.php has been moved to src/Network/ accidentally - reverted some parts in src/Database/DBA.php as pointed out by Annando - removed internal TODO items - added some spaces for better readability
122 lines
3.4 KiB
PHP
122 lines
3.4 KiB
PHP
<?php
|
|
/**
|
|
* @file mod/suggest.php
|
|
*/
|
|
|
|
use Friendica\App;
|
|
use Friendica\Content\ContactSelector;
|
|
use Friendica\Content\Widget;
|
|
use Friendica\Core\L10n;
|
|
use Friendica\Core\System;
|
|
use Friendica\Database\DBA;
|
|
use Friendica\Model\Contact;
|
|
use Friendica\Model\GContact;
|
|
use Friendica\Util\Proxy as ProxyUtils;
|
|
|
|
function suggest_init(App $a)
|
|
{
|
|
if (! local_user()) {
|
|
return;
|
|
}
|
|
|
|
if (x($_GET,'ignore') && intval($_GET['ignore'])) {
|
|
// Check if we should do HTML-based delete confirmation
|
|
if ($_REQUEST['confirm']) {
|
|
// <form> can't take arguments in its "action" parameter
|
|
// so add any arguments as hidden inputs
|
|
$query = explode_querystring($a->query_string);
|
|
$inputs = [];
|
|
foreach ($query['args'] as $arg) {
|
|
if (strpos($arg, 'confirm=') === false) {
|
|
$arg_parts = explode('=', $arg);
|
|
$inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
|
|
}
|
|
}
|
|
|
|
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
|
|
'$method' => 'get',
|
|
'$message' => L10n::t('Do you really want to delete this suggestion?'),
|
|
'$extra_inputs' => $inputs,
|
|
'$confirm' => L10n::t('Yes'),
|
|
'$confirm_url' => $query['base'],
|
|
'$confirm_name' => 'confirmed',
|
|
'$cancel' => L10n::t('Cancel'),
|
|
]);
|
|
$a->error = 1; // Set $a->error so the other module functions don't execute
|
|
return;
|
|
}
|
|
// Now check how the user responded to the confirmation query
|
|
if (!$_REQUEST['canceled']) {
|
|
DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_GET['ignore']]);
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
function suggest_content(App $a)
|
|
{
|
|
$o = '';
|
|
|
|
if (! local_user()) {
|
|
notice(L10n::t('Permission denied.') . EOL);
|
|
return;
|
|
}
|
|
|
|
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
|
|
|
|
$a->page['aside'] .= Widget::findPeople();
|
|
$a->page['aside'] .= Widget::follow();
|
|
|
|
|
|
$r = GContact::suggestionQuery(local_user());
|
|
|
|
if (! DBA::isResult($r)) {
|
|
$o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
|
|
return $o;
|
|
}
|
|
|
|
$id = 0;
|
|
|
|
foreach ($r as $rr) {
|
|
|
|
$connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
|
|
$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
|
|
$photo_menu = [
|
|
'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])],
|
|
'follow' => [L10n::t("Connect/Follow"), $connlnk],
|
|
'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
|
|
];
|
|
|
|
$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
|
|
|
|
$entry = [
|
|
'url' => Contact::magicLink($rr['url']),
|
|
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
|
|
'img_hover' => $rr['url'],
|
|
'name' => $contact_details['name'],
|
|
'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
|
|
'details' => $contact_details['location'],
|
|
'tags' => $contact_details['keywords'],
|
|
'about' => $contact_details['about'],
|
|
'account_type' => Contact::getAccountType($contact_details),
|
|
'ignlnk' => $ignlnk,
|
|
'ignid' => $rr['id'],
|
|
'conntxt' => L10n::t('Connect'),
|
|
'connlnk' => $connlnk,
|
|
'photo_menu' => $photo_menu,
|
|
'ignore' => L10n::t('Ignore/Hide'),
|
|
'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
|
|
'id' => ++$id,
|
|
];
|
|
$entries[] = $entry;
|
|
}
|
|
|
|
$tpl = get_markup_template('viewcontact_template.tpl');
|
|
|
|
$o .= replace_macros($tpl,[
|
|
'$title' => L10n::t('Friend Suggestions'),
|
|
'$contacts' => $entries,
|
|
]);
|
|
|
|
return $o;
|
|
}
|