diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_duplicate.inc.php | 43 | ||||
| -rw-r--r-- | templates/show_duplicates.inc.php | 94 | ||||
| -rw-r--r-- | templates/show_list_duplicates.inc.php | 103 | ||||
| -rw-r--r-- | templates/sidebar_admin.inc.php | 1 |
4 files changed, 107 insertions, 134 deletions
diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php new file mode 100644 index 00000000..1f4ead8e --- /dev/null +++ b/templates/show_duplicate.inc.php @@ -0,0 +1,43 @@ +<?php +/* + + Copyright (c) 2001 - 2007 Ampache.org + All rights reserved. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +?> +<?php show_box_top(_('Find Duplicates')); ?> +<form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" > +<table cellspacing="0" cellpadding="3"> +<tr> + <td valign="top"><strong><?php echo _('Search Type'); ?>:</strong></td> + <td> + <?php + $name = 'check_' . scrub_in($_REQUEST['search_type']); + ${$name} = ' checked="checked" '; + ?> + <input type="radio" name="search_type" value="title"<?php echo $check_title; ?>/><?php echo _('Title'); ?><br /> + <input type="radio" name="search_type" value="artist_title"<?php echo $check_artist_title; ?>/><?php echo _('Artist and Title'); ?><br /> + <input type="radio" name="search_type" value="artist_album_title"<?php echo $check_artist_album_title; ?>/><?php echo _('Artist, Album and Title'); ?><br /> + </td> +</tr> +</table> +<div class="formValidation"> + <input type="submit" value="<?php echo _('Find Duplicates'); ?>" /> +</div> +</form> +<?php show_box_bottom(); ?> diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php index 731016ad..f93bbf83 100644 --- a/templates/show_duplicates.inc.php +++ b/templates/show_duplicates.inc.php @@ -1,13 +1,12 @@ <?php /* - Copyright (c) 2001 - 2005 Ampache.org + Copyright (c) 2001 - 2007 Ampache.org All rights reserved. This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License v2 + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,35 +18,68 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -$web_path = conf('web_path'); ?> -<?php show_box_top(_('Find Duplicates')); ?> -<form name="duplicates" action="<?php echo conf('web_path'); ?>/admin/duplicates.php" method="post" enctype="multipart/form-data" > -<table cellspacing="0" cellpadding="3" width="450"> - <tr> - <td valign="top"><?php echo _('Search Type'); ?>:</td> - <td> - <?php - $name = 'check_' . $_REQUEST['search_type']; - ${$name} = ' checked="checked" '; +<?php show_box_top(_('Duplicate Songs')); ?> +<form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable"> +<table class="tabledata" cellpadding="0" cellspacing="0"> +<colgroup> + <col id="col_disable" /> + <col id="col_song" /> + <col id="col_artist" /> + <col id="col_album" /> + <col id="col_length" /> + <col id="col_bitrate" /> + <col id="col_size" /> + <col id="col_filename" /> +</colgroup> +<tr class="th-top"> + <th class="cel_disable"><?php echo _('Disable'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_length"><?php echo _('Length'); ?></th> + <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> + <th class="cel_size"><?php echo _('Size'); ?></th> + <th class="cel_filename"><?php echo _('Filename'); ?></th> +</tr> +<?php + foreach ($duplicates as $item) { + // Gather the duplicates + $songs = Catalog::get_duplicate_info($item,$search_type); + + foreach ($songs as $key=>$song_id) { + $song = new Song($song_id); + $song->format(); + $row_key = 'duplicate_' . $song_id; + $current_class = ($key == '0') ? 'row-highlight' : flip_class(); + $button = $song->enabled ? 'disable' : 'enable'; ?> - <input type="radio" name="search_type" value="title"<?php echo $check_title; ?>/><?php echo _('Title'); ?><br /> - <input type="radio" name="search_type" value="artist_title"<?php echo $check_artist_title; ?>/><?php echo _('Artist and Title'); ?><br /> - <input type="radio" name="search_type" value="artist_album_title"<?php echo $check_artist_album_title; ?>/><?php echo _('Artist, Album and Title'); ?><br /> - </td> - </tr> - <tr> - <td> </td> - <td> - <?php if ($_REQUEST['auto']) { $auto_check = ' checked="checked"'; } ?> - <input type="checkbox" name="auto" value="1" <?php echo $auto_check; ?>/><?php echo _('Select Best Guess'); ?> - </td> - </tr> +<tr id="<?php echo $row_key; ?>" class="<?php echo $current_class; ?>"> + <td class="cel_disable"> + <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song_id,$button,_(ucfirst($button)),'flip_state_' . $song_id); ?> + </td> + <td class="cel_song"><?php echo $song->f_link; ?></td> + <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> + <td class="cel_album"><?php echo $song->f_album_link; ?></td> + <td class="cel_length"><?php echo $song->f_time; ?></td> + <td class="cel_bitrate"><?php echo $song->f_bitrate; ?></td> + <td class="cel_size"><?php echo $song->f_size; ?>MB</td> + <td class="cel_filename"><?php echo scrub_out($song->file); ?></td> +</tr> +<?php + } // end foreach ($dinfolist as $dinfo) + } // end foreach ($flags as $flag) +?> +<tr class="th-bottom"> + <th class="cel_disable"><?php echo _('Disable'); ?></th> + <th class="cel_song"><?php echo _('Song'); ?></th> + <th class="cel_artist"><?php echo _('Artist'); ?></th> + <th class="cel_album"><?php echo _('Album'); ?></th> + <th class="cel_length"><?php echo _('Length'); ?></th> + <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> + <th class="cel_size"><?php echo _('Size'); ?></th> + <th class="cel_filename"><?php echo _('Filename'); ?></th> +</tr> </table> -<div class="formValidation"> - <input type="hidden" name="action" value="search" /> - <input type="submit" value="<?php echo _('Search'); ?>" /> -</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_list_duplicates.inc.php b/templates/show_list_duplicates.inc.php deleted file mode 100644 index 25abeecc..00000000 --- a/templates/show_list_duplicates.inc.php +++ /dev/null @@ -1,103 +0,0 @@ -<?php -/* - - Copyright (c) 2001 - 2006 Ampache.org - All rights reserved. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License v2 - as published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -$web_path = conf('web_path'); -show_duplicate_searchbox($search_type); - -if (count($flags)) { ?> - <?php show_box_top(_('Duplicate Songs')); ?> - <form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable"> - <table class="tabledata" cellpadding="0" cellspacing="0"> - <colgroup> - <col id="col_disable" /> - <col id="col_song" /> - <col id="col_artist" /> - <col id="col_album" /> - <col id="col_length" /> - <col id="col_bitrate" /> - <col id="col_size" /> - <col id="col_filename" /> - </colgroup> - <tr class="th-top"> - <th class="cel_disable"><?php echo _('Disable'); ?></th> - <th class="cel_song"><?php echo _('Song'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_length"><?php echo _('Length'); ?></th> - <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> - <th class="cel_size"><?php echo _('Size'); ?></th> - <th class="cel_filename"><?php echo _('Filename'); ?></th> - </tr> - <?php - foreach ($flags as $flag) { - /* Build the Song */ - $song = new Song($flag['song']); - $song->format_song(); - - // Set some extra vars - $alt_title = $song->title; - $formated_title = $song->f_title; - $artist = $song->f_artist; - $alt_artist = $song->f_full_artist; - - // Gather the duplicates - $dinfolist = get_duplicate_info($song,$search_type,$_REQUEST['auto']); - - // Set the current class, only changes once per set of duplicates - $current_class = flip_class(); - - foreach ($dinfolist as $key=>$dinfo) { - $check_txt = ''; - if ($key == '0' AND $_REQUEST['auto']) { $check_txt = ' checked="checked"'; } - echo "<tr class=\"".$current_class."\">". - "<td class=\"cel_disable\"><input type=\"checkbox\" name=\"song_ids[]\" value=\"" . $dinfo['songid'] . "\" $check_txt/></td>". - "<td class=\"cel_song\"><a href=\"$web_path/stream.php?action=single_song&song_id=$song->id\">".scrub_out($formated_title)."</a> </td>". - "<td class=\"cel_artist\"><a href=\"$web_path/artists.php?action=show&artist=".$dinfo['artistid']."\" title=\"".scrub_out($dinfo['artist'])."\">".scrub_out($dinfo['artist'])."</a> </td>". - "<td class=\"cel_album\"><a href=\"$web_path/albums.php?action=show&album=".$dinfo['albumid']."\" title=\"".scrub_out($dinfo['album'])."\">".scrub_out($dinfo['album'])."</a> </td>". - "<td class=\"cel_length\">".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."</td>". - "<td class=\"cel_bitrate\">".intval($dinfo['bitrate']/1000)."</td>". - "<td class=\"cel_size\">".sprintf("%.2f", ($dinfo['size']/1048576))."MB</td>". - "<td class=\"cel_filename\">".$dinfo['file']."</td>"; - echo "</tr>\n"; - } // end foreach ($dinfolist as $dinfo) - - } // end foreach ($flags as $flag) - ?> - <tr class="th-bottom"> - <th class="cel_disable"><?php echo _('Disable'); ?></th> - <th class="cel_song"><?php echo _('Song'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_length"><?php echo _('Length'); ?></th> - <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> - <th class="cel_size"><?php echo _('Size'); ?></th> - <th class="cel_filename"><?php echo _('Filename'); ?></th> - </tr> - </table> - <div class="formValidation"> - <input type="submit" value="<?php echo _('Disable Songs'); ?>" /> - </div> - </form> - <?php show_box_bottom(); ?> -<?php } else { ?> -<p class="error"><?php echo _('No Records Found'); ?></p> -<?php } // end if ($flags) and else ?> - diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php index c34de6bd..bc35e000 100644 --- a/templates/sidebar_admin.inc.php +++ b/templates/sidebar_admin.inc.php @@ -20,6 +20,7 @@ </li> <li><h4><?php echo _('Other Tools'); ?></h4> <ul class="sb3" id="sb_admin_ot"> + <li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Find Duplicates'); ?></a></li> <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li> <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></li> </ul> |