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

Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop

Browse source 
Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
This commit is contained in:
Afterster 2015-11-07 08:08:59 +01:00
commit 5124a5ed4c
303 changed files with 4334 additions and 4561 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/tests/codestyle.sh
View file

@ -14,7 +14,7 @@ fi
PHPCSFIXERARGS="fix -v --fixers="
# Mandatory fix
FIXERS1="indentation,linefeed,trailing_spaces,short_tag,braces,controls_spaces,eof_ending,visibility"
FIXERS1="indentation,linefeed,trailing_spaces,short_tag,braces,controls_spaces,eof_ending,visibility,align_equals,concat_with_spaces"
# Optionnal fix & false positive
#FIXERS2="visibility"

126
templates/show_album_row.inc.php
View file

@ -23,26 +23,17 @@
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if ($show_direct_play) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $libitem->get_http_album_query_ids('object_id'), 'play', T_('Play'), 'play_album_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $libitem->get_http_album_query_ids('object_id') . '&append=true', 'play_add', T_('Play last'), 'addplay_album_' . $libitem->id);
?>
<?php
if ($show_direct_play) {
echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $libitem->get_http_album_query_ids('object_id'), 'play', T_('Play'), 'play_album_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $libitem->get_http_album_query_ids('object_id') . '&append=true', 'play_add', T_('Play last'), 'addplay_album_' . $libitem->id);
if (Stream_Playlist::check_autoplay_next()) {
echo Ajax::button('?page=stream&action=directplay&object_type=album&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_album_' . $libitem->id);
}
}
}
?>
<?php if (Stream_Playlist::check_autoplay_next()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=album&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_album_' . $libitem->id);
?>
<?php
}
?>
<?php
} ?>
</div>
</td>
<?php
@ -59,11 +50,10 @@ if (Art::is_enabled()) {
<td class="cel_album"><?php echo $libitem->f_link; ?></td>
<td class="cel_add">
<span class="cel_item_add">
<?php if ($show_playlist_add) {
?>
<?php echo Ajax::button('?action=basket&type=album&' . $libitem->get_http_album_query_ids('id'), 'add', T_('Add to temporary playlist'), 'add_album_' . $libitem->id);
?>
<?php echo Ajax::button('?action=basket&type=album_random&' . $libitem->get_http_album_query_ids('id'), 'random', T_('Random to temporary playlist'), 'random_album_' . $libitem->id);
<?php
if ($show_playlist_add) {
echo Ajax::button('?action=basket&type=album&' . $libitem->get_http_album_query_ids('id'), 'add', T_('Add to temporary playlist'), 'add_album_' . $libitem->id);
echo Ajax::button('?action=basket&type=album_random&' . $libitem->get_http_album_query_ids('id'), 'random', T_('Random to temporary playlist'), 'random_album_' . $libitem->id);
?>
<a id="<?php echo 'add_playlist_'.$libitem->id ?>" onclick="showPlaylistDialog(event, 'album', '<?php if (!count($libitem->album_suite)) {
echo $libitem->id;
@ -71,8 +61,7 @@ if (Art::is_enabled()) {
echo implode(',', $libitem->album_suite);
}
?>')">
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
?>
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist')); ?>
</a>
<?php
} ?>
@ -83,87 +72,64 @@ if (Art::is_enabled()) {
<td class="cel_year"><?php if ($libitem->year > 0) {
echo $libitem->year;
} ?></td>
<?php if (AmpConfig::get('show_played_times')) {
?>
<td class="cel_counter"><?php echo $libitem->object_cnt;
?></td>
<?php
} ?>
if (AmpConfig::get('show_played_times')) { ?>
<td class="cel_counter"><?php echo $libitem->object_cnt; ?></td>
<?php
}
?>
<td class="cel_tags"><?php echo $libitem->f_tags; ?></td>
<?php if (User::is_registered()) {
?>
<?php if (AmpConfig::get('ratings')) {
?>
<?php
if (User::is_registered()) {
if (AmpConfig::get('ratings')) { ?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_album"><?php Rating::show($libitem->id, 'album');
?></td>
<?php
}
?>
<?php if (AmpConfig::get('userflags')) {
?>
if (AmpConfig::get('userflags')) { ?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_album"><?php Userflag::show($libitem->id, 'album');
?></td>
<?php
}
}
?>
<?php
} ?>
<td class="cel_action">
<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
if (AmpConfig::get('sociable') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
?>
<?php if (AmpConfig::get('sociable') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
?>
<a href="<?php echo AmpConfig::get('web_path');
?>/shout.php?action=show_add_shout&type=album&amp;id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('comment', T_('Post Shout'));
?>
<a href="<?php echo AmpConfig::get('web_path'); ?>/shout.php?action=show_add_shout&type=album&amp;id=<?php echo $libitem->id; ?>">
<?php echo UI::get_icon('comment', T_('Post Shout')); ?>
</a>
<?php
}
?>
<?php
}
?>
<?php if (Access::check('interface','25')) {
?>
<?php if (AmpConfig::get('share') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
?>
<?php Share::display_ui('album', $libitem->id, false);
?>
if (AmpConfig::get('share') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
Share::display_ui('album', $libitem->id, false);
}
if (AmpConfig::get('share') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
Share::display_ui('album', $libitem->id, false);
}
}
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'); ?>">
<?php echo UI::get_icon('batch_download', T_('Batch Download')); ?>
</a>
<?php
}
?>
<?php
} ?>
<?php 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');
?>">
<?php echo UI::get_icon('batch_download', T_('Batch Download'));
?>
</a>
<?php
} ?>
<?php if (Access::check('interface','50') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
?>
if (Access::check('interface','50') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) { ?>
<a id="<?php echo 'edit_album_'.$libitem->id ?>" onclick="showEditDialog('album_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_album_'.$libitem->id ?>', '<?php echo T_('Album edit') ?>', 'album_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
<?php echo UI::get_icon('edit', T_('Edit')); ?>
</a>
<?php
} ?>
<?php if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_album_'.$libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/albums.php?action=delete&album_id=<?php echo $libitem->id;
?>">
}
if (Catalog::can_remove($libitem)) { ?>
<a id="<?php echo 'delete_album_'.$libitem->id ?>" href="<?php echo AmpConfig::get('web_path'); ?>/albums.php?action=delete&album_id=<?php echo $libitem->id; ?>">
<?php echo UI::get_icon('delete', T_('Delete'));
?>
</a>
<?php
} ?>
}
?>
</td>

117
templates/show_artist_row.inc.php
View file

@ -23,26 +23,17 @@
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if ($show_direct_play) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id,'play', T_('Play'),'play_artist_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_artist_' . $libitem->id);
?>
<?php
if ($show_direct_play) {
echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id,'play', T_('Play'),'play_artist_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_artist_' . $libitem->id);
if (Stream_Playlist::check_autoplay_next()) {
echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_artist_' . $libitem->id);
}
}
}
?>
<?php if (Stream_Playlist::check_autoplay_next()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_artist_' . $libitem->id);
?>
<?php
}
?>
<?php
} ?>
</div>
</td>
<?php
@ -59,15 +50,13 @@ if (Art::is_enabled()) {
<td class="cel_artist"><?php echo $libitem->f_link; ?></td>
<td class="cel_add">
<span class="cel_item_add">
<?php if ($show_playlist_add) {
?>
<?php echo Ajax::button('?action=basket&type=artist&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_artist_' . $libitem->id);
?>
<?php echo Ajax::button('?action=basket&type=artist_random&id=' . $libitem->id,'random', T_('Random to temporary playlist'),'random_artist_' . $libitem->id);
<?php
if ($show_playlist_add) {
echo Ajax::button('?action=basket&type=artist&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_artist_' . $libitem->id);
echo Ajax::button('?action=basket&type=artist_random&id=' . $libitem->id,'random', T_('Random to temporary playlist'),'random_artist_' . $libitem->id);
?>
<a id="<?php echo 'add_playlist_'.$libitem->id ?>" onclick="showPlaylistDialog(event, 'artist', '<?php echo $libitem->id ?>')">
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
?>
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist')); ?>
</a>
<?php
} ?>
@ -76,75 +65,43 @@ if (Art::is_enabled()) {
<td class="cel_songs"><?php echo $libitem->songs; ?></td>
<td class="cel_albums"><?php echo $libitem->albums; ?></td>
<td class="cel_time"><?php echo $libitem->f_time; ?></td>
<?php if (AmpConfig::get('show_played_times')) {
?>
<td class="cel_counter"><?php echo $libitem->object_cnt;
?></td>
<?php if (AmpConfig::get('show_played_times')) { ?>
<td class="cel_counter"><?php echo $libitem->object_cnt; ?></td>
<?php
} ?>
<td class="cel_tags"><?php echo $libitem->f_tags; ?></td>
<?php if (User::is_registered()) {
?>
<?php if (AmpConfig::get('ratings')) {
?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_artist"><?php Rating::show($libitem->id,'artist');
?></td>
<?php
if (User::is_registered()) {
if (AmpConfig::get('ratings')) { ?>
<td class="cel_rating" id="rating_<?php echo $libitem->id; ?>_artist"><?php Rating::show($libitem->id,'artist'); ?></td>
<?php
}
?>
<?php if (AmpConfig::get('userflags')) {
?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_artist"><?php Userflag::show($libitem->id,'artist');
?></td>
if (AmpConfig::get('userflags')) { ?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id; ?>_artist"><?php Userflag::show($libitem->id,'artist'); ?></td>
<?php
}
}
?>
<?php
} ?>
<td class="cel_action">
<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
if (AmpConfig::get('sociable') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
?>
<?php if (AmpConfig::get('sociable') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
?>
<a href="<?php echo AmpConfig::get('web_path');
?>/shout.php?action=show_add_shout&type=artist&amp;id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('comment', T_('Post Shout'));
?>
<a href="<?php echo AmpConfig::get('web_path'); ?>/shout.php?action=show_add_shout&type=artist&amp;id=<?php echo $libitem->id; ?>">
<?php echo UI::get_icon('comment', T_('Post Shout')); ?>
</a>
<?php
}
if ($libitem->can_edit()) { ?>
<a id="<?php echo 'edit_artist_'.$libitem->id ?>" onclick="showEditDialog('artist_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_artist_'.$libitem->id ?>', '<?php echo T_('Artist edit') ?>', 'artist_')">
<?php echo UI::get_icon('edit', T_('Edit')); ?>
</a>
<?php
}
if (Catalog::can_remove($libitem)) { ?>
<a id="<?php echo 'delete_artist_'.$libitem->id ?>" href="<?php echo AmpConfig::get('web_path'); ?>/artists.php?action=delete&artist_id=<?php echo $libitem->id; ?>">
<?php echo UI::get_icon('delete', T_('Delete')); ?>
</a>
<?php
}
?>
<?php
} ?>
<?php if (Access::check_function('batch_download') && check_can_zip('artist')) {
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path');
?>/batch.php?action=artist&amp;id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('batch_download', T_('Batch Download'));
?>
</a>
<?php
} ?>
<?php if ($libitem->can_edit()) {
?>
<a id="<?php echo 'edit_artist_'.$libitem->id ?>" onclick="showEditDialog('artist_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_artist_'.$libitem->id ?>', '<?php echo T_('Artist edit') ?>', 'artist_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<?php
} ?>
<?php if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_artist_'.$libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/artists.php?action=delete&artist_id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('delete', T_('Delete'));
?>
</a>
<?php
} ?>
</td>

5
templates/show_broadcast_row.inc.php
View file

@ -24,10 +24,7 @@
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=broadcast&object_id=' . $libitem->id,'play', T_('Play'),'play_broadcast_' . $libitem->id);
?>
<?php
echo Ajax::button('?page=stream&action=directplay&object_type=broadcast&object_id=' . $libitem->id,'play', T_('Play'),'play_broadcast_' . $libitem->id);
} ?>
</div>
</td>

5
templates/show_channel_row.inc.php
View file

@ -24,10 +24,7 @@
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=channel&object_id=' . $libitem->id,'play', T_('Play'),'play_channel_' . $libitem->id);
?>
<?php
echo Ajax::button('?page=stream&action=directplay&object_type=channel&object_id=' . $libitem->id,'play', T_('Play'),'play_channel_' . $libitem->id);
} ?>
</div>
</td>

22
templates/show_edit_album_row.inc.php
View file

@ -30,7 +30,8 @@
<tr>
<td class="edit_dialog_content_header"><?php echo T_('Artist') ?></td>
<td>
<?php if (Access::check('interface', 50)) {
<?php
if (Access::check('interface', 50)) {
if ($libitem->artist_count == '1') {
show_artist_select('artist', $libitem->artist_id);
} else {
@ -45,9 +46,9 @@
<tr>
<td class="edit_dialog_content_header"><?php echo T_('Album Artist') ?></td>
<td>
<?php if (Access::check('interface', 50)) {
?>
<?php show_artist_select('album_artist', $libitem->album_artist, true, $libitem->id, true);
<?php
if (Access::check('interface', 50)) {
show_artist_select('album_artist', $libitem->album_artist, true, $libitem->id, true);
?>
<div id="album_artist_select_album_<?php echo $libitem->id ?>">
<?php echo Ajax::observe('album_artist_select_' . $libitem->id, 'change', 'check_inline_song_edit("album_artist", ' . $libitem->id . ')');
@ -77,12 +78,11 @@
<input type="text" name="mbid" value="<?php echo $libitem->mbid;
?>" />
<?php
} else {
echo $libitem->mbid;
}
?>
<?php echo $libitem->mbid;
?>
<?php
} ?>
</td>
</tr>
<tr>
@ -93,11 +93,9 @@
<input type="text" name="mbid_group" value="<?php echo $libitem->mbid_group;
?>" />
<?php
} else {
?>
<?php echo $libitem->mbid_group;
?>
<?php
echo $libitem->mbid_group;
} ?>
</td>
</tr>

5
templates/show_edit_artist_row.inc.php
View file

@ -36,10 +36,7 @@
?>" />
<?php
} else {
?>
<?php echo $libitem->mbid;
?>
<?php
echo $libitem->mbid;
} ?>
</td>
</tr>

6
templates/show_edit_share_row.inc.php
View file

@ -39,7 +39,8 @@
<td class="edit_dialog_content_header"></td>
<td><input type="checkbox" name="allow_stream" value="1" <?php echo ($libitem->allow_stream) ? 'checked' : ''; ?> /> <?php echo T_('Allow Stream') ?></td>
</tr>
<?php if ((($libitem->object_type == 'song' || $libitem->object_type == 'video') && Access::check_function('download')) || Access::check_function('batch_download')) {
<?php
if ((($libitem->object_type == 'song' || $libitem->object_type == 'video') && Access::check_function('download')) || Access::check_function('batch_download')) {
?>
<tr>
<td class="edit_dialog_content_header"></td>
@ -47,7 +48,8 @@
?> /> <?php echo T_('Allow Download') ?></td>
</tr>
<?php
} ?>
}
?>
</table>
<input type="hidden" name="id" value="<?php echo $libitem->id; ?>" />
<input type="hidden" name="type" value="share_row" />

22
templates/show_edit_song_row.inc.php
View file

@ -27,7 +27,8 @@
<td class="edit_dialog_content_header"><?php echo T_('Title') ?></td>
<td><input type="text" name="title" value="<?php echo scrub_out($libitem->title); ?>" autofocus /></td>
</tr>
<?php if (Access::check('interface','75')) {
<?php
if (Access::check('interface','75')) {
?>
<tr>
<td class="edit_dialog_content_header"><?php echo T_('Artist') ?></td>
@ -52,7 +53,8 @@
</td>
</tr>
<?php
} ?>
}
?>
<tr>
<td class="edit_dialog_content_header"><?php echo T_('Track') ?></td>
<td><input type="text" name="track" value="<?php echo scrub_out($libitem->track); ?>" /></td>
@ -60,17 +62,16 @@
<tr>
<td class="edit_dialog_content_header"><?php echo T_('MusicBrainz ID') ?></td>
<td>
<?php if (Access::check('interface', 50)) {
<?php
if (Access::check('interface', 50)) {
?>
<input type="text" name="mbid" value="<?php echo $libitem->mbid;
?>" />
<?php
} else {
echo $libitem->mbid;
}
?>
<?php echo $libitem->mbid;
?>
<?php
} ?>
</td>
</tr>
<tr>
@ -91,7 +92,8 @@
<input type="text" name="edit_tags" id="edit_tags" value="<?php echo Tag::get_display($libitem->tags); ?>" />
</td>
</tr>
<?php if (AmpConfig::get('licensing')) {
<?php
if (AmpConfig::get('licensing')) {
?>
<tr>
<td class="edit_dialog_content_header"><?php echo T_('Music License') ?></td>
@ -105,8 +107,8 @@
</td>
</tr>
<?php
} ?>
}
?>
</table>
<input type="hidden" name="id" value="<?php echo $libitem->id; ?>" />
<input type="hidden" name="type" value="song_row" />

46
templates/show_label_row.inc.php
View file

@ -22,50 +22,30 @@
?>
<?php
if (Art::is_enabled()) {
$name = scrub_out($libitem->f_name);
?>
$name = scrub_out($libitem->f_name); ?>
<td class="cel_cover">
<?php
Art::display('label', $libitem->id, $name, 1, AmpConfig::get('web_path') . '/labels.php?action=show&label=' . $libitem->id);
?>
<?php Art::display('label', $libitem->id, $name, 1, AmpConfig::get('web_path') . '/labels.php?action=show&label=' . $libitem->id); ?>
</td>
<?php
} ?>
}
?>
<td class="cel_label"><?php echo $libitem->f_link; ?></td>
<td class="cel_category"><?php echo $libitem->category; ?></td>
<td class="cel_artists"><?php echo $libitem->artists; ?></td>
<td class="cel_action">
<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
if (AmpConfig::get('sociable')) {
?>
<?php if (AmpConfig::get('sociable')) {
?>
<a href="<?php echo AmpConfig::get('web_path');
?>/shout.php?action=show_add_shout&type=label&amp;id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('comment', T_('Post Shout'));
?>
<a href="<?php echo AmpConfig::get('web_path') ?>/shout.php?action=show_add_shout&type=label&amp;id=<?php echo $libitem->id ?>">
<?php echo UI::get_icon('comment', T_('Post Shout')) ?>
</a>
<?php
}
if (Catalog::can_remove($libitem)) { ?>
<a id="<?php echo 'delete_label_'.$libitem->id ?>" href="<?php echo AmpConfig::get('web_path') ?>/labels.php?action=delete&label_id=<?php echo $libitem->id ?>">
<?php echo UI::get_icon('delete', T_('Delete')) ?>
</a>
<?php
}
?>
<?php
} ?>
<?php if ($libitem->can_edit()) {
?>
<a id="<?php echo 'edit_label_'.$libitem->id ?>" onclick="showEditDialog('label_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_label_'.$libitem->id ?>', '<?php echo T_('Label edit') ?>', 'label_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<?php
} ?>
<?php if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_label_'.$libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/labels.php?action=delete&label_id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('delete', T_('Delete'));
?>
</a>
<?php
} ?>
</td>

22
templates/show_live_stream_row.inc.php
View file

@ -23,30 +23,28 @@
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $libitem->id, 'play', T_('Play live stream'),'play_live_stream_' . $libitem->id);
?>
<?php
} ?>
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $libitem->id, 'play', T_('Play live stream'),'play_live_stream_' . $libitem->id);
}
?>
</div>
</td>
<td class="cel_streamname"><?php echo $libitem->f_link; ?></td>
<td class="cel_streamurl"><?php echo $libitem->f_url_link; ?></td>
<td class="cel_codec"><?php echo $libitem->codec; ?></td>
<td class="cel_action">
<?php if (Access::check('interface','50')) {
<?php
if (Access::check('interface','50')) {
?>
<a id="<?php echo 'edit_live_stream_' . $libitem->id ?>" onclick="showEditDialog('live_stream_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_live_stream_' . $libitem->id ?>', '<?php echo T_('Live Stream edit') ?>', 'live_stream_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<?php
} ?>
<?php if (Access::check('interface','75')) {
}
if (Access::check('interface','75')) {
echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $libitem->id,'delete', T_('Delete'),'delete_live_stream_' . $libitem->id);
}
?>
<?php echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $libitem->id,'delete', T_('Delete'),'delete_live_stream_' . $libitem->id);
?>
<?php
} ?>
</td>

