From 2d5ed879bd17024154e87de22c811bbfd0e69433 Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Sun, 15 Jan 2006 06:27:55 +0000 Subject: more flagging fixes, you can flag files now you just cant do anything about it --- templates/flag.inc | 132 ------------------------------------------ templates/show_flag.inc.php | 136 ++++++++++++++++++++++++++++++++++++++++++++ templates/show_songs.inc | 26 +++------ 3 files changed, 144 insertions(+), 150 deletions(-) delete mode 100644 templates/flag.inc create mode 100644 templates/show_flag.inc.php (limited to 'templates') diff --git a/templates/flag.inc b/templates/flag.inc deleted file mode 100644 index fde096ab..00000000 --- a/templates/flag.inc +++ /dev/null @@ -1,132 +0,0 @@ -format_song(); - if (!preg_match('/\.mp3$/', $song->file)) { - echo "

Ampache can only edit MP3 file tags currently.
"; - echo "Back"; - return; - } // end if (!preg_match('/\.mp3$/',$song->file)) -?> - -

-

- - -

- - -
- - - - - - - - - - - - - - - - - - - - - -
:file; ?>
:f_title; ?> by f_artist_full; ?>
:
: -
  - " /> - -
- -
- - -

View Flagged Songs

-

This is the list of songs that have been flagged by your Ampache users. Use - this list to determine what songs you need to re-rip or tags you need to update.

- -
- - - - - - - - - - song); - $song->format_song(); - $alt_title = $song->title; - $artist = $song->f_artist; - $alt_artist = $song->f_full_artist; - - echo "". - "". - "". - ""; - /*echo "\n";*/ - if ($flag->type === 'newid3') { - echo ""; - } else { - echo ""; - echo "\n"; - } // end if ($flag->type === 'newid3') and else - } // end foreach ($flags as $flag) - ?> - -
 SongFlagNew Flag:Flagged byID3 Update:
id."\" name=\"flag[]\" value=\"".$flag->id."\">song\" title=\"$alt_title\">$song->f_title by ". - "artist_id\" title=\"$alt_artist\">$artist$flag->type"; - $onchange = "onchange=\"document.getElementById('flag_".$flag->id."').checked='checked';\""; - show_flagged_popup($flag->type, 'type', $flag->id."_newflag", $onchange); - echo "".$flag->username."
".date('m/d/y',$flag->date)."		id\">Fixed
id."\" value=\"accept\" />Accept"; - echo "id."\" value=\"reject\" />Reject
song."\">edit/view
-
- -

You don't have any flagged songs.

- diff --git a/templates/show_flag.inc.php b/templates/show_flag.inc.php new file mode 100644 index 00000000..571d822d --- /dev/null +++ b/templates/show_flag.inc.php @@ -0,0 +1,136 @@ +format_song(); + $title = scrub_out($song->f_title . " by " . $song->f_artist_full); + $file = scrub_out($song->file); + break; + case 'album': + break; + case 'artist': + break; + default: + break; +} // end type switch +?> + +

+

+ +
+ + + + + + + + + + + + + + + + + + + + + +
:
:
: + +
:
  + + + + +
+
+ +

View Flagged Songs

+

This is the list of songs that have been flagged by your Ampache users. Use +this list to determine what songs you need to re-rip or tags you need to update.

+ +
+ + + + + + + + + + song); + $song->format_song(); + $alt_title = $song->title; + $artist = $song->f_artist; + $alt_artist = $song->f_full_artist; + + echo "". + "". + "". + ""; + /*echo "\n";*/ + if ($flag->type === 'newid3') { + echo ""; + } else { + echo ""; + echo "\n"; + } // end if ($flag->type === 'newid3') and else + } // end foreach ($flags as $flag) + ?> + +
 SongFlagNew Flag:Flagged byID3 Update:
id."\" name=\"flag[]\" value=\"".$flag->id."\">song\" title=\"$alt_title\">$song->f_title by ". + "artist_id\" title=\"$alt_artist\">$artist$flag->type"; + $onchange = "onchange=\"document.getElementById('flag_".$flag->id."').checked='checked';\""; + show_flagged_popup($flag->type, 'type', $flag->id."_newflag", $onchange); + echo "".$flag->username."
".date('m/d/y',$flag->date)."		id\">Fixed
id."\" value=\"accept\" />Accept"; + echo "id."\" value=\"reject\" />Reject
song."\">edit/view
+
+?php } else { ?> +

You don't have any flagged songs.

+ diff --git a/templates/show_songs.inc b/templates/show_songs.inc index e8078231..df1bfeba 100644 --- a/templates/show_songs.inc +++ b/templates/show_songs.inc @@ -21,9 +21,6 @@ */ $web_path = conf('web_path'); -// Need to set the username for the song ratings. -$username = $GLOBALS['user']->username; - /* If it's a playlist and they've got rights */ if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access('100'))) { $tab = 1; @@ -46,7 +43,6 @@ if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $G - @@ -97,6 +93,7 @@ foreach ($song_ids as $song_id) { + has_flag()) { echo "**"; } ?> >f_title); ?> @@ -120,25 +117,21 @@ foreach ($song_ids as $song_id) { f_genre; ?> - f_style; ?> title="flagcomment; ?>"> - flagtype; ?> - - has_access('100')) { ?> - Edit | Flag | + Flag + has_access('100')) { ?> + | Edit | enabled) { ?> Disable Enable - - Flag - prefs['download']) { ?> + prefs['download']) { ?> | title . "." . $song->type); ?>"> - prefs['direct_link']) { ?> - | title . "." . $song->type); ?>"> + prefs['direct_link']) { ?> + | title . "." . $song->type); ?>"> @@ -150,9 +143,6 @@ foreach ($song_ids as $song_id) { MB - +


-- cgit