diff options
| -rw-r--r-- | lib/class/genre.class.php | 4 | ||||
| -rw-r--r-- | lib/general.lib.php | 2 | ||||
| -rw-r--r-- | lib/rss.php | 4 | ||||
| -rw-r--r-- | templates/show_list_duplicates.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_now_playing_row.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_play_selected.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_playlist_box.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_playlists.inc.php | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php index 64a44b96..a37c449e 100644 --- a/lib/class/genre.class.php +++ b/lib/class/genre.class.php @@ -67,8 +67,8 @@ class Genre { $this->f_link = "<a href=\"" . Config::get('web_path') . "/genre.php?action=show_genre&genre_id=" . $this->id . "\">" . scrub_out($this->name) . "</a>"; - $this->play_link = Config::get('web_path') . '/song.php?action=genre&genre=' . $this->id; - $this->random_link = Config::get('web_path') . '/song.php?action=random_genre&genre=' . $this->id; + $this->play_link = Config::get('web_path') . '/stream.php?action=genre&genre=' . $this->id; + $this->random_link = Config::get('web_path') . '/stream.php?action=random_genre&genre=' . $this->id; $this->download_link = Config::get('web_path') . '/batch.php?action=genre&id=' . $this->id; } // format diff --git a/lib/general.lib.php b/lib/general.lib.php index 65422c48..ea1556d3 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -452,7 +452,7 @@ function get_global_popular($type) { $song->format(); $text = "$song->f_artist_full - $song->title"; /* Add to array */ - $song->link = "<a href=\"$web_path/song.php?action=single_song&song_id=$song->id\" title=\"". scrub_out($text) ."\">" . + $song->link = "<a href=\"$web_path/stream.php?action=single_song&song_id=$song->id\" title=\"". scrub_out($text) ."\">" . scrub_out(truncate_with_ellipsis($text, Config::get('ellipsis_threshold_title')+3)) . " (" . $r['count'] . ")</a>"; $items[] = $song; } // if it's a song diff --git a/lib/rss.php b/lib/rss.php index fdcac5e7..cfce735d 100644 --- a/lib/rss.php +++ b/lib/rss.php @@ -119,7 +119,7 @@ switch ($type) { $song = new Song($r->object_id); $artist = $song->get_artist_name(); echo " <title><![CDATA[$artist - $song->title ($r->count)]]></title>\n"; - echo " <link>$web_path/song.php?action=single_song&song_id=$r->object_id</link>\n"; + echo " <link>$web_path/stream.php?action=single_song&song_id=$r->object_id</link>\n"; echo " <description><![CDATA[$artist - $song->title ($r->count)]]></description>\n"; echo "</item>\n"; } @@ -204,7 +204,7 @@ switch ($type) { $user = new User($item['user']); $user->format_user(); echo " <title><![CDATA[$song->title]]></title>\n"; - echo " <link>$web_path/song.php?action=single_song&song_id=".$item['object_id']."</link>\n"; + echo " <link>$web_path/stream.php?action=single_song&song_id=".$item['object_id']."</link>\n"; echo " <description><![CDATA[$user->fullname played $song->title - $song->f_artist $time_string]]></description>\n"; echo "</item>\n"; } diff --git a/templates/show_list_duplicates.inc.php b/templates/show_list_duplicates.inc.php index 41572cc1..f4ff4b58 100644 --- a/templates/show_list_duplicates.inc.php +++ b/templates/show_list_duplicates.inc.php @@ -59,7 +59,7 @@ if (count($flags)) { ?> if ($key == '0' AND $_REQUEST['auto']) { $check_txt = ' checked="checked"'; } echo "<tr class=\"".$current_class."\">". "<td><input type=\"checkbox\" name=\"song_ids[]\" value=\"" . $dinfo['songid'] . "\" $check_txt/></td>". - "<td><a href=\"$web_path/song.php?action=single_song&song_id=$song->id\">".scrub_out($formated_title)."</a> </td>". + "<td><a href=\"$web_path/stream.php?action=single_song&song_id=$song->id\">".scrub_out($formated_title)."</a> </td>". "<td><a href=\"$web_path/artists.php?action=show&artist=".$dinfo['artistid']."\" title=\"".scrub_out($dinfo['artist'])."\">".scrub_out($dinfo['artist'])."</a> </td>". "<td><a href=\"$web_path/albums.php?action=show&album=".$dinfo['albumid']."\" title=\"".scrub_out($dinfo['album'])."\">".scrub_out($dinfo['album'])."</a> </td>". "<td>".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."</td>". diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index 54aac9bc..0ff867b6 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -28,7 +28,7 @@ $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full,'25')); <a href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>"><?php echo scrub_out($np_user->fullname); ?></a><br /><br /> <!-- ## modified ##--> <strong><?php echo _('Song'); ?></strong><br /> - <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/song.php?action=single_song&song_id=<?php echo $song->id; ?>"> + <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> <?php echo $title; ?> </a> <div id="rating_<?php echo $song->id; ?>_song"> diff --git a/templates/show_play_selected.inc.php b/templates/show_play_selected.inc.php index 6b7f111c..47a083e2 100644 --- a/templates/show_play_selected.inc.php +++ b/templates/show_play_selected.inc.php @@ -25,7 +25,7 @@ $web_path = conf('web_path'); <table border="0" cellpadding="14" cellspacing="0" class="text-box"> <tr> <td> - <input class="button" type="button" value="<?php echo _('Play Selected'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/song.php?action=play_selected');" /> + <input class="button" type="button" value="<?php echo _('Play Selected'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/stream.php?action=play_selected');" /> <?php if (batch_ok()) { ?> <input class="button" type="button" value="<?php echo _('Download Selected'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/batch.php?action=download_selected');" /> diff --git a/templates/show_playlist_box.inc.php b/templates/show_playlist_box.inc.php index ffc2055a..1d064e3e 100644 --- a/templates/show_playlist_box.inc.php +++ b/templates/show_playlist_box.inc.php @@ -33,8 +33,8 @@ $title = _('Playlist Actions'); <?php if ($_REQUEST['playlist_id']) { ?> <li><a href="<?php echo $web_path; ?>/playlist.php?action=edit&playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Edit Playlist'); ?></a></li> <li><a href="<?php echo $web_path; ?>/playlist.php?action=normalize_tracks&playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Normalize Tracks'); ?></a></li> - <li><a href="<?php echo $web_path; ?>/song.php?action=play_selected&playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Play This Playlist'); ?></a></li> - <li><a href="<?php echo $web_path; ?>/song.php?action=playlist_random&playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Play Random'); ?></a></li> + <li><a href="<?php echo $web_path; ?>/stream.php?action=play_selected&playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Play This Playlist'); ?></a></li> + <li><a href="<?php echo $web_path; ?>/stream.php?action=playlist_random&playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Play Random'); ?></a></li> <li><a href="<?php echo $web_path; ?>/playlist.php?action=show_delete_playlist&playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Delete This Playlist'); ?></a></li> <?php } else { ?> <li><a href="<?php echo $web_path; ?>/playlist.php?action=show_import_playlist"><?php echo _('Import From File'); ?></a></li> diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index e907f592..a8c376ab 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -64,9 +64,9 @@ foreach ($playlists as $playlist) { <?php echo _('Delete'); ?></a> <?php } ?> <?php if ($count > 0) { ?> - | <a href="<?php echo $web_path; ?>/song.php?action=playlist&playlist_id=<?php echo $playlist->id; ?>"> + | <a href="<?php echo $web_path; ?>/stream.php?action=playlist&playlist_id=<?php echo $playlist->id; ?>"> <?php echo _('Play'); ?></a> - | <a href="<?php echo $web_path; ?>/song.php?action=playlist_random&playlist_id=<?php echo $playlist->id; ?>"> + | <a href="<?php echo $web_path; ?>/stream.php?action=playlist_random&playlist_id=<?php echo $playlist->id; ?>"> <?php echo _('Random'); ?></a> <?php if (batch_ok()) { ?> | <a href="<?php echo $web_path; ?>/batch.php?action=pl&id=<?php echo $playlist->id; ?>"> |