20
templates/show_now_playing_row.inc.php
View file

@ -24,8 +24,8 @@
<div class="np_cell cel_username">
<label><?php echo T_('Username'); ?></label>
<a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>">
<?php echo scrub_out($np_user->fullname); ?>
<?php
echo scrub_out($np_user->fullname);
if ($np_user->f_avatar_medium) {
echo '<div>' . $np_user->f_avatar_medium . '</div>';
}
@ -47,7 +47,8 @@
<label><?php echo T_('Artist'); ?></label>
<?php echo $media->f_artist_link; ?>
</div>
<?php if (!empty($media->f_tags)) {
<?php
if (!empty($media->f_tags)) {
?>
<div id="np_song_tags_<?php echo $media->id?>" class="np_cell cel_artist">
<label><?php echo T_('Tags');
@ -56,7 +57,8 @@
?>
</div>
<?php
} ?>
}
?>
</div>
<?php if (Art::is_enabled()) {
@ -100,10 +102,12 @@ $(document).ready(function(){
<?php
} ?>
<?php if (Access::check('interface', '25')) {
<?php
if (Access::check('interface', '25')) {
?>
<div class="np_group" id="np_group_4">
<?php if (AmpConfig::get('ratings')) {
<?php
if (AmpConfig::get('ratings')) {
?>
<div class="np_cell cel_rating">
<label><?php echo T_('Rating');
@ -116,8 +120,7 @@ $(document).ready(function(){
</div>
<?php
}
?>
<?php if (AmpConfig::get('userflags')) {
if (AmpConfig::get('userflags')) {
?>
<div class="np_cell cel_userflag">
<label><?php echo T_('Fav.');
@ -133,4 +136,5 @@ $(document).ready(function(){
?>
</div>
<?php
} ?>
}
?>

14
templates/show_now_playing_video_row.inc.php
View file

@ -26,8 +26,8 @@ $media->format();
<div class="np_cell cel_username">
<label><?php echo T_('Username'); ?></label>
<a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>">
<?php echo scrub_out($np_user->fullname); ?>
<?php
echo scrub_out($np_user->fullname);
if ($np_user->f_avatar_medium) {
echo '<div>' . $np_user->f_avatar_medium . '</div>';
}
@ -43,7 +43,8 @@ $media->format();
</div>
</div>
<?php if (Art::is_enabled()) {
<?php
if (Art::is_enabled()) {
?>
<div class="np_group" id="np_group_3">
<div class="np_cell cel_albumart">
@ -54,10 +55,12 @@ $media->format();
</div>
</div>
<?php
} ?>
}
?>
<div class="np_group" id="np_group_4">
<?php if (AmpConfig::get('ratings')) {
<?php
if (AmpConfig::get('ratings')) {
?>
<div class="np_cell cel_rating">
<label><?php echo T_('Rating');
@ -78,5 +81,6 @@ $media->format();
</div>
</div>
<?php
} ?>
}
?>
</div>

9
templates/show_object_row.inc.php
View file

@ -26,9 +26,8 @@
*/
?>
<?php foreach ($headers as $key=>$header) {
?>
<td><?php echo $object->$key;
?></td>
<?php
} ?>
foreach ($headers as $key=>$header) {
echo '<td>' . $object->$key . '</td>';
}
?>

72
templates/show_playlist_row.inc.php
View file

@ -23,69 +23,60 @@
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id,'play', T_('Play'),'play_playlist_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id,'play', T_('Play'),'play_playlist_' . $libitem->id);
if (Stream_Playlist::check_autoplay_next()) {
echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_playlist_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $libitem->id);
}
}
}
?>
<?php if (Stream_Playlist::check_autoplay_next()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_playlist_' . $libitem->id);
?>
<?php
}
?>
<?php
} ?>
</div>
</td>
<td class="cel_playlist"><?php echo $libitem->f_link; ?></td>
<td class="cel_add">
<span class="cel_item_add">
<?php echo Ajax::button('?action=basket&type=playlist&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_playlist_' . $libitem->id); ?>
<?php if (Access::check('interface', '25')) {
?>
<?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $libitem->id,'random', T_('Random to temporary playlist'),'random_playlist_' . $libitem->id);
<?php
echo Ajax::button('?action=basket&type=playlist&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_playlist_' . $libitem->id);
if (Access::check('interface', '25')) {
echo Ajax::button('?action=basket&type=playlist_random&id=' . $libitem->id,'random', T_('Random to temporary playlist'),'random_playlist_' . $libitem->id);
?>
<a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'playlist', '<?php echo $libitem->id ?>')">
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
?>
</a>
<?php
} ?>
}
?>
</span>
</td>
<td class="cel_type"><?php echo $libitem->f_type; ?></td>
<td class="cel_songs"><?php echo $libitem->get_song_count(); ?></td>
<td class="cel_owner"><?php echo scrub_out($libitem->f_user); ?></td>
<?php if (User::is_registered()) {
?>
<?php if (AmpConfig::get('ratings')) {
<?php
if (User::is_registered()) {
if (AmpConfig::get('ratings')) {
?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_playlist"><?php Rating::show($libitem->id, 'playlist');
?></td>
<?php
}
?>
<?php if (AmpConfig::get('userflags')) {
if (AmpConfig::get('userflags')) {
?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_playlist"><?php Userflag::show($libitem->id, 'playlist');
?></td>
<?php
}
}
?>
<?php
} ?>
<td class="cel_action">
<?php if (Access::check_function('batch_download') && check_can_zip('playlist')) {
<?php
if (Access::check_function('batch_download') && check_can_zip('playlist')) {
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path');
?>/batch.php?action=playlist&amp;id=<?php echo $libitem->id;
@ -94,26 +85,19 @@
?>
</a>
<?php
} ?>
<?php if (Access::check('interface', '25')) {
?>
<?php if (AmpConfig::get('share')) {
?>
<?php Share::display_ui('playlist', $libitem->id, false);
?>
<?php
}
?>
<?php
} ?>
<?php if ($libitem->has_access()) {
if (Access::check('interface', '25')) {
if (AmpConfig::get('share')) {
Share::display_ui('playlist', $libitem->id, false);
}
}
if ($libitem->has_access()) {
?>
<a id="<?php echo 'edit_playlist_' . $libitem->id ?>" onclick="showEditDialog('playlist_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_playlist_' . $libitem->id ?>', '<?php echo T_('Playlist edit') ?>', 'playlist_row_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<?php echo Ajax::button('?page=browse&action=delete_object&type=playlist&id=' . $libitem->id, 'delete', T_('Delete'), 'delete_playlist_' . $libitem->id, '', '', T_('Do you really want to delete the playlist?'));
}
?>
<?php
} ?>
</td>

88
templates/show_playlist_song_row.inc.php
View file

@ -24,109 +24,73 @@
if ($libitem->enabled || Access::check('interface','50')) {
?>
<td class="cel_play">
<span class="cel_play_content"><?php echo '<b>'.$playlist_track.'</b>';
?></span>
<span class="cel_play_content"><?php echo '<b>' . $playlist_track . '</b>' ?></span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id, 'play', T_('Play'),'play_playlist_song_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_song_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id, 'play', T_('Play'),'play_playlist_song_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_song_' . $libitem->id);
}
?>
<?php
}
?>
</div>
</td>
<td class="cel_song"><?php echo $libitem->f_link;
?></td>
<td class="cel_song"><?php echo $libitem->f_link ?></td>
<td class="cel_add">
<span class="cel_item_add">
<?php echo Ajax::button('?action=basket&type=song&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'playlist_add_' . $libitem->id);
?>
<?php if (Access::check('interface', '25')) {
if (Access::check('interface', '25')) {
?>
<a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'song', '<?php echo $libitem->id ?>')">
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
?>
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist')) ?>
</a>
<?php
}
?>
</span>
</td>
<td class="cel_artist"><?php echo $libitem->f_artist_link;
?></td>
<td class="cel_album"><?php echo $libitem->f_album_link;
?></td>
<td class="cel_tags"><?php echo $libitem->f_tags;
?></td>
<td class="cel_time"><?php echo $libitem->f_time;
?></td>
<td class="cel_artist"><?php echo $libitem->f_artist_link ?></td>
<td class="cel_album"><?php echo $libitem->f_album_link ?></td>
<td class="cel_tags"><?php echo $libitem->f_tags ?></td>
<td class="cel_time"><?php echo $libitem->f_time ?></td>
<?php if (User::is_registered()) {
if (AmpConfig::get('ratings')) {
?>
<?php if (AmpConfig::get('ratings')) {
?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_song"><?php Rating::show($libitem->id,'song');
?></td>
<td class="cel_rating" id="rating_<?php echo $libitem->id ?>_song"><?php Rating::show($libitem->id,'song') ?></td>
<?php
}
if (AmpConfig::get('userflags')) {
?>
<?php if (AmpConfig::get('userflags')) {
?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_song"><?php Userflag::show($libitem->id,'song');
?></td>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id ?>_song"><?php Userflag::show($libitem->id,'song') ?></td>
<?php
}
?>
<?php
}
?>
<td class="cel_action">
<?php if (AmpConfig::get('download')) {
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path');
?>/stream.php?action=download&amp;song_id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('download', T_('Download'));
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path') ?>/stream.php?action=download&amp;song_id=<?php echo $libitem->id ?>">
<?php echo UI::get_icon('download', T_('Download')) ?>
</a>
<?php
}
?>
<?php if (Access::check('interface', '25')) {
?>
<?php if (AmpConfig::get('share')) {
?>
<?php Share::display_ui('song', $libitem->id, false);
?>
<?php
if (Access::check('interface', '25')) {
if (AmpConfig::get('share')) {
Share::display_ui('song', $libitem->id, false);
}
?>
<?php
}
?>
<?php if (get_class($playlist) == "Playlist" && $playlist->has_access()) {
?>
<?php echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete', T_('Delete'),'track_del_' . $object['track_id']);
?>
<?php
if (get_class($playlist) == "Playlist" && $playlist->has_access()) {
echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete', T_('Delete'),'track_del_' . $object['track_id']);
}
?>
</td>
<?php if (Access::check('interface', '50') && get_class($playlist) == "Playlist") {
?>
<td class="cel_drag">
<?php echo UI::get_icon('drag', T_('Reorder'));
?>
<?php echo UI::get_icon('drag', T_('Reorder')) ?>
</td>
<?php
}
} ?>
}
?>

28
templates/show_search_row.inc.php
View file

@ -23,19 +23,14 @@
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id,'play', T_('Play'),'play_playlist_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id,'play', T_('Play'),'play_playlist_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $libitem->id);
}
}
?>
<?php
} ?>
</div>
</td>
<td class="cel_playlist"><?php echo $libitem->f_link; ?></td>
@ -52,7 +47,8 @@
<td class="cel_limit"><?php echo (($libitem->limit > 0) ? $libitem->limit : T_('None')); ?></td>
<td class="cel_owner"><?php echo scrub_out($libitem->f_user); ?></td>
<td class="cel_action">
<?php if (Access::check_function('batch_download') && check_can_zip('search')) {
<?php
if (Access::check_function('batch_download') && check_can_zip('search')) {
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path');
?>/batch.php?action=search&amp;id=<?php echo $libitem->id;
@ -61,15 +57,15 @@
?>
</a>
<?php
} ?>
<?php if ($libitem->has_access()) {
}
if ($libitem->has_access()) {
?>
<a id="<?php echo 'edit_playlist_' . $libitem->id ?>" onclick="showEditDialog('search_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_playlist_' . $libitem->id ?>', '<?php echo T_('Smart Playlist edit') ?>', 'smartplaylist_row_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<?php echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $libitem->id,'delete', T_('Delete'),'delete_playlist_' . $libitem->id);
?>
<?php
} ?>
echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $libitem->id,'delete', T_('Delete'),'delete_playlist_' . $libitem->id);
}
?>
</td>

4
templates/show_share_row.inc.php
View file

@ -34,8 +34,6 @@
<td class="cel_public_url"><?php echo $libitem->public_url; ?></td>
<td class="cel_action">
<div id="share_action_<?php echo $libitem->id; ?>">
<?php
$libitem->show_action_buttons();
?>
<?php $libitem->show_action_buttons(); ?>
</div>
</td>

25
templates/show_song_preview_row.inc.php
View file

@ -23,18 +23,12 @@
<?php if (AmpConfig::get('echonest_api_key')) {
?>
<td class="cel_play">
<?php if (AmpConfig::get('directplay') && $libitem->file) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id,'play_preview', T_('Play'),'play_song_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id . '&append=true','play_add_preview', T_('Play last'),'addplay_song_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay') && $libitem->file) {
echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id,'play_preview', T_('Play'),'play_song_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id . '&append=true','play_add_preview', T_('Play last'),'addplay_song_' . $libitem->id);
}
?>
<?php
}
?>
</td>
@ -45,11 +39,10 @@
?>
<td class="cel_add">
<span class="cel_item_add">
<?php if ($libitem->file) {
?>
<?php echo Ajax::button('?action=basket&type=song_preview&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
?>
<?php if (Access::check('interface', '25')) {
<?php
if ($libitem->file) {
echo Ajax::button('?action=basket&type=song_preview&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
if (Access::check('interface', '25')) {
?>
<a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'song_preview', '<?php echo $libitem->id ?>')">
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
@ -57,8 +50,6 @@
</a>
<?php
}
?>
<?php
}
?>
</span>

151
templates/show_song_row.inc.php
View file

@ -1,4 +1,4 @@
<?php
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
@ -24,135 +24,95 @@
if ($libitem->enabled || Access::check('interface','50')) {
?>
<td class="cel_play">
<span class="cel_play_content"><?php if (isset($argument) && $argument) {
<span class="cel_play_content">
<?php
if (isset($argument) && $argument) {
echo '<b>' . $libitem->f_track . '</b>';
}
?></span>
?>
</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id, 'play', T_('Play'), 'play_song_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_song_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id, 'play', T_('Play'), 'play_song_' . $libitem->id);
if (Stream_Playlist::check_autoplay_next()) {
echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_song_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_song_' . $libitem->id);
}
?>
<?php if (Stream_Playlist::check_autoplay_next()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_song_' . $libitem->id);
?>
<?php
}
?>
<?php
}
?>
</div>
</td>
<td class="cel_song"><?php echo $libitem->f_link;
?></td>
<td class="cel_song"><?php echo $libitem->f_link ?></td>
<td class="cel_add">
<span class="cel_item_add">
<?php echo Ajax::button('?action=basket&type=song&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
?>
<?php if (Access::check('interface', '25')) {
<?php
echo Ajax::button('?action=basket&type=song&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
if (Access::check('interface', '25')) {
?>
<a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'song', '<?php echo $libitem->id ?>')">
<?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
?>
</a>
<?php
if (AmpConfig::get('directplay')) {
echo $libitem->show_custom_play_actions();
}
?>
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo $libitem->show_custom_play_actions();
?>
<?php
}
?>
</span>
</td>
<td class="cel_artist"><?php echo $libitem->f_artist_link;
?></td>
<td class="cel_album"><?php echo $libitem->f_album_link;
?></td>
<td class="cel_tags"><?php echo $libitem->f_tags;
?></td>
<td class="cel_time"><?php echo $libitem->f_time;
?></td>
<td class="cel_artist"><?php echo $libitem->f_artist_link ?></td>
<td class="cel_album"><?php echo $libitem->f_album_link ?></td>
<td class="cel_tags"><?php echo $libitem->f_tags ?></td>
<td class="cel_time"><?php echo $libitem->f_time ?></td>
<?php if (AmpConfig::get('show_played_times')) {
?>
<td class="cel_counter"><?php echo $libitem->object_cnt;
?></td>
<td class="cel_counter"><?php echo $libitem->object_cnt ?></td>
<?php
}
?>
<?php if (User::is_registered()) {
?>
<?php if (AmpConfig::get('ratings')) {
if (User::is_registered()) {
if (AmpConfig::get('ratings')) {
?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_song"><?php Rating::show($libitem->id,'song');
?></td>
?>_song">
<?php Rating::show($libitem->id,'song') ?>
</td>
<?php
}
?>
<?php if (AmpConfig::get('userflags')) {
if (AmpConfig::get('userflags')) {
?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_song"><?php Userflag::show($libitem->id,'song');
?></td>
?>_song">
<?php Userflag::show($libitem->id,'song') ?>
</td>
<?php
}
?>
<?php
}
}
?>
<td class="cel_action">
<a href="<?php echo $libitem->link;
?>"><?php echo UI::get_icon('preferences', T_('Song Information'));
?></a>
<a href="<?php echo $libitem->link ?>"><?php echo UI::get_icon('preferences', T_('Song Information')) ?></a>
<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
if (AmpConfig::get('sociable')) {
?>
<?php if (AmpConfig::get('sociable')) {
?>
<a href="<?php echo AmpConfig::get('web_path');
?>/shout.php?action=show_add_shout&type=song&id=<?php echo $libitem->id;
?>"><?php echo UI::get_icon('comment', T_('Post Shout'));
?></a>
<a href="<?php echo AmpConfig::get('web_path') ?>/shout.php?action=show_add_shout&type=song&id=<?php echo $libitem->id ?>"><?php echo UI::get_icon('comment', T_('Post Shout')) ?></a>
<?php
}
}
if (Access::check('interface','25')) {
if (AmpConfig::get('share')) {
Share::display_ui('song', $libitem->id, false);
}
}
if (Access::check_function('download')) {
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path') ?>/stream.php?action=download&song_id=<?php echo $libitem->id ?>"><?php echo UI::get_icon('download', T_('Download')) ?></a>
<?php
}
?>
<?php if (Access::check('interface','25')) {
?>
<?php if (AmpConfig::get('share')) {
?>
<?php Share::display_ui('song', $libitem->id, false);
?>
<?php
}
?>
<?php
}
?>
<?php if (Access::check_function('download')) {
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path');
?>/stream.php?action=download&song_id=<?php echo $libitem->id;
?>"><?php echo UI::get_icon('download', T_('Download'));
?></a>
<?php
}
?>
<?php if (Access::check('interface','50') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
if (Access::check('interface','50') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
?>
<a id="<?php echo 'edit_song_' . $libitem->id ?>" onclick="showEditDialog('song_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_song_' . $libitem->id ?>', '<?php echo T_('Song edit') ?>', 'song_')">
<?php echo UI::get_icon('edit', T_('Edit'));
@ -160,12 +120,9 @@ if ($libitem->enabled || Access::check('interface','50')) {
</a>
<?php
}
?>
<?php if (Access::check('interface','75') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
?>
<?php $icon = $libitem->enabled ? 'disable' : 'enable';
?>
<?php $button_flip_state_id = 'button_flip_state_' . $libitem->id;
if (Access::check('interface','75') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
$icon = $libitem->enabled ? 'disable' : 'enable';
$button_flip_state_id = 'button_flip_state_' . $libitem->id;
?>
<span id="<?php echo($button_flip_state_id);
?>">
@ -174,8 +131,7 @@ if ($libitem->enabled || Access::check('interface','50')) {
</span>
<?php
}
?>
<?php if (Catalog::can_remove($libitem)) {
if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_song_' . $libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/song.php?action=delete&song_id=<?php echo $libitem->id;
@ -187,12 +143,15 @@ if ($libitem->enabled || Access::check('interface','50')) {
}
?>
</td>
<?php if (Access::check('interface', '50') && isset($argument) && $argument) {
<?php
if (Access::check('interface', '50') && isset($argument) && $argument) {
?>
<td class="cel_drag">
<?php echo UI::get_icon('drag', T_('Reorder'));
?>
</td>
<?php
}
} ?>
}
?>

39
templates/show_tvshow_row.inc.php
View file

@ -23,19 +23,14 @@
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id,'play', T_('Play'),'play_tvshow_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_tvshow_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id,'play', T_('Play'),'play_tvshow_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_tvshow_' . $libitem->id);
}
}
?>
<?php
} ?>
</div>
</td>
<?php
@ -46,33 +41,33 @@ if (Art::is_enabled()) {
?>
</td>
<?php
} ?>
}
?>
<td class="cel_tvshow"><?php echo $libitem->f_link; ?></td>
<td class="cel_episodes"><?php echo $libitem->episodes; ?></td>
<td class="cel_seasons"><?php echo $libitem->seasons; ?></td>
<td class="cel_tags"><?php echo $libitem->f_tags; ?></td>
<?php if (User::is_registered()) {
?>
<?php if (AmpConfig::get('ratings')) {
<?php
if (User::is_registered()) {
if (AmpConfig::get('ratings')) {
?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_tvshow"><?php Rating::show($libitem->id,'tvshow');
?></td>
<?php
}
?>
<?php if (AmpConfig::get('userflags')) {
if (AmpConfig::get('userflags')) {
?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_tvshow"><?php Userflag::show($libitem->id,'tvshow');
?></td>
<?php
}
}
?>
<?php
} ?>
<td class="cel_action">
<?php if (Access::check('interface','50')) {
<?php
if (Access::check('interface','50')) {
?>
<a id="<?php echo 'edit_tvshow_' . $libitem->id ?>" onclick="showEditDialog('tvshow_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_tvshow_' . $libitem->id ?>', '<?php echo T_('TV Show edit') ?>', 'tvshow_')">
<?php echo UI::get_icon('edit', T_('Edit'));
@ -80,7 +75,8 @@ if (Art::is_enabled()) {
</a>
<?php
} ?>
<?php if (Catalog::can_remove($libitem)) {
<?php
if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_tvshow_' . $libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/tvshows.php?action=delete&tvshow_id=<?php echo $libitem->id;
@ -89,5 +85,6 @@ if (Art::is_enabled()) {
?>
</a>
<?php
} ?>
}
?>
</td>

52
templates/show_tvshow_season_row.inc.php
View file

@ -23,23 +23,17 @@
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id,'play', T_('Play'),'play_season_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_season_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id,'play', T_('Play'),'play_season_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_season_' . $libitem->id);
}
}
?>
<?php
} ?>
</div>
</td>
<?php
if (Art::is_enabled()) {
<?php if (Art::is_enabled()) {
?>
<td class="cel_cover">
<?php Art::display('tvshow_season', $libitem->id, $libitem->f_name, 6, $libitem->link);
@ -50,36 +44,39 @@ if (Art::is_enabled()) {
<td class="cel_season"><?php echo $libitem->f_link; ?></td>
<td class="cel_tvshow"><?php echo $libitem->f_tvshow_link; ?></td>
<td class="cel_episodes"><?php echo $libitem->episodes; ?></td>
<?php if (User::is_registered()) {
?>
<?php if (AmpConfig::get('ratings')) {
<?php
if (User::is_registered()) {
if (AmpConfig::get('ratings')) {
?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_tvshow_season"><?php Rating::show($libitem->id,'tvshow_season');
?></td>
?>_tvshow_season">
<?php Rating::show($libitem->id,'tvshow_season');
?>
</td>
<?php
}
?>
<?php if (AmpConfig::get('userflags')) {
if (AmpConfig::get('userflags')) {
?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_tvshow_season"><?php Userflag::show($libitem->id,'tvshow_season');
?></td>
?>_tvshow_season">
<?php Userflag::show($libitem->id,'tvshow_season');
?>
</td>
<?php
}
}
?>
<?php
} ?>
<td class="cel_action">
<?php if (Access::check('interface','50')) {
<?php
if (Access::check('interface','50')) {
?>
<a id="<?php echo 'edit_tvshow_season_' . $libitem->id ?>" onclick="showEditDialog('tvshow_season_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_tvshow_season_' . $libitem->id ?>', '<?php echo T_('Season edit') ?>', 'tvshow_season_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<?php
} ?>
<?php if (Catalog::can_remove($libitem)) {
}
if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_tvshow_season_' . $libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/tvshow_seasons.php?action=delete&tvshow_season_id=<?php echo $libitem->id;
@ -88,5 +85,6 @@ if (Art::is_enabled()) {
?>
</a>
<?php
} ?>
}
?>
</td>

63
templates/show_user_row.inc.php
View file

@ -26,20 +26,22 @@
if ($libitem->f_avatar_mini) {
echo $libitem->f_avatar_mini;
}
?>
<?php echo $libitem->username; ?>
<?php if ($libitem->fullname_public || Access::check('interface', 100)) {
echo $libitem->username;
if ($libitem->fullname_public || Access::check('interface', 100)) {
echo "(" . $libitem->fullname . ")";
} ?>
}
?>
</a>
</td>
<td class="cel_lastseen"><?php echo $last_seen; ?></td>
<td class="cel_registrationdate"><?php echo $create_date; ?></td>
<?php if (Access::check('interface', 50)) {
<?php
if (Access::check('interface', 50)) {
?>
<td class="cel_activity"><?php echo $libitem->f_useage;
?></td>
<?php if (AmpConfig::get('track_user_ip')) {
<?php
if (AmpConfig::get('track_user_ip')) {
?>
<td class="cel_lastip">
<a href="<?php echo $web_path;
@ -50,35 +52,46 @@ if ($libitem->f_avatar_mini) {
</a>
</td>
<?php
}
?>
<?php
} ?>
<?php if (Access::check('interface', 25) && AmpConfig::get('sociable')) {
}
if (Access::check('interface', 25) && AmpConfig::get('sociable')) {
?>
<td class="cel_follow"><?php echo $libitem->get_display_follow();
?></td>
<?php
} ?>
}
?>
<td class="cel_action">
<?php if (Access::check('interface', 25) && AmpConfig::get('sociable')) {
<?php
if (Access::check('interface', 25) && AmpConfig::get('sociable')) {
?>
<a id="<?php echo 'reply_pvmsg_' . $libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/pvmsg.php?action=show_add_message&to_user=<?php echo $libitem->username;
?>"><?php echo UI::get_icon('mail', T_('Send private message'));
?></a>
?>">
<?php echo UI::get_icon('mail', T_('Send private message'));
?>
</a>
<?php
} ?>
<?php if (Access::check('interface', 100)) {
}
?>
<?php
if (Access::check('interface', 100)) {
?>
<a href="<?php echo $web_path;
?>/admin/users.php?action=show_edit&amp;user_id=<?php echo $libitem->id;
?>"><?php echo UI::get_icon('edit', T_('Edit'));
?></a>
?>">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<a href="<?php echo $web_path;
?>/admin/users.php?action=show_preferences&amp;user_id=<?php echo $libitem->id;
?>"><?php echo UI::get_icon('preferences', T_('Preferences'));
?></a>
?>">
<?php echo UI::get_icon('preferences', T_('Preferences'));
?>
</a>
<?php
//FIXME: Fix this for the extra permission levels
if ($libitem->disabled == '1') {
@ -89,10 +102,14 @@ if ($libitem->f_avatar_mini) {
?>
<a href="<?php echo $web_path;
?>/admin/users.php?action=delete&user_id=<?php echo $libitem->id;
?>"><?php echo UI::get_icon('delete', T_('Delete'));
?></a>
?>">
<?php echo UI::get_icon('delete', T_('Delete'));
?>
</a>
<?php
} ?>
}
?>
</td>
<?php
if (($libitem->is_logged_in()) AND ($libitem->is_online())) {

90
templates/show_video_row.inc.php
View file

@ -28,26 +28,17 @@ if (!isset($video_type)) {
<td class="cel_play">
<span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id,'play', T_('Play'),'play_video_' . $libitem->id);
?>
<?php if (Stream_Playlist::check_autoplay_append()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_video_' . $libitem->id);
?>
<?php
if (AmpConfig::get('directplay')) {
echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id,'play', T_('Play'),'play_video_' . $libitem->id);
if (Stream_Playlist::check_autoplay_next()) {
echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_video_' . $libitem->id);
if (Stream_Playlist::check_autoplay_append()) {
echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_video_' . $libitem->id);
}
}
}
?>
<?php if (Stream_Playlist::check_autoplay_next()) {
?>
<?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_video_' . $libitem->id);
?>
<?php
}
?>
<?php
} ?>
</div>
</td>
<?php
@ -83,77 +74,56 @@ if ($video_type != 'video') {
<?php
} ?>
<td class="cel_tags"><?php echo $libitem->f_tags; ?></td>
<?php if (User::is_registered()) {
<?php
if (User::is_registered()) {
if (AmpConfig::get('ratings')) {
?>
<?php if (AmpConfig::get('ratings')) {
?>
<td class="cel_rating" id="rating_<?php echo $libitem->id;
?>_video"><?php Rating::show($libitem->id, 'video');
?></td>
<td class="cel_rating" id="rating_<?php echo $libitem->id ?>_video"><?php Rating::show($libitem->id, 'video') ?></td>
<?php
}
if (AmpConfig::get('userflags')) {
?>
<?php if (AmpConfig::get('userflags')) {
?>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id;
?>_video"><?php Userflag::show($libitem->id, 'video');
?></td>
<td class="cel_userflag" id="userflag_<?php echo $libitem->id ?>_video"><?php Userflag::show($libitem->id, 'video') ?></td>
<?php
}
}
?>
<?php
} ?>
<td class="cel_action">
<a href="<?php echo $libitem->link; ?>"><?php echo UI::get_icon('preferences', T_('Video Information')); ?></a>
<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
if (AmpConfig::get('sociable')) {
?>
<?php if (AmpConfig::get('sociable')) {
?>
<a href="<?php echo AmpConfig::get('web_path');
?>/shout.php?action=show_add_shout&type=video&id=<?php echo $libitem->id;
?>"><?php echo UI::get_icon('comment', T_('Post Shout'));
?></a>
<a href="<?php echo AmpConfig::get('web_path') ?>/shout.php?action=show_add_shout&type=video&id=<?php echo $libitem->id ?>"><?php echo UI::get_icon('comment', T_('Post Shout')) ?></a>
<?php
}
?>
<?php
}
?>
<?php if (Access::check('interface','25')) {
?>
<?php if (AmpConfig::get('share')) {
?>
<?php Share::display_ui('video', $libitem->id, false);
?>
<?php
if (Access::check('interface','25')) {
if (AmpConfig::get('share')) {
Share::display_ui('video', $libitem->id, false);
}
?>
<?php
} ?>
<?php if (Access::check_function('download')) {
}
if (Access::check_function('download')) {
?>
<a rel="nohtml" href="<?php echo AmpConfig::get('web_path');
?>/stream.php?action=download&video_id=<?php echo $libitem->id;
?>"><?php echo UI::get_icon('download', T_('Download'));
?></a>
<?php
} ?>
<?php if (Access::check('interface','50')) {
}
if (Access::check('interface','50')) {
?>
<a id="<?php echo 'edit_video_' . $libitem->id ?>" onclick="showEditDialog('video_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_video_' . $libitem->id ?>', '<?php echo T_('Video edit') ?>', 'video_')">
<?php echo UI::get_icon('edit', T_('Edit'));
?>
</a>
<?php
} ?>
<?php if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_video_'.$libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
?>/video.php?action=delete&video_id=<?php echo $libitem->id;
?>">
<?php echo UI::get_icon('delete', T_('Delete'));
}
if (Catalog::can_remove($libitem)) {
?>
<a id="<?php echo 'delete_video_' . $libitem->id ?>" href="<?php echo AmpConfig::get('web_path') ?> /video.php?action=delete&video_id=<?php echo $libitem->id ?>">
<?php echo UI::get_icon('delete', T_('Delete')) ?>
</a>
<?php
} ?>
}
?>
</td>

4
templates/show_wanted_album_row.inc.php
View file

@ -27,8 +27,6 @@
<td class="cel_user"><?php echo $libitem->f_user; ?></td>
<td class="cel_action">
<div id="wanted_action_<?php echo $libitem->mbid; ?>">
<?php
$libitem->show_action_buttons();
?>
<?php $libitem->show_action_buttons(); ?>
</div>
</td>