$prefix = substr($prefix, 0, $size - 22);
return(str_replace(".", "", uniqid($prefix, true)));
} else {
- $prefix = substr($prefix, 0, $size - 13);
+ $prefix = substr($prefix, 0, max($size - 13, 0));
return(uniqid($prefix));
}
}
Programming
---
+###Code documentation
+
+If you are interested in having the documentation of the Friendica code outside of the code files, you can use [Doxygen](http://doxygen.org) to generate it.
+The configuration file for Doxygen is located in the ```util``` directory of the project sources.
+Run
+
+ $> doxygen util/Doxyfile
+
+to generate the files which will be located in the ```doc/html``` subdirectory in the Friendica directory.
+You can browse these files with any browser.
+
+If you find missing documentation, don't hestitate to contact us and write it down to enhance the code documentation.
+
###Issues
Have a look at our [issue tracker](https://github.com/friendica/friendica) on github!
}
else {
- // TODO: We really should send a notification to the owner after 2-3 weeks
- // so they won't be surprised when the contact vanishes and can take
- // remedial action if this was a serious mistake or glitch
+ /// @todo
+ /// We really should send a notification to the owner after 2-3 weeks
+ /// so they won't be surprised when the contact vanishes and can take
+ /// remedial action if this was a serious mistake or glitch
$expiry = $contact['term-date'] . ' + 32 days ';
if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
$page_owner_nick = $r[0]['nickname'];
-// To-Do:
-// $default_cid = $r[0]['id'];
-// $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+ /// @TODO
+ /// $default_cid = $r[0]['id'];
+ /// $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
if ((strlen($imagedata) == 0) AND ($url == "")) {
logger("No image data and no url provided", LOGGER_DEBUG);
<?php
-/* To-Do:
- - Automatically detect if incoming data is HTML or BBCode
-*/
+/**
+ * @file include/api.php
+ *
+ * @todo Automatically detect if incoming data is HTML or BBCode
+ */
/* Contact details:
Gerhard Seeber Mail: gerhard@seeber.at Friendica: http://mozartweg.dyndns.org/friendica/gerhard
}
function api_error(&$a, $type, $error) {
- # TODO: https://dev.twitter.com/overview/api/response-codes
+ /// @TODO https://dev.twitter.com/overview/api/response-codes
$r = "<status><error>".$error."</error><request>".$a->query_string."</request></status>";
switch($type){
case "xml":
$_REQUEST['body'] .= "\n\n".$media;
}
- // To-Do: Multiple IDs
+ /// @TODO Multiple IDs
if (requestdata('media_ids')) {
$r = q("SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
intval(requestdata('media_ids')), api_user());
*
* http://developer.twitter.com/doc/get/statuses/home_timeline
*
- * TODO: Optional parameters
- * TODO: Add reply info
+ * @TODO Optional parameters
+ * @TODO Add reply info
*/
function api_statuses_home_timeline(&$a, $type){
if (api_user()===false) return false;
function api_favorites_create_destroy(&$a, $type){
if (api_user()===false) return false;
- # for versioned api.
- # TODO: we need a better global soluton
+ // for versioned api.
+ /// @TODO We need a better global soluton
$action_argv_id=2;
if ($a->argv[1]=="1.1") $action_argv_id=3;
}
function api_get_entitities(&$text, $bbcode) {
- /*
- To-Do:
- * Links at the first character of the post
- */
+ /// @todo
+ /// Links at the first character of the post
$a = get_app();
}
function api_get_nick($profile) {
-/* To-Do:
- - remove trailing junk from profile url
- - pump.io check has to check the website
-*/
+/// @TODO Remove trailing junk from profile url
+/// @TODO pump.io check has to check the website
$nick = "";
}
}
- // To-Do: look at the page if its really a pumpio site
+ /// @TODO Look at the page if its really a pumpio site
//if (!$nick == "") {
// $pumpio = preg_replace("=https?://(.*)/(.*)/=ism", "$2", $profile."/");
// if ($pumpio != $profile)
require_once('include/datetime.php');
function nuke_session() {
+ if (get_config('system', 'disable_database_session')) {
+ session_unset();
+ return;
+ }
+
new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
unset($_SESSION['authenticated']);
unset($_SESSION['my_address']);
unset($_SESSION['addr']);
unset($_SESSION['return_url']);
+
}
-// login/logout
+// login/logout
if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) {
if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
-
+
// process logout request
call_hooks("logging_out");
nuke_session();
$check = get_config('system','paranoia');
// extra paranoia - if the IP changed, log them out
if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
- logger('Session address changed. Paranoid setting in effect, blocking session. '
+ logger('Session address changed. Paranoid setting in effect, blocking session. '
. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
nuke_session();
goaway(z_root());
}
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+ $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
intval($_SESSION['uid'])
);
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$a = get_app();
- $openid->returnUrl = $a->get_baseurl(true) . '/openid';
+ $openid->returnUrl = $a->get_baseurl(true) . '/openid';
goaway($openid->authUrl());
} catch (Exception $e) {
notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
// process normal login request
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
+ $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+ FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
dbesc(trim($_POST['username'])),
dbesc(trim($_POST['username'])),
}
if((! $record) || (! count($record))) {
- logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
+ logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
notice( t('Login failed.') . EOL );
goaway(z_root());
}
}
function new_cookie($time) {
- $old_sid = session_id();
- session_set_cookie_params("$time");
- session_regenerate_id(false);
+ if (!get_config('system', 'disable_database_session'))
+ $old_sid = session_id();
+
+ session_set_cookie_params($time);
- q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+ if (!get_config('system', 'disable_database_session')) {
+ session_regenerate_id(false);
+ q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+ }
}
// update nodeinfo data
nodeinfo_cron();
- // To-Do: Regenerate usage statistics
+ /// @TODO Regenerate usage statistics
// q("ANALYZE TABLE `item`");
// once daily run birthday_updates and then expire in background
// Months count from 1.
-// TODO: provide (prev,next) links, define class variations for different size calendars
+/// @TODO Provide (prev,next) links, define class variations for different size calendars
if(! function_exists('cal')) {
require_once('include/datetime.php');
/**
- *
- * MySQL database class
+ * @class MySQL database class
*
* For debugging, insert 'dbg(1);' anywhere in the program flow.
* dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
require_once("boot.php");
require_once('include/queue_fn.php');
require_once('include/html2plain.php');
+require_once("include/Scrape.php");
+require_once('include/diaspora.php');
require_once("include/ostatus.php");
function delivery_run(&$argv, &$argc){
@include(".htconfig.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
}
require_once("include/session.php");
require_once("include/datetime.php");
require_once('include/items.php');
require_once('include/bbcode.php');
- require_once('include/diaspora.php');
require_once('include/email.php');
load_config('config');
// Some other process may have delivered this item already.
- $r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
+ $r = q("SELECT * FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d LIMIT 1",
dbesc($cmd),
dbesc($item_id),
dbesc($contact_id)
// It's ours to deliver. Remove it from the queue.
- q("delete from deliverq where cmd = '%s' and item = %d and contact = %d",
+ q("DELETE FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d",
dbesc($cmd),
dbesc($item_id),
dbesc($contact_id)
continue;
$expire = false;
+ $mail = false;
+ $fsuggest = false;
+ $relocate = false;
$top_level = false;
$recipients = array();
$url_recipients = array();
+ $followup = false;
$normal_mode = true;
$recipients[] = $contact_id;
- if($cmd === 'expire') {
+ if($cmd === 'mail') {
+ $normal_mode = false;
+ $mail = true;
+ $message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
+ intval($item_id)
+ );
+ if(! count($message)){
+ return;
+ }
+ $uid = $message[0]['uid'];
+ $recipients[] = $message[0]['contact-id'];
+ $item = $message[0];
+ }
+ elseif($cmd === 'expire') {
$normal_mode = false;
$expire = true;
- $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
+ $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
intval($item_id)
);
$uid = $item_id;
$item_id = 0;
if(! count($items))
- continue;
+ continue;
}
- else {
+ elseif($cmd === 'suggest') {
+ $normal_mode = false;
+ $fsuggest = true;
+ $suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+ intval($item_id)
+ );
+ if(! count($suggest))
+ return;
+ $uid = $suggest[0]['uid'];
+ $recipients[] = $suggest[0]['cid'];
+ $item = $suggest[0];
+ } elseif($cmd === 'relocate') {
+ $normal_mode = false;
+ $relocate = true;
+ $uid = $item_id;
+ } else {
// find ancestors
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
intval($item_id)
$uid = $r[0]['uid'];
$updated = $r[0]['edited'];
- // POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
- if(! $parent_id)
- continue;
-
-
- $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
+ $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
intval($parent_id)
);
if(! in_array($item['contact-id'],$contacts_arr))
$contacts_arr[] = intval($item['contact-id']);
if(count($contacts_arr)) {
- $str_contacts = implode(',',$contacts_arr);
- $icontacts = q("SELECT * FROM `contact`
+ $str_contacts = implode(',',$contacts_arr);
+ $icontacts = q("SELECT * FROM `contact`
WHERE `id` IN ( $str_contacts ) "
);
}
}
}
- $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
- `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
+ $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+ `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
`user`.`page-flags`, `user`.`prvnets`
- FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
intval($uid)
);
$public_message = true;
- // fill this in with a single salmon slap if applicable
-
- $slap = '';
+ if(! ($mail || $fsuggest || $relocate)) {
+ require_once('include/group.php');
- require_once('include/group.php');
-
- $parent = $items[0];
+ $parent = $items[0];
// This is IMPORTANT!!!!
// by stringing togther an array of retractions and sending them onward.
- $localhost = $a->get_hostname();
- if(strpos($localhost,':'))
- $localhost = substr($localhost,0,strpos($localhost,':'));
+ $localhost = $a->get_hostname();
+ if(strpos($localhost,':'))
+ $localhost = substr($localhost,0,strpos($localhost,':'));
- /**
- *
- * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
- * have been known to cause runaway conditions which affected several servers, along with
- * permissions issues.
- *
- */
+ /**
+ *
+ * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
+ * have been known to cause runaway conditions which affected several servers, along with
+ * permissions issues.
+ *
+ */
- if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
- logger('relay denied for delivery agent.');
+ $relay_to_owner = false;
- /* no relay allowed for direct contact delivery */
- continue;
- }
+ if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
+ $relay_to_owner = true;
+ }
+
+ if($relay_to_owner) {
+ logger('followup '.$target_item["guid"], LOGGER_DEBUG);
+ // local followup to remote post
+ $followup = true;
+ }
+
+ if((strlen($parent['allow_cid']))
+ || (strlen($parent['allow_gid']))
+ || (strlen($parent['deny_cid']))
+ || (strlen($parent['deny_gid']))) {
+ $public_message = false; // private recipients, not public
+ }
- if((strlen($parent['allow_cid']))
- || (strlen($parent['allow_gid']))
- || (strlen($parent['deny_cid']))
- || (strlen($parent['deny_gid']))) {
- $public_message = false; // private recipients, not public
}
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
$hubxml = feed_hublinks();
- logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
-
- require_once('include/salmon.php');
-
if($contact['self'])
continue;
$deliver_status = 0;
+ logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']);
+
switch($contact['network']) {
- case NETWORK_DFRN :
+ case NETWORK_DFRN:
logger('notifier: dfrndelivery: ' . $contact['name']);
$feed_template = get_markup_template('atom_feed.tpl');
'$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
));
- foreach($items as $item) {
- if(! $item['parent'])
- continue;
+ if($mail) {
+ $public_message = false; // mail is not public
+
+ $body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
+
+ $atom .= replace_macros($mail_template, array(
+ '$name' => xmlify($owner['name']),
+ '$profile_page' => xmlify($owner['url']),
+ '$thumb' => xmlify($owner['thumb']),
+ '$item_id' => xmlify($item['uri']),
+ '$subject' => xmlify($item['title']),
+ '$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
+ '$content' => xmlify($body),
+ '$parent_id' => xmlify($item['parent-uri'])
+ ));
+ } elseif($fsuggest) {
+ $public_message = false; // suggestions are not public
+
+ $sugg_template = get_markup_template('atom_suggest.tpl');
+
+ $atom .= replace_macros($sugg_template, array(
+ '$name' => xmlify($item['name']),
+ '$url' => xmlify($item['url']),
+ '$photo' => xmlify($item['photo']),
+ '$request' => xmlify($item['request']),
+ '$note' => xmlify($item['note'])
+ ));
+
+ // We don't need this any more
+
+ q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+ intval($item['id'])
+ );
+ } elseif($relocate) {
+ $public_message = false; // suggestions are not public
- // private emails may be in included in public conversations. Filter them.
- if(($public_message) && $item['private'] == 1)
- continue;
+ $sugg_template = get_markup_template('atom_relocate.tpl');
- $item_contact = get_item_contact($item,$icontacts);
- if(! $item_contact)
- continue;
+ /* get site pubkey. this could be a new installation with no site keys*/
+ $pubkey = get_config('system','site_pubkey');
+ if(! $pubkey) {
+ $res = new_keypair(1024);
+ set_config('system','site_prvkey', $res['prvkey']);
+ set_config('system','site_pubkey', $res['pubkey']);
+ }
- if($normal_mode) {
- if($item_id == $item['id'] || $item['id'] == $item['parent'])
- $atom .= atom_entry($item,'text',null,$owner,true,(($top_level) ? $contact['id'] : 0));
+ $rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
+ WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
+ $photos = array();
+ $ext = Photo::supportedTypes();
+ foreach($rp as $p){
+ $photos[$p['scale']] = $a->get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
}
- else
- $atom .= atom_entry($item,'text',null,$owner,true);
+ unset($rp, $ext);
+
+ $atom .= replace_macros($sugg_template, array(
+ '$name' => xmlify($owner['name']),
+ '$photo' => xmlify($photos[4]),
+ '$thumb' => xmlify($photos[5]),
+ '$micro' => xmlify($photos[6]),
+ '$url' => xmlify($owner['url']),
+ '$request' => xmlify($owner['request']),
+ '$confirm' => xmlify($owner['confirm']),
+ '$notify' => xmlify($owner['notify']),
+ '$poll' => xmlify($owner['poll']),
+ '$sitepubkey' => xmlify(get_config('system','site_pubkey')),
+ //'$pubkey' => xmlify($owner['pubkey']),
+ //'$prvkey' => xmlify($owner['prvkey']),
+ ));
+ unset($photos);
+ } elseif($followup) {
+ foreach($items as $item) { // there is only one item
+ if(! $item['parent'])
+ continue;
+ if($item['id'] == $item_id) {
+ logger('followup: item: ' . print_r($item,true), LOGGER_DATA);
+ $atom .= atom_entry($item,'text',null,$owner,false);
+ }
+ }
+ } else {
+ foreach($items as $item) {
+ if(! $item['parent'])
+ continue;
+ // private emails may be in included in public conversations. Filter them.
+ if(($public_message) && $item['private'] == 1)
+ continue;
+
+ $item_contact = get_item_contact($item,$icontacts);
+ if(! $item_contact)
+ continue;
+
+ if($normal_mode) {
+ if($item_id == $item['id'] || $item['id'] == $item['parent'])
+ $atom .= atom_entry($item,'text',null,$owner,true,(($top_level) ? $contact['id'] : 0));
+ }
+ else
+ $atom .= atom_entry($item,'text',null,$owner,true);
+
+ }
}
$atom .= '</feed>' . "\r\n";
}
break;
- case NETWORK_OSTATUS :
+ case NETWORK_OSTATUS:
// Do not send to otatus if we are not configured to send to public networks
if($owner['prvnets'])
break;
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
break;
- // only send salmon if public - e.g. if it's ok to notify
- // a public hub, it's ok to send a salmon
-
- if(($public_message) && (! $expire)) {
- $slaps = array();
-
- foreach($items as $item) {
- if(! $item['parent'])
- continue;
-
- // private emails may be in included in public conversations. Filter them.
- if(($public_message) && $item['private'] == 1)
- continue;
-
- $item_contact = get_item_contact($item,$icontacts);
- if(! $item_contact)
- continue;
-
- if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
- $slaps[] = ostatus_salmon($item,$owner);
- //$slaps[] = atom_entry($item,'html',null,$owner,true);
- }
-
- logger('notifier: slapdelivery: ' . $contact['name']);
- foreach($slaps as $slappy) {
- if($contact['notify']) {
- if(! was_recently_delayed($contact['id']))
- $deliver_status = slapper($owner,$contact['notify'],$slappy);
- else
- $deliver_status = (-1);
-
- if($deliver_status == (-1)) {
- // queue message for redelivery
- add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
- }
- }
- }
- }
-
+ // There is currently no code here to distribute anything to OStatus.
+ // This is done in "notifier.php" (See "url_recipients" and "push_notify")
break;
- case NETWORK_MAIL :
+ case NETWORK_MAIL:
case NETWORK_MAIL2:
if(get_config('system','dfrn_only'))
}
break;
- case NETWORK_DIASPORA :
+ case NETWORK_DIASPORA:
if($public_message)
$loc = 'public batch ' . $contact['batch'];
else
logger('delivery: diaspora batch deliver: ' . $loc);
- if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
+ if(get_config('system','dfrn_only') || (!get_config('system','diaspora_enabled')))
+ break;
+
+ if($mail) {
+ diaspora_send_mail($item,$owner,$contact);
+ break;
+ }
+
+ if(!$normal_mode)
break;
if((! $contact['pubkey']) && (! $public_message))
}
}
- if(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
+ if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
// top-level retraction
logger('delivery: diaspora retract: ' . $loc);
diaspora_send_retraction($target_item,$owner,$contact,$public_message);
break;
- }
- elseif($target_item['uri'] !== $target_item['parent-uri']) {
+ } elseif($followup) {
+ // send comments and likes to owner to relay
+ diaspora_send_followup($target_item,$owner,$contact,$public_message);
+ break;
+ } elseif($target_item['uri'] !== $target_item['parent-uri']) {
// we are the relay - send comments, likes and relayable_retractions to our conversants
logger('delivery: diaspora relay: ' . $loc);
diaspora_send_relay($target_item,$owner,$contact,$public_message);
break;
- }
- elseif(($top_level) && (! $walltowall)) {
+ } elseif(($top_level) && (! $walltowall)) {
// currently no workable solution for sending walltowall
logger('delivery: diaspora status: ' . $loc);
diaspora_send_status($target_item,$owner,$contact,$public_message);
break;
- case NETWORK_FEED :
- case NETWORK_FACEBOOK :
- if(get_config('system','dfrn_only'))
- break;
- case NETWORK_PUMPIO :
- if(get_config('system','dfrn_only'))
- break;
default:
break;
}
<?php
-/*
-To-Do:
-- GET /people/9aed8882b9f64896/stream
-*/
+/**
+ * @file include/diaspora.php
+ *
+ * @todo GET /people/9aed8882b9f64896/stream
+ */
require_once('include/crypto.php');
require_once('include/items.php');
}
function diaspora_plink($addr, $guid) {
- $r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", $addr);
+ $r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
// Fallback
if (!$r)
DiasporaFetchGuid($datarray);
$message_id = item_store($datarray);
- // To-Do:
- // Looking if there is some subscribe mechanism in Diaspora to get all comments for this post
+ /// @TODO
+ /// Looking if there is some subscribe mechanism in Diaspora to get all comments for this post
return $message_id;
}
$body = scale_external_images($body);
// Add OEmbed and other information to the body
- // To-Do: It could be a repeated redmatrix item
- // Then we shouldn't add further data to it
+ /// @TODO It could be a repeated redmatrix item
+ /// Then we shouldn't add further data to it
if ($item["object-type"] == ACTIVITY_OBJ_NOTE)
$body = add_page_info_to_body($body, false, true);
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
// The only item with `parent` and `id` as the parent id is the parent item.
- $p = q("select origin from item where parent = %d and id = %d limit 1",
- $r[0]['parent'],
- $r[0]['parent']
+ $p = q("SELECT `origin` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
+ intval($r[0]['parent']),
+ intval($r[0]['parent'])
);
if(count($p)) {
if(($p[0]['origin']) && (! $parent_author_signature)) {
if(substr($birthday,5) === substr($contact['bd'],5))
$birthday = $contact['bd'];
- // TODO: update name on item['author-name'] if the name changed. See consume_feed()
- // Not doing this currently because D* protocol is scheduled for revision soon.
+ /// @TODO Update name on item['author-name'] if the name changed. See consume_feed()
+ /// (Not doing this currently because D* protocol is scheduled for revision soon).
$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s', `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($name),
/**
* email_send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code
- * (not to notify the user, but to send items to email contacts
+ * (not to notify the user, but to send items to email contacts)
*
- * TODO: this could be changed to use the Emailer class
+ * @todo This could be changed to use the Emailer class
*/
function email_send($addr, $subject, $headers, $item) {
//$headers .= 'MIME-Version: 1.0' . "\n";
continue;
}
- // To-Do?
+ /// @TODO ?
// <category>Ausland</category>
// <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
dbesc($item["uri"]), dbesc($item["network"]));
}
-// Adds a "lang" specification in a "postopts" element of given $arr,
-// if possible and not already present.
-// Expects "body" element to exist in $arr.
-// TODO: add a parameter to request forcing override
+/**
+ * Adds a "lang" specification in a "postopts" element of given $arr,
+ * if possible and not already present.
+ * Expects "body" element to exist in $arr.
+ *
+ * @todo Add a parameter to request forcing override
+ */
function item_add_language_opt(&$arr) {
if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ?
if ( strstr($arr['postopts'], 'lang=') )
{
// do not override
- // TODO: add parameter to request overriding
+ /// @TODO Add parameter to request overriding
return;
}
$postopts = $arr['postopts'];
return 1;
}
- // TODO
- // merge with current record, current contents have priority
- // update record, set url-updated
- // update profile photos
- // schedule a scan?
+ /// @TODO
+ /// merge with current record, current contents have priority
+ /// update record, set url-updated
+ /// update profile photos
+ /// schedule a scan?
return 0;
}
$o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
}
- // To-Do:
- // To support these elements, the API needs to be enhanced
- //$o .= '<link rel="ostatus:conversation" href="'.xmlify($a->get_baseurl().'/display/'.$owner['nickname'].'/'.$item['parent']).'"/>'."\r\n";
- //$o .= "\t".'<link rel="self" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
- //$o .= "\t".'<link rel="edit" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
+ /// @TODO
+ /// To support these elements, the API needs to be enhanced
+ /// $o .= '<link rel="ostatus:conversation" href="'.xmlify($a->get_baseurl().'/display/'.$owner['nickname'].'/'.$item['parent']).'"/>'."\r\n";
+ /// $o .= "\t".'<link rel="self" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
+ /// $o .= "\t".'<link rel="edit" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
// Deactivated since it was meant only for OStatus
//$o .= item_get_attachment($item);
if (($sigpos < $quotepos) and ($sigpos != 0))
return(array('body' => $message, 'sig' => ''));
- // To-Do: Regexp umstellen, so dass auf 1 oder kein Leerzeichen
- // geprueft wird
- //$message = str_replace("\n--\n", "\n-- \n", $message);
+ /// @TODO Regexp umstellen, so dass auf 1 oder kein Leerzeichen
+ /// geprueft wird
+ /// $message = str_replace("\n--\n", "\n-- \n", $message);
$pattern = '/(.*)[\r\n]-- [\r\n](.*)/is';
$lines = explode("\n",$headers);
if(count($lines)) {
foreach($lines as $line) {
- // TODO alter the following regex to support multiple relations (space separated)
+ /// @TODO Alter the following regex to support multiple relations (space separated)
if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
$pagelink = $matches[1];
break;
require_once("include/Scrape.php");
require_once('include/diaspora.php');
require_once("include/ostatus.php");
+require_once('include/salmon.php');
/*
* This file was at one time responsible for doing all deliveries, but this caused
- * big problems on shared hosting systems, where the process might get killed by the
- * hosting provider and nothing would get delivered.
- * It now only delivers one message under certain cases, and invokes a queued
- * delivery mechanism (include/deliver.php) to deliver individual contacts at
- * controlled intervals.
- * This has a much better chance of surviving random processes getting killed
- * by the hosting provider.
- * A lot of this code is duplicated in include/deliver.php until we have time to go back
- * and re-structure the delivery procedure based on the obstacles that have been thrown at
- * us by hosting providers.
+ * big problems when the process was killed or stalled during the delivery process.
+ * It now invokes separate queues that are delivering via delivery.php and pubsubpublish.php.
*/
/*
$normal_mode = false;
$relocate = true;
$uid = $item_id;
+
+ $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
} else {
// find ancestors
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
$uid = $r[0]['uid'];
$updated = $r[0]['edited'];
- // POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
- if(! $parent_id)
- return;
-
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
intval($parent_id)
if(! ($mail || $fsuggest || $relocate)) {
+ $slap = ostatus_salmon($target_item,$owner);
+
require_once('include/group.php');
$parent = $items[0];
$relay_to_owner = false;
- if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
+ if(!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
$relay_to_owner = true;
}
- if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && (! $top_level)) {
+ if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) {
$relay_to_owner = true;
}
$public_message = false; // not public
$conversant_str = dbesc($parent['contact-id']);
$recipients = array($parent['contact-id']);
+ $recipients_followup = array($parent['contact-id']);
- if (!$target_item['private'] AND $target_item['wall'] AND
+ //if (!$target_item['private'] AND $target_item['wall'] AND
+ if (!$target_item['private'] AND
(strlen($target_item['allow_cid'].$target_item['allow_gid'].
$target_item['deny_cid'].$target_item['deny_gid']) == 0))
$push_notify = true;
- // We notify Friendica users in the thread when it is an OStatus thread.
- // Hopefully this transfers the messages to the other Friendica servers. (Untested)
if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
$push_notify = true;
if ($parent["network"] == NETWORK_OSTATUS) {
- $r = q("SELECT `author-link` FROM `item` WHERE `parent` = %d AND `author-link` != '%s'",
- intval($target_item["parent"]), dbesc($owner['url']));
- foreach($r as $parent_item) {
- $probed_contact = probe_url($parent_item["author-link"]);
- if (($probed_contact["notify"] != "") AND ($probed_contact["network"] == NETWORK_DFRN)) {
- logger('Notify Friendica user '.$probed_contact["url"].': '.$probed_contact["notify"]);
- $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
- }
- }
+ // Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments
+ // Currently it is work at progress
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending`",
+ intval($uid),
+ dbesc(NETWORK_DFRN)
+ );
+ if(count($r))
+ foreach($r as $rr)
+ $recipients_followup[] = $rr['id'];
}
-
- if (count($url_recipients))
- logger("url_recipients ".print_r($url_recipients,true));
}
+ logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
} else {
$followup = false;
// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
} else
- $sql_extra = "";
+ $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')";
$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0".$sql_extra);
if(count($r))
$contacts = $r;
- }
-
- $feed_template = get_markup_template('atom_feed.tpl');
- $mail_template = get_markup_template('atom_mail.tpl');
-
- $atom = '';
- $slaps = array();
-
- $hubxml = feed_hublinks();
-
- $birthday = feed_birthday($owner['uid'],$owner['timezone']);
-
- if(strlen($birthday))
- $birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
-
- $atom .= replace_macros($feed_template, array(
- '$version' => xmlify(FRIENDICA_VERSION),
- '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
- '$feed_title' => xmlify($owner['name']),
- '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
- '$hub' => $hubxml,
- '$salmon' => '', // private feed, we don't use salmon here
- '$name' => xmlify($owner['name']),
- '$profile_page' => xmlify($owner['url']),
- '$photo' => xmlify($owner['photo']),
- '$thumb' => xmlify($owner['thumb']),
- '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
- '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) ,
- '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) ,
- '$birthday' => $birthday,
- '$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
-
- ));
-
- if($mail) {
- $public_message = false; // mail is not public
-
- $body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
-
- $atom .= replace_macros($mail_template, array(
- '$name' => xmlify($owner['name']),
- '$profile_page' => xmlify($owner['url']),
- '$thumb' => xmlify($owner['thumb']),
- '$item_id' => xmlify($item['uri']),
- '$subject' => xmlify($item['title']),
- '$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
- '$content' => xmlify($body),
- '$parent_id' => xmlify($item['parent-uri'])
- ));
- } elseif($fsuggest) {
- $public_message = false; // suggestions are not public
-
- $sugg_template = get_markup_template('atom_suggest.tpl');
-
- $atom .= replace_macros($sugg_template, array(
- '$name' => xmlify($item['name']),
- '$url' => xmlify($item['url']),
- '$photo' => xmlify($item['photo']),
- '$request' => xmlify($item['request']),
- '$note' => xmlify($item['note'])
- ));
-
- // We don't need this any more
-
- q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1",
- intval($item['id'])
- );
-
- } elseif($relocate) {
- $public_message = false; // suggestions are not public
- $sugg_template = get_markup_template('atom_relocate.tpl');
-
- /* get site pubkey. this could be a new installation with no site keys*/
- $pubkey = get_config('system','site_pubkey');
- if(! $pubkey) {
- $res = new_keypair(1024);
- set_config('system','site_prvkey', $res['prvkey']);
- set_config('system','site_pubkey', $res['pubkey']);
- }
-
- $rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
- WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
- $photos = array();
- $ext = Photo::supportedTypes();
- foreach($rp as $p){
- $photos[$p['scale']] = $a->get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
- }
- unset($rp, $ext);
-
- $atom .= replace_macros($sugg_template, array(
- '$name' => xmlify($owner['name']),
- '$photo' => xmlify($photos[4]),
- '$thumb' => xmlify($photos[5]),
- '$micro' => xmlify($photos[6]),
- '$url' => xmlify($owner['url']),
- '$request' => xmlify($owner['request']),
- '$confirm' => xmlify($owner['confirm']),
- '$notify' => xmlify($owner['notify']),
- '$poll' => xmlify($owner['poll']),
- '$sitepubkey' => xmlify(get_config('system','site_pubkey')),
- //'$pubkey' => xmlify($owner['pubkey']),
- //'$prvkey' => xmlify($owner['prvkey']),
- ));
- $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
- unset($photos);
- } else {
-
- $slap = ostatus_salmon($target_item,$owner);
- //$slap = atom_entry($target_item,'html',null,$owner,false);
-
- if($followup) {
- foreach($items as $item) { // there is only one item
- if(! $item['parent'])
- continue;
- if($item['id'] == $item_id) {
- logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
- //$slap = atom_entry($item,'html',null,$owner,false);
- $atom .= atom_entry($item,'text',null,$owner,false);
- }
- }
- } else {
- foreach($items as $item) {
-
- if(! $item['parent'])
- continue;
-
- // private emails may be in included in public conversations. Filter them.
-
- if(($public_message) && $item['private'] == 1)
- continue;
-
-
- $contact = get_item_contact($item,$contacts);
-
- if(! $contact)
- continue;
-
- if($normal_mode) {
-
- // we only need the current item, but include the parent because without it
- // older sites without a corresponding dfrn_notify change may do the wrong thing.
-
- if($item_id == $item['id'] || $item['id'] == $item['parent'])
- $atom .= atom_entry($item,'text',null,$owner,true);
- } else
- $atom .= atom_entry($item,'text',null,$owner,true);
-
- if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
- $slaps[] = ostatus_salmon($item,$owner);
- //$slaps[] = atom_entry($item,'html',null,$owner,true);
- }
- }
- }
- $atom .= '</feed>' . "\r\n";
-
- logger('notifier: ' . $atom, LOGGER_DATA);
-
- logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
+ } else
+ $public_message = false;
// If this is a public message and pubmail is set on the parent, include all your email contacts
if((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
&& (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid']))
&& (intval($target_item['pubmail']))) {
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
intval($uid),
dbesc(NETWORK_MAIL)
);
}
if($followup)
- $recip_str = $parent['contact-id'];
+ $recip_str = implode(', ', $recipients_followup);
else
$recip_str = implode(', ', $recipients);
if ($relocate)
$r = $recipients_relocate;
else
- $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ",
+ $r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending`",
dbesc($recip_str)
);
- require_once('include/salmon.php');
-
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
// If we are using the worker we don't need a delivery interval
if(count($r)) {
foreach($r as $contact) {
- if((! $mail) && (! $fsuggest) && (! $followup) && (!$relocate) && (! $contact['self'])) {
+ if(!$contact['self']) {
if(($contact['network'] === NETWORK_DIASPORA) && ($public_message))
continue;
- q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )",
+ q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)",
dbesc($cmd),
intval($item_id),
intval($contact['id'])
if($contact['self'])
continue;
- logger("Deliver ".$target_item["guid"]." to ".$contact['url'], LOGGER_DEBUG);
+ logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
// potentially more than one recipient. Start a new process and space them out a bit.
// we will deliver single recipient types of message and email recipients here.
- if((! $mail) && (! $fsuggest) && (!$relocate) && (! $followup)) {
-
- $this_batch[] = $contact['id'];
+ $this_batch[] = $contact['id'];
- if(count($this_batch) == $deliveries_per_process) {
- proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
- $this_batch = array();
- if($interval)
- @time_sleep_until(microtime(true) + (float) $interval);
- }
- continue;
- }
- // be sure to pick up any stragglers
- if(count($this_batch))
+ if(count($this_batch) >= $deliveries_per_process) {
proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
-
-
- $deliver_status = 0;
-
- logger("main delivery by notifier: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate");
-
- switch($contact['network']) {
- case NETWORK_DFRN:
-
- // perform local delivery if we are on the same site
-
- $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3));
-
- if(link_compare($basepath,$a->get_baseurl())) {
-
- $nickname = basename($contact['url']);
- if($contact['issued-id'])
- $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
- else
- $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
-
- $x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
- `contact`.`pubkey` AS `cpubkey`,
- `contact`.`prvkey` AS `cprvkey`,
- `contact`.`thumb` AS `thumb`,
- `contact`.`url` as `url`,
- `contact`.`name` as `senderName`,
- `user`.*
- FROM `contact`
- INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
- WHERE `contact`.`blocked` = 0 AND `contact`.`archive` = 0
- AND `contact`.`pending` = 0
- AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
- $sql_extra
- AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1",
- dbesc(NETWORK_DFRN),
- dbesc($nickname)
- );
-
- if($x && count($x)) {
- $write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false);
- if((($owner['page-flags'] == PAGE_COMMUNITY) || ($write_flag)) && (! $x[0]['writable'])) {
- q("update contact set writable = 1 where id = %d",
- intval($x[0]['id'])
- );
- $x[0]['writable'] = 1;
- }
-
- // if contact's ssl policy changed, which we just determined
- // is on our own server, update our contact links
-
- $ssl_policy = get_config('system','ssl_policy');
- fix_contact_ssl_policy($x[0],$ssl_policy);
-
- // If we are setup as a soapbox we aren't accepting top level posts from this person
-
- if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
- break;
-
- require_once('library/simplepie/simplepie.inc');
- logger('mod-delivery: local delivery');
- local_delivery($x[0],$atom);
- break;
- }
- }
-
- logger('notifier: dfrndelivery: ' . $contact['name']);
- $deliver_status = dfrn_deliver($owner,$contact,$atom);
-
- logger('notifier: dfrn_delivery returns ' . $deliver_status);
-
- if($deliver_status == (-1)) {
- logger('notifier: delivery failed: queuing message');
- // queue message for redelivery
- add_to_queue($contact['id'],NETWORK_DFRN,$atom);
- }
- break;
- case NETWORK_OSTATUS:
-
- // Do not send to ostatus if we are not configured to send to public networks
- if($owner['prvnets'])
- break;
-
- if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
- break;
-
- if($followup && $contact['notify']) {
- logger('slapdelivery followup item '.$item_id.' to ' . $contact['name']);
- $deliver_status = slapper($owner,$contact['notify'],$slap);
-
- if($deliver_status == (-1)) {
- // queue message for redelivery
- add_to_queue($contact['id'],NETWORK_OSTATUS,$slap);
- }
- } else {
-
- // only send salmon if public - e.g. if it's ok to notify
- // a public hub, it's ok to send a salmon
-
- if((count($slaps)) && ($public_message) && (! $expire)) {
- logger('slapdelivery item '.$item_id.' to ' . $contact['name']);
- foreach($slaps as $slappy) {
- if($contact['notify']) {
- $deliver_status = slapper($owner,$contact['notify'],$slappy);
- if($deliver_status == (-1)) {
- // queue message for redelivery
- add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
- }
- }
- }
- }
- }
- break;
-
- case NETWORK_MAIL:
- case NETWORK_MAIL2:
-
- if(get_config('system','dfrn_only'))
- break;
-
- // WARNING: does not currently convert to RFC2047 header encodings, etc.
-
- $addr = $contact['addr'];
- if(! strlen($addr))
- break;
-
- if($cmd === 'wall-new' || $cmd === 'comment-new') {
-
- $it = null;
- if($cmd === 'wall-new')
- $it = $items[0];
- else {
- $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($argv[2]),
- intval($uid)
- );
- if(count($r))
- $it = $r[0];
- }
- if(! $it)
- break;
-
-
-
- $local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($uid)
- );
- if(! count($local_user))
- break;
-
- $reply_to = '';
- $r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
- intval($uid)
- );
- if($r1 && $r1[0]['reply_to'])
- $reply_to = $r1[0]['reply_to'];
-
- $subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
-
- // only expose our real email address to true friends
- if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
- if($reply_to) {
- $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n";
- $headers .= 'Sender: '.$local_user[0]['email']."\n";
- } else
- $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
- else
- $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
-
- //if($reply_to)
- // $headers .= 'Reply-to: ' . $reply_to . "\n";
-
- $headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
-
- if($it['uri'] !== $it['parent-uri']) {
- $headers .= "References: <".iri2msgid($it["parent-uri"]).">";
-
- // If Threading is enabled, write down the correct parent
- if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"]))
- $headers .= " <".iri2msgid($it["thr-parent"]).">";
- $headers .= "\n";
-
- if(!$it['title']) {
- $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($it['parent-uri']),
- intval($uid));
-
- if(count($r) AND ($r[0]['title'] != ''))
- $subject = $r[0]['title'];
- else {
- $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($it['parent-uri']),
- intval($uid));
-
- if(count($r) AND ($r[0]['title'] != ''))
- $subject = $r[0]['title'];
- }
- }
- if(strncasecmp($subject,'RE:',3))
- $subject = 'Re: '.$subject;
- }
- email_send($addr, $subject, $headers, $it);
- }
- break;
- case NETWORK_DIASPORA:
- if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')))
- break;
-
- if($mail) {
- diaspora_send_mail($item,$owner,$contact);
- break;
- }
-
- if(! $normal_mode)
- break;
-
- // special handling for followup to public post
- // all other public posts processed as public batches further below
-
- if($public_message) {
- if($followup)
- diaspora_send_followup($target_item,$owner,$contact, true);
- break;
- }
-
- if(! $contact['pubkey'])
- break;
-
- $unsupported_activities = array(ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
-
- //don't transmit activities which are not supported by diaspora
- foreach($unsupported_activities as $act) {
- if(activity_match($target_item['verb'],$act)) {
- break 2;
- }
- }
-
- if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
- // send both top-level retractions and relayable retractions for owner to relay
- diaspora_send_retraction($target_item,$owner,$contact);
- break;
- }
- elseif($followup) {
- // send comments and likes to owner to relay
- diaspora_send_followup($target_item,$owner,$contact);
- break;
- }
- elseif($target_item['uri'] !== $target_item['parent-uri']) {
- // we are the relay - send comments, likes and relayable_retractions
- // (of comments and likes) to our conversants
- diaspora_send_relay($target_item,$owner,$contact);
- break;
- }
- elseif(($top_level) && (! $walltowall)) {
- // currently no workable solution for sending walltowall
- diaspora_send_status($target_item,$owner,$contact);
- break;
- }
-
- break;
-
- case NETWORK_FEED:
- case NETWORK_FACEBOOK:
- if(get_config('system','dfrn_only'))
- break;
- case NETWORK_PUMPIO:
- if(get_config('system','dfrn_only'))
- break;
- default:
- break;
+ $this_batch = array();
+ if($interval)
+ @time_sleep_until(microtime(true) + (float) $interval);
}
+ continue;
}
+
+ // be sure to pick up any stragglers
+ if(count($this_batch))
+ proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
}
- // send additional slaps to mentioned remote tags (@foo@example.com)
+ // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
+ // They are especially used for notifications to OStatus users that don't follow us.
- //if($slap && count($url_recipients) && ($followup || $top_level) && ($public_message || $push_notify) && (! $expire)) {
- if($slap && count($url_recipients) && ($public_message || $push_notify) && (!$expire)) {
- if(! get_config('system','dfrn_only')) {
+ if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
+ if(!get_config('system','dfrn_only')) {
foreach($url_recipients as $url) {
if($url) {
logger('notifier: urldelivery: ' . $url);
$deliver_status = slapper($owner,$url,$slap);
- // TODO: redeliver/queue these items on failure, though there is no contact record
+ /// @TODO Redeliver/queue these items on failure, though there is no contact record
}
}
}
}
-
+ // Notify PuSH subscribers (Used for OStatus distribution of regular posts)
if($push_notify AND strlen($hub)) {
$hubs = explode(',', $hub);
if(count($hubs)) {
poco_load($contact['id'],$importer_uid,0,$contact['poco']);
}
- // To-Do:
- // - Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
- // - Check whether this is possible with Redmatrix
+ /// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
+ /// @TODO Check whether this is possible with Redmatrix
if ($contact["network"] == NETWORK_DIASPORA) {
if (poco_do_update($contact["created"], $contact["last-item"], $contact["failure_update"], $contact["success_update"])) {
$last_updated = poco_last_updated($contact["url"]);
logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
// some mailing lists have the original author as 'from' - add this sender info to msg body.
- // todo: adding a gravatar for the original author would be cool
+ /// @TODO Adding a gravatar for the original author would be cool
if(! stristr($meta->from,$contact['addr'])) {
$from = imap_mime_header_decode($meta->from);
require_once("include/Photo.php");
require_once("include/Scrape.php");
require_once("include/follow.php");
+require_once("include/api.php");
require_once("mod/proxy.php");
define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
$item["object"] = $xml;
$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
- // To-Do:
- // Delete a message
+ /// @TODO
+ /// Delete a message
if ($item["verb"] == "qvitter-delete-notice") {
// ignore "Delete" messages (by now)
logger("Ignore delete message ".print_r($item, true));
if ($georsspoint)
$item["coord"] = $georsspoint->item(0)->nodeValue;
- // To-Do
- // $item["location"] =
+ /// @TODO
+ /// $item["location"] =
$categories = $xpath->query('atom:category', $entry);
if ($categories) {
$existing_message = $message_exists[0];
// We improved the way we fetch OStatus messages, this shouldn't happen very often now
- // To-Do: we have to change the shadow copies as well. This way here is really ugly.
+ /// @TODO We have to change the shadow copies as well. This way here is really ugly.
if ($existing_message["parent"] != $parent["id"]) {
logger('updating id '.$existing_message["id"].' with parent '.$existing_message["parent"].' to parent '.$parent["id"].' uri '.$parent["uri"].' thread '.$parent_uri, LOGGER_DEBUG);
logger("No contact found for url ".$actor, LOGGER_DEBUG);
// Adding a global contact
- // To-Do: Use this data for the post
+ /// @TODO Use this data for the post
$global_contact_id = get_contact($actor, 0);
logger("Global contact ".$global_contact_id." found for url ".$actor, LOGGER_DEBUG);
}
}
+function get_reshared_guid($item) {
+ $body = trim($item["body"]);
+
+ // Skip if it isn't a pure repeated messages
+ // Does it start with a share?
+ if (strpos($body, "[share") > 0)
+ return("");
+
+ // Does it end with a share?
+ if (strlen($body) > (strrpos($body, "[/share]") + 8))
+ return("");
+
+ $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+ // Skip if there is no shared message in there
+ if ($body == $attributes)
+ return(false);
+
+ $guid = "";
+ preg_match("/guid='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $guid = $matches[1];
+
+ preg_match('/guid="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $guid = $matches[1];
+
+ return $guid;
+}
+
function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) {
$element = $doc->createElement($element, xmlify($value));
function ostatus_add_header($doc, $owner) {
$a = get_app();
- $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
- intval($owner["uid"]));
- if (!$r)
- return;
-
- $profile = $r[0];
-
$root = $doc->createElementNS(NS_ATOM, 'feed');
$doc->appendChild($root);
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
xml_add_element($doc, $root, "id", $a->get_baseurl()."/profile/".$owner["nick"]);
- xml_add_element($doc, $root, "title", sprintf("%s timeline", $profile["name"]));
- xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $profile["name"], $a->config["sitename"]));
- xml_add_element($doc, $root, "logo", $profile["photo"]);
+ xml_add_element($doc, $root, "title", sprintf("%s timeline", $owner["name"]));
+ xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
+ xml_add_element($doc, $root, "logo", $owner["photo"]);
xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
- $author = ostatus_add_author($doc, $owner, $profile);
+ $author = ostatus_add_author($doc, $owner);
$root->appendChild($author);
$attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html");
xml_add_element($doc, $root, "link", "", $attributes);
- // To-Do: We have to find out what this is
- //$attributes = array("href" => $a->get_baseurl()."/sup",
- // "rel" => "http://api.friendfeed.com/2008/03#sup",
- // "type" => "application/json");
- //xml_add_element($doc, $root, "link", "", $attributes);
+ /// @TODO We have to find out what this is
+ /// $attributes = array("href" => $a->get_baseurl()."/sup",
+ /// "rel" => "http://api.friendfeed.com/2008/03#sup",
+ /// "type" => "application/json");
+ /// xml_add_element($doc, $root, "link", "", $attributes);
ostatus_hublinks($doc, $root);
}
}
-function ostatus_add_author($doc, $owner, $profile) {
+function ostatus_add_author($doc, $owner) {
$a = get_app();
+ $r = q("SELECT `homepage` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
+ if ($r)
+ $profile = $r[0];
+
$author = $doc->createElement("author");
xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
xml_add_element($doc, $author, "uri", $owner["url"]);
- xml_add_element($doc, $author, "name", $profile["name"]);
+ xml_add_element($doc, $author, "name", $owner["name"]);
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
xml_add_element($doc, $author, "link", "", $attributes);
"type" => "image/jpeg", // To-Do?
"media:width" => 175,
"media:height" => 175,
- "href" => $profile["photo"]);
+ "href" => $owner["photo"]);
xml_add_element($doc, $author, "link", "", $attributes);
- $attributes = array(
- "rel" => "avatar",
- "type" => "image/jpeg", // To-Do?
- "media:width" => 80,
- "media:height" => 80,
- "href" => $profile["thumb"]);
- xml_add_element($doc, $author, "link", "", $attributes);
+ if (isset($owner["thumb"])) {
+ $attributes = array(
+ "rel" => "avatar",
+ "type" => "image/jpeg", // To-Do?
+ "media:width" => 80,
+ "media:height" => 80,
+ "href" => $owner["thumb"]);
+ xml_add_element($doc, $author, "link", "", $attributes);
+ }
xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]);
- xml_add_element($doc, $author, "poco:displayName", $profile["name"]);
- xml_add_element($doc, $author, "poco:note", bbcode($profile["about"]));
+ xml_add_element($doc, $author, "poco:displayName", $owner["name"]);
+ xml_add_element($doc, $author, "poco:note", $owner["about"]);
if (trim($owner["location"]) != "") {
$element = $doc->createElement("poco:address");
$author->appendChild($urls);
}
- xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"]));
- xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
+ if (count($profile)) {
+ xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"]));
+ xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
+ }
return $author;
}
-/*
-To-Do: Picture attachments should look like this:
-
-<a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
-class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
-
+/**
+ * @TODO Picture attachments should look like this:
+ * <a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
+ * class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
+ *
*/
-function ostatus_entry($doc, $item, $owner, $toplevel = false) {
+function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) {
$a = get_app();
- if (!$toplevel) {
+ $is_repeat = false;
+
+/* if (!$repeat) {
+ $repeated_guid = get_reshared_guid($item);
+
+ if ($repeated_guid != "") {
+ $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ intval($owner["uid"]), dbesc($repeated_guid));
+ if ($r) {
+ $repeated_item = $r[0];
+ $is_repeat = true;
+ }
+ }
+ }
+*/
+ if (!$toplevel AND !$repeat) {
$entry = $doc->createElement("entry");
$title = sprintf("New note by %s", $owner["nick"]);
+ } elseif (!$toplevel AND $repeat) {
+ $entry = $doc->createElement("activity:object");
+ $title = sprintf("New note by %s", $owner["nick"]);
} else {
$entry = $doc->createElementNS(NS_ATOM, "entry");
$entry->setAttribute("xmlns:ostatus", NS_OSTATUS);
$entry->setAttribute("xmlns:statusnet", NS_STATUSNET);
- $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
- intval($owner["uid"]));
- if (!$r)
- return;
-
- $profile = $r[0];
-
- $author = ostatus_add_author($doc, $owner, $profile);
+ $author = ostatus_add_author($doc, $owner);
$entry->appendChild($author);
$title = sprintf("New comment by %s", $owner["nick"]);
// But: it seems as if it doesn't federate well between the GS servers
// So we just set it to "note" to be sure that it reaches their target systems
- xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+ if (!$repeat)
+ xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+ else
+ xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity');
+
xml_add_element($doc, $entry, "id", $item["uri"]);
xml_add_element($doc, $entry, "title", $title);
"href" => $a->get_baseurl()."/display/".$item["guid"]));
xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
- xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
+
+ if (!$is_repeat)
+ xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
+ else
+ xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE);
+
xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
+ if ($is_repeat) {
+ $repeated_owner = array();
+ $repeated_owner["name"] = $repeated_item["author-name"];
+ $repeated_owner["url"] = $repeated_item["author-link"];
+ $repeated_owner["photo"] = $repeated_item["author-avatar"];
+ $repeated_owner["nick"] = $repeated_owner["name"];
+ $repeated_owner["location"] = "";
+ $repeated_owner["about"] = "";
+ $repeated_owner["uid"] = 0;
+
+ $r =q("SELECT * FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($repeated_item["author-link"]));
+ if ($r) {
+ $repeated_owner["nick"] = $r[0]["nick"];
+ $repeated_owner["location"] = $r[0]["location"];
+ $repeated_owner["about"] = $r[0]["about"];
+ }
+
+ $entry_repeat = ostatus_entry($doc, $repeated_item, $repeated_owner, false, true);
+ $entry->appendChild($entry_repeat);
+ } elseif ($repeat) {
+ $author = ostatus_add_author($doc, $owner);
+ $entry->appendChild($author);
+ }
+
$mentioned = array();
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
- $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
+ $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$attributes = array(
ostatus_get_attachment($doc, $entry, $item);
- // To-Do:
- // The API call has yet to be implemented
+ /// @TODO
+ /// The API call has yet to be implemented
//$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
// "rel" => "self", "type" => "application/atom+xml");
//xml_add_element($doc, $entry, "link", "", $attributes);
if ($app == "")
$app = "web";
- xml_add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item["id"], "source" => $app));
+
+ $attributes = array("local_id" => $item["id"], "source" => $app);
+ if ($is_repeat)
+ $attributes["repeat_of"] = $repeated_item["id"];
+
+ xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes);
return $entry;
}
WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`))
- OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s'))) AND `thread`.`mention`)
- AND (`item`.`owner-link` IN ('%s', '%s'))
+ OR (`item`.`network` = '%s' AND ((`thread`.`network` IN ('%s', '%s')) OR (`thritem`.`network` IN ('%s', '%s')))) AND `thread`.`mention`)
+ AND ((`item`.`owner-link` IN ('%s', '%s') AND (`item`.`parent` = `item`.`id`))
+ OR (`item`.`author-link` IN ('%s', '%s')))
ORDER BY `item`.`received` DESC
LIMIT 0, 300",
- intval($owner["uid"]), dbesc($check_date),
- dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+ intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN),
+ //dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+ //dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+ dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
+ dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
+ dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])),
dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"]))
);
}
function shortenmsg($msg, $limit, $twitter = false) {
- // To-Do:
- // For Twitter URLs aren't shortened, but they have to be calculated as if.
+ /// @TODO
+ /// For Twitter URLs aren't shortened, but they have to be calculated as if.
$lines = explode("\n", $msg);
$msg = "";
q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
intval($pid["pid"]));
else {
- // To-Do: Kill long running processes
- // But: Update processes (like the database update) mustn't be killed
+ /// @TODO Kill long running processes
+ /// But: Update processes (like the database update) mustn't be killed
}
} else
$r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
foreach($r as $rr) {
- //$params = get_feed_for($a, '', $rr['nickname'], $rr['last_update'], 0, true);
+
+ logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
+
$params = ostatus_feed($a, $rr['nickname'], $rr['last_update']);
$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
return;
}
- // add all namespaces to item
-
-$namespaces = <<< EOT
-<entry xmlns="http://www.w3.org/2005/Atom"
- xmlns:thr="http://purl.org/syndication/thread/1.0"
- xmlns:at="http://purl.org/atompub/tombstones/1.0"
- xmlns:media="http://purl.org/syndication/atommedia"
- xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
- xmlns:as="http://activitystrea.ms/spec/1.0/"
- xmlns:georss="http://www.georss.org/georss"
- xmlns:poco="http://portablecontacts.net/spec/1.0"
- xmlns:ostatus="http://ostatus.org/schema/1.0"
- xmlns:statusnet="http://status.net/schema/api/1/" > >
-EOT;
-
- $slap = str_replace('<entry>',$namespaces,$slap);
-
logger('slapper called for '.$url.'. Data: ' . $slap);
// create a magic envelope
if(! function_exists('ref_session_open')) {
function ref_session_open ($s,$n) {
- return true;
+ return true;
}}
if(! function_exists('ref_session_read')) {
function ref_session_read ($id) {
- global $session_exists;
- if(x($id))
- $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
- if(count($r)) {
- $session_exists = true;
- return $r[0]['data'];
- } else {
- logger("no data for session $id", LOGGER_TRACE);
- }
- return '';
+ global $session_exists;
+ if(x($id))
+ $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
+
+ if(count($r)) {
+ $session_exists = true;
+ return $r[0]['data'];
+ } else {
+ logger("no data for session $id", LOGGER_TRACE);
+ }
+ return '';
}}
if(! function_exists('ref_session_write')) {
function ref_session_write ($id,$data) {
- global $session_exists, $session_expire;
- if(! $id || ! $data) {
- return false;
- }
-
- $expire = time() + $session_expire;
- $default_expire = time() + 300;
-
- if($session_exists)
- $r = q("UPDATE `session`
- SET `data` = '%s', `expire` = '%s'
- WHERE `sid` = '%s'",
- dbesc($data), dbesc($expire), dbesc($id));
- else
- $r = q("INSERT INTO `session`
- SET `sid` = '%s', `expire` = '%s', `data` = '%s'",
- dbesc($id), dbesc($default_expire), dbesc($data));
-
- return true;
+ global $session_exists, $session_expire;
+
+ if(! $id || ! $data) {
+ return false;
+ }
+
+ $expire = time() + $session_expire;
+ $default_expire = time() + 300;
+
+ if($session_exists) {
+ $r = q("UPDATE `session`
+ SET `data` = '%s'
+ WHERE `data` != '%s' AND `sid` = '%s'",
+ dbesc($data), dbesc($data), dbesc($id));
+
+ $r = q("UPDATE `session`
+ SET `expire` = '%s'
+ WHERE `expire` != '%s' AND `sid` = '%s'",
+ dbesc($expire), dbesc($expire), dbesc($id));
+ } else
+ $r = q("INSERT INTO `session`
+ SET `sid` = '%s', `expire` = '%s', `data` = '%s'",
+ dbesc($id), dbesc($default_expire), dbesc($data));
+
+ return true;
}}
if(! function_exists('ref_session_close')) {
function ref_session_close() {
- return true;
+ return true;
}}
if(! function_exists('ref_session_destroy')) {
function ref_session_destroy ($id) {
- q("DELETE FROM `session` WHERE `sid` = '%s'", dbesc($id));
- return true;
+ q("DELETE FROM `session` WHERE `sid` = '%s'", dbesc($id));
+ return true;
}}
if(! function_exists('ref_session_gc')) {
function ref_session_gc($expire) {
- q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time()));
- q("OPTIMIZE TABLE `sess_data`");
- return true;
+ q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time()));
+ q("OPTIMIZE TABLE `sess_data`");
+ return true;
}}
$gc_probability = 50;
ini_set('session.use_only_cookies', 1);
ini_set('session.cookie_httponly', 1);
-
-session_set_save_handler ('ref_session_open', 'ref_session_close',
- 'ref_session_read', 'ref_session_write',
- 'ref_session_destroy', 'ref_session_gc');
+if (!get_config('system', 'disable_database_session'))
+ session_set_save_handler('ref_session_open', 'ref_session_close',
+ 'ref_session_read', 'ref_session_write',
+ 'ref_session_destroy', 'ref_session_gc');
<?php
+/**
+ * @file include/socgraph.php
+ *
+ * @todo Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
+ * @todo Fetch profile data from profile page for Redmatrix users
+ * @todo Detect if it is a forum
+ */
require_once('include/datetime.php');
require_once("include/Scrape.php");
require_once("include/html2bbcode.php");
-/*
- To-Do:
- - Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
- - Fetch profile data from profile page for Redmatrix users
- - Detect if it is a forum
-*/
/*
* poco_load
$keywords = implode(", ", $tag);
// If you query a Friendica server for its profiles, the network has to be Friendica
- // To-Do: It could also be a Redmatrix server
+ /// TODO It could also be a Redmatrix server
//if ($uid == 0)
// $network = NETWORK_DFRN;
$done = array();
- // To-Do: Check if it is really neccessary to poll the own server
+ /// TODO Check if it is really neccessary to poll the own server
poco_load(0,0,0,$a->get_baseurl() . '/poco');
$done[] = $a->get_baseurl() . '/poco';
// send relocate message (below)\r
break;\r
case NETWORK_ZOT:\r
- // TODO handle zot network\r
+ /// @TODO handle zot network\r
break;\r
case NETWORK_MAIL2:\r
- // TODO ?\r
+ /// @TODO ?\r
break;\r
case NETWORK_FEED:\r
case NETWORK_MAIL:\r
if(! local_user()) {
- //TODO: we need login form to redirect to this page
+ /// @TODO We need login form to redirect to this page
notice( t('Please login to continue.') . EOL );
return login(false,$request->get_parameters());
}
// show if account is a community account
- // ToDo the other should be also respected, but first we need a good translatiion
- // and systemwide consistency for displaying the page type
+ /// @TODO The other page types should be also respected, but first we need a good
+ /// translatiion and systemwide consistency for displaying the page type
if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP))
$community = true;
// have been provided, and run any anti-spam plugins
- // TODO
-
-
-
if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
notice( t('Permission denied.') . EOL) ;
return login(false);
}
- // TODO:is this really necessary? $a is already available to hooks
+ /// @TODO Is this really necessary? $a is already available to hooks
$arr = array('query' => $a->query_string);
call_hooks('network_content_init', $arr);
$o = '';
// item filter tabs
- // TODO: fix this logic, reduce duplication
- //$a->page['content'] .= '<div class="tabs-wrapper">';
+ /// @TODO fix this logic, reduce duplication
+ //
/ $a->page['content'] .= '<div class="tabs-wrapper">';
list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
// if no tabs are selected, defaults to comments
// NOTREACHED
}
- $o = "<h2>".t("Subsribing to OStatus contacts")."</h2>";
+ $o = "<h2>".t("Subscribing to OStatus contacts")."</h2>";
$uid = local_user();
<?php
-/* To-Do
-https://developers.google.com/+/plugins/snippet/
-
-<meta itemprop="name" content="Toller Titel">
-<meta itemprop="description" content="Eine tolle Beschreibung">
-<meta itemprop="image" content="http://maple.libertreeproject.org/images/tree-icon.png">
-
-<body itemscope itemtype="http://schema.org/Product">
- <h1 itemprop="name">Shiny Trinket</h1>
- <img itemprop="image" src="{image-url}" />
- <p itemprop="description">Shiny trinkets are shiny.</p>
-</body>
+/**
+ * @file mod/parse_url.php
+ *
+ * @todo https://developers.google.com/+/plugins/snippet/
+ *
+ * @verbatim
+ * <meta itemprop="name" content="Toller Titel">
+ * <meta itemprop="description" content="Eine tolle Beschreibung">
+ * <meta itemprop="image" content="http://maple.libertreeproject.org/images/tree-icon.png">
+ *
+ * <body itemscope itemtype="http://schema.org/Product">
+ * <h1 itemprop="name">Shiny Trinket</h1>
+ * <img itemprop="image" src="{image-url}" />
+ * <p itemprop="description">Shiny trinkets are shiny.</p>
+ * </body>
+ * @endverbatim
*/
if(!function_exists('deletenode')) {
// NOTREACHED
}
- $o = "<h2>".t("Resubsribing to OStatus contacts")."</h2>";
+ $o = "<h2>".t("Resubscribing to OStatus contacts")."</h2>";
$uid = local_user();
}\r
\r
if (x($_FILES,'accountfile')){\r
- // TODO: pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
+ /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
import_account($a, $_FILES['accountfile']);\r
return;\r
}\r
* @package test.util
*/
class AutonameTest extends PHPUnit_Framework_TestCase {
- /**\r
- *autonames should be random, even length\r
- */\r
- public function testAutonameEven() {\r
- $autoname1=autoname(10);\r
- $autoname2=autoname(10);\r
- \r
- $this->assertNotEquals($autoname1, $autoname2);\r
- }\r
- \r
- /**\r
- *autonames should be random, odd length\r
- */\r
- public function testAutonameOdd() {\r
- $autoname1=autoname(9);\r
- $autoname2=autoname(9);\r
- \r
- $this->assertNotEquals($autoname1, $autoname2);\r
- }\r
- \r
- /**\r
- * try to fail autonames\r
- */\r
- public function testAutonameNoLength() {\r
- $autoname1=autoname(0);\r
- $this->assertEquals(0, strlen($autoname1));\r
- }\r
+ /**
+ *autonames should be random, even length
+ */
+ public function testAutonameEven() {
+ $autoname1=autoname(10);
+ $autoname2=autoname(10);
+
+ $this->assertNotEquals($autoname1, $autoname2);
+ }
+
+ /**
+ *autonames should be random, odd length
+ */
+ public function testAutonameOdd() {
+ $autoname1=autoname(9);
+ $autoname2=autoname(9);
+
+ $this->assertNotEquals($autoname1, $autoname2);
+ }
+
+ /**
+ * try to fail autonames
+ */
+ public function testAutonameNoLength() {
+ $autoname1=autoname(0);
+ $this->assertEquals(0, strlen($autoname1));
+ }
/**
* try to fail it with invalid input
*
* TODO: What's corect behaviour here? An exception?
- */\r
- public function testAutonameNegativeLength() {\r
- $autoname1=autoname(-23);\r
- $this->assertEquals(0, strlen($autoname1));\r
- }\r
- \r
- // public function testAutonameMaxLength() {\r
- // $autoname2=autoname(PHP_INT_MAX);\r
- // $this->assertEquals(PHP_INT_MAX, count($autoname2));\r
- // }\r
+ */
+ public function testAutonameNegativeLength() {
+ $autoname1=autoname(-23);
+ $this->assertEquals(0, strlen($autoname1));
+ }
+
+ // public function testAutonameMaxLength() {
+ // $autoname2=autoname(PHP_INT_MAX);
+ // $this->assertEquals(PHP_INT_MAX, count($autoname2));
+ // }
/**
* test with a length, that may be too short
- */\r
- public function testAutonameLength1() {\r
- $autoname1=autoname(1);\r
+ */
+ public function testAutonameLength1() {
+ $autoname1=autoname(1);
$this->assertEquals(1, count($autoname1));
- $autoname2=autoname(1);\r
+ $autoname2=autoname(1);
$this->assertEquals(1, count($autoname2));
// The following test is problematic, with only 26 possibilities
// generating the same thing twice happens often aka
// birthday paradox
-// $this->assertFalse($autoname1==$autoname2); \r
+// $this->assertFalse($autoname1==$autoname2);
}
}
\ No newline at end of file
ALIASES += "FIXME=\fixme"
ALIASES += "TODO=\todo"
ALIASES += "BUG=\bug"
+ALIASES += "hooks=\xrefitem hooks \"Hooks\" \"Hooks List\""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 07:48+0100\n"
+"POT-Creation-Date: 2015-12-27 08:40+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
-#: mod/contacts.php:50 include/identity.php:380
+#: mod/contacts.php:50 include/identity.php:389
msgid "Network:"
msgstr ""
#: mod/contacts.php:51 mod/contacts.php:986 mod/videos.php:37
#: mod/viewcontacts.php:105 mod/dirfind.php:208 mod/network.php:596
-#: mod/allfriends.php:72 mod/match.php:82 mod/directory.php:172
-#: mod/common.php:124 mod/suggest.php:95 mod/photos.php:41
+#: mod/allfriends.php:77 mod/match.php:82 mod/directory.php:172
+#: mod/common.php:123 mod/suggest.php:95 mod/photos.php:41
#: include/identity.php:295
msgid "Forum"
msgstr ""
msgid "Failed to update contact record."
msgstr ""
-#: mod/contacts.php:364 mod/manage.php:96 mod/display.php:496
+#: mod/contacts.php:364 mod/manage.php:96 mod/display.php:493
#: mod/profile_photo.php:19 mod/profile_photo.php:175 mod/profile_photo.php:186
#: mod/profile_photo.php:199 mod/ostatus_subscribe.php:9 mod/follow.php:10
-#: mod/follow.php:72 mod/follow.php:137 mod/item.php:169 mod/item.php:185
+#: mod/follow.php:72 mod/follow.php:137 mod/item.php:169 mod/item.php:181
#: mod/group.php:19 mod/dfrn_confirm.php:55 mod/fsuggest.php:78
#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/viewcontacts.php:40
#: mod/notifications.php:69 mod/message.php:45 mod/message.php:181
#: mod/api.php:31 mod/notes.php:22 mod/poke.php:149 mod/repair_ostatus.php:9
#: mod/invite.php:15 mod/invite.php:101 mod/photos.php:171 mod/photos.php:1105
#: mod/regmod.php:110 mod/uimport.php:23 mod/attach.php:33
-#: include/items.php:5067 index.php:382
+#: include/items.php:5070 index.php:383
msgid "Permission denied."
msgstr ""
#: mod/settings.php:1162 mod/settings.php:1163 mod/settings.php:1164
#: mod/settings.php:1165 mod/dfrn_request.php:850 mod/register.php:238
#: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661
-#: mod/profiles.php:687 mod/api.php:105 include/items.php:4899
+#: mod/profiles.php:687 mod/api.php:105 include/items.php:4902
msgid "Yes"
msgstr ""
#: mod/fbrowser.php:128 mod/settings.php:651 mod/settings.php:677
#: mod/dfrn_request.php:864 mod/suggest.php:32 mod/editpost.php:148
#: mod/photos.php:247 mod/photos.php:336 include/conversation.php:1221
-#: include/items.php:4902
+#: include/items.php:4905
msgid "Cancel"
msgstr ""
msgid "Private communications are not available for this contact."
msgstr ""
-#: mod/contacts.php:543 mod/admin.php:645
+#: mod/contacts.php:543 mod/admin.php:647
msgid "Never"
msgstr ""
msgid "Fetch further information for feeds"
msgstr ""
-#: mod/contacts.php:570 mod/admin.php:654
+#: mod/contacts.php:570 mod/admin.php:656
msgid "Disabled"
msgstr ""
msgid "Update public posts"
msgstr ""
-#: mod/contacts.php:609 mod/admin.php:1653
+#: mod/contacts.php:609 mod/admin.php:1656
msgid "Update now"
msgstr ""
-#: mod/contacts.php:611 mod/dirfind.php:190 mod/allfriends.php:60
+#: mod/contacts.php:611 mod/dirfind.php:190 mod/allfriends.php:65
#: mod/match.php:71 mod/suggest.php:82 include/contact_widgets.php:32
-#: include/Contact.php:321 include/conversation.php:924
+#: include/Contact.php:310 include/conversation.php:924
msgid "Connect/Follow"
msgstr ""
#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864
-#: mod/admin.php:1117
+#: mod/admin.php:1120
msgid "Unblock"
msgstr ""
#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864
-#: mod/admin.php:1116
+#: mod/admin.php:1119
msgid "Block"
msgstr ""
msgstr ""
#: mod/contacts.php:637 mod/follow.php:127 mod/notifications.php:246
-#: mod/directory.php:153 include/identity.php:313 include/identity.php:621
+#: mod/directory.php:153 include/identity.php:313 include/identity.php:630
msgid "About:"
msgstr ""
#: mod/contacts.php:639 mod/follow.php:129 mod/notifications.php:248
-#: include/identity.php:615
+#: include/identity.php:624
msgid "Tags:"
msgstr ""
msgstr ""
#: mod/contacts.php:792 mod/contacts.php:840 mod/viewcontacts.php:116
-#: include/identity.php:732 include/identity.php:735 include/text.php:1012
+#: include/identity.php:741 include/identity.php:744 include/text.php:1012
#: include/nav.php:123 include/nav.php:187 view/theme/diabook/theme.php:125
msgid "Contacts"
msgstr ""
msgid "Unarchive"
msgstr ""
-#: mod/contacts.php:808 mod/group.php:171 mod/admin.php:1115
+#: mod/contacts.php:808 mod/group.php:171 mod/admin.php:1118
#: mod/content.php:440 mod/content.php:743 mod/settings.php:713
#: mod/photos.php:1723 object/Item.php:134 include/conversation.php:635
msgid "Delete"
msgstr ""
-#: mod/contacts.php:821 include/identity.php:677 include/nav.php:75
+#: mod/contacts.php:821 include/identity.php:686 include/nav.php:75
msgid "Status"
msgstr ""
-#: mod/contacts.php:824 include/identity.php:680
+#: mod/contacts.php:824 include/identity.php:689
msgid "Status Messages and Posts"
msgstr ""
#: mod/contacts.php:829 mod/profperm.php:104 mod/newmember.php:32
-#: include/identity.php:569 include/identity.php:655 include/identity.php:685
+#: include/identity.php:578 include/identity.php:664 include/identity.php:694
#: include/nav.php:76 view/theme/diabook/theme.php:124
msgid "Profile"
msgstr ""
-#: mod/contacts.php:832 include/identity.php:688
+#: mod/contacts.php:832 include/identity.php:697
msgid "Profile Details"
msgstr ""
msgid "View all contacts"
msgstr ""
-#: mod/contacts.php:849 mod/common.php:135
+#: mod/contacts.php:849 mod/common.php:134
msgid "Common Friends"
msgstr ""
msgid "Post successful."
msgstr ""
-#: mod/profperm.php:19 mod/group.php:72 index.php:381
+#: mod/profperm.php:19 mod/group.php:72 index.php:382
msgid "Permission denied"
msgstr ""
msgid "All Contacts (with secure profile access)"
msgstr ""
-#: mod/display.php:82 mod/display.php:283 mod/display.php:500
-#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1160 mod/admin.php:1381
-#: mod/notice.php:15 include/items.php:4858
+#: mod/display.php:82 mod/display.php:280 mod/display.php:497
+#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1163 mod/admin.php:1384
+#: mod/notice.php:15 include/items.php:4861
msgid "Item not found."
msgstr ""
-#: mod/display.php:211 mod/videos.php:197 mod/viewcontacts.php:35
+#: mod/display.php:209 mod/videos.php:197 mod/viewcontacts.php:35
#: mod/community.php:18 mod/dfrn_request.php:779 mod/search.php:93
#: mod/search.php:99 mod/directory.php:37 mod/photos.php:976
msgid "Public access denied."
msgstr ""
-#: mod/display.php:331 mod/profile.php:155
+#: mod/display.php:328 mod/profile.php:155
msgid "Access to this profile has been restricted."
msgstr ""
-#: mod/display.php:493
+#: mod/display.php:490
msgid "Item has been removed."
msgstr ""
"join."
msgstr ""
-#: mod/newmember.php:22 mod/admin.php:1212 mod/admin.php:1457
+#: mod/newmember.php:22 mod/admin.php:1215 mod/admin.php:1460
#: mod/settings.php:99 include/nav.php:182 view/theme/diabook/theme.php:544
#: view/theme/diabook/theme.php:648
msgid "Settings"
#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168
#: include/conversation.php:130 include/conversation.php:266
-#: include/text.php:1993 include/diaspora.php:2146
+#: include/text.php:1993 include/diaspora.php:2147
#: view/theme/diabook/theme.php:471
msgid "photo"
msgstr ""
#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 mod/like.php:346
#: include/conversation.php:125 include/conversation.php:134
#: include/conversation.php:261 include/conversation.php:270
-#: include/diaspora.php:2146 view/theme/diabook/theme.php:466
+#: include/diaspora.php:2147 view/theme/diabook/theme.php:466
#: view/theme/diabook/theme.php:475
msgid "status"
msgstr ""
msgstr ""
#: mod/ostatus_subscribe.php:14
-msgid "Subsribing to OStatus contacts"
+msgid "Subscribing to OStatus contacts"
msgstr ""
#: mod/ostatus_subscribe.php:25
msgid "Unable to locate original post."
msgstr ""
-#: mod/item.php:322
+#: mod/item.php:318
msgid "Empty post discarded."
msgstr ""
-#: mod/item.php:460 mod/wall_upload.php:213 mod/wall_upload.php:227
+#: mod/item.php:456 mod/wall_upload.php:213 mod/wall_upload.php:227
#: mod/wall_upload.php:234 include/Photo.php:954 include/Photo.php:969
#: include/Photo.php:976 include/Photo.php:998 include/message.php:145
msgid "Wall Photos"
msgstr ""
-#: mod/item.php:834
+#: mod/item.php:830
msgid "System error. Post not saved."
msgstr ""
-#: mod/item.php:963
+#: mod/item.php:959
#, php-format
msgid ""
"This message was sent to you by %s, a member of the Friendica social network."
msgstr ""
-#: mod/item.php:965
+#: mod/item.php:961
#, php-format
msgid "You may visit them online at %s"
msgstr ""
-#: mod/item.php:966
+#: mod/item.php:962
msgid ""
"Please contact the sender by replying to this post if you do not wish to "
"receive these messages."
msgstr ""
-#: mod/item.php:970
+#: mod/item.php:966
#, php-format
msgid "%s posted an update."
msgstr ""
msgid "Group is empty"
msgstr ""
-#: mod/apps.php:7 index.php:225
+#: mod/apps.php:7 index.php:226
msgid "You must be logged in to use addons. "
msgstr ""
msgstr ""
#: mod/dfrn_confirm.php:487 include/conversation.php:185
-#: include/diaspora.php:636
+#: include/diaspora.php:637
#, php-format
msgid "%1$s is now friends with %2$s"
msgstr ""
msgid "Unable to update your contact profile details on our system"
msgstr ""
-#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4270
+#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4273
msgid "[Name Withheld]"
msgstr ""
msgid "%1$s has joined %2$s"
msgstr ""
-#: mod/profile.php:21 include/identity.php:52
+#: mod/profile.php:21 include/identity.php:53
msgid "Requested profile is not available."
msgstr ""
#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
#: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17
-#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1733
+#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1735
msgid "Invalid request."
msgstr ""
"Password reset failed."
msgstr ""
-#: mod/lostpass.php:109 boot.php:1307
+#: mod/lostpass.php:109 boot.php:1310
msgid "Password Reset"
msgstr ""
msgid "event"
msgstr ""
-#: mod/like.php:187 include/conversation.php:141 include/diaspora.php:2162
+#: mod/like.php:187 include/conversation.php:141 include/diaspora.php:2163
#: view/theme/diabook/theme.php:480
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgid "if applicable"
msgstr ""
-#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1113
+#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1116
msgid "Approve"
msgstr ""
msgstr ""
#: mod/notifications.php:250 mod/directory.php:147 include/identity.php:306
-#: include/identity.php:580
+#: include/identity.php:589
msgid "Gender:"
msgstr ""
msgid "Refetch contact data"
msgstr ""
-#: mod/crepair.php:170 mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124
-#: mod/admin.php:1137 mod/settings.php:652 mod/settings.php:678
+#: mod/crepair.php:170 mod/admin.php:1114 mod/admin.php:1126 mod/admin.php:1127
+#: mod/admin.php:1140 mod/settings.php:652 mod/settings.php:678
msgid "Name"
msgstr ""
"entries from this contact."
msgstr ""
-#: mod/bookmarklet.php:12 boot.php:1293 include/nav.php:91
+#: mod/bookmarklet.php:12 boot.php:1296 include/nav.php:91
msgid "Login"
msgstr ""
msgid "Access denied."
msgstr ""
-#: mod/dirfind.php:188 mod/allfriends.php:75 mod/match.php:85
+#: mod/dirfind.php:188 mod/allfriends.php:80 mod/match.php:85
#: mod/suggest.php:98 include/contact_widgets.php:10 include/identity.php:209
msgid "Connect"
msgstr ""
-#: mod/dirfind.php:189 mod/allfriends.php:59 mod/match.php:70
-#: mod/directory.php:162 mod/suggest.php:81 include/Contact.php:307
-#: include/Contact.php:320 include/Contact.php:362 include/conversation.php:912
+#: mod/dirfind.php:189 mod/allfriends.php:64 mod/match.php:70
+#: mod/directory.php:162 mod/suggest.php:81 include/Contact.php:296
+#: include/Contact.php:309 include/Contact.php:351 include/conversation.php:912
#: include/conversation.php:926
msgid "View Profile"
msgstr ""
msgid "No matches"
msgstr ""
-#: mod/fbrowser.php:32 include/identity.php:693 include/nav.php:77
+#: mod/fbrowser.php:32 include/identity.php:702 include/nav.php:77
#: view/theme/diabook/theme.php:126
msgid "Photos"
msgstr ""
msgid "Theme settings updated."
msgstr ""
-#: mod/admin.php:127 mod/admin.php:711
+#: mod/admin.php:127 mod/admin.php:713
msgid "Site"
msgstr ""
-#: mod/admin.php:128 mod/admin.php:655 mod/admin.php:1106 mod/admin.php:1121
+#: mod/admin.php:128 mod/admin.php:657 mod/admin.php:1109 mod/admin.php:1124
msgid "Users"
msgstr ""
-#: mod/admin.php:129 mod/admin.php:1210 mod/admin.php:1270 mod/settings.php:66
+#: mod/admin.php:129 mod/admin.php:1213 mod/admin.php:1273 mod/settings.php:66
msgid "Plugins"
msgstr ""
-#: mod/admin.php:130 mod/admin.php:1455 mod/admin.php:1506
+#: mod/admin.php:130 mod/admin.php:1458 mod/admin.php:1509
msgid "Themes"
msgstr ""
msgid "Inspect Queue"
msgstr ""
-#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1594
+#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1597
msgid "Logs"
msgstr ""
msgid "User registrations waiting for confirmation"
msgstr ""
-#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:710 mod/admin.php:1105
-#: mod/admin.php:1209 mod/admin.php:1269 mod/admin.php:1454 mod/admin.php:1505
-#: mod/admin.php:1593
+#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:712 mod/admin.php:1108
+#: mod/admin.php:1212 mod/admin.php:1272 mod/admin.php:1457 mod/admin.php:1508
+#: mod/admin.php:1596
msgid "Administration"
msgstr ""
"eventually deleted if the delivery fails permanently."
msgstr ""
-#: mod/admin.php:243 mod/admin.php:1059
+#: mod/admin.php:243 mod/admin.php:1062
msgid "Normal Account"
msgstr ""
-#: mod/admin.php:244 mod/admin.php:1060
+#: mod/admin.php:244 mod/admin.php:1063
msgid "Soapbox Account"
msgstr ""
-#: mod/admin.php:245 mod/admin.php:1061
+#: mod/admin.php:245 mod/admin.php:1064
msgid "Community/Celebrity Account"
msgstr ""
-#: mod/admin.php:246 mod/admin.php:1062
+#: mod/admin.php:246 mod/admin.php:1065
msgid "Automatic Friend Account"
msgstr ""
msgid "Can not parse base url. Must have at least <scheme>://<domain>"
msgstr ""
-#: mod/admin.php:587
+#: mod/admin.php:589
msgid "RINO2 needs mcrypt php extension to work."
msgstr ""
-#: mod/admin.php:595
+#: mod/admin.php:597
msgid "Site settings updated."
msgstr ""
-#: mod/admin.php:619 mod/settings.php:903
+#: mod/admin.php:621 mod/settings.php:903
msgid "No special theme for mobile devices"
msgstr ""
-#: mod/admin.php:638
+#: mod/admin.php:640
msgid "No community page"
msgstr ""
-#: mod/admin.php:639
+#: mod/admin.php:641
msgid "Public postings from users of this site"
msgstr ""
-#: mod/admin.php:640
+#: mod/admin.php:642
msgid "Global community page"
msgstr ""
-#: mod/admin.php:646
+#: mod/admin.php:648
msgid "At post arrival"
msgstr ""
-#: mod/admin.php:647 include/contact_selectors.php:56
+#: mod/admin.php:649 include/contact_selectors.php:56
msgid "Frequently"
msgstr ""
-#: mod/admin.php:648 include/contact_selectors.php:57
+#: mod/admin.php:650 include/contact_selectors.php:57
msgid "Hourly"
msgstr ""
-#: mod/admin.php:649 include/contact_selectors.php:58
+#: mod/admin.php:651 include/contact_selectors.php:58
msgid "Twice daily"
msgstr ""
-#: mod/admin.php:650 include/contact_selectors.php:59
+#: mod/admin.php:652 include/contact_selectors.php:59
msgid "Daily"
msgstr ""
-#: mod/admin.php:656
+#: mod/admin.php:658
msgid "Users, Global Contacts"
msgstr ""
-#: mod/admin.php:657
+#: mod/admin.php:659
msgid "Users, Global Contacts/fallback"
msgstr ""
-#: mod/admin.php:661
+#: mod/admin.php:663
msgid "One month"
msgstr ""
-#: mod/admin.php:662
+#: mod/admin.php:664
msgid "Three months"
msgstr ""
-#: mod/admin.php:663
+#: mod/admin.php:665
msgid "Half a year"
msgstr ""
-#: mod/admin.php:664
+#: mod/admin.php:666
msgid "One year"
msgstr ""
-#: mod/admin.php:669
+#: mod/admin.php:671
msgid "Multi user instance"
msgstr ""
-#: mod/admin.php:692
+#: mod/admin.php:694
msgid "Closed"
msgstr ""
-#: mod/admin.php:693
+#: mod/admin.php:695
msgid "Requires approval"
msgstr ""
-#: mod/admin.php:694
+#: mod/admin.php:696
msgid "Open"
msgstr ""
-#: mod/admin.php:698
+#: mod/admin.php:700
msgid "No SSL policy, links will track page SSL state"
msgstr ""
-#: mod/admin.php:699
+#: mod/admin.php:701
msgid "Force all links to use SSL"
msgstr ""
-#: mod/admin.php:700
+#: mod/admin.php:702
msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr ""
-#: mod/admin.php:712 mod/admin.php:1271 mod/admin.php:1507 mod/admin.php:1595
+#: mod/admin.php:714 mod/admin.php:1274 mod/admin.php:1510 mod/admin.php:1598
#: mod/settings.php:650 mod/settings.php:760 mod/settings.php:804
#: mod/settings.php:873 mod/settings.php:960 mod/settings.php:1195
msgid "Save Settings"
msgstr ""
-#: mod/admin.php:713 mod/register.php:263
+#: mod/admin.php:715 mod/register.php:263
msgid "Registration"
msgstr ""
-#: mod/admin.php:714
+#: mod/admin.php:716
msgid "File upload"
msgstr ""
-#: mod/admin.php:715
+#: mod/admin.php:717
msgid "Policies"
msgstr ""
-#: mod/admin.php:716
+#: mod/admin.php:718
msgid "Advanced"
msgstr ""
-#: mod/admin.php:717
+#: mod/admin.php:719
msgid "Auto Discovered Contact Directory"
msgstr ""
-#: mod/admin.php:718
+#: mod/admin.php:720
msgid "Performance"
msgstr ""
-#: mod/admin.php:719
+#: mod/admin.php:721
msgid ""
"Relocate - WARNING: advanced function. Could make this server unreachable."
msgstr ""
-#: mod/admin.php:722
+#: mod/admin.php:724
msgid "Site name"
msgstr ""
-#: mod/admin.php:723
+#: mod/admin.php:725
msgid "Host name"
msgstr ""
-#: mod/admin.php:724
+#: mod/admin.php:726
msgid "Sender Email"
msgstr ""
-#: mod/admin.php:724
+#: mod/admin.php:726
msgid ""
"The email address your server shall use to send notification emails from."
msgstr ""
-#: mod/admin.php:725
+#: mod/admin.php:727
msgid "Banner/Logo"
msgstr ""
-#: mod/admin.php:726
+#: mod/admin.php:728
msgid "Shortcut icon"
msgstr ""
-#: mod/admin.php:726
+#: mod/admin.php:728
msgid "Link to an icon that will be used for browsers."
msgstr ""
-#: mod/admin.php:727
+#: mod/admin.php:729
msgid "Touch icon"
msgstr ""
-#: mod/admin.php:727
+#: mod/admin.php:729
msgid "Link to an icon that will be used for tablets and mobiles."
msgstr ""
-#: mod/admin.php:728
+#: mod/admin.php:730
msgid "Additional Info"
msgstr ""
-#: mod/admin.php:728
+#: mod/admin.php:730
#, php-format
msgid ""
"For public servers: you can add additional information here that will be "
"listed at %s/siteinfo."
msgstr ""
-#: mod/admin.php:729
+#: mod/admin.php:731
msgid "System language"
msgstr ""
-#: mod/admin.php:730
+#: mod/admin.php:732
msgid "System theme"
msgstr ""
-#: mod/admin.php:730
+#: mod/admin.php:732
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr ""
-#: mod/admin.php:731
+#: mod/admin.php:733
msgid "Mobile system theme"
msgstr ""
-#: mod/admin.php:731
+#: mod/admin.php:733
msgid "Theme for mobile devices"
msgstr ""
-#: mod/admin.php:732
+#: mod/admin.php:734
msgid "SSL link policy"
msgstr ""
-#: mod/admin.php:732
+#: mod/admin.php:734
msgid "Determines whether generated links should be forced to use SSL"
msgstr ""
-#: mod/admin.php:733
+#: mod/admin.php:735
msgid "Force SSL"
msgstr ""
-#: mod/admin.php:733
+#: mod/admin.php:735
msgid ""
"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
"to endless loops."
msgstr ""
-#: mod/admin.php:734
+#: mod/admin.php:736
msgid "Old style 'Share'"
msgstr ""
-#: mod/admin.php:734
+#: mod/admin.php:736
msgid "Deactivates the bbcode element 'share' for repeating items."
msgstr ""
-#: mod/admin.php:735
+#: mod/admin.php:737
msgid "Hide help entry from navigation menu"
msgstr ""
-#: mod/admin.php:735
+#: mod/admin.php:737
msgid ""
"Hides the menu entry for the Help pages from the navigation menu. You can "
"still access it calling /help directly."
msgstr ""
-#: mod/admin.php:736
+#: mod/admin.php:738
msgid "Single user instance"
msgstr ""
-#: mod/admin.php:736
+#: mod/admin.php:738
msgid "Make this instance multi-user or single-user for the named user"
msgstr ""
-#: mod/admin.php:737
+#: mod/admin.php:739
msgid "Maximum image size"
msgstr ""
-#: mod/admin.php:737
+#: mod/admin.php:739
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr ""
-#: mod/admin.php:738
+#: mod/admin.php:740
msgid "Maximum image length"
msgstr ""
-#: mod/admin.php:738
+#: mod/admin.php:740
msgid ""
"Maximum length in pixels of the longest side of uploaded images. Default is "
"-1, which means no limits."
msgstr ""
-#: mod/admin.php:739
+#: mod/admin.php:741
msgid "JPEG image quality"
msgstr ""
-#: mod/admin.php:739
+#: mod/admin.php:741
msgid ""
"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
"100, which is full quality."
msgstr ""
-#: mod/admin.php:741
+#: mod/admin.php:743
msgid "Register policy"
msgstr ""
-#: mod/admin.php:742
+#: mod/admin.php:744
msgid "Maximum Daily Registrations"
msgstr ""
-#: mod/admin.php:742
+#: mod/admin.php:744
msgid ""
"If registration is permitted above, this sets the maximum number of new user "
"registrations to accept per day. If register is set to closed, this setting "
"has no effect."
msgstr ""
-#: mod/admin.php:743
+#: mod/admin.php:745
msgid "Register text"
msgstr ""
-#: mod/admin.php:743
+#: mod/admin.php:745
msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: mod/admin.php:744
+#: mod/admin.php:746
msgid "Accounts abandoned after x days"
msgstr ""
-#: mod/admin.php:744
+#: mod/admin.php:746
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr ""
-#: mod/admin.php:745
+#: mod/admin.php:747
msgid "Allowed friend domains"
msgstr ""
-#: mod/admin.php:745
+#: mod/admin.php:747
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr ""
-#: mod/admin.php:746
+#: mod/admin.php:748
msgid "Allowed email domains"
msgstr ""
-#: mod/admin.php:746
+#: mod/admin.php:748
msgid ""
"Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any "
"domains"
msgstr ""
-#: mod/admin.php:747
+#: mod/admin.php:749
msgid "Block public"
msgstr ""
-#: mod/admin.php:747
+#: mod/admin.php:749
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr ""
-#: mod/admin.php:748
+#: mod/admin.php:750
msgid "Force publish"
msgstr ""
-#: mod/admin.php:748
+#: mod/admin.php:750
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: mod/admin.php:749
+#: mod/admin.php:751
msgid "Global directory URL"
msgstr ""
-#: mod/admin.php:749
+#: mod/admin.php:751
msgid ""
"URL to the global directory. If this is not set, the global directory is "
"completely unavailable to the application."
msgstr ""
-#: mod/admin.php:750
+#: mod/admin.php:752
msgid "Allow threaded items"
msgstr ""
-#: mod/admin.php:750
+#: mod/admin.php:752
msgid "Allow infinite level threading for items on this site."
msgstr ""
-#: mod/admin.php:751
+#: mod/admin.php:753
msgid "Private posts by default for new users"
msgstr ""
-#: mod/admin.php:751
+#: mod/admin.php:753
msgid ""
"Set default post permissions for all new members to the default privacy "
"group rather than public."
msgstr ""
-#: mod/admin.php:752
+#: mod/admin.php:754
msgid "Don't include post content in email notifications"
msgstr ""
-#: mod/admin.php:752
+#: mod/admin.php:754
msgid ""
"Don't include the content of a post/comment/private message/etc. in the "
"email notifications that are sent out from this site, as a privacy measure."
msgstr ""
-#: mod/admin.php:753
+#: mod/admin.php:755
msgid "Disallow public access to addons listed in the apps menu."
msgstr ""
-#: mod/admin.php:753
+#: mod/admin.php:755
msgid ""
"Checking this box will restrict addons listed in the apps menu to members "
"only."
msgstr ""
-#: mod/admin.php:754
+#: mod/admin.php:756
msgid "Don't embed private images in posts"
msgstr ""
-#: mod/admin.php:754
+#: mod/admin.php:756
msgid ""
"Don't replace locally-hosted private photos in posts with an embedded copy "
"of the image. This means that contacts who receive posts containing private "
"photos will have to authenticate and load each image, which may take a while."
msgstr ""
-#: mod/admin.php:755
+#: mod/admin.php:757
msgid "Allow Users to set remote_self"
msgstr ""
-#: mod/admin.php:755
+#: mod/admin.php:757
msgid ""
"With checking this, every user is allowed to mark every contact as a "
"remote_self in the repair contact dialog. Setting this flag on a contact "
"causes mirroring every posting of that contact in the users stream."
msgstr ""
-#: mod/admin.php:756
+#: mod/admin.php:758
msgid "Block multiple registrations"
msgstr ""
-#: mod/admin.php:756
+#: mod/admin.php:758
msgid "Disallow users to register additional accounts for use as pages."
msgstr ""
-#: mod/admin.php:757
+#: mod/admin.php:759
msgid "OpenID support"
msgstr ""
-#: mod/admin.php:757
+#: mod/admin.php:759
msgid "OpenID support for registration and logins."
msgstr ""
-#: mod/admin.php:758
+#: mod/admin.php:760
msgid "Fullname check"
msgstr ""
-#: mod/admin.php:758
+#: mod/admin.php:760
msgid ""
"Force users to register with a space between firstname and lastname in Full "
"name, as an antispam measure"
msgstr ""
-#: mod/admin.php:759
+#: mod/admin.php:761
msgid "UTF-8 Regular expressions"
msgstr ""
-#: mod/admin.php:759
+#: mod/admin.php:761
msgid "Use PHP UTF8 regular expressions"
msgstr ""
-#: mod/admin.php:760
+#: mod/admin.php:762
msgid "Community Page Style"
msgstr ""
-#: mod/admin.php:760
+#: mod/admin.php:762
msgid ""
"Type of community page to show. 'Global community' shows every public "
"posting from an open distributed network that arrived on this server."
msgstr ""
-#: mod/admin.php:761
+#: mod/admin.php:763
msgid "Posts per user on community page"
msgstr ""
-#: mod/admin.php:761
+#: mod/admin.php:763
msgid ""
"The maximum number of posts per user on the community page. (Not valid for "
"'Global Community')"
msgstr ""
-#: mod/admin.php:762
+#: mod/admin.php:764
msgid "Enable OStatus support"
msgstr ""
-#: mod/admin.php:762
+#: mod/admin.php:764
msgid ""
"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
"communications in OStatus are public, so privacy warnings will be "
"occasionally displayed."
msgstr ""
-#: mod/admin.php:763
+#: mod/admin.php:765
msgid "OStatus conversation completion interval"
msgstr ""
-#: mod/admin.php:763
+#: mod/admin.php:765
msgid ""
"How often shall the poller check for new entries in OStatus conversations? "
"This can be a very ressource task."
msgstr ""
-#: mod/admin.php:764
+#: mod/admin.php:766
msgid "OStatus support can only be enabled if threading is enabled."
msgstr ""
-#: mod/admin.php:766
+#: mod/admin.php:768
msgid ""
"Diaspora support can't be enabled because Friendica was installed into a sub "
"directory."
msgstr ""
-#: mod/admin.php:767
+#: mod/admin.php:769
msgid "Enable Diaspora support"
msgstr ""
-#: mod/admin.php:767
+#: mod/admin.php:769
msgid "Provide built-in Diaspora network compatibility."
msgstr ""
-#: mod/admin.php:768
+#: mod/admin.php:770
msgid "Only allow Friendica contacts"
msgstr ""
-#: mod/admin.php:768
+#: mod/admin.php:770
msgid ""
"All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled."
msgstr ""
-#: mod/admin.php:769
+#: mod/admin.php:771
msgid "Verify SSL"
msgstr ""
-#: mod/admin.php:769
+#: mod/admin.php:771
msgid ""
"If you wish, you can turn on strict certificate checking. This will mean you "
"cannot connect (at all) to self-signed SSL sites."
msgstr ""
-#: mod/admin.php:770
+#: mod/admin.php:772
msgid "Proxy user"
msgstr ""
-#: mod/admin.php:771
+#: mod/admin.php:773
msgid "Proxy URL"
msgstr ""
-#: mod/admin.php:772
+#: mod/admin.php:774
msgid "Network timeout"
msgstr ""
-#: mod/admin.php:772
+#: mod/admin.php:774
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: mod/admin.php:773
+#: mod/admin.php:775
msgid "Delivery interval"
msgstr ""
-#: mod/admin.php:773
+#: mod/admin.php:775
msgid ""
"Delay background delivery processes by this many seconds to reduce system "
"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
"for large dedicated servers."
msgstr ""
-#: mod/admin.php:774
+#: mod/admin.php:776
msgid "Poll interval"
msgstr ""
-#: mod/admin.php:774
+#: mod/admin.php:776
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr ""
-#: mod/admin.php:775
+#: mod/admin.php:777
msgid "Maximum Load Average"
msgstr ""
-#: mod/admin.php:775
+#: mod/admin.php:777
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr ""
-#: mod/admin.php:776
+#: mod/admin.php:778
msgid "Maximum Load Average (Frontend)"
msgstr ""
-#: mod/admin.php:776
+#: mod/admin.php:778
msgid "Maximum system load before the frontend quits service - default 50."
msgstr ""
-#: mod/admin.php:777
+#: mod/admin.php:779
msgid "Maximum table size for optimization"
msgstr ""
-#: mod/admin.php:777
+#: mod/admin.php:779
msgid ""
"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
"Enter -1 to disable it."
msgstr ""
-#: mod/admin.php:779
+#: mod/admin.php:780
+msgid "Minimum level of fragmentation"
+msgstr ""
+
+#: mod/admin.php:780
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr ""
+
+#: mod/admin.php:782
msgid "Periodical check of global contacts"
msgstr ""
-#: mod/admin.php:779
+#: mod/admin.php:782
msgid ""
"If enabled, the global contacts are checked periodically for missing or "
"outdated data and the vitality of the contacts and servers."
msgstr ""
-#: mod/admin.php:780
+#: mod/admin.php:783
msgid "Days between requery"
msgstr ""
-#: mod/admin.php:780
+#: mod/admin.php:783
msgid "Number of days after which a server is requeried for his contacts."
msgstr ""
-#: mod/admin.php:781
+#: mod/admin.php:784
msgid "Discover contacts from other servers"
msgstr ""
-#: mod/admin.php:781
+#: mod/admin.php:784
msgid ""
"Periodically query other servers for contacts. You can choose between "
"'users': the users on the remote system, 'Global Contacts': active contacts "
"Global Contacts'."
msgstr ""
-#: mod/admin.php:782
+#: mod/admin.php:785
msgid "Timeframe for fetching global contacts"
msgstr ""
-#: mod/admin.php:782
+#: mod/admin.php:785
msgid ""
"When the discovery is activated, this value defines the timeframe for the "
"activity of the global contacts that are fetched from other servers."
msgstr ""
-#: mod/admin.php:783
+#: mod/admin.php:786
msgid "Search the local directory"
msgstr ""
-#: mod/admin.php:783
+#: mod/admin.php:786
msgid ""
"Search the local directory instead of the global directory. When searching "
"locally, every search will be executed on the global directory in the "
"background. This improves the search results when the search is repeated."
msgstr ""
-#: mod/admin.php:785
+#: mod/admin.php:788
msgid "Publish server information"
msgstr ""
-#: mod/admin.php:785
+#: mod/admin.php:788
msgid ""
"If enabled, general server and usage data will be published. The data "
"contains the name and version of the server, number of users with public "
"href='http://the-federation.info/'>the-federation.info</a> for details."
msgstr ""
-#: mod/admin.php:787
+#: mod/admin.php:790
msgid "Use MySQL full text engine"
msgstr ""
-#: mod/admin.php:787
+#: mod/admin.php:790
msgid ""
"Activates the full text engine. Speeds up search - but can only search for "
"four and more characters."
msgstr ""
-#: mod/admin.php:788
+#: mod/admin.php:791
msgid "Suppress Language"
msgstr ""
-#: mod/admin.php:788
+#: mod/admin.php:791
msgid "Suppress language information in meta information about a posting."
msgstr ""
-#: mod/admin.php:789
+#: mod/admin.php:792
msgid "Suppress Tags"
msgstr ""
-#: mod/admin.php:789
+#: mod/admin.php:792
msgid "Suppress showing a list of hashtags at the end of the posting."
msgstr ""
-#: mod/admin.php:790
+#: mod/admin.php:793
msgid "Path to item cache"
msgstr ""
-#: mod/admin.php:790
+#: mod/admin.php:793
msgid "The item caches buffers generated bbcode and external images."
msgstr ""
-#: mod/admin.php:791
+#: mod/admin.php:794
msgid "Cache duration in seconds"
msgstr ""
-#: mod/admin.php:791
+#: mod/admin.php:794
msgid ""
"How long should the cache files be hold? Default value is 86400 seconds (One "
"day). To disable the item cache, set the value to -1."
msgstr ""
-#: mod/admin.php:792
+#: mod/admin.php:795
msgid "Maximum numbers of comments per post"
msgstr ""
-#: mod/admin.php:792
+#: mod/admin.php:795
msgid "How much comments should be shown for each post? Default value is 100."
msgstr ""
-#: mod/admin.php:793
+#: mod/admin.php:796
msgid "Path for lock file"
msgstr ""
-#: mod/admin.php:793
+#: mod/admin.php:796
msgid ""
"The lock file is used to avoid multiple pollers at one time. Only define a "
"folder here."
msgstr ""
-#: mod/admin.php:794
+#: mod/admin.php:797
msgid "Temp path"
msgstr ""
-#: mod/admin.php:794
+#: mod/admin.php:797
msgid ""
"If you have a restricted system where the webserver can't access the system "
"temp path, enter another path here."
msgstr ""
-#: mod/admin.php:795
+#: mod/admin.php:798
msgid "Base path to installation"
msgstr ""
-#: mod/admin.php:795
+#: mod/admin.php:798
msgid ""
"If the system cannot detect the correct path to your installation, enter the "
"correct path here. This setting should only be set if you are using a "
"restricted system and symbolic links to your webroot."
msgstr ""
-#: mod/admin.php:796
+#: mod/admin.php:799
msgid "Disable picture proxy"
msgstr ""
-#: mod/admin.php:796
+#: mod/admin.php:799
msgid ""
"The picture proxy increases performance and privacy. It shouldn't be used on "
"systems with very low bandwith."
msgstr ""
-#: mod/admin.php:797
+#: mod/admin.php:800
msgid "Enable old style pager"
msgstr ""
-#: mod/admin.php:797
+#: mod/admin.php:800
msgid ""
"The old style pager has page numbers but slows down massively the page speed."
msgstr ""
-#: mod/admin.php:798
+#: mod/admin.php:801
msgid "Only search in tags"
msgstr ""
-#: mod/admin.php:798
+#: mod/admin.php:801
msgid "On large systems the text search can slow down the system extremely."
msgstr ""
-#: mod/admin.php:800
+#: mod/admin.php:803
msgid "New base url"
msgstr ""
-#: mod/admin.php:800
+#: mod/admin.php:803
msgid ""
"Change base url for this server. Sends relocate message to all DFRN contacts "
"of all users."
msgstr ""
-#: mod/admin.php:802
+#: mod/admin.php:805
msgid "RINO Encryption"
msgstr ""
-#: mod/admin.php:802
+#: mod/admin.php:805
msgid "Encryption layer between nodes."
msgstr ""
-#: mod/admin.php:803
+#: mod/admin.php:806
msgid "Embedly API key"
msgstr ""
-#: mod/admin.php:803
+#: mod/admin.php:806
msgid ""
"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
"web pages. This is an optional parameter."
msgstr ""
-#: mod/admin.php:821
+#: mod/admin.php:824
msgid "Update has been marked successful"
msgstr ""
-#: mod/admin.php:829
+#: mod/admin.php:832
#, php-format
msgid "Database structure update %s was successfully applied."
msgstr ""
-#: mod/admin.php:832
+#: mod/admin.php:835
#, php-format
msgid "Executing of database structure update %s failed with error: %s"
msgstr ""
-#: mod/admin.php:844
+#: mod/admin.php:847
#, php-format
msgid "Executing %s failed with error: %s"
msgstr ""
-#: mod/admin.php:847
+#: mod/admin.php:850
#, php-format
msgid "Update %s was successfully applied."
msgstr ""
-#: mod/admin.php:851
+#: mod/admin.php:854
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr ""
-#: mod/admin.php:853
+#: mod/admin.php:856
#, php-format
msgid "There was no additional update function %s that needed to be called."
msgstr ""
-#: mod/admin.php:872
+#: mod/admin.php:875
msgid "No failed updates."
msgstr ""
-#: mod/admin.php:873
+#: mod/admin.php:876
msgid "Check database structure"
msgstr ""
-#: mod/admin.php:878
+#: mod/admin.php:881
msgid "Failed Updates"
msgstr ""
-#: mod/admin.php:879
+#: mod/admin.php:882
msgid ""
"This does not include updates prior to 1139, which did not return a status."
msgstr ""
-#: mod/admin.php:880
+#: mod/admin.php:883
msgid "Mark success (if update was manually applied)"
msgstr ""
-#: mod/admin.php:881
+#: mod/admin.php:884
msgid "Attempt to execute this update step automatically"
msgstr ""
-#: mod/admin.php:913
+#: mod/admin.php:916
#, php-format
msgid ""
"\n"
"\t\t\t\tthe administrator of %2$s has set up an account for you."
msgstr ""
-#: mod/admin.php:916
+#: mod/admin.php:919
#, php-format
msgid ""
"\n"
"\t\t\tThank you and welcome to %4$s."
msgstr ""
-#: mod/admin.php:948 include/user.php:423
+#: mod/admin.php:951 include/user.php:423
#, php-format
msgid "Registration details for %s"
msgstr ""
-#: mod/admin.php:960
+#: mod/admin.php:963
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] ""
msgstr[1] ""
-#: mod/admin.php:967
+#: mod/admin.php:970
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] ""
msgstr[1] ""
-#: mod/admin.php:1006
+#: mod/admin.php:1009
#, php-format
msgid "User '%s' deleted"
msgstr ""
-#: mod/admin.php:1014
+#: mod/admin.php:1017
#, php-format
msgid "User '%s' unblocked"
msgstr ""
-#: mod/admin.php:1014
+#: mod/admin.php:1017
#, php-format
msgid "User '%s' blocked"
msgstr ""
-#: mod/admin.php:1107
+#: mod/admin.php:1110
msgid "Add User"
msgstr ""
-#: mod/admin.php:1108
+#: mod/admin.php:1111
msgid "select all"
msgstr ""
-#: mod/admin.php:1109
+#: mod/admin.php:1112
msgid "User registrations waiting for confirm"
msgstr ""
-#: mod/admin.php:1110
+#: mod/admin.php:1113
msgid "User waiting for permanent deletion"
msgstr ""
-#: mod/admin.php:1111
+#: mod/admin.php:1114
msgid "Request date"
msgstr ""
-#: mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 mod/admin.php:1139
+#: mod/admin.php:1114 mod/admin.php:1126 mod/admin.php:1127 mod/admin.php:1142
#: include/contact_selectors.php:79 include/contact_selectors.php:86
msgid "Email"
msgstr ""
-#: mod/admin.php:1112
+#: mod/admin.php:1115
msgid "No registrations."
msgstr ""
-#: mod/admin.php:1114
+#: mod/admin.php:1117
msgid "Deny"
msgstr ""
-#: mod/admin.php:1118
+#: mod/admin.php:1121
msgid "Site admin"
msgstr ""
-#: mod/admin.php:1119
+#: mod/admin.php:1122
msgid "Account expired"
msgstr ""
-#: mod/admin.php:1122
+#: mod/admin.php:1125
msgid "New User"
msgstr ""
-#: mod/admin.php:1123 mod/admin.php:1124
+#: mod/admin.php:1126 mod/admin.php:1127
msgid "Register date"
msgstr ""
-#: mod/admin.php:1123 mod/admin.php:1124
+#: mod/admin.php:1126 mod/admin.php:1127
msgid "Last login"
msgstr ""
-#: mod/admin.php:1123 mod/admin.php:1124
+#: mod/admin.php:1126 mod/admin.php:1127
msgid "Last item"
msgstr ""
-#: mod/admin.php:1123
+#: mod/admin.php:1126
msgid "Deleted since"
msgstr ""
-#: mod/admin.php:1124 mod/settings.php:41
+#: mod/admin.php:1127 mod/settings.php:41
msgid "Account"
msgstr ""
-#: mod/admin.php:1126
+#: mod/admin.php:1129
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: mod/admin.php:1127
+#: mod/admin.php:1130
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: mod/admin.php:1137
+#: mod/admin.php:1140
msgid "Name of the new user."
msgstr ""
-#: mod/admin.php:1138
+#: mod/admin.php:1141
msgid "Nickname"
msgstr ""
-#: mod/admin.php:1138
+#: mod/admin.php:1141
msgid "Nickname of the new user."
msgstr ""
-#: mod/admin.php:1139
+#: mod/admin.php:1142
msgid "Email address of the new user."
msgstr ""
-#: mod/admin.php:1172
+#: mod/admin.php:1175
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: mod/admin.php:1176
+#: mod/admin.php:1179
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: mod/admin.php:1186 mod/admin.php:1410
+#: mod/admin.php:1189 mod/admin.php:1413
msgid "Disable"
msgstr ""
-#: mod/admin.php:1188 mod/admin.php:1412
+#: mod/admin.php:1191 mod/admin.php:1415
msgid "Enable"
msgstr ""
-#: mod/admin.php:1211 mod/admin.php:1456
+#: mod/admin.php:1214 mod/admin.php:1459
msgid "Toggle"
msgstr ""
-#: mod/admin.php:1219 mod/admin.php:1466
+#: mod/admin.php:1222 mod/admin.php:1469
msgid "Author: "
msgstr ""
-#: mod/admin.php:1220 mod/admin.php:1467
+#: mod/admin.php:1223 mod/admin.php:1470
msgid "Maintainer: "
msgstr ""
-#: mod/admin.php:1272
+#: mod/admin.php:1275
#: view/smarty3/compiled/f835364006028b1061f37be121c9bd9db5fa50a9.file.admin_plugins.tpl.php:42
msgid "Reload active plugins"
msgstr ""
-#: mod/admin.php:1370
+#: mod/admin.php:1373
msgid "No themes found."
msgstr ""
-#: mod/admin.php:1448
+#: mod/admin.php:1451
msgid "Screenshot"
msgstr ""
-#: mod/admin.php:1508
+#: mod/admin.php:1511
msgid "Reload active themes"
msgstr ""
-#: mod/admin.php:1512
+#: mod/admin.php:1515
msgid "[Experimental]"
msgstr ""
-#: mod/admin.php:1513
+#: mod/admin.php:1516
msgid "[Unsupported]"
msgstr ""
-#: mod/admin.php:1540
+#: mod/admin.php:1543
msgid "Log settings updated."
msgstr ""
-#: mod/admin.php:1596
+#: mod/admin.php:1599
msgid "Clear"
msgstr ""
-#: mod/admin.php:1602
+#: mod/admin.php:1605
msgid "Enable Debugging"
msgstr ""
-#: mod/admin.php:1603
+#: mod/admin.php:1606
msgid "Log file"
msgstr ""
-#: mod/admin.php:1603
+#: mod/admin.php:1606
msgid ""
"Must be writable by web server. Relative to your Friendica top-level "
"directory."
msgstr ""
-#: mod/admin.php:1604
+#: mod/admin.php:1607
msgid "Log level"
msgstr ""
-#: mod/admin.php:1654 include/acl_selectors.php:348
+#: mod/admin.php:1657 include/acl_selectors.php:348
msgid "Close"
msgstr ""
-#: mod/admin.php:1660
+#: mod/admin.php:1663
msgid "FTP Host"
msgstr ""
-#: mod/admin.php:1661
+#: mod/admin.php:1664
msgid "FTP Path"
msgstr ""
-#: mod/admin.php:1662
+#: mod/admin.php:1665
msgid "FTP User"
msgstr ""
-#: mod/admin.php:1663
+#: mod/admin.php:1666
msgid "FTP Password"
msgstr ""
msgid "Invalid contact."
msgstr ""
-#: mod/allfriends.php:38
+#: mod/allfriends.php:43
msgid "No friends to display."
msgstr ""
msgid "link to source"
msgstr ""
-#: mod/events.php:456 include/identity.php:713 include/nav.php:79
+#: mod/events.php:456 include/identity.php:722 include/nav.php:79
#: include/nav.php:140 view/theme/diabook/theme.php:127
msgid "Events"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: mod/content.php:608 boot.php:785 object/Item.php:422
+#: mod/content.php:608 boot.php:788 object/Item.php:422
#: include/contact_widgets.php:242 include/forums.php:110
-#: include/items.php:5178 view/theme/vier/theme.php:264
+#: include/items.php:5181 view/theme/vier/theme.php:264
msgid "show more"
msgstr ""
msgstr ""
#: mod/content.php:711 mod/photos.php:1629 mod/photos.php:1677
-#: mod/photos.php:1765 boot.php:784 object/Item.php:393 object/Item.php:709
+#: mod/photos.php:1765 boot.php:787 object/Item.php:393 object/Item.php:709
msgid "Comment"
msgstr ""
msgid "Help"
msgstr ""
-#: mod/help.php:42 mod/p.php:16 mod/p.php:25 index.php:269
+#: mod/help.php:42 mod/p.php:16 mod/p.php:25 index.php:270
msgid "Not Found"
msgstr ""
-#: mod/help.php:45 index.php:272
+#: mod/help.php:45 index.php:273
msgid "Page not found."
msgstr ""
msgid "Basic Settings"
msgstr ""
-#: mod/settings.php:1210 include/identity.php:578
+#: mod/settings.php:1210 include/identity.php:587
msgid "Full Name:"
msgstr ""
msgid "Choose a nickname: "
msgstr ""
-#: mod/register.php:280 boot.php:1268 include/nav.php:108
+#: mod/register.php:280 boot.php:1271 include/nav.php:108
msgid "Register"
msgstr ""
msgid "Search results for: %s"
msgstr ""
-#: mod/directory.php:149 include/identity.php:309 include/identity.php:600
+#: mod/directory.php:149 include/identity.php:309 include/identity.php:609
msgid "Status:"
msgstr ""
-#: mod/directory.php:151 include/identity.php:311 include/identity.php:611
+#: mod/directory.php:151 include/identity.php:311 include/identity.php:620
msgid "Homepage:"
msgstr ""
msgid "No entries."
msgstr ""
-#: mod/common.php:87
+#: mod/common.php:86
msgid "No contacts in common."
msgstr ""
msgid "Since [date]:"
msgstr ""
-#: mod/profiles.php:724 include/identity.php:609
+#: mod/profiles.php:724 include/identity.php:618
msgid "Sexual Preference:"
msgstr ""
msgid "Homepage URL:"
msgstr ""
-#: mod/profiles.php:726 include/identity.php:613
+#: mod/profiles.php:726 include/identity.php:622
msgid "Hometown:"
msgstr ""
-#: mod/profiles.php:727 include/identity.php:617
+#: mod/profiles.php:727 include/identity.php:626
msgid "Political Views:"
msgstr ""
msgid "Private Keywords:"
msgstr ""
-#: mod/profiles.php:731 include/identity.php:625
+#: mod/profiles.php:731 include/identity.php:634
msgid "Likes:"
msgstr ""
-#: mod/profiles.php:732 include/identity.php:627
+#: mod/profiles.php:732 include/identity.php:636
msgid "Dislikes:"
msgstr ""
msgid "Visible to:"
msgstr ""
-#: mod/notes.php:46 include/identity.php:721
+#: mod/notes.php:46 include/identity.php:730
msgid "Personal Notes"
msgstr ""
msgstr ""
#: mod/repair_ostatus.php:14
-msgid "Resubsribing to OStatus contacts"
+msgid "Resubscribing to OStatus contacts"
msgstr ""
#: mod/repair_ostatus.php:30
"important, please visit http://friendica.com"
msgstr ""
-#: mod/photos.php:99 include/identity.php:696
+#: mod/photos.php:99 include/identity.php:705
msgid "Photo Albums"
msgstr ""
msgid "Item was not found."
msgstr ""
-#: boot.php:783
+#: boot.php:786
msgid "Delete this item?"
msgstr ""
-#: boot.php:786
+#: boot.php:789
msgid "show fewer"
msgstr ""
-#: boot.php:1160
+#: boot.php:1163
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: boot.php:1267
+#: boot.php:1270
msgid "Create a New Account"
msgstr ""
-#: boot.php:1292 include/nav.php:72
+#: boot.php:1295 include/nav.php:72
msgid "Logout"
msgstr ""
-#: boot.php:1295
+#: boot.php:1298
msgid "Nickname or Email address: "
msgstr ""
-#: boot.php:1296
+#: boot.php:1299
msgid "Password: "
msgstr ""
-#: boot.php:1297
+#: boot.php:1300
msgid "Remember me"
msgstr ""
-#: boot.php:1300
+#: boot.php:1303
msgid "Or login using OpenID: "
msgstr ""
-#: boot.php:1306
+#: boot.php:1309
msgid "Forgot your password?"
msgstr ""
-#: boot.php:1309
+#: boot.php:1312
msgid "Website Terms of Service"
msgstr ""
-#: boot.php:1310
+#: boot.php:1313
msgid "terms of service"
msgstr ""
-#: boot.php:1312
+#: boot.php:1315
msgid "Website Privacy Policy"
msgstr ""
-#: boot.php:1313
+#: boot.php:1316
msgid "privacy policy"
msgstr ""
msgid "%1$d %2$s ago"
msgstr ""
-#: include/datetime.php:474 include/items.php:2470
+#: include/datetime.php:474 include/items.php:2473
#, php-format
msgid "%s's birthday"
msgstr ""
-#: include/datetime.php:475 include/items.php:2471
+#: include/datetime.php:475 include/items.php:2474
#, php-format
msgid "Happy Birthday %s"
msgstr ""
-#: include/identity.php:43
+#: include/identity.php:44
msgid "Requested account is not available."
msgstr ""
-#: include/identity.php:96 include/identity.php:281 include/identity.php:652
+#: include/identity.php:97 include/identity.php:281 include/identity.php:661
msgid "Edit profile"
msgstr ""
msgid "Manage/edit profiles"
msgstr ""
-#: include/identity.php:412 include/identity.php:498
+#: include/identity.php:421 include/identity.php:507
msgid "g A l F d"
msgstr ""
-#: include/identity.php:413 include/identity.php:499
+#: include/identity.php:422 include/identity.php:508
msgid "F d"
msgstr ""
-#: include/identity.php:458 include/identity.php:545
+#: include/identity.php:467 include/identity.php:554
msgid "[today]"
msgstr ""
-#: include/identity.php:470
+#: include/identity.php:479
msgid "Birthday Reminders"
msgstr ""
-#: include/identity.php:471
+#: include/identity.php:480
msgid "Birthdays this week:"
msgstr ""
-#: include/identity.php:532
+#: include/identity.php:541
msgid "[No description]"
msgstr ""
-#: include/identity.php:556
+#: include/identity.php:565
msgid "Event Reminders"
msgstr ""
-#: include/identity.php:557
+#: include/identity.php:566
msgid "Events this week:"
msgstr ""
-#: include/identity.php:585
+#: include/identity.php:594
msgid "j F, Y"
msgstr ""
-#: include/identity.php:586
+#: include/identity.php:595
msgid "j F"
msgstr ""
-#: include/identity.php:593
+#: include/identity.php:602
msgid "Birthday:"
msgstr ""
-#: include/identity.php:597
+#: include/identity.php:606
msgid "Age:"
msgstr ""
-#: include/identity.php:606
+#: include/identity.php:615
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: include/identity.php:619
+#: include/identity.php:628
msgid "Religion:"
msgstr ""
-#: include/identity.php:623
+#: include/identity.php:632
msgid "Hobbies/Interests:"
msgstr ""
-#: include/identity.php:630
+#: include/identity.php:639
msgid "Contact information and Social Networks:"
msgstr ""
-#: include/identity.php:632
+#: include/identity.php:641
msgid "Musical interests:"
msgstr ""
-#: include/identity.php:634
+#: include/identity.php:643
msgid "Books, literature:"
msgstr ""
-#: include/identity.php:636
+#: include/identity.php:645
msgid "Television:"
msgstr ""
-#: include/identity.php:638
+#: include/identity.php:647
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: include/identity.php:640
+#: include/identity.php:649
msgid "Love/Romance:"
msgstr ""
-#: include/identity.php:642
+#: include/identity.php:651
msgid "Work/employment:"
msgstr ""
-#: include/identity.php:644
+#: include/identity.php:653
msgid "School/education:"
msgstr ""
-#: include/identity.php:648
+#: include/identity.php:657
msgid "Forums:"
msgstr ""
-#: include/identity.php:701 include/identity.php:704 include/nav.php:78
+#: include/identity.php:710 include/identity.php:713 include/nav.php:78
msgid "Videos"
msgstr ""
-#: include/identity.php:716 include/nav.php:140
+#: include/identity.php:725 include/nav.php:140
msgid "Events and Calendar"
msgstr ""
-#: include/identity.php:724
+#: include/identity.php:733
msgid "Only You Can See This"
msgstr ""
msgid "stopped following"
msgstr ""
-#: include/Contact.php:361 include/conversation.php:911
+#: include/Contact.php:350 include/conversation.php:911
msgid "View Status"
msgstr ""
-#: include/Contact.php:363 include/conversation.php:913
+#: include/Contact.php:352 include/conversation.php:913
msgid "View Photos"
msgstr ""
-#: include/Contact.php:364 include/conversation.php:914
+#: include/Contact.php:353 include/conversation.php:914
msgid "Network Posts"
msgstr ""
-#: include/Contact.php:365 include/conversation.php:915
+#: include/Contact.php:354 include/conversation.php:915
msgid "Edit Contact"
msgstr ""
-#: include/Contact.php:366
+#: include/Contact.php:355
msgid "Drop Contact"
msgstr ""
-#: include/Contact.php:367 include/conversation.php:916
+#: include/Contact.php:356 include/conversation.php:916
msgid "Send PM"
msgstr ""
-#: include/Contact.php:368 include/conversation.php:920
+#: include/Contact.php:357 include/conversation.php:920
msgid "Poke"
msgstr ""
msgid "Encrypted content"
msgstr ""
-#: include/notifier.php:843 include/delivery.php:458
+#: include/notifier.php:843 include/delivery.php:459
msgid "(no subject)"
msgstr ""
-#: include/notifier.php:853 include/delivery.php:469 include/enotify.php:37
+#: include/notifier.php:853 include/delivery.php:470 include/enotify.php:37
msgid "noreply"
msgstr ""
-#: include/dba_pdo.php:72 include/dba.php:56
+#: include/dba_pdo.php:72 include/dba.php:55
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
msgid "Site map"
msgstr ""
-#: include/api.php:343 include/api.php:354 include/api.php:463
-#: include/api.php:1182 include/api.php:1184
+#: include/api.php:345 include/api.php:356 include/api.php:465
+#: include/api.php:1184 include/api.php:1186
msgid "User not found."
msgstr ""
-#: include/api.php:830
+#: include/api.php:832
#, php-format
msgid "Daily posting limit of %d posts reached. The post was rejected."
msgstr ""
-#: include/api.php:849
+#: include/api.php:851
#, php-format
msgid "Weekly posting limit of %d posts reached. The post was rejected."
msgstr ""
-#: include/api.php:868
+#: include/api.php:870
#, php-format
msgid "Monthly posting limit of %d posts reached. The post was rejected."
msgstr ""
-#: include/api.php:1391
+#: include/api.php:1393
msgid "There is no status with this id."
msgstr ""
-#: include/api.php:1465
+#: include/api.php:1467
msgid "There is no conversation with this id."
msgstr ""
-#: include/api.php:1744
+#: include/api.php:1746
msgid "Invalid item."
msgstr ""
-#: include/api.php:1754
+#: include/api.php:1756
msgid "Invalid action. "
msgstr ""
-#: include/api.php:1762
+#: include/api.php:1764
msgid "DB error"
msgstr ""
"\t\tThank you and welcome to %2$s."
msgstr ""
-#: include/diaspora.php:719
+#: include/diaspora.php:720
msgid "Sharing notification from Diaspora network"
msgstr ""
-#: include/diaspora.php:2606
+#: include/diaspora.php:2607
msgid "Attachments:"
msgstr ""
-#: include/items.php:4897
+#: include/items.php:4900
msgid "Do you really want to delete this item?"
msgstr ""
-#: include/items.php:5172
+#: include/items.php:5175
msgid "Archives"
msgstr ""
msgid "Done. You can now login with your username and password"
msgstr ""
-#: index.php:441
+#: index.php:442
msgid "toggle mobile"
msgstr ""
projects / friendica.git / commitdiff