valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix inline flash/html5 audio player

This commit is contained in:
Andrew Dolgov 2013-01-15 11:23:27 +04:00
parent 6effae6dd8
commit ca3bca990d
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/functions.php
View File

@ -2987,8 +2987,8 @@
$id = 'AUDIO-' . uniqid(); $id = 'AUDIO-' . uniqid();
$entry .= "<audio id=\"$id\"\"> $entry .= "<audio id=\"$id\"\" controls>
<source src=\"$url\"></source> <source type=\"$ctype\" src=\"$url\"></source>
</audio>"; </audio>";
$entry .= "<span onclick=\"player(this)\" $entry .= "<span onclick=\"player(this)\"
@ -3004,14 +3004,20 @@
value=\"lib/button/musicplayer.swf?song_url=$url\" /> value=\"lib/button/musicplayer.swf?song_url=$url\" />
</object>"; </object>";
} }
if ($entry) $entry .= "&nbsp;" . basename($url);
return $entry;
} }
$filename = substr($url, strrpos($url, "/")+1); return "";
/* $filename = substr($url, strrpos($url, "/")+1);
$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" . $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$filename . " (" . $ctype . ")" . "</a>"; $filename . " (" . $ctype . ")" . "</a>"; */
return $entry;
} }
function format_article($link, $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) { function format_article($link, $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
@ -4608,6 +4614,7 @@
$entries_html = array(); $entries_html = array();
$entries = array(); $entries = array();
$entries_inline = array();
foreach ($result as $line) { foreach ($result as $line) {
@ -4618,7 +4625,9 @@
$filename = substr($url, strrpos($url, "/")+1); $filename = substr($url, strrpos($url, "/")+1);
# $player = format_inline_player($link, $url, $ctype); $player = format_inline_player($link, $url, $ctype);
if ($player) array_push($entries_inline, $player);
# $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" . # $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
# $filename . " (" . $ctype . ")" . "</a>"; # $filename . " (" . $ctype . ")" . "</a>";
@ -4655,6 +4664,12 @@
} }
} }
if (count($entries_inline) > 0) {
$rv .= "<hr clear='both'/>";
foreach ($entries_inline as $entry) { $rv .= $entry; };
$rv .= "<hr clear='both'/>";
}
$rv .= "<br/><div dojoType=\"dijit.form.DropDownButton\">". $rv .= "<br/><div dojoType=\"dijit.form.DropDownButton\">".
"<span>" . __('Attachments')."</span>"; "<span>" . __('Attachments')."</span>";
$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; $rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";