use Friendica\App;
use Friendica\Content\ForumManager;
use Friendica\Core\Addon;
-use Friendica\Core\L10n;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
use Friendica\Model\GContact;
-use Friendica\Model\Profile;
-
-require_once "mod/proxy.php";
+use Friendica\Util\Proxy as ProxyUtils;
function vier_init(App $a)
{
$a->set_template_engine('smarty3');
- if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
+ if (!empty($a->argv[0]) && $a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
vier_community_info();
$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
// Hide the left menu bar
/// @TODO maybe move this static array out where it should belong?
- if (($a->page['aside'] == "") && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications",
+ if (empty($a->page['aside']) && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications",
"probe", "webfinger", "login", "invite", "credits"])) {
$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
}
$r = GContact::suggestionQuery(local_user(), 0, 9);
$tpl = get_markup_template('ch_directory_item.tpl');
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$aside['$comunity_profiles_title'] = L10n::t('Community Profiles');
$aside['$comunity_profiles_items'] = [];
foreach ($r as $rr) {
$entry = replace_macros($tpl, [
'$id' => $rr['id'],
- //'$profile_link' => Profile::zrl($rr['url']),
'$profile_link' => 'follow/?url='.urlencode($rr['url']),
- '$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_MICRO),
+ '$photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_MICRO),
'$alt_text' => $rr['name'],
]);
$aside['$comunity_profiles_items'][] = $entry;
9
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$aside['$lastusers_title'] = L10n::t('Last users');
$aside['$lastusers_items'] = [];
//right_aside FIND FRIENDS
if ($show_friends && local_user()) {
$nv = [];
- $nv['title'] = ["", L10n::t('Find Friends'), "", ""];
- $nv['directory'] = ['directory', L10n::t('Local Directory'), "", ""];
- $nv['global_directory'] = [get_server(), L10n::t('Global Directory'), "", ""];
- $nv['match'] = ['match', L10n::t('Similar Interests'), "", ""];
- $nv['suggest'] = ['suggest', L10n::t('Friend Suggestions'), "", ""];
- $nv['invite'] = ['invite', L10n::t('Invite Friends'), "", ""];
-
- $nv['search'] = '<form name="simple_bar" method="get" action="dirfind">
- <span class="sbox_l"></span>
- <span class="sbox">
- <input type="text" name="search" size="13" maxlength="50">
- </span>
- <span class="sbox_r" id="srch_clear"></span>';
+ $nv['findpeople'] = L10n::t('Find People');
+ $nv['desc'] = L10n::t('Enter name or interest');
+ $nv['label'] = L10n::t('Connect/Follow');
+ $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing');
+ $nv['findthem'] = L10n::t('Find');
+ $nv['suggest'] = L10n::t('Friend Suggestions');
+ $nv['similar'] = L10n::t('Similar Interests');
+ $nv['random'] = L10n::t('Random Profile');
+ $nv['inv'] = L10n::t('Invite Friends');
+ $nv['directory'] = L10n::t('Global Directory');
+ $nv['global_dir'] = get_server();
+ $nv['local_directory'] = L10n::t('Local Directory');
$aside['$nv'] = $nv;
}
//Community_Pages at right_aside
if ($show_pages && local_user()) {
+ $cid = null;
if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
$cid = $_GET['cid'];
}
$entry = [
'url' => 'network?f=&cid=' . $contact['id'],
- 'external_url' => 'redir/' . $contact['id'],
+ 'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'],
'cid' => $contact['id'],
'selected' => $selected,
- 'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+ 'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
'id' => ++$id,
];
$entries[] = $entry;
$query .= ",";
}
- $query .= "'".dbesc(normalise_link(trim($helper)))."'";
+ $query .= "'".DBA::escape(normalise_link(trim($helper)))."'";
}
$r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query);
}
foreach ($r as $index => $helper) {
- $r[$index]["url"] = Profile::zrl($helper["url"]);
+ $r[$index]["url"] = Contact::magicLink($helper["url"]);
}
$r[] = ["url" => "help/Quick-Start-guide", "name" => L10n::t("Quick Start")];
$tpl = get_markup_template('ch_connectors.tpl');
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$con_services = [];
$con_services['title'] = ["", L10n::t('Connect Services'), "", ""];
$aside['$con_services'] = $con_services;