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

missed a few zrl/zmg conversions, like for translate_item and enotify messages

Browse Source
This commit is contained in:
friendica 2013-06-12 00:58:31 -07:00
parent 6914a4eeac
commit 4a072297f7
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
include/conversation.php
View File

@ -114,8 +114,8 @@ function localize_item(&$item){
if($author_link && $author_name && $item_url) { if($author_link && $author_name && $item_url) {
$author = '[url=' . chanlink_url($item['author']['xchan_url']) . ']' . $item['author']['xchan_name'] . '[/url]'; $author = '[zrl=' . chanlink_url($item['author']['xchan_url']) . ']' . $item['author']['xchan_name'] . '[/zrl]';
$objauthor = '[url=' . chanlink_url($author_link) . ']' . $author_name . '[/url]'; $objauthor = '[zrl=' . chanlink_url($author_link) . ']' . $author_name . '[/zrl]';
switch($obj->type) { switch($obj->type) {
case ACTIVITY_OBJ_PHOTO: case ACTIVITY_OBJ_PHOTO:
@ -132,7 +132,7 @@ function localize_item(&$item){
break; break;
} }
$plink = '[url=' . zid($item_url) . ']' . $post_type . '[/url]'; $plink = '[zrl=' . zid($item_url) . ']' . $post_type . '[/zrl]';
if(activity_match($item['verb'],ACTIVITY_LIKE)) { if(activity_match($item['verb'],ACTIVITY_LIKE)) {
$bodyverb = t('%1$s likes %2$s\'s %3$s'); $bodyverb = t('%1$s likes %2$s\'s %3$s');
@ -165,9 +165,9 @@ function localize_item(&$item){
$Bname = $obj['title']; $Bname = $obj['title'];
$A = '[url=' . chanlink_url($Alink) . ']' . $Aname . '[/url]'; $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]';
$B = '[url=' . chanlink_url($Blink) . ']' . $Bname . '[/url]'; $B = '[zrl=' . chanlink_url($Blink) . ']' . $Bname . '[/zrl]';
if ($Bphoto!="") $Bphoto = '[url=' . chanlink_url($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; if ($Bphoto!="") $Bphoto = '[zrl=' . chanlink_url($Blink) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]';
$item['body'] = $item['localize'] = sprintf( t('%1$s is now connected with %2$s'), $A, $B); $item['body'] = $item['localize'] = sprintf( t('%1$s is now connected with %2$s'), $A, $B);
$item['body'] .= "\n\n\n" . $Bphoto; $item['body'] .= "\n\n\n" . $Bphoto;
@ -193,9 +193,9 @@ function localize_item(&$item){
} }
$Bname = $obj['title']; $Bname = $obj['title'];
$A = '[url=' . chanlink_url($Alink) . ']' . $Aname . '[/url]'; $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]';
$B = '[url=' . chanlink_url($Blink) . ']' . $Bname . '[/url]'; $B = '[zrl=' . chanlink_url($Blink) . ']' . $Bname . '[/zrl]';
if ($Bphoto!="") $Bphoto = '[url=' . chanlink_url($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; if ($Bphoto!="") $Bphoto = '[zrl=' . chanlink_url($Blink) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]';
// we can't have a translation string with three positions but no distinguishable text // we can't have a translation string with three positions but no distinguishable text
// So here is the translate string. // So here is the translate string.
@ -220,7 +220,7 @@ function localize_item(&$item){
$Aname = $item['author']['xchan_name']; $Aname = $item['author']['xchan_name'];
$Alink = $item['author']['xchan_url']; $Alink = $item['author']['xchan_url'];
$A = '[url=' . chanlink_url($Alink) . ']' . $Aname . '[/url]'; $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]';
$txt = t('%1$s is currently %2$s'); $txt = t('%1$s is currently %2$s');
@ -237,8 +237,8 @@ function localize_item(&$item){
if(count($r)==0) return; if(count($r)==0) return;
$obj=$r[0]; $obj=$r[0];
$author = '[url=' . zid($item['author-link']) . ']' . $item['author-name'] . '[/url]'; $author = '[zrl=' . zid($item['author-link']) . ']' . $item['author-name'] . '[/zrl]';
$objauthor = '[url=' . zid($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; $objauthor = '[zrl=' . zid($obj['author-link']) . ']' . $obj['author-name'] . '[/zrl]';
switch($obj['verb']){ switch($obj['verb']){
case ACTIVITY_POST: case ACTIVITY_POST:
@ -253,17 +253,17 @@ function localize_item(&$item){
default: default:
if($obj['resource_id']){ if($obj['resource_id']){
$post_type = t('photo'); $post_type = t('photo');
$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $m=array(); preg_match("/\[[zu]rl=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1]; $rr['plink'] = $m[1];
} else { } else {
$post_type = t('status'); $post_type = t('status');
} }
} }
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; $plink = '[zrl=' . $obj['plink'] . ']' . $post_type . '[/zrl]';
$parsedobj = parse_xml_string($xmlhead.$item['object']); $parsedobj = parse_xml_string($xmlhead.$item['object']);
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content); $tag = sprintf('#[zrl=%s]%s[/zrl]', $parsedobj->id, $parsedobj->content);
$item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag );
} }
@ -288,9 +288,9 @@ function localize_item(&$item){
$target = $r[0]; $target = $r[0];
$Bname = $target['author-name']; $Bname = $target['author-name'];
$Blink = $target['author-link']; $Blink = $target['author-link'];
$A = '[url=' . zid($Alink) . ']' . $Aname . '[/url]'; $A = '[zrl=' . zid($Alink) . ']' . $Aname . '[/zrl]';
$B = '[url=' . zid($Blink) . ']' . $Bname . '[/url]'; $B = '[zrl=' . zid($Blink) . ']' . $Bname . '[/zrl]';
$P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]'; $P = '[zrl=' . $target['plink'] . ']' . t('post/item') . '[/zrl]';
$item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n"; $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n";
} }
@ -298,25 +298,26 @@ function localize_item(&$item){
} }
*/ */
/*
$matches = null; $matches = null;
if(strpos($item['body'],'[url') !== false) { if(strpos($item['body'],'[zrl') !== false) {
if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { if(preg_match_all('/@\[zrl=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
if(! strpos($mtch[1],'zid=')) if(! strpos($mtch[1],'zid='))
$item['body'] = str_replace($mtch[0],'@[url=' . zid($mtch[1]). ']',$item['body']); $item['body'] = str_replace($mtch[0],'@[zrl=' . zid($mtch[1]). ']',$item['body']);
} }
} }
} }
if(strpos($item['body'],'[img') !== false) { if(strpos($item['body'],'[zmg') !== false) {
// add zid's to public images // add zid's to public images
if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) { if(preg_match_all('/\[zrl=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[zmg(.*?)\]h(.*?)\[\/zmg\]\[\/zrl\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
$item['body'] = str_replace($mtch[0],'[url=' . zid( $mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3]) . '][img' . $mtch[4] . ']h' . $mtch[5] . '[/img][/url]',$item['body']); $item['body'] = str_replace($mtch[0],'[zrl=' . zid( $mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3]) . '][zmg' . $mtch[4] . ']h' . $mtch[5] . '[/zmg][/zrl]',$item['body']);
} }
} }
} }
*/
// add sparkle links to appropriate permalinks // add sparkle links to appropriate permalinks
// $x = stristr($item['plink'],'/display/'); // $x = stristr($item['plink'],'/display/');

2
include/enotify.php
View File

@ -114,7 +114,7 @@ function notification($params) {
// "a post" // "a post"
$dest_str = sprintf(t('%1$s commented on [zrl=%2$s]a %3$s[/zrl]'), $dest_str = sprintf(t('%1$s commented on [zrl=%2$s]a %3$s[/zrl]'),
'[url=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/url]', '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
$itemlink, $itemlink,
$item_post_type); $item_post_type);

2
version.inc
View File

@ -1 +1 @@
2013-06-09.339 2013-06-12.342