harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

share mostly working, preview still horked

Browse Source
This commit is contained in:
friendica 2012-11-03 03:54:19 -07:00
parent 2fa93655c4
commit 1971b96452
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
done
View File

@ -159,7 +159,7 @@ mod/
search_ac.php search_ac.php
search.php search.php
settings.php settings.php
share.php + share.php
+ smilies.php + smilies.php
+ starred.php + starred.php
subthread.php subthread.php

2
mod/item.php
View File

@ -938,7 +938,7 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
$images = $match[1]; $images = $match[1];
if($images) { if($images) {
foreach($images as $image) { foreach($images as $image) {
if(! stristr($image,$a->get_baseurl() . '/photo/')) if(! stristr($image,get_app()->get_baseurl() . '/photo/'))
continue; continue;
$image_uri = substr($image,strrpos($image,'/') + 1); $image_uri = substr($image,strrpos($image,'/') + 1);
$image_uri = substr($image_uri,0, strpos($image_uri,'-')); $image_uri = substr($image_uri,0, strpos($image_uri,'-'));

15
mod/share.php
View File

@ -4,23 +4,22 @@ require_once('bbcode.php');
function share_init(&$a) { function share_init(&$a) {
$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); $post_id = ((argc() > 1) ? intval(argv(1)) : 0);
if((! $post_id) || (! local_user())) if((! $post_id) || (! local_user()))
killme(); killme();
$r = q("SELECT item.*, contact.network FROM `item` $r = q("SELECT * from item WHERE id = %d AND uid = %d and item_restrict = 0 LIMIT 1",
left join contact on `item`.`contact-id` = `contact`.`id`
WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1",
intval($post_id), intval($post_id),
intval(local_user()) intval(local_user())
); );
if(! count($r) || ($r[0]['private'] == 1)) if((! $r) || $r[0]['item_private'])
killme(); killme();
$o = '[share]'; xchan_query($r);
$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; $o = '[share]' . "\n";
$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author']['xchan_url'] . ']' . $r[0]['author']['xchan_name'] . '[/url]' . "\n";
if($r[0]['title']) if($r[0]['title'])
$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
$o .= $r[0]['body'] . "\n" ; $o .= $r[0]['body'] . "\n" ;