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

diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order

This commit is contained in:
Friendika 2011-10-19 15:08:16 -07:00
parent 1148cbab22
commit 19129e06c3
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php'); require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
define ( 'FRIENDIKA_VERSION', '2.3.1138' ); define ( 'FRIENDIKA_VERSION', '2.3.1139' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1097 ); define ( 'DB_UPDATE_VERSION', 1097 );

4
include/diaspora.php
View File

@ -621,7 +621,7 @@ function diaspora_reshare($importer,$xml) {
return; return;
} }
$x = str_replace(array('<activity_streams-photo>','</activity_streams-photo>'),array('<asphoto>','</asphoto>'),$x); $x = str_replace(array('<activity_streams-photo>','</activity_streams-photo>'),array('<asphoto>','</asphoto>'),$x);
$source_xml = parse_xml_string($x,true); $source_xml = parse_xml_string($x,false);
if(strlen($source_xml->asphoto->objectId) && ($source_xml->asphoto->objectId != 0) && ($source_xml->asphoto->image_url)) if(strlen($source_xml->asphoto->objectId) && ($source_xml->asphoto->objectId != 0) && ($source_xml->asphoto->image_url))
$body = '[url=' . notags(unxmlify($source_xml->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->asphoto->objectId)) . '[/img][/url]' . "\n"; $body = '[url=' . notags(unxmlify($source_xml->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->asphoto->objectId)) . '[/img][/url]' . "\n";
@ -631,7 +631,7 @@ function diaspora_reshare($importer,$xml) {
$body = diaspora2bb($source_xml->status_message->raw_message); $body = diaspora2bb($source_xml->status_message->raw_message);
} }
else { else {
logger('diaspora_reshare: no reshare content found.'); logger('diaspora_reshare: no reshare content found: ' . print_r($source_xml,true));
return; return;
} }
if(! $body) { if(! $body) {

2
mod/network.php
View File

@ -151,7 +151,7 @@ function network_content(&$a, $update = 0) {
), ),
array( array(
'label' => t('Posted Order'), 'label' => t('Posted Order'),
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
'sel'=>$postord_active, 'sel'=>$postord_active,
), ),

5
mod/settings.php
View File

@ -293,8 +293,13 @@ function settings_post(&$a) {
$url = $_SESSION['my_url']; $url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url'))) if($url && strlen(get_config('system','directory_submit_url')))
proc_run('php',"include/directory.php","$url"); proc_run('php',"include/directory.php","$url");
} }
// not yet ready for prime time
// require_once('include/profile_update.php');
// profile_change();
$_SESSION['theme'] = $theme; $_SESSION['theme'] = $theme;
if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) { if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {

16
view/diaspora_profile.tpl Normal file
View File

@ -0,0 +1,16 @@
<XML>
<post><profile>
<diaspora_handle>$handle</diaspora_handle>
<first_name>$first</first_name>
<last_name>$last</last_name>
<image_url>$large</image_url>
<image_url_small>$small</image_url_small>
<image_url_medium>$medium</image_url_medium>
<birthday>$dob</birthday>
<gender>$gender</gender>
<bio>$about</bio>
<location>$location</location>
<searchable>$searchable</searchable>
<tag_string>$tags</tag_string>
</profile></post>
</XML>