From a4eafa834d8f9a80be6cb55c55b62c20ce7f0bb8 Mon Sep 17 00:00:00 2001 From: Afterster Date: Tue, 21 Apr 2015 19:56:36 +0200 Subject: [PATCH] Fix few french translation Avoid player exit confirmation on download links Fix song removal from user uploader --- lib/ui.lib.php | 36 ++++++++++++------- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 109831 -> 109811 bytes locale/fr_FR/LC_MESSAGES/messages.po | 32 ++++++++--------- song.php | 4 ++- templates/create_web_player_embedded.inc.php | 1 - templates/show_html5_player_headers.inc.php | 2 +- 6 files changed, 43 insertions(+), 32 deletions(-) diff --git a/lib/ui.lib.php b/lib/ui.lib.php index f3dedfbc..1aff57a6 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -203,13 +203,6 @@ function show_album_select($name='album', $album_id=0, $allow_add=false, $song_i $key = "album_select_c" . ++$album_id_cnt; } - // Added ID field so we can easily observe this element - echo "\n"; + + if ($allow_none) { + echo "\t\n"; + } while ($r = Dba::fetch_assoc($db_results)) { $selected = ''; @@ -240,6 +241,10 @@ function show_album_select($name='album', $album_id=0, $allow_add=false, $song_i echo "\n"; + if ($count === 0) { + echo "\n"; + } + } // show_album_select /** @@ -257,12 +262,6 @@ function show_artist_select($name='artist', $artist_id=0, $allow_add=false, $son $key = $name . "_select_c" . ++$artist_id_cnt; } - echo "\n"; + + if ($allow_none) { + echo "\t\n"; + } while ($r = Dba::fetch_assoc($db_results)) { $selected = ''; @@ -290,6 +296,10 @@ function show_artist_select($name='artist', $artist_id=0, $allow_add=false, $son echo "\n"; + if ($count === 0) { + echo "\n"; + } + } // show_artist_select /** diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo index ebf7ca0a8494d5bdde1aaa01b97d3a0f868e70fb..ad595b7396a9b5b879aabd54208e8dcdefb86c4c 100644 GIT binary patch delta 10924 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 zid && $song->user_upload > 0) { - if (Access::check('interface','50') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_remove'))) { + if (Access::check('interface','50') || ($song->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_remove'))) { if ($song->remove_from_disk()) { show_confirmation(T_('Song Deletion'), T_('Song has been deleted.'), AmpConfig::get('web_path')); } else { show_confirmation(T_('Song Deletion'), T_('Cannot delete this song.'), AmpConfig::get('web_path')); } } else { + debug_event('song', 'Unauthorized to remove this song.', 1); UI::access_denied(); exit; } } else { + debug_event('song', 'Cannot remove a song that wasn\'t uploaded.', 1); UI::access_denied(); exit; } diff --git a/templates/create_web_player_embedded.inc.php b/templates/create_web_player_embedded.inc.php index cce6fe35..d3c15144 100644 --- a/templates/create_web_player_embedded.inc.php +++ b/templates/create_web_player_embedded.inc.php @@ -47,7 +47,6 @@ if ($_REQUEST['append']) { document.onbeforeunload = null; - if (appendmedia) { } else if (playnext) { diff --git a/templates/show_html5_player_headers.inc.php b/templates/show_html5_player_headers.inc.php index 299c4e7a..e6233716 100644 --- a/templates/show_html5_player_headers.inc.php +++ b/templates/show_html5_player_headers.inc.php @@ -471,7 +471,7 @@ function stopBroadcast() window.parent.onbeforeunload = function (evt) { - if (!$("#jquery_jplayer_1").data("jPlayer").status.paused) { + if (!$("#jquery_jplayer_1").data("jPlayer").status.paused && (document.activeElement === undefined || (document.activeElement.href.indexOf('/batch.php') < 0 && document.activeElement.href.indexOf('/stream.php') < 0))) { var message = ''; if (typeof evt == 'undefined') { evt = window.event;