clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/friendica/friendica into develop

This commit is contained in:
Ralf Thees 2018-10-15 15:16:21 +02:00
parent a97b540ebb ab20a83c0a
commit f303f9edf2
30 changed files with 1388 additions and 1345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
INSTALL.txt
View File

@ -56,6 +56,13 @@ you wish to communicate with the Diaspora network.
- For alternative server configurations (such as Nginx server and MariaDB - For alternative server configurations (such as Nginx server and MariaDB
database engine), refer to the wiki at https://github.com/friendica/friendica/wiki database engine), refer to the wiki at https://github.com/friendica/friendica/wiki
This guide will walk you through the manual installation process of Friendica.
If this is nothing for you, you might be interested in
* the Friendica Docker image (https://github.com/friendica/docker) or
* how install Friendica with YunoHost (https://github.com/YunoHost-Apps/friendica_ynh).
2. Unpack the Friendica files into the root of your web server document area. 2. Unpack the Friendica files into the root of your web server document area.
- If you copy the directory tree to your webserver, make sure - If you copy the directory tree to your webserver, make sure

2
boot.php
View File

@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily'); define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.12-dev'); define('FRIENDICA_VERSION', '2018.12-dev');
define('DFRN_PROTOCOL_VERSION', '2.23'); define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1285); define('DB_UPDATE_VERSION', 1286);
define('NEW_UPDATE_ROUTINE_VERSION', 1170); define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/** /**

6
config/dbstructure.json
View File

@ -1298,14 +1298,16 @@
"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Creation date"}, "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Creation date"},
"pid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Process id of the worker"}, "pid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Process id of the worker"},
"executed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Execution date"}, "executed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Execution date"},
"next_try": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Next retrial date"},
"retrial": {"type": "tinyint", "not null": "1", "default": "0", "comment": "Retrial counter"},
"done": {"type": "boolean", "not null": "1", "default": "0", "comment": "Marked 1 when the task was done - will be deleted later"} "done": {"type": "boolean", "not null": "1", "default": "0", "comment": "Marked 1 when the task was done - will be deleted later"}
}, },
"indexes": { "indexes": {
"PRIMARY": ["id"], "PRIMARY": ["id"],
"pid": ["pid"], "pid": ["pid"],
"parameter": ["parameter(64)"], "parameter": ["parameter(64)"],
"priority_created": ["priority", "created"], "priority_created_next_try": ["priority", "created", "next_try"],
"done_executed": ["done", "executed"] "done_executed_next_try": ["done", "executed", "next_try"]
} }
} }
} }

8
doc/Install.md
View File

@ -40,6 +40,14 @@ Requirements
Installation procedure Installation procedure
--- ---
### Alternative Installation Methods
This guide will walk you through the manual installation process of Friendica.
If this is nothing for you, you might be interested in
* the [Friendica Docker image](https://github.com/friendica/docker) or
* how [install Friendica with YunoHost](https://github.com/YunoHost-Apps/friendica_ynh).
### Get Friendica ### Get Friendica
Unpack the Friendica files into the root of your web server document area. Unpack the Friendica files into the root of your web server document area.

8
doc/de/Install.md
View File

@ -40,6 +40,14 @@ Requirements
Installation Installation
--- ---
### Alternative Wege um Friendica zu Installieren
Diese Anleitung wird dir Schritt-für-Schritt zeigen wie du Friendica auf deinem Server installieren kannst.
Falls du an automatischen Möglichkeiten interesse hast, wirf doch einen Blick auf
* das [Docker image für Friendica](https://github.com/friendica/docker) oder
* die [Installation von Friendica auf YunoHost](https://github.com/YunoHost-Apps/friendica_ynh).
### Friendica ### Friendica
Entpacke die Friendica-Daten in das Quellverzeichnis (root) des Dokumentenbereichs deines Webservers. Entpacke die Friendica-Daten in das Quellverzeichnis (root) des Dokumentenbereichs deines Webservers.

2
include/api.php
View File

@ -761,7 +761,7 @@ function api_get_user(App $a, $contact_id = null)
'statusnet_blocking' => false, 'statusnet_blocking' => false,
'notifications' => false, 'notifications' => false,
/// @TODO old way? /// @TODO old way?
//'statusnet_profile_url' => System::baseUrl()."/contacts/".$uinfo[0]['cid'], //'statusnet_profile_url' => System::baseUrl()."/contact/".$uinfo[0]['cid'],
'statusnet_profile_url' => $uinfo[0]['url'], 'statusnet_profile_url' => $uinfo[0]['url'],
'uid' => intval($uinfo[0]['uid']), 'uid' => intval($uinfo[0]['uid']),
'cid' => intval($uinfo[0]['cid']), 'cid' => intval($uinfo[0]['cid']),

2
mod/admin.php
View File

@ -1922,7 +1922,7 @@ function admin_page_users(App $a)
'$h_users' => L10n::t('Users'), '$h_users' => L10n::t('Users'),
'$h_newuser' => L10n::t('New User'), '$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, '$th_users' => $th_users,
'$order_users' => $order, '$order_users' => $order,
'$order_direction_users' => $order_direction, '$order_direction_users' => $order_direction,

23
mod/allfriends.php
View File

@ -8,13 +8,12 @@ use Friendica\Content\ContactSelector;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model;
use Friendica\Model\GContact; use Friendica\Module;
use Friendica\Model\Profile;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'mod/contacts.php';
function allfriends_content(App $a) function allfriends_content(App $a)
{ {
@ -42,13 +41,13 @@ function allfriends_content(App $a)
} }
$a->page['aside'] = ""; $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->setPagerTotal($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)) { if (!DBA::isResult($r)) {
$o .= L10n::t('No friends to display.'); $o .= L10n::t('No friends to display.');
return $o; return $o;
@ -59,7 +58,7 @@ function allfriends_content(App $a)
$entries = []; $entries = [];
foreach ($r as $rr) { foreach ($r as $rr) {
//get further details of the contact //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 = ''; $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 the contact is not common to the user, Connect/Follow' will be added to the photo menu
if ($rr['cid']) { if ($rr['cid']) {
$rr['id'] = $rr['cid']; $rr['id'] = $rr['cid'];
$photo_menu = Contact::photoMenu($rr); $photo_menu = Model\Contact::photoMenu($rr);
} else { } else {
$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url']; $connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
$photo_menu = [ $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] 'follow' => [L10n::t("Connect/Follow"), $connlnk]
]; ];
} }
@ -86,7 +85,7 @@ function allfriends_content(App $a)
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], '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']), 'network' => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
'photo_menu' => $photo_menu, 'photo_menu' => $photo_menu,
'conntxt' => L10n::t('Connect'), 'conntxt' => L10n::t('Connect'),
@ -96,7 +95,7 @@ function allfriends_content(App $a)
$entries[] = $entry; $entries[] = $entry;
} }
$tab_str = contacts_tab($a, $contact, 4); $tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
$tpl = get_markup_template('viewcontact_template.tpl'); $tpl = get_markup_template('viewcontact_template.tpl');

31
mod/common.php
View File

@ -7,13 +7,12 @@ use Friendica\App;
use Friendica\Content\ContactSelector; use Friendica\Content\ContactSelector;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model;
use Friendica\Model\GContact; use Friendica\Module;
use Friendica\Model\Profile;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'mod/contacts.php';
function common_content(App $a) function common_content(App $a)
{ {
@ -42,7 +41,7 @@ function common_content(App $a)
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$a->page['aside'] = ""; $a->page['aside'] = "";
Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"])); Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
} }
} else { } else {
$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]); $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
@ -65,12 +64,12 @@ function common_content(App $a)
return; return;
} }
if (!$cid && Profile::getMyURL()) { if (!$cid && Model\Profile::getMyURL()) {
$contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]); $contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL()), 'uid' => $uid]);
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$cid = $contact['id']; $cid = $contact['id'];
} else { } 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)) { if (DBA::isResult($gcontact)) {
$zcid = $gcontact['id']; $zcid = $gcontact['id'];
} }
@ -82,9 +81,9 @@ function common_content(App $a)
} }
if ($cid) { if ($cid) {
$t = GContact::countCommonFriends($uid, $cid); $t = Model\GContact::countCommonFriends($uid, $cid);
} else { } else {
$t = GContact::countCommonFriendsZcid($uid, $zcid); $t = Model\GContact::countCommonFriendsZcid($uid, $zcid);
} }
if ($t > 0) { if ($t > 0) {
@ -95,9 +94,9 @@ function common_content(App $a)
} }
if ($cid) { 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 { } 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)) { if (!DBA::isResult($r)) {
@ -109,13 +108,13 @@ function common_content(App $a)
$entries = []; $entries = [];
foreach ($r as $rr) { foreach ($r as $rr) {
//get further details of the contact //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() // $rr['id'] is needed to use contact_photo_menu()
/// @TODO Adding '/" here avoids E_NOTICE on missing constants /// @TODO Adding '/" here avoids E_NOTICE on missing constants
$rr['id'] = $rr['cid']; $rr['id'] = $rr['cid'];
$photo_menu = Contact::photoMenu($rr); $photo_menu = Model\Contact::photoMenu($rr);
$entry = [ $entry = [
'url' => $rr['url'], 'url' => $rr['url'],
@ -126,7 +125,7 @@ function common_content(App $a)
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], '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']), 'network' => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
'photo_menu' => $photo_menu, 'photo_menu' => $photo_menu,
'id' => ++$id, 'id' => ++$id,
@ -137,7 +136,7 @@ function common_content(App $a)
$title = ''; $title = '';
$tab_str = ''; $tab_str = '';
if ($cmd === 'loc' && $cid && local_user() == $uid) { if ($cmd === 'loc' && $cid && local_user() == $uid) {
$tab_str = contacts_tab($a, $contact, 4); $tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
} else { } else {
$title = L10n::t('Common Friends'); $title = L10n::t('Common Friends');
} }

1123
mod/contacts.php
View File

File diff suppressed because it is too large Load Diff

12
mod/crepair.php
View File

@ -8,10 +8,8 @@ use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model;
use Friendica\Model\Profile; use Friendica\Module;
require_once 'mod/contacts.php';
function crepair_init(App $a) function crepair_init(App $a)
{ {
@ -30,7 +28,7 @@ function crepair_init(App $a)
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$a->data['contact'] = $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) { if ($photo) {
logger('mod-crepair: updating photo from ' . $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) { if ($r) {
@ -135,7 +133,7 @@ function crepair_content(App $a)
$update_profile = in_array($contact['network'], [Protocol::ACTIVITYPUB, 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'); $tpl = get_markup_template('crepair.tpl');
$o = replace_macros($tpl, [ $o = replace_macros($tpl, [

4
mod/dfrn_confirm.php
View File

@ -400,7 +400,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
// Let's send our user to the contact editor in case they want to // Let's send our user to the contact editor in case they want to
// do anything special with this new friend. // do anything special with this new friend.
if ($handsfree === null) { if ($handsfree === null) {
goaway(System::baseUrl() . '/contacts/' . intval($contact_id)); goaway(System::baseUrl() . '/contact/' . intval($contact_id));
} else { } else {
return; return;
} }
@ -604,7 +604,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
'to_name' => $combined['username'], 'to_name' => $combined['username'],
'to_email' => $combined['email'], 'to_email' => $combined['email'],
'uid' => $combined['uid'], '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_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')),
'source_link' => $combined['url'], 'source_link' => $combined['url'],
'source_photo' => $combined['photo'], 'source_photo' => $combined['photo'],

4
mod/dfrn_request.php
View File

@ -173,9 +173,9 @@ function dfrn_request_post(App $a)
Contact::updateAvatar($photo, local_user(), $r[0]["id"], true); Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
} }
$forwardurl = System::baseUrl() . "/contacts/" . $r[0]['id']; $forwardurl = System::baseUrl() . "/contact/" . $r[0]['id'];
} else { } else {
$forwardurl = System::baseUrl() . "/contacts"; $forwardurl = System::baseUrl() . "/contact";
} }
// Allow the blocked remote notification to complete // Allow the blocked remote notification to complete

25
mod/dirfind.php
View File

@ -12,14 +12,13 @@ use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model;
use Friendica\Model\GContact; use Friendica\Module;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
require_once 'mod/contacts.php';
function dirfind_init(App $a) { function dirfind_init(App $a) {
@ -83,7 +82,7 @@ function dirfind_content(App $a, $prefix = "") {
$objresult->tags = ""; $objresult->tags = "";
$objresult->network = $user_data["network"]; $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->cid = $contact["cid"];
$objresult->pcid = $contact["zid"]; $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 // 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)) { if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
GContact::update($user_data); Model\GContact::update($user_data);
} }
} elseif ($local) { } elseif ($local) {
@ -156,7 +155,7 @@ function dirfind_content(App $a, $prefix = "") {
continue; continue;
} }
$result = Contact::getDetailsByURL($result["nurl"], local_user()); $result = Model\Contact::getDetailsByURL($result["nurl"], local_user());
if ($result["name"] == "") { if ($result["name"] == "") {
$result["name"] = end(explode("/", $urlparts["path"])); $result["name"] = end(explode("/", $urlparts["path"]));
@ -200,7 +199,7 @@ function dirfind_content(App $a, $prefix = "") {
$alt_text = ""; $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); $itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
@ -210,8 +209,8 @@ function dirfind_content(App $a, $prefix = "") {
$conntxt = ""; $conntxt = "";
$contact = DBA::selectFirst('contact', [], ['id' => $jj->cid]); $contact = DBA::selectFirst('contact', [], ['id' => $jj->cid]);
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$photo_menu = Contact::photoMenu($contact); $photo_menu = Model\Contact::photoMenu($contact);
$details = _contact_detail_for_template($contact); $details = Module\Contact::getContactTemplateVars($contact);
$alt_text = $details['alt_text']; $alt_text = $details['alt_text'];
} else { } else {
$photo_menu = []; $photo_menu = [];
@ -222,12 +221,12 @@ function dirfind_content(App $a, $prefix = "") {
$contact = DBA::selectFirst('contact', [], ['id' => $jj->pcid]); $contact = DBA::selectFirst('contact', [], ['id' => $jj->pcid]);
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$photo_menu = Contact::photoMenu($contact); $photo_menu = Model\Contact::photoMenu($contact);
} else { } else {
$photo_menu = []; $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]; $photo_menu['follow'] = [L10n::t("Connect/Follow"), $connlnk];
} }
@ -235,7 +234,7 @@ function dirfind_content(App $a, $prefix = "") {
$entry = [ $entry = [
'alt_text' => $alt_text, 'alt_text' => $alt_text,
'url' => Contact::magicLink($jj->url), 'url' => Model\Contact::magicLink($jj->url),
'itemurl' => $itemurl, 'itemurl' => $itemurl,
'name' => htmlentities($jj->name), 'name' => htmlentities($jj->name),
'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB), 'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
@ -246,7 +245,7 @@ function dirfind_content(App $a, $prefix = "") {
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => Contact::getAccountType($contact_details), 'account_type' => Model\Contact::getAccountType($contact_details),
'network' => ContactSelector::networkToName($jj->network, $jj->url), 'network' => ContactSelector::networkToName($jj->network, $jj->url),
'id' => ++$id, 'id' => ++$id,
]; ];

22
mod/group.php
View File

@ -11,8 +11,8 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model;
use Friendica\Model\Group; use Friendica\Module;
function group_init(App $a) { function group_init(App $a) {
if (local_user()) { if (local_user()) {
@ -54,7 +54,7 @@ function group_post(App $a) {
); );
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL); notice(L10n::t('Group not found.') . EOL);
goaway(System::baseUrl() . '/contacts'); goaway(System::baseUrl() . '/contact');
return; // NOTREACHED return; // NOTREACHED
} }
$group = $r[0]; $group = $r[0];
@ -116,8 +116,6 @@ function group_content(App $a) {
$nogroup = false; $nogroup = false;
if (($a->argc == 2) && ($a->argv[1] === 'none')) { if (($a->argc == 2) && ($a->argv[1] === 'none')) {
require_once 'mod/contacts.php';
$id = -1; $id = -1;
$nogroup = true; $nogroup = true;
$group = [ $group = [
@ -176,8 +174,6 @@ function group_content(App $a) {
} }
if (($a->argc > 1) && intval($a->argv[1])) { 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", $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
intval($a->argv[1]), intval($a->argv[1]),
intval(local_user()) intval(local_user())
@ -185,11 +181,11 @@ function group_content(App $a) {
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(L10n::t('Group not found.') . EOL); notice(L10n::t('Group not found.') . EOL);
goaway(System::baseUrl() . '/contacts'); goaway(System::baseUrl() . '/contact');
} }
$group = $r[0]; $group = $r[0];
$members = Contact::getByGroupId($group['id']); $members = Model\Contact::getByGroupId($group['id']);
$preselected = []; $preselected = [];
$entry = []; $entry = [];
$id = 0; $id = 0;
@ -207,7 +203,7 @@ function group_content(App $a) {
Group::addMember($group['id'], $change); Group::addMember($group['id'], $change);
} }
$members = Contact::getByGroupId($group['id']); $members = Model\Contact::getByGroupId($group['id']);
$preselected = []; $preselected = [];
if (count($members)) { if (count($members)) {
foreach ($members as $member) { foreach ($members as $member) {
@ -253,7 +249,7 @@ function group_content(App $a) {
// Format the data of the group members // Format the data of the group members
foreach ($members as $member) { foreach ($members as $member) {
if ($member['url']) { if ($member['url']) {
$entry = _contact_detail_for_template($member); $entry = Module\Contact::getContactTemplateVars($member);
$entry['label'] = 'members'; $entry['label'] = 'members';
$entry['photo_menu'] = ''; $entry['photo_menu'] = '';
$entry['change_member'] = [ $entry['change_member'] = [
@ -270,7 +266,7 @@ function group_content(App $a) {
} }
if ($nogroup) { if ($nogroup) {
$r = Contact::getUngroupedList(local_user()); $r = Model\Contact::getUngroupedList(local_user());
} else { } else {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
intval(local_user()) 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 // Format the data of the contacts who aren't in the contact group
foreach ($r as $member) { foreach ($r as $member) {
if (!in_array($member['id'], $preselected)) { if (!in_array($member['id'], $preselected)) {
$entry = _contact_detail_for_template($member); $entry = Module\Contact::getContactTemplateVars($member);
$entry['label'] = 'contacts'; $entry['label'] = 'contacts';
if (!$nogroup) if (!$nogroup)
$entry['photo_menu'] = []; $entry['photo_menu'] = [];

6
mod/newmember.php
View File

@ -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="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="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 .= '</ul>';
$o .= '<h4>' . L10n::t('Groups') . '</h4>'; $o .= '<h4>' . L10n::t('Groups') . '</h4>';
$o .= '<ul>'; $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')) { 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; $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;

5
mod/update_contacts.php
View File

@ -5,8 +5,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Module\Contact;
require_once 'mod/contacts.php';
function update_contacts_content(App $a) function update_contacts_content(App $a)
{ {
@ -15,7 +14,7 @@ function update_contacts_content(App $a)
echo "<section>"; echo "<section>";
if ($_GET["force"] == 1) { if ($_GET["force"] == 1) {
$text = contacts_content($a, true); $text = Contact::content($a, true);
} else { } else {
$text = ''; $text = '';
} }

2
src/Content/Nav.php
View File

@ -210,7 +210,7 @@ class Nav
$nav['profiles'] = ['profiles', L10n::t('Profiles'), '', L10n::t('Manage/Edit Profiles')]; $nav['profiles'] = ['profiles', L10n::t('Profiles'), '', L10n::t('Manage/Edit Profiles')];
} }
$nav['contacts'] = ['contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; $nav['contacts'] = ['contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
} }
// Show the link to the admin configuration page if user is admin // Show the link to the admin configuration page if user is admin

49
src/Core/Worker.php
View File

@ -8,6 +8,7 @@ use Friendica\Database\DBA;
use Friendica\Model\Process; use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\BaseObject;
require_once 'include/dba.php'; require_once 'include/dba.php';
@ -152,7 +153,8 @@ class Worker
*/ */
private static function totalEntries() private static function totalEntries()
{ {
return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done`", NULL_DATE]); return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, DateTimeFormat::utcNow()]);
} }
/** /**
@ -162,7 +164,7 @@ class Worker
*/ */
private static function highestPriority() private static function highestPriority()
{ {
$condition = ["`executed` <= ? AND NOT `done`", NULL_DATE]; $condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", NULL_DATE, DateTimeFormat::utcNow()];
$workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]); $workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
if (DBA::isResult($workerqueue)) { if (DBA::isResult($workerqueue)) {
return $workerqueue["priority"]; return $workerqueue["priority"];
@ -180,7 +182,8 @@ class Worker
*/ */
private static function processWithPriorityActive($priority) private static function processWithPriorityActive($priority)
{ {
$condition = ["`priority` <= ? AND `executed` > ? AND NOT `done`", $priority, NULL_DATE]; $condition = ["`priority` <= ? AND `executed` > ? AND NOT `done` AND `next_try` < ?",
$priority, NULL_DATE, DateTimeFormat::utcNow()];
return DBA::exists('workerqueue', $condition); return DBA::exists('workerqueue', $condition);
} }
@ -240,7 +243,7 @@ class Worker
self::execFunction($queue, $include, $argv, true); self::execFunction($queue, $include, $argv, true);
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) { if (DBA::update('workerqueue', ['done' => true], ['id' => $queue['id']])) {
Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow()); Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
} }
self::$db_duration = (microtime(true) - $stamp); self::$db_duration = (microtime(true) - $stamp);
@ -805,7 +808,8 @@ class Worker
$result = DBA::select( $result = DBA::select(
'workerqueue', 'workerqueue',
['id'], ['id'],
["`executed` <= ? AND `priority` < ? AND NOT `done`", NULL_DATE, $highest_priority], ["`executed` <= ? AND `priority` < ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']] ['limit' => $limit, 'order' => ['priority', 'created']]
); );
@ -821,7 +825,8 @@ class Worker
$result = DBA::select( $result = DBA::select(
'workerqueue', 'workerqueue',
['id'], ['id'],
["`executed` <= ? AND `priority` > ? AND NOT `done`", NULL_DATE, $highest_priority], ["`executed` <= ? AND `priority` > ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']] ['limit' => $limit, 'order' => ['priority', 'created']]
); );
@ -840,7 +845,8 @@ class Worker
$result = DBA::select( $result = DBA::select(
'workerqueue', 'workerqueue',
['id'], ['id'],
["`executed` <= ? AND NOT `done`", NULL_DATE], ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
NULL_DATE, DateTimeFormat::utcNow()],
['limit' => $limit, 'order' => ['priority', 'created']] ['limit' => $limit, 'order' => ['priority', 'created']]
); );
@ -1116,6 +1122,35 @@ class Worker
return true; return true;
} }
/**
* Defers the current worker entry
*/
public static function defer()
{
if (empty(BaseObject::getApp()->queue)) {
return;
}
$queue = BaseObject::getApp()->queue;
$retrial = $queue['retrial'];
$id = $queue['id'];
if ($retrial > 14) {
logger('Id ' . $id . ' had been tried 14 times, it will be deleted now.', LOGGER_DEBUG);
DBA::delete('workerqueue', ['id' => $id]);
}
// Calculate the delay until the next trial
$delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
$next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
logger('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG);
$fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => NULL_DATE, 'pid' => 0];
DBA::update('workerqueue', $fields, ['id' => $id]);
}
/** /**
* Log active processes into the "process" table * Log active processes into the "process" table
* *

6
src/Model/Contact.php
View File

@ -923,12 +923,12 @@ class Contact extends BaseObject
$poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id']; $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
} }
$contact_url = System::baseUrl() . '/contacts/' . $contact['id']; $contact_url = System::baseUrl() . '/contact/' . $contact['id'];
$posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/conversations'; $posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
if (!$contact['self']) { if (!$contact['self']) {
$contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1'; $contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
} }
/** /**

4
src/Model/Group.php
View File

@ -349,7 +349,7 @@ class Group extends BaseObject
* @param int $cid * @param int $cid
* @return string * @return string
*/ */
public static function sidebarWidget($every = 'contacts', $each = 'group', $editmode = 'standard', $group_id = '', $cid = 0) public static function sidebarWidget($every = 'contact', $each = 'group', $editmode = 'standard', $group_id = '', $cid = 0)
{ {
$o = ''; $o = '';
@ -404,7 +404,7 @@ class Group extends BaseObject
'newgroup' => $editmode == 'extended' || $editmode == 'full' ? 1 : '', 'newgroup' => $editmode == 'extended' || $editmode == 'full' ? 1 : '',
'grouppage' => 'group/', 'grouppage' => 'group/',
'$edittext' => L10n::t('Edit group'), '$edittext' => L10n::t('Edit group'),
'$ungrouped' => $every === 'contacts' ? L10n::t('Contacts not in any group') : '', '$ungrouped' => $every === 'contact' ? L10n::t('Contacts not in any group') : '',
'$ungrouped_selected' => (($group_id === 'none') ? 'group-selected' : ''), '$ungrouped_selected' => (($group_id === 'none') ? 'group-selected' : ''),
'$createtext' => L10n::t('Create a new group'), '$createtext' => L10n::t('Create a new group'),
'$creategroup' => L10n::t('Group Name: '), '$creategroup' => L10n::t('Group Name: '),

1106
src/Module/Contact.php Normal file
View File

File diff suppressed because it is too large Load Diff

15
src/Util/Temporal.php
View File

@ -294,12 +294,18 @@ class Temporal
return L10n::t('never'); return L10n::t('never');
} }
$isfuture = false;
$etime = time() - $abs; $etime = time() - $abs;
if ($etime < 1) { if ($etime < 1 && $etime >= 0) {
return L10n::t('less than a second ago'); return L10n::t('less than a second ago');
} }
if ($etime < 0){
$etime = -$etime;
$isfuture = true;
}
$a = [12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')], $a = [12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')],
30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')], 30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')],
7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')], 7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')],
@ -315,7 +321,12 @@ class Temporal
$r = round($d); $r = round($d);
// translators - e.g. 22 hours ago, 1 minute ago // translators - e.g. 22 hours ago, 1 minute ago
if (!$format) { if (!$format) {
$format = L10n::t('%1$d %2$s ago'); if($isfuture){
$format = L10n::t('in %1$d %2$s');
}
else {
$format = L10n::t('%1$d %2$s ago');
}
} }
return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1])); return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1]));

234
util/messages.po
View File

@ -51,7 +51,7 @@ msgstr ""
#: mod/profile_photo.php:198 mod/wall_attach.php:80 mod/wall_attach.php:83 #: mod/profile_photo.php:198 mod/wall_attach.php:80 mod/wall_attach.php:83
#: mod/item.php:166 mod/uimport.php:15 mod/cal.php:306 mod/regmod.php:108 #: mod/item.php:166 mod/uimport.php:15 mod/cal.php:306 mod/regmod.php:108
#: mod/editpost.php:19 mod/fsuggest.php:80 mod/allfriends.php:23 #: mod/editpost.php:19 mod/fsuggest.php:80 mod/allfriends.php:23
#: mod/contacts.php:387 mod/events.php:195 mod/follow.php:54 mod/follow.php:118 #: mod/contact.php:387 mod/events.php:195 mod/follow.php:54 mod/follow.php:118
#: mod/attach.php:39 mod/poke.php:144 mod/invite.php:21 mod/invite.php:112 #: mod/attach.php:39 mod/poke.php:144 mod/invite.php:21 mod/invite.php:112
#: mod/notes.php:32 mod/profiles.php:179 mod/profiles.php:511 #: mod/notes.php:32 mod/profiles.php:179 mod/profiles.php:511
#: mod/photos.php:183 mod/photos.php:1067 #: mod/photos.php:183 mod/photos.php:1067
@ -94,7 +94,7 @@ msgstr ""
#: view/theme/vier/config.php:119 view/theme/frio/config.php:118 #: view/theme/vier/config.php:119 view/theme/frio/config.php:118
#: mod/crepair.php:150 mod/install.php:204 mod/install.php:242 #: mod/crepair.php:150 mod/install.php:204 mod/install.php:242
#: mod/manage.php:184 mod/message.php:264 mod/message.php:430 #: mod/manage.php:184 mod/message.php:264 mod/message.php:430
#: mod/fsuggest.php:114 mod/contacts.php:631 mod/events.php:560 #: mod/fsuggest.php:114 mod/contact.php:631 mod/events.php:560
#: mod/localtime.php:56 mod/poke.php:194 mod/invite.php:155 #: mod/localtime.php:56 mod/poke.php:194 mod/invite.php:155
#: mod/profiles.php:577 mod/photos.php:1096 mod/photos.php:1182 #: mod/profiles.php:577 mod/photos.php:1096 mod/photos.php:1182
#: mod/photos.php:1454 mod/photos.php:1499 mod/photos.php:1538 #: mod/photos.php:1454 mod/photos.php:1499 mod/photos.php:1538
@ -186,7 +186,7 @@ msgstr ""
#: view/theme/vier/theme.php:199 include/conversation.php:881 #: view/theme/vier/theme.php:199 include/conversation.php:881
#: mod/dirfind.php:231 mod/match.php:90 mod/suggest.php:86 #: mod/dirfind.php:231 mod/match.php:90 mod/suggest.php:86
#: mod/allfriends.php:76 mod/contacts.php:611 mod/follow.php:143 #: mod/allfriends.php:76 mod/contact.php:611 mod/follow.php:143
#: src/Model/Contact.php:944 src/Content/Widget.php:61 #: src/Model/Contact.php:944 src/Content/Widget.php:61
msgid "Connect/Follow" msgid "Connect/Follow"
msgstr "" msgstr ""
@ -195,7 +195,7 @@ msgstr ""
msgid "Examples: Robert Morgenstein, Fishing" msgid "Examples: Robert Morgenstein, Fishing"
msgstr "" msgstr ""
#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:845 #: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contact.php:845
#: src/Content/Widget.php:63 #: src/Content/Widget.php:63
msgid "Find" msgid "Find"
msgstr "" msgstr ""
@ -320,7 +320,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:269 mod/contacts.php:690 mod/contacts.php:880 #: view/theme/frio/theme.php:269 mod/contact.php:690 mod/contact.php:880
#: src/Model/Profile.php:888 src/Content/Nav.php:100 #: src/Model/Profile.php:888 src/Content/Nav.php:100
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -331,7 +331,7 @@ msgid "Your posts and conversations"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:270 mod/newmember.php:24 mod/profperm.php:116 #: view/theme/frio/theme.php:270 mod/newmember.php:24 mod/profperm.php:116
#: mod/contacts.php:692 mod/contacts.php:896 src/Model/Profile.php:730 #: mod/contact.php:692 mod/contact.php:896 src/Model/Profile.php:730
#: src/Model/Profile.php:863 src/Model/Profile.php:896 src/Content/Nav.php:101 #: src/Model/Profile.php:863 src/Model/Profile.php:896 src/Content/Nav.php:101
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -400,7 +400,7 @@ msgid "Account settings"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:280 include/text.php:906 mod/viewcontacts.php:125 #: view/theme/frio/theme.php:280 include/text.php:906 mod/viewcontacts.php:125
#: mod/contacts.php:839 mod/contacts.php:908 src/Model/Profile.php:967 #: mod/contact.php:839 mod/contact.php:908 src/Model/Profile.php:967
#: src/Model/Profile.php:970 src/Content/Nav.php:147 src/Content/Nav.php:213 #: src/Model/Profile.php:970 src/Content/Nav.php:147 src/Content/Nav.php:213
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -475,7 +475,7 @@ msgstr ""
#: mod/settings.php:1153 mod/settings.php:1154 mod/settings.php:1155 #: mod/settings.php:1153 mod/settings.php:1154 mod/settings.php:1155
#: mod/settings.php:1156 mod/settings.php:1157 mod/register.php:237 #: mod/settings.php:1156 mod/settings.php:1157 mod/register.php:237
#: mod/message.php:154 mod/suggest.php:40 mod/dfrn_request.php:645 #: mod/message.php:154 mod/suggest.php:40 mod/dfrn_request.php:645
#: mod/api.php:110 mod/contacts.php:471 mod/follow.php:150 mod/profiles.php:541 #: mod/api.php:110 mod/contact.php:471 mod/follow.php:150 mod/profiles.php:541
#: mod/profiles.php:544 mod/profiles.php:566 #: mod/profiles.php:544 mod/profiles.php:566
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@ -483,7 +483,7 @@ msgstr ""
#: include/items.php:399 include/conversation.php:1179 mod/videos.php:146 #: include/items.php:399 include/conversation.php:1179 mod/videos.php:146
#: mod/settings.php:676 mod/settings.php:702 mod/unfollow.php:130 #: mod/settings.php:676 mod/settings.php:702 mod/unfollow.php:130
#: mod/message.php:157 mod/tagrm.php:19 mod/tagrm.php:91 mod/suggest.php:43 #: mod/message.php:157 mod/tagrm.php:19 mod/tagrm.php:91 mod/suggest.php:43
#: mod/dfrn_request.php:655 mod/editpost.php:146 mod/contacts.php:474 #: mod/dfrn_request.php:655 mod/editpost.php:146 mod/contact.php:474
#: mod/follow.php:161 mod/fbrowser.php:104 mod/fbrowser.php:135 #: mod/follow.php:161 mod/fbrowser.php:104 mod/fbrowser.php:135
#: mod/photos.php:255 mod/photos.php:327 #: mod/photos.php:255 mod/photos.php:327
msgid "Cancel" msgid "Cancel"
@ -586,7 +586,7 @@ msgid "Select"
msgstr "" msgstr ""
#: include/conversation.php:627 mod/settings.php:736 mod/admin.php:1906 #: include/conversation.php:627 mod/settings.php:736 mod/admin.php:1906
#: mod/contacts.php:855 mod/contacts.php:1133 mod/photos.php:1567 #: mod/contact.php:855 mod/contact.php:1133 mod/photos.php:1567
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -2014,7 +2014,7 @@ msgstr ""
msgid "Only logged in users are permitted to perform a probing." msgid "Only logged in users are permitted to perform a probing."
msgstr "" msgstr ""
#: mod/directory.php:151 mod/notifications.php:248 mod/contacts.php:681 #: mod/directory.php:151 mod/notifications.php:248 mod/contact.php:681
#: mod/events.php:548 src/Model/Event.php:67 src/Model/Event.php:94 #: mod/events.php:548 src/Model/Event.php:67 src/Model/Event.php:94
#: src/Model/Event.php:431 src/Model/Event.php:922 src/Model/Profile.php:430 #: src/Model/Event.php:431 src/Model/Event.php:922 src/Model/Profile.php:430
msgid "Location:" msgid "Location:"
@ -2033,7 +2033,7 @@ msgstr ""
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: mod/directory.php:159 mod/notifications.php:250 mod/contacts.php:685 #: mod/directory.php:159 mod/notifications.php:250 mod/contact.php:685
#: src/Model/Profile.php:436 src/Model/Profile.php:806 #: src/Model/Profile.php:436 src/Model/Profile.php:806
msgid "About:" msgid "About:"
msgstr "" msgstr ""
@ -2114,7 +2114,7 @@ msgstr ""
msgid "Missing some important data!" msgid "Missing some important data!"
msgstr "" msgstr ""
#: mod/settings.php:176 mod/settings.php:701 mod/contacts.php:851 #: mod/settings.php:176 mod/settings.php:701 mod/contact.php:851
msgid "Update" msgid "Update"
msgstr "" msgstr ""
@ -3006,7 +3006,7 @@ msgstr ""
msgid "Items tagged with: %s" msgid "Items tagged with: %s"
msgstr "" msgstr ""
#: mod/search.php:248 mod/contacts.php:844 #: mod/search.php:248 mod/contact.php:844
#, php-format #, php-format
msgid "Results for: %s" msgid "Results for: %s"
msgstr "" msgstr ""
@ -3015,7 +3015,7 @@ msgstr ""
msgid "No contacts in common." msgid "No contacts in common."
msgstr "" msgstr ""
#: mod/common.php:142 mod/contacts.php:919 #: mod/common.php:142 mod/contact.php:919
msgid "Common Friends" msgid "Common Friends"
msgstr "" msgstr ""
@ -3177,7 +3177,7 @@ msgstr ""
msgid "Members" msgid "Members"
msgstr "" msgstr ""
#: mod/group.php:246 mod/contacts.php:742 #: mod/group.php:246 mod/contact.php:742
msgid "All Contacts" msgid "All Contacts"
msgstr "" msgstr ""
@ -3301,7 +3301,7 @@ msgstr ""
msgid "No contacts." msgid "No contacts."
msgstr "" msgstr ""
#: mod/viewcontacts.php:106 mod/contacts.php:640 mod/contacts.php:1055 #: mod/viewcontacts.php:106 mod/contact.php:640 mod/contact.php:1055
#, php-format #, php-format
msgid "Visit %s's profile [%s]" msgid "Visit %s's profile [%s]"
msgstr "" msgstr ""
@ -3318,7 +3318,7 @@ msgstr ""
msgid "Contact unfollowed" msgid "Contact unfollowed"
msgstr "" msgstr ""
#: mod/unfollow.php:113 mod/contacts.php:607 #: mod/unfollow.php:113 mod/contact.php:607
msgid "Disconnect/Unfollow" msgid "Disconnect/Unfollow"
msgstr "" msgstr ""
@ -3331,11 +3331,11 @@ msgid "Submit Request"
msgstr "" msgstr ""
#: mod/unfollow.php:135 mod/notifications.php:174 mod/notifications.php:258 #: mod/unfollow.php:135 mod/notifications.php:174 mod/notifications.php:258
#: mod/admin.php:500 mod/admin.php:510 mod/contacts.php:677 mod/follow.php:166 #: mod/admin.php:500 mod/admin.php:510 mod/contact.php:677 mod/follow.php:166
msgid "Profile URL" msgid "Profile URL"
msgstr "" msgstr ""
#: mod/unfollow.php:145 mod/contacts.php:891 mod/follow.php:189 #: mod/unfollow.php:145 mod/contact.php:891 mod/follow.php:189
#: src/Model/Profile.php:891 #: src/Model/Profile.php:891
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
@ -3472,7 +3472,7 @@ msgid "Discard"
msgstr "" msgstr ""
#: mod/notifications.php:57 mod/notifications.php:181 mod/notifications.php:266 #: mod/notifications.php:57 mod/notifications.php:181 mod/notifications.php:266
#: mod/contacts.php:659 mod/contacts.php:853 mod/contacts.php:1116 #: mod/contact.php:659 mod/contact.php:853 mod/contact.php:1116
msgid "Ignore" msgid "Ignore"
msgstr "" msgstr ""
@ -3520,7 +3520,7 @@ msgstr ""
msgid "Suggested by:" msgid "Suggested by:"
msgstr "" msgstr ""
#: mod/notifications.php:176 mod/notifications.php:255 mod/contacts.php:667 #: mod/notifications.php:176 mod/notifications.php:255 mod/contact.php:667
msgid "Hide this contact from others" msgid "Hide this contact from others"
msgstr "" msgstr ""
@ -3577,12 +3577,12 @@ msgstr ""
msgid "Subscriber" msgid "Subscriber"
msgstr "" msgstr ""
#: mod/notifications.php:252 mod/contacts.php:687 mod/follow.php:177 #: mod/notifications.php:252 mod/contact.php:687 mod/follow.php:177
#: src/Model/Profile.php:794 #: src/Model/Profile.php:794
msgid "Tags:" msgid "Tags:"
msgstr "" msgstr ""
#: mod/notifications.php:261 mod/contacts.php:81 src/Model/Profile.php:533 #: mod/notifications.php:261 mod/contact.php:81 src/Model/Profile.php:533
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
@ -4500,13 +4500,13 @@ msgstr ""
msgid "select none" msgid "select none"
msgstr "" msgstr ""
#: mod/admin.php:494 mod/admin.php:1907 mod/contacts.php:658 #: mod/admin.php:494 mod/admin.php:1907 mod/contact.php:658
#: mod/contacts.php:852 mod/contacts.php:1108 #: mod/contact.php:852 mod/contact.php:1108
msgid "Block" msgid "Block"
msgstr "" msgstr ""
#: mod/admin.php:495 mod/admin.php:1909 mod/contacts.php:658 #: mod/admin.php:495 mod/admin.php:1909 mod/contact.php:658
#: mod/contacts.php:852 mod/contacts.php:1108 #: mod/contact.php:852 mod/contact.php:1108
msgid "Unblock" msgid "Unblock"
msgstr "" msgstr ""
@ -4769,7 +4769,7 @@ msgid "Public postings from local users and the federated network"
msgstr "" msgstr ""
#: mod/admin.php:1353 mod/admin.php:1520 mod/admin.php:1530 #: mod/admin.php:1353 mod/admin.php:1520 mod/admin.php:1530
#: mod/contacts.php:583 #: mod/contact.php:583
msgid "Disabled" msgid "Disabled"
msgstr "" msgstr ""
@ -4849,7 +4849,7 @@ msgstr ""
msgid "Policies" msgid "Policies"
msgstr "" msgstr ""
#: mod/admin.php:1431 mod/contacts.php:929 mod/events.php:562 #: mod/admin.php:1431 mod/contact.php:929 mod/events.php:562
#: src/Model/Profile.php:865 #: src/Model/Profile.php:865
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
@ -6143,7 +6143,7 @@ msgstr ""
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: mod/dfrn_request.php:412 mod/contacts.php:241 #: mod/dfrn_request.php:412 mod/contact.php:241
msgid "Failed to update contact record." msgid "Failed to update contact record."
msgstr "" msgstr ""
@ -6552,364 +6552,364 @@ msgstr ""
msgid "No friends to display." msgid "No friends to display."
msgstr "" msgstr ""
#: mod/contacts.php:168 #: mod/contact.php:168
#, php-format #, php-format
msgid "%d contact edited." msgid "%d contact edited."
msgid_plural "%d contacts edited." msgid_plural "%d contacts edited."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: mod/contacts.php:195 mod/contacts.php:401 #: mod/contact.php:195 mod/contact.php:401
msgid "Could not access contact record." msgid "Could not access contact record."
msgstr "" msgstr ""
#: mod/contacts.php:205 #: mod/contact.php:205
msgid "Could not locate selected profile." msgid "Could not locate selected profile."
msgstr "" msgstr ""
#: mod/contacts.php:239 #: mod/contact.php:239
msgid "Contact updated." msgid "Contact updated."
msgstr "" msgstr ""
#: mod/contacts.php:422 #: mod/contact.php:422
msgid "Contact has been blocked" msgid "Contact has been blocked"
msgstr "" msgstr ""
#: mod/contacts.php:422 #: mod/contact.php:422
msgid "Contact has been unblocked" msgid "Contact has been unblocked"
msgstr "" msgstr ""
#: mod/contacts.php:432 #: mod/contact.php:432
msgid "Contact has been ignored" msgid "Contact has been ignored"
msgstr "" msgstr ""
#: mod/contacts.php:432 #: mod/contact.php:432
msgid "Contact has been unignored" msgid "Contact has been unignored"
msgstr "" msgstr ""
#: mod/contacts.php:442 #: mod/contact.php:442
msgid "Contact has been archived" msgid "Contact has been archived"
msgstr "" msgstr ""
#: mod/contacts.php:442 #: mod/contact.php:442
msgid "Contact has been unarchived" msgid "Contact has been unarchived"
msgstr "" msgstr ""
#: mod/contacts.php:466 #: mod/contact.php:466
msgid "Drop contact" msgid "Drop contact"
msgstr "" msgstr ""
#: mod/contacts.php:469 mod/contacts.php:848 #: mod/contact.php:469 mod/contact.php:848
msgid "Do you really want to delete this contact?" msgid "Do you really want to delete this contact?"
msgstr "" msgstr ""
#: mod/contacts.php:487 #: mod/contact.php:487
msgid "Contact has been removed." msgid "Contact has been removed."
msgstr "" msgstr ""
#: mod/contacts.php:524 #: mod/contact.php:524
#, php-format #, php-format
msgid "You are mutual friends with %s" msgid "You are mutual friends with %s"
msgstr "" msgstr ""
#: mod/contacts.php:529 #: mod/contact.php:529
#, php-format #, php-format
msgid "You are sharing with %s" msgid "You are sharing with %s"
msgstr "" msgstr ""
#: mod/contacts.php:534 #: mod/contact.php:534
#, php-format #, php-format
msgid "%s is sharing with you" msgid "%s is sharing with you"
msgstr "" msgstr ""
#: mod/contacts.php:558 #: mod/contact.php:558
msgid "Private communications are not available for this contact." msgid "Private communications are not available for this contact."
msgstr "" msgstr ""
#: mod/contacts.php:560 #: mod/contact.php:560
msgid "Never" msgid "Never"
msgstr "" msgstr ""
#: mod/contacts.php:563 #: mod/contact.php:563
msgid "(Update was successful)" msgid "(Update was successful)"
msgstr "" msgstr ""
#: mod/contacts.php:563 #: mod/contact.php:563
msgid "(Update was not successful)" msgid "(Update was not successful)"
msgstr "" msgstr ""
#: mod/contacts.php:565 mod/contacts.php:1089 #: mod/contact.php:565 mod/contact.php:1089
msgid "Suggest friends" msgid "Suggest friends"
msgstr "" msgstr ""
#: mod/contacts.php:569 #: mod/contact.php:569
#, php-format #, php-format
msgid "Network type: %s" msgid "Network type: %s"
msgstr "" msgstr ""
#: mod/contacts.php:574 #: mod/contact.php:574
msgid "Communications lost with this contact!" msgid "Communications lost with this contact!"
msgstr "" msgstr ""
#: mod/contacts.php:580 #: mod/contact.php:580
msgid "Fetch further information for feeds" msgid "Fetch further information for feeds"
msgstr "" msgstr ""
#: mod/contacts.php:582 #: mod/contact.php:582
msgid "" msgid ""
"Fetch information like preview pictures, title and teaser from the feed " "Fetch information like preview pictures, title and teaser from the feed "
"item. You can activate this if the feed doesn't contain much text. Keywords " "item. You can activate this if the feed doesn't contain much text. Keywords "
"are taken from the meta header in the feed item and are posted as hash tags." "are taken from the meta header in the feed item and are posted as hash tags."
msgstr "" msgstr ""
#: mod/contacts.php:584 #: mod/contact.php:584
msgid "Fetch information" msgid "Fetch information"
msgstr "" msgstr ""
#: mod/contacts.php:585 #: mod/contact.php:585
msgid "Fetch keywords" msgid "Fetch keywords"
msgstr "" msgstr ""
#: mod/contacts.php:586 #: mod/contact.php:586
msgid "Fetch information and keywords" msgid "Fetch information and keywords"
msgstr "" msgstr ""
#: mod/contacts.php:618 #: mod/contact.php:618
msgid "Profile Visibility" msgid "Profile Visibility"
msgstr "" msgstr ""
#: mod/contacts.php:619 #: mod/contact.php:619
msgid "Contact Information / Notes" msgid "Contact Information / Notes"
msgstr "" msgstr ""
#: mod/contacts.php:620 #: mod/contact.php:620
msgid "Contact Settings" msgid "Contact Settings"
msgstr "" msgstr ""
#: mod/contacts.php:629 #: mod/contact.php:629
msgid "Contact" msgid "Contact"
msgstr "" msgstr ""
#: mod/contacts.php:633 #: mod/contact.php:633
#, php-format #, php-format
msgid "" msgid ""
"Please choose the profile you would like to display to %s when viewing your " "Please choose the profile you would like to display to %s when viewing your "
"profile securely." "profile securely."
msgstr "" msgstr ""
#: mod/contacts.php:635 #: mod/contact.php:635
msgid "Their personal note" msgid "Their personal note"
msgstr "" msgstr ""
#: mod/contacts.php:637 #: mod/contact.php:637
msgid "Edit contact notes" msgid "Edit contact notes"
msgstr "" msgstr ""
#: mod/contacts.php:641 #: mod/contact.php:641
msgid "Block/Unblock contact" msgid "Block/Unblock contact"
msgstr "" msgstr ""
#: mod/contacts.php:642 #: mod/contact.php:642
msgid "Ignore contact" msgid "Ignore contact"
msgstr "" msgstr ""
#: mod/contacts.php:643 #: mod/contact.php:643
msgid "Repair URL settings" msgid "Repair URL settings"
msgstr "" msgstr ""
#: mod/contacts.php:644 #: mod/contact.php:644
msgid "View conversations" msgid "View conversations"
msgstr "" msgstr ""
#: mod/contacts.php:649 #: mod/contact.php:649
msgid "Last update:" msgid "Last update:"
msgstr "" msgstr ""
#: mod/contacts.php:651 #: mod/contact.php:651
msgid "Update public posts" msgid "Update public posts"
msgstr "" msgstr ""
#: mod/contacts.php:653 mod/contacts.php:1099 #: mod/contact.php:653 mod/contact.php:1099
msgid "Update now" msgid "Update now"
msgstr "" msgstr ""
#: mod/contacts.php:659 mod/contacts.php:853 mod/contacts.php:1116 #: mod/contact.php:659 mod/contact.php:853 mod/contact.php:1116
msgid "Unignore" msgid "Unignore"
msgstr "" msgstr ""
#: mod/contacts.php:663 #: mod/contact.php:663
msgid "Currently blocked" msgid "Currently blocked"
msgstr "" msgstr ""
#: mod/contacts.php:664 #: mod/contact.php:664
msgid "Currently ignored" msgid "Currently ignored"
msgstr "" msgstr ""
#: mod/contacts.php:665 #: mod/contact.php:665
msgid "Currently archived" msgid "Currently archived"
msgstr "" msgstr ""
#: mod/contacts.php:666 #: mod/contact.php:666
msgid "Awaiting connection acknowledge" msgid "Awaiting connection acknowledge"
msgstr "" msgstr ""
#: mod/contacts.php:667 #: mod/contact.php:667
msgid "" msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible" "Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr "" msgstr ""
#: mod/contacts.php:668 #: mod/contact.php:668
msgid "Notification for new posts" msgid "Notification for new posts"
msgstr "" msgstr ""
#: mod/contacts.php:668 #: mod/contact.php:668
msgid "Send a notification of every new post of this contact" msgid "Send a notification of every new post of this contact"
msgstr "" msgstr ""
#: mod/contacts.php:671 #: mod/contact.php:671
msgid "Blacklisted keywords" msgid "Blacklisted keywords"
msgstr "" msgstr ""
#: mod/contacts.php:671 #: mod/contact.php:671
msgid "" msgid ""
"Comma separated list of keywords that should not be converted to hashtags, " "Comma separated list of keywords that should not be converted to hashtags, "
"when \"Fetch information and keywords\" is selected" "when \"Fetch information and keywords\" is selected"
msgstr "" msgstr ""
#: mod/contacts.php:683 src/Model/Profile.php:437 #: mod/contact.php:683 src/Model/Profile.php:437
msgid "XMPP:" msgid "XMPP:"
msgstr "" msgstr ""
#: mod/contacts.php:688 #: mod/contact.php:688
msgid "Actions" msgid "Actions"
msgstr "" msgstr ""
#: mod/contacts.php:734 #: mod/contact.php:734
msgid "Suggestions" msgid "Suggestions"
msgstr "" msgstr ""
#: mod/contacts.php:737 #: mod/contact.php:737
msgid "Suggest potential friends" msgid "Suggest potential friends"
msgstr "" msgstr ""
#: mod/contacts.php:745 #: mod/contact.php:745
msgid "Show all contacts" msgid "Show all contacts"
msgstr "" msgstr ""
#: mod/contacts.php:750 #: mod/contact.php:750
msgid "Unblocked" msgid "Unblocked"
msgstr "" msgstr ""
#: mod/contacts.php:753 #: mod/contact.php:753
msgid "Only show unblocked contacts" msgid "Only show unblocked contacts"
msgstr "" msgstr ""
#: mod/contacts.php:758 #: mod/contact.php:758
msgid "Blocked" msgid "Blocked"
msgstr "" msgstr ""
#: mod/contacts.php:761 #: mod/contact.php:761
msgid "Only show blocked contacts" msgid "Only show blocked contacts"
msgstr "" msgstr ""
#: mod/contacts.php:766 #: mod/contact.php:766
msgid "Ignored" msgid "Ignored"
msgstr "" msgstr ""
#: mod/contacts.php:769 #: mod/contact.php:769
msgid "Only show ignored contacts" msgid "Only show ignored contacts"
msgstr "" msgstr ""
#: mod/contacts.php:774 #: mod/contact.php:774
msgid "Archived" msgid "Archived"
msgstr "" msgstr ""
#: mod/contacts.php:777 #: mod/contact.php:777
msgid "Only show archived contacts" msgid "Only show archived contacts"
msgstr "" msgstr ""
#: mod/contacts.php:782 #: mod/contact.php:782
msgid "Hidden" msgid "Hidden"
msgstr "" msgstr ""
#: mod/contacts.php:785 #: mod/contact.php:785
msgid "Only show hidden contacts" msgid "Only show hidden contacts"
msgstr "" msgstr ""
#: mod/contacts.php:843 #: mod/contact.php:843
msgid "Search your contacts" msgid "Search your contacts"
msgstr "" msgstr ""
#: mod/contacts.php:854 mod/contacts.php:1125 #: mod/contact.php:854 mod/contact.php:1125
msgid "Archive" msgid "Archive"
msgstr "" msgstr ""
#: mod/contacts.php:854 mod/contacts.php:1125 #: mod/contact.php:854 mod/contact.php:1125
msgid "Unarchive" msgid "Unarchive"
msgstr "" msgstr ""
#: mod/contacts.php:857 #: mod/contact.php:857
msgid "Batch Actions" msgid "Batch Actions"
msgstr "" msgstr ""
#: mod/contacts.php:883 #: mod/contact.php:883
msgid "Conversations started by this contact" msgid "Conversations started by this contact"
msgstr "" msgstr ""
#: mod/contacts.php:888 #: mod/contact.php:888
msgid "Posts and Comments" msgid "Posts and Comments"
msgstr "" msgstr ""
#: mod/contacts.php:899 src/Model/Profile.php:899 #: mod/contact.php:899 src/Model/Profile.php:899
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: mod/contacts.php:911 #: mod/contact.php:911
msgid "View all contacts" msgid "View all contacts"
msgstr "" msgstr ""
#: mod/contacts.php:922 #: mod/contact.php:922
msgid "View all common friends" msgid "View all common friends"
msgstr "" msgstr ""
#: mod/contacts.php:932 #: mod/contact.php:932
msgid "Advanced Contact Settings" msgid "Advanced Contact Settings"
msgstr "" msgstr ""
#: mod/contacts.php:1022 #: mod/contact.php:1022
msgid "Mutual Friendship" msgid "Mutual Friendship"
msgstr "" msgstr ""
#: mod/contacts.php:1027 #: mod/contact.php:1027
msgid "is a fan of yours" msgid "is a fan of yours"
msgstr "" msgstr ""
#: mod/contacts.php:1032 #: mod/contact.php:1032
msgid "you are a fan of" msgid "you are a fan of"
msgstr "" msgstr ""
#: mod/contacts.php:1049 mod/photos.php:1496 mod/photos.php:1535 #: mod/contact.php:1049 mod/photos.php:1496 mod/photos.php:1535
#: mod/photos.php:1595 src/Object/Post.php:792 #: mod/photos.php:1595 src/Object/Post.php:792
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: mod/contacts.php:1056 #: mod/contact.php:1056
msgid "Edit contact" msgid "Edit contact"
msgstr "" msgstr ""
#: mod/contacts.php:1110 #: mod/contact.php:1110
msgid "Toggle Blocked status" msgid "Toggle Blocked status"
msgstr "" msgstr ""
#: mod/contacts.php:1118 #: mod/contact.php:1118
msgid "Toggle Ignored status" msgid "Toggle Ignored status"
msgstr "" msgstr ""
#: mod/contacts.php:1127 #: mod/contact.php:1127
msgid "Toggle Archive status" msgid "Toggle Archive status"
msgstr "" msgstr ""
#: mod/contacts.php:1135 #: mod/contact.php:1135
msgid "Delete contact" msgid "Delete contact"
msgstr "" msgstr ""

2
view/templates/contacts-template.tpl
View File

@ -14,7 +14,7 @@
{{$tabs}} {{$tabs}}
<form action="{{$baseurl}}/contacts/batch/" method="POST"> <form action="{{$baseurl}}/contact/batch/" method="POST">
{{foreach $contacts as $contact}} {{foreach $contacts as $contact}}
{{include file="contact_template.tpl"}} {{include file="contact_template.tpl"}}
{{/foreach}} {{/foreach}}

2
view/templates/crepair.tpl
View File

@ -15,7 +15,7 @@
<div id="contact-update-profile-wrapper"> <div id="contact-update-profile-wrapper">
{{if $update_profile}} {{if $update_profile}}
<span id="contact-update-profile-now" class="button"><a href="contacts/{{$contact_id}}/updateprofile" >{{$udprofilenow}}</a></span> <span id="contact-update-profile-now" class="button"><a href="contact/{{$contact_id}}/updateprofile" >{{$udprofilenow}}</a></span>
{{/if}} {{/if}}
</div> </div>

2
view/theme/frio/templates/contact_edit.tpl
View File

@ -45,7 +45,7 @@
{{if $poll_enabled}} {{if $poll_enabled}}
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div> <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
{{if $poll_interval}} {{if $poll_interval}}
<form id="contact-edit-poll-form" action="/contacts/{{$contact_id}}" method="post"> <form id="contact-edit-poll-form" action="/contact/{{$contact_id}}" method="post">
<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
<input class="btn btn-primary" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> <input class="btn btn-primary" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
</form> </form>

2
view/theme/frio/templates/contacts-template.tpl
View File

@ -28,7 +28,7 @@
<div id="contacts-search-end"></div> <div id="contacts-search-end"></div>
{{* we need the form container to make batch actions work *}} {{* we need the form container to make batch actions work *}}
<form name="batch_actions_submit" action="{{$baseurl}}/contacts/batch/" method="POST"> <form name="batch_actions_submit" action="{{$baseurl}}/contact/batch/" method="POST">
{{* we put here a hidden input element. This is needed to transmit the batch actions with javascript*}} {{* we put here a hidden input element. This is needed to transmit the batch actions with javascript*}}
<input type="hidden" class="batch-action no-input fakelist" name="batch_submit" value="{{$l|escape:'html'}}"> <input type="hidden" class="batch-action no-input fakelist" name="batch_submit" value="{{$l|escape:'html'}}">

2
view/theme/frio/templates/crepair.tpl
View File

@ -17,7 +17,7 @@
<div id="contact-update-profile-wrapper"> <div id="contact-update-profile-wrapper">
{{if $update_profile}} {{if $update_profile}}
<span id="contact-update-profile-now" class="button"><a href="contacts/{{$contact_id}}/updateprofile" >{{$udprofilenow}}</a></span> <span id="contact-update-profile-now" class="button"><a href="contact/{{$contact_id}}/updateprofile" >{{$udprofilenow}}</a></span>
{{/if}} {{/if}}
</div> </div>

17
view/theme/frio/theme.php
View File

@ -16,7 +16,8 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Profile; use Friendica\Model;
use Friendica\Module;
$frio = 'view/theme/frio'; $frio = 'view/theme/frio';
@ -208,7 +209,7 @@ function frio_contact_photo_menu(App $a, &$args)
function frio_remote_nav($a, &$nav) function frio_remote_nav($a, &$nav)
{ {
// get the homelink from $_XSESSION // get the homelink from $_XSESSION
$homelink = Profile::getMyURL(); $homelink = Model\Profile::getMyURL();
if (!$homelink) { if (!$homelink) {
$homelink = defaults($_SESSION, 'visitor_home', ''); $homelink = defaults($_SESSION, 'visitor_home', '');
} }
@ -246,7 +247,7 @@ function frio_remote_nav($a, &$nav)
} elseif (!local_user() && remote_user()) { } elseif (!local_user() && remote_user()) {
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
$nav['remote'] = L10n::t('Guest'); $nav['remote'] = L10n::t('Guest');
} elseif (Profile::getMyURL()) { } elseif (Model\Profile::getMyURL()) {
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact` $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
WHERE `addr` = '%s' AND `network` = 'dfrn'", WHERE `addr` = '%s' AND `network` = 'dfrn'",
DBA::escape($webbie)); DBA::escape($webbie));
@ -277,7 +278,7 @@ function frio_remote_nav($a, &$nav)
$nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')]; $nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')];
$nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')]; $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')];
$nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')]; $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')];
$nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; $nav['contacts'] = [$server_url . '/contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
$nav['sitename'] = Config::get('config', 'sitename'); $nav['sitename'] = Config::get('config', 'sitename');
} }
} }
@ -286,7 +287,7 @@ function frio_remote_nav($a, &$nav)
* @brief: Search for contacts * @brief: Search for contacts
* *
* This function search for a users contacts. The code is copied from contact search * This function search for a users contacts. The code is copied from contact search
* in /mod/contacts.php. With this function the contacts will permitted to acl_lookup() * in /src/Module/Contact.php. With this function the contacts will permitted to acl_lookup()
* and can grabbed as json. For this we use the type="r". This is usful to to let js * and can grabbed as json. For this we use the type="r". This is usful to to let js
* grab the contact data. * grab the contact data.
* We use this to give the data to textcomplete and have a filter function at the * We use this to give the data to textcomplete and have a filter function at the
@ -297,12 +298,10 @@ function frio_remote_nav($a, &$nav)
*/ */
function frio_acl_lookup(App $a, &$results) function frio_acl_lookup(App $a, &$results)
{ {
require_once 'mod/contacts.php';
$nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : ''; $nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : '';
// we introduce a new search type, r should do the same query like it's // we introduce a new search type, r should do the same query like it's
// done in /mod/contacts for connections // done in /src/Module/Contact.php for connections
if ($results['type'] !== 'r') { if ($results['type'] !== 'r') {
return; return;
} }
@ -334,7 +333,7 @@ function frio_acl_lookup(App $a, &$results)
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$contacts[] = _contact_detail_for_template($rr); $contacts[] = Module\Contact::getContactTemplateVars($rr);
} }
} }