MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode

Browse source
This commit is contained in:
Michael Vogel 2015-05-01 11:06:39 +02:00
parent be96b1eaa4 c9e07fa3ac
commit 747607fe97
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/oembed.php
View file

@ -210,7 +210,7 @@ function oembed_iframe($src,$width,$height) {
$a = get_app(); $a = get_app();
$s = $a->get_baseurl()."/oembed/".base64url_encode($src); $s = $a->get_baseurl()."/oembed/".base64url_encode($src);
return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>'; return '<iframe class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
} }

12
mod/ping.php
View file

@ -1,5 +1,6 @@
<?php <?php
require_once("include/datetime.php"); require_once("include/datetime.php");
require_once('include/bbcode.php');
function ping_init(&$a) { function ping_init(&$a) {
@ -191,8 +192,6 @@ function ping_init(&$a) {
$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
require_once('include/bbcode.php');
if($firehose) { if($firehose) {
echo ' <notif count="'.$tot.'">'; echo ' <notif count="'.$tot.'">';
} }
@ -208,17 +207,17 @@ function ping_init(&$a) {
if ($intro>0){ if ($intro>0){
foreach ($intros as $i) { foreach ($intros as $i) {
echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") ); echo xmlize($a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen', "&rarr; ".t("{0} wants to be your friend"));
}; };
} }
if ($mail>0){ if ($mail>0){
foreach ($mails as $i) { foreach ($mails as $i) {
echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") ); echo xmlize($a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',"&rarr; ".t("{0} sent you a message"));
}; };
} }
if ($register>0){ if ($register>0){
foreach ($regs as $i) { foreach ($regs as $i) {
echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") ); echo xmlize($a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen', "&rarr; ".t("{0} requested registration"));
}; };
} }
@ -349,6 +348,9 @@ function ping_get_notifications($uid, $regularnotifications) {
if (is_null($notification["deleted"])) if (is_null($notification["deleted"]))
$notification["deleted"] = 0; $notification["deleted"] = 0;
$notification["msg"] = strip_tags(bbcode($notification["msg"]));
$notification["name"] = strip_tags(bbcode($notification["name"]));
// Replace the name with {0} but ensure to make that only once // Replace the name with {0} but ensure to make that only once
// The {0} is used later and prints the name in bold. // The {0} is used later and prints the name in bold.
// But don't do it for the android app. // But don't do it for the android app.

4
view/global.css
View file

@ -84,6 +84,10 @@ span.connector {
position: relative; position: relative;
} }
.embed_rich {
display: block;
}
/* Shared Messages */ /* Shared Messages */
.shared_header { .shared_header {
height: 32px; height: 32px;