Merge remote-tracking branch 'friendika/master'

This commit is contained in:
Fabio Comuni 2011-09-28 09:27:59 +02:00
commit dccd2da356
15 changed files with 40 additions and 13 deletions

View file

@ -7,8 +7,8 @@ require_once('include/text.php');
require_once("include/pgettext.php"); require_once("include/pgettext.php");
require_once('include/nav.php'); require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
define ( 'FRIENDIKA_VERSION', '2.3.1116' ); define ( 'FRIENDIKA_VERSION', '2.3.1117' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1092 ); define ( 'DB_UPDATE_VERSION', 1092 );

View file

@ -1267,7 +1267,7 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) {
$return_code = $a->get_curl_code(); $return_code = $a->get_curl_code();
logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_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'); logger('diaspora_transmit: queue message');
// queue message for redelivery // queue message for redelivery
q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`,`batch`) 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)); return(($return_code) ? $return_code : (-1));
} }

View file

@ -1042,6 +1042,9 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
if((! $curl_stat) || (! strlen($xml))) if((! $curl_stat) || (! strlen($xml)))
return(-1); // timed out return(-1); // timed out
if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))
return(-1);
if(strpos($xml,'<?xml') === false) { if(strpos($xml,'<?xml') === false) {
logger('dfrn_deliver: phase 2: no valid XML returned'); logger('dfrn_deliver: phase 2: no valid XML returned');
logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA); logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);

View file

@ -187,6 +187,9 @@ EOT;
logger('slapper returned ' . $return_code); logger('slapper returned ' . $return_code);
if(! $return_code) if(! $return_code)
return(-1); return(-1);
if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
return(-1);
return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
} }

View file

@ -235,8 +235,8 @@ ACL.prototype.populate = function(data){
var height = Math.ceil(data.tot / that.nw) * 42; var height = Math.ceil(data.tot / that.nw) * 42;
that.list_content.height(height); that.list_content.height(height);
$(data.items).each(function(){ $(data.items).each(function(){
html = "<div class='acl-list-item {4} {5}' id='{2}{3}'>"+that.item_tpl+"</div>"; 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 ); 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; if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
//console.log(html); //console.log(html);
that.list_content.append(html); that.list_content.append(html);

View file

@ -53,12 +53,13 @@ function acl_init(&$a){
"photo" => "images/default-group-mm.png", "photo" => "images/default-group-mm.png",
"name" => $g['name'], "name" => $g['name'],
"id" => intval($g['id']), "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` != '' WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
$sql_extra $sql_extra
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
@ -70,7 +71,8 @@ function acl_init(&$a){
"photo" => $g['micro'], "photo" => $g['micro'],
"name" => $g['name'], "name" => $g['name'],
"id" => intval($g['id']), "id" => intval($g['id']),
"network" => $g['network'] "network" => $g['network'],
"link" => $g['url'],
); );
} }

View file

@ -21,6 +21,7 @@ function friendika_init(&$a) {
'register_policy' => $register_policy[$a->config['register_policy']], 'register_policy' => $register_policy[$a->config['register_policy']],
'admin' => $admin, 'admin' => $admin,
'site_name' => $a->config['sitename'], 'site_name' => $a->config['sitename'],
'platform' => FRIENDIKA_PLATFORM,
'info' => ((x($a->config,'info')) ? $a->config['info'] : '') 'info' => ((x($a->config,'info')) ? $a->config['info'] : '')
); );

View file

@ -1,11 +1,13 @@
<?php <?php
require_once('include/crypto.php');
function hostxrd_init(&$a) { function hostxrd_init(&$a) {
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml"); header("Content-type: text/xml");
$tpl = file_get_contents('view/xrd_host.tpl'); $tpl = file_get_contents('view/xrd_host.tpl');
echo str_replace(array( 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(); session_write_close();
exit(); exit();

View file

@ -41,6 +41,7 @@ function xrd_init(&$a) {
$tpl = file_get_contents('view/xrd_person.tpl'); $tpl = file_get_contents('view/xrd_person.tpl');
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$nick' => $r[0]['nickname'],
'$accturi' => $uri, '$accturi' => $uri,
'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'], '$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'],
'$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'], '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'],
@ -50,7 +51,8 @@ function xrd_init(&$a) {
'$dspr' => $dspr, '$dspr' => $dspr,
'$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'], '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'],
'$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'] . '/mention', '$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'])
)); ));

View file

@ -507,6 +507,10 @@ input#dfrn-url {
margin-bottom: 30px; margin-bottom: 30px;
} }
#profile-extra-links {
clear: both;
}
#profile-extra-links ul { #profile-extra-links ul {
list-style-type: none; list-style-type: none;
padding: 0px; padding: 0px;

View file

@ -16,7 +16,7 @@
</div> </div>
<div class="wall-item-photo-end"></div> <div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" > <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 class="wall-item-location" id="wall-item-location-$id">$location</div>
</div> </div>
</div> </div>

View file

@ -21,7 +21,7 @@
</div> </div>
<div class="wall-item-photo-end"></div> <div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" > <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 class="wall-item-location" id="wall-item-location-$id">$location</div>
</div> </div>
</div> </div>

View file

@ -406,6 +406,7 @@ nav {
} }
#profile-extra-links { #profile-extra-links {
clear: both;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
margin-left: 20px; margin-left: 20px;

View file

@ -21,5 +21,9 @@
type="http://purl.org/zot/1.0/accept" type="http://purl.org/zot/1.0/accept"
zot:accept="application/atom+xml" /> 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> </XRD>

View file

@ -5,7 +5,7 @@
<Alias>$accturi</Alias> <Alias>$accturi</Alias>
<Alias>$profile_url</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" /> href="$zot_post" />
<Property xmlns:zot="http://purl.og/zot/1.0" <Property xmlns:zot="http://purl.og/zot/1.0"
@ -40,4 +40,8 @@
<Link rel="magic-public-key" <Link rel="magic-public-key"
href="$modexp" /> 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> </XRD>