mirror of https://github.com/friendica/friendica
Merge remote-tracking branch 'friendika/master'
This commit is contained in:
Fabio Comuni
commit
dccd2da356
4
boot.php
4
boot.php
|
|
@ -7,8 +7,8 @@ require_once('include/text.php');
|
|||
require_once("include/pgettext.php");
|
||||
require_once('include/nav.php');
|
||||
|
||||
|
||||
define ( 'FRIENDIKA_VERSION', '2.3.1116' );
|
||||
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
|
||||
define ( 'FRIENDIKA_VERSION', '2.3.1117' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||
define ( 'DB_UPDATE_VERSION', 1092 );
|
||||
|
||||
|
|
|
|||
|
|
@ -1267,7 +1267,7 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) {
|
|||
$return_code = $a->get_curl_code();
|
||||
logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code);
|
||||
|
||||
if(! $return_code) {
|
||||
if((! $return_code) || (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))) {
|
||||
logger('diaspora_transmit: queue message');
|
||||
// queue message for redelivery
|
||||
q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`,`batch`)
|
||||
|
|
@ -1280,5 +1280,6 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
return(($return_code) ? $return_code : (-1));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1042,6 +1042,9 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
if((! $curl_stat) || (! strlen($xml)))
|
||||
return(-1); // timed out
|
||||
|
||||
if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))
|
||||
return(-1);
|
||||
|
||||
if(strpos($xml,'<?xml') === false) {
|
||||
logger('dfrn_deliver: phase 2: no valid XML returned');
|
||||
logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
|
||||
|
|
|
|||
|
|
@ -187,6 +187,9 @@ EOT;
|
|||
logger('slapper returned ' . $return_code);
|
||||
if(! $return_code)
|
||||
return(-1);
|
||||
if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
|
||||
return(-1);
|
||||
|
||||
return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -235,8 +235,8 @@ ACL.prototype.populate = function(data){
|
|||
var height = Math.ceil(data.tot / that.nw) * 42;
|
||||
that.list_content.height(height);
|
||||
$(data.items).each(function(){
|
||||
html = "<div class='acl-list-item {4} {5}' id='{2}{3}'>"+that.item_tpl+"</div>";
|
||||
html = html.format( this.photo, this.name, this.type, this.id, '', this.network );
|
||||
html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
|
||||
html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
|
||||
if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
|
||||
//console.log(html);
|
||||
that.list_content.append(html);
|
||||
|
|
|
|||
|
|
@ -53,12 +53,13 @@ function acl_init(&$a){
|
|||
"photo" => "images/default-group-mm.png",
|
||||
"name" => $g['name'],
|
||||
"id" => intval($g['id']),
|
||||
"uids" => array_map("intval", explode(",",$g['uids']))
|
||||
"uids" => array_map("intval", explode(",",$g['uids'])),
|
||||
"link" => ''
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
$r = q("SELECT `id`, `name`, `micro`, `network` FROM `contact`
|
||||
$r = q("SELECT `id`, `name`, `micro`, `network`, `url` FROM `contact`
|
||||
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
|
||||
$sql_extra
|
||||
ORDER BY `name` ASC ",
|
||||
|
|
@ -70,7 +71,8 @@ function acl_init(&$a){
|
|||
"photo" => $g['micro'],
|
||||
"name" => $g['name'],
|
||||
"id" => intval($g['id']),
|
||||
"network" => $g['network']
|
||||
"network" => $g['network'],
|
||||
"link" => $g['url'],
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ function friendika_init(&$a) {
|
|||
'register_policy' => $register_policy[$a->config['register_policy']],
|
||||
'admin' => $admin,
|
||||
'site_name' => $a->config['sitename'],
|
||||
'platform' => FRIENDIKA_PLATFORM,
|
||||
'info' => ((x($a->config,'info')) ? $a->config['info'] : '')
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
<?php
|
||||
|
||||
require_once('include/crypto.php');
|
||||
|
||||
function hostxrd_init(&$a) {
|
||||
header('Access-Control-Allow-Origin: *');
|
||||
header("Content-type: text/xml");
|
||||
$tpl = file_get_contents('view/xrd_host.tpl');
|
||||
echo str_replace(array(
|
||||
'$zroot','$domain','$zot_post'),array(z_root(),z_path(),z_root() . '/post'),$tpl);
|
||||
'$zroot','$domain','$zot_post','$bigkey'),array(z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
|
||||
session_write_close();
|
||||
exit();
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ function xrd_init(&$a) {
|
|||
$tpl = file_get_contents('view/xrd_person.tpl');
|
||||
|
||||
$o = replace_macros($tpl, array(
|
||||
'$nick' => $r[0]['nickname'],
|
||||
'$accturi' => $uri,
|
||||
'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'],
|
||||
'$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'],
|
||||
|
|
@ -50,7 +51,8 @@ function xrd_init(&$a) {
|
|||
'$dspr' => $dspr,
|
||||
'$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'],
|
||||
'$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'] . '/mention',
|
||||
'$modexp' => 'data:application/magic-public-key,' . $salmon_key
|
||||
'$modexp' => 'data:application/magic-public-key,' . $salmon_key,
|
||||
'$bigkey' => salmon_key($r[0]['pubkey'])
|
||||
));
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -507,6 +507,10 @@ input#dfrn-url {
|
|||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
#profile-extra-links {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#profile-extra-links ul {
|
||||
list-style-type: none;
|
||||
padding: 0px;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
</div>
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
|
||||
$lock
|
||||
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}
|
||||
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
</div>
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
|
||||
$lock
|
||||
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}
|
||||
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -406,6 +406,7 @@ nav {
|
|||
}
|
||||
|
||||
#profile-extra-links {
|
||||
clear: both;
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-left: 20px;
|
||||
|
|
|
|||
|
|
@ -21,5 +21,9 @@
|
|||
type="http://purl.org/zot/1.0/accept"
|
||||
zot:accept="application/atom+xml" />
|
||||
|
||||
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
|
||||
type="http://salmon-protocol.org/ns/magic-key"
|
||||
mk:key_id="1">$bigkey</Property>
|
||||
|
||||
|
||||
</XRD>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<Alias>$accturi</Alias>
|
||||
<Alias>$profile_url</Alias>
|
||||
|
||||
<Link rel="http://purl.org/zot/1.0/post"
|
||||
<Link rel="http://purl.org/zot/1.0/post/$nick"
|
||||
href="$zot_post" />
|
||||
|
||||
<Property xmlns:zot="http://purl.og/zot/1.0"
|
||||
|
|
@ -40,4 +40,8 @@
|
|||
<Link rel="magic-public-key"
|
||||
href="$modexp" />
|
||||
|
||||
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
|
||||
type="http://salmon-protocol.org/ns/magic-key"
|
||||
mk:key_id="1">$bigkey</Property>
|
||||
|
||||
</XRD>
|
||||
|
|
|
|||
Loading…
Reference in New Issue