From 81a854f7ea737ecdb05ebfb5d09209508f34b745 Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Sun, 16 Dec 2007 23:52:06 +0000 Subject: fixed the find duplicates stuff, its actually still broken somewhat but it mostly works so why not commit eah? --- templates/show_duplicate.inc.php | 43 ++++++++++++++ templates/show_duplicates.inc.php | 94 ++++++++++++++++++++---------- templates/show_list_duplicates.inc.php | 103 --------------------------------- templates/sidebar_admin.inc.php | 1 + 4 files changed, 107 insertions(+), 134 deletions(-) create mode 100644 templates/show_duplicate.inc.php delete mode 100644 templates/show_list_duplicates.inc.php (limited to 'templates') 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 @@ + + +
+ + + + + +
: + + />
+ />
+ />
+
+
+ +
+
+ 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 @@ - -
- - - -
: - + + ++ + + + + + + + + + + + + + + + + + + +$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'; ?> - />
- />
- />
- - - - - - + + + + + + + + + + + + + + + + + + + + +
  - - /> -
+ + f_link; ?>f_artist_link; ?>f_album_link; ?>f_time; ?>f_bitrate; ?>f_size; ?>MBfile); ?>
-
- - -
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 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - 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 "". - "". - "". - "". - "". - "". - "". - "". - ""; - echo "\n"; - } // end foreach ($dinfolist as $dinfo) - - } // end foreach ($flags as $flag) - ?> - - - - - - - - - - -
id\">".scrub_out($formated_title)." ".scrub_out($dinfo['artist'])." ".scrub_out($dinfo['album'])." ".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."".intval($dinfo['bitrate']/1000)."".sprintf("%.2f", ($dinfo['size']/1048576))."MB".$dinfo['file']."
-
- -
-
- - -

- - 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 @@

    • +
    -- cgit