diff options
| -rw-r--r-- | admin/song.php | 6 | ||||
| -rw-r--r-- | flag.php | 23 | ||||
| -rw-r--r-- | templates/footer.inc | 22 | ||||
| -rw-r--r-- | templates/userform.inc | 2 |
4 files changed, 34 insertions, 19 deletions
diff --git a/admin/song.php b/admin/song.php index a3aea196..51ef2318 100644 --- a/admin/song.php +++ b/admin/song.php @@ -39,7 +39,7 @@ if (!$user->has_access('100')) { $action = scrub_in($_REQUEST['action']); $song = scrub_in($_REQUEST['song']); - +$return_referer = return_referer(); show_template('header'); $song_obj = new Song($_REQUEST['song_id']); @@ -62,7 +62,7 @@ switch($action) { $song_obj->update_enabled(0,$song_id); } // end foreach } // end else - show_confirmation(_("Songs Disabled"),_("The requested song(s) have been disabled"),return_referer()); + show_confirmation(_("Songs Disabled"),_("The requested song(s) have been disabled"),htmlspecialchars($return_referer)); break; case "enabled": // If we pass just one, make it still work @@ -72,7 +72,7 @@ switch($action) { $song_obj->update_enabled(1,$song_id); } // end foreach } // end else - show_confirmation(_("Songs Enabled"),_("The requested song(s) have been enabled"),return_referer()); + show_confirmation(_("Songs Enabled"),_("The requested song(s) have been enabled"),htmlspecialchars($return_referer)); break; default: echo "Don't know what to do yet."; @@ -32,27 +32,20 @@ $action = scrub_in($_REQUEST['action']); $song = scrub_in($_REQUEST['song']); if ( $action == 'flag_song') { - $flagged_type = scrub_in($_REQUEST['flagged_type']); - $comment = scrub_in($_REQUEST['comment']); + $flagged_type = scrub_in($_REQUEST['flagged_type']); + $comment = scrub_in($_REQUEST['comment']); insert_flagged_song($song, $flagged_type, $comment); $flag_text = _("Flagging song completed."); $action = 'flag'; } -?> -<?php show_template('header'); ?> -<?php - $highlight = "Home"; - show_menu_items($highlight); - - if ( $action == 'flag' ) { - $type = 'show_flagged_form'; - $song_id = $song; +show_template('header'); - include(conf('prefix') . "/templates/flag.inc"); - } +if ( $action == 'flag' ) { + $type = 'show_flagged_form'; + $song_id = $song; + include(conf('prefix') . "/templates/flag.inc"); +} show_footer(); ?> -</body> -</html> diff --git a/templates/footer.inc b/templates/footer.inc index b35db223..853da337 100644 --- a/templates/footer.inc +++ b/templates/footer.inc @@ -1,3 +1,25 @@ +<?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 + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + 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. + +*/ +?> </td></tr></table> </div> <!-- end id="content"--> </div> <!-- end id="maincontainer"--> diff --git a/templates/userform.inc b/templates/userform.inc index 46c70dd9..8d168d16 100644 --- a/templates/userform.inc +++ b/templates/userform.inc @@ -25,7 +25,7 @@ if ($type === 'new_user') { $title = _("Adding a New User"); } else { - $userfield = "$username; + $userfield = $username; $title = _("Editing existing User"); } ?> |