strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error

Browse source
This commit is contained in:
Friendika 2011-08-26 01:32:22 -07:00
parent a4739aef91
commit 1861dc1fae
3 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/bbcode.php
View file

@ -134,7 +134,7 @@ function bbcode($Text,$preserve_nl = false) {
// Youtube extensions // Youtube extensions
$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
$Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<iframe width="425" height="349" src="http://www.youtube.com/embed/$1" frameborder="0" allowfullscreen></iframe>', $Text); $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<iframe width="425" height="349" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
} }
// $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text); // $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);

8
include/notifier.php
View file

@ -641,15 +641,19 @@ function notifier_run($argv, $argc){
/* Don't deliver to folks who have already been delivered to */ /* Don't deliver to folks who have already been delivered to */
if(in_array($rr['id'],$conversants)) if(in_array($rr['id'],$conversants)) {
logger('notifier: already delivered id=' . $rr['id']);
continue; continue;
}
$n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", $n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($rr['id']) intval($rr['id'])
); );
if(count($n)) { if(count($n)) {
$contact = $n[0]; $contact = $n[0];
logger('pubdeliver: network: ' . $contact['network']);
switch($contact['network']) { switch($contact['network']) {
case NETWORK_DFRN : case NETWORK_DFRN :
logger('notifier: dfrnpubdelivery: ' . $contact['name']); logger('notifier: dfrnpubdelivery: ' . $contact['name']);

28
include/queue.php
View file

@ -29,6 +29,11 @@ function queue_run($argv, $argc){
load_hooks(); load_hooks();
if($argc > 1)
$queue_id = intval($argv[1]);
else
$queue_id = 0;
$deadguys = array(); $deadguys = array();
logger('queue: start'); logger('queue: start');
@ -44,13 +49,19 @@ function queue_run($argv, $argc){
q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
} }
$r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE "); if($queue_id)
$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id)
);
else
$r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
if(! count($r)){ if(! count($r)){
return; return;
} }
call_hooks('queue_predeliver', $a, $r); if(! $queue_id)
call_hooks('queue_predeliver', $a, $r);
// delivery loop // delivery loop
@ -63,9 +74,16 @@ function queue_run($argv, $argc){
// queue_predeliver hooks may have changed the queue db details, // queue_predeliver hooks may have changed the queue db details,
// so check again if this entry still needs processing // so check again if this entry still needs processing
$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ", if($queue_id) {
intval($q_item['id']) $qi = q("select * from queue where `id` = %d limit 1",
); intval($queue_id)
);
}
else {
$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
intval($q_item['id'])
);
}
if(! count($qi)) if(! count($qi))
continue; continue;