diff options
| -rw-r--r-- | include/bbcode.php | 13 | ||||
| -rw-r--r-- | include/zot.php | 11 | ||||
| -rw-r--r-- | mod/rpost.php | 10 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 32 insertions, 4 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 756d73aba..de8a34b80 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -2,7 +2,7 @@ require_once("include/oembed.php"); require_once('include/event.php'); - +require_once('include/zot.php'); function tryoembed($match) { @@ -178,6 +178,11 @@ function bb_ShareAttributesSimple($match) { return($text); } +function rpost_callback($match) { + return str_replace($match[0],get_rpost_path(get_app()->get_observer()) . '&body=' . urlencode($match[1]),$match[0]); +} + + // BBcode 2 HTML was written by WAY2WEB.net // extended to work with Mistpark/Friendica/Red - Mike Macgirvin @@ -220,13 +225,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // process [observer] tags before we do anything else because we might // be stripping away stuff that then doesn't need to be worked on anymore $observer = $a->get_observer(); - if (strpos($Text,'[/observer]') !== false) { + if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) { if ($observer) { $Text = preg_replace("/\[observer\=1\](.*?)\[\/observer\]/ism", '$1', $Text); $Text = preg_replace("/\[observer\=0\].*?\[\/observer\]/ism", '', $Text); + $Text = preg_replace_callback("/\[rpost\](.*?)\[\/rpost\]/ism", 'rpost_callback', $Text); } else { $Text = preg_replace("/\[observer\=1\].*?\[\/observer\]/ism", '', $Text); $Text = preg_replace("/\[observer\=0\](.*?)\[\/observer\]/ism", '$1', $Text); + $Text = preg_replace("/\[rpost\](.*?)\[\/rpost\]/ism", '', $Text); } } @@ -266,7 +273,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = str_replace('[observer.url]',$observer['xchan_url'], $Text); $Text = str_replace('[observer.name]',$observer['xchan_name'], $Text); $Text = str_replace('[observer.address]',$observer['xchan_addr'], $Text); - $Text = str_replace('[observer.photo]','[zmg]'.$observer['xchan_photo_l'].'[/zmg]', $Text); + $Text = str_replace('[observer.photo]','[zmg]'.$observer['xchan_photo_l'].'[/zmg]', $Text); } else { $Text = str_replace('[observer.baseurl]', '', $Text); $Text = str_replace('[observer.url]','', $Text); diff --git a/include/zot.php b/include/zot.php index 91729f9de..71d68700a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1896,3 +1896,14 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { } return $result; } + +// We probably should make rpost discoverable. + +function get_rpost_path($observer) { + if(! $observer) + return ''; + $parsed = parse_url($observer['xchan_url']); + + return $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f='; + +}
\ No newline at end of file diff --git a/mod/rpost.php b/mod/rpost.php index 78adb5e34..562040f1b 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -28,6 +28,16 @@ function rpost_content(&$a) { $o = ''; if(! local_user()) { + if(remote_user()) { + // redirect to your own site. + // We can only do this with a GET request so you'll need to keep the text short or risk getting truncated + // by the wretched beast called 'shusoin'. All the browsers now allow long GET requests, but suhosin + // blocks them. + + + + } + // FIXME // probably need to figure out how to preserve the $_REQUEST variables in the session // in case you aren't currently logged in. Otherwise you'll have to go back to diff --git a/version.inc b/version.inc index 44c8de402..08d815d83 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-28.480 +2013-10-29.481 |