yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Code Issues Releases Wiki Activity

Add missing slash in album batch download link

Browse source 
Add log entry on Plex api stream
This commit is contained in:
Afterster 2016-02-16 06:22:39 +01:00
parent c2db9a2e03
commit e231533080
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/class/plex_api.class.php
View file

@ -1065,7 +1065,6 @@ class Plex_Api
protected static function stream_url($url) protected static function stream_url($url)
{ {
// header("Location: " . $url);
set_time_limit(0); set_time_limit(0);
ob_end_clean(); ob_end_clean();
@ -1075,6 +1074,10 @@ class Plex_Api
$reqheaders[] = "Range: " . $headers['Range']; $reqheaders[] = "Range: " . $headers['Range'];
} }
// Curl support, we stream transparently to avoid redirect. Redirect can fail on few clients
debug_event('plex-api', 'Stream proxy: ' . $url, 5);
// header("Location: " . $url);
$ch = curl_init($url); $ch = curl_init($url);
curl_setopt_array($ch, array( curl_setopt_array($ch, array(
CURLOPT_HTTPHEADER => $reqheaders, CURLOPT_HTTPHEADER => $reqheaders,

2
templates/show_album_row.inc.php
View file

@ -124,7 +124,7 @@ if (Art::is_enabled()) {
} }
if (Access::check_function('batch_download') && check_can_zip('album')) { if (Access::check_function('batch_download') && check_can_zip('album')) {
?> ?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path') ?>batch.php?action=album&<?php echo $libitem->get_http_album_query_ids('id') ?>"> <a rel="nohtml" href="<?php echo AmpConfig::get('web_path') ?>/batch.php?action=album&<?php echo $libitem->get_http_album_query_ids('id') ?>">
<?php echo UI::get_icon('batch_download', T_('Batch Download')); <?php echo UI::get_icon('batch_download', T_('Batch Download'));
?> ?>
</a> </a>