fix nexturl typo and more translate

4 files changed, 10 insertions, 10 deletions

diff --git a/admin/access.php b/admin/access.php
index 34aac4fa..e4af598e 100644
--- a/admin/access.php
+++ b/admin/access.php
@@ -106,7 +106,7 @@ switch ($_REQUEST['action']) {
 		$access = new Access($_REQUEST['access_id']); 
 		$access->update($_POST);
 		if (!Error::occurred()) { 
-			show_confirmation(_('Updated'),_('Access List Entry updated'),'admin/access.php');
+			show_confirmation(_('Updated'),_('Access List Entry updated'), Config::get('web_path').'/admin/access.php');
 		} 
 		else { 
 			$access->format(); 
diff --git a/admin/catalog.php b/admin/catalog.php
index e7900950..b3512122 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -113,7 +113,7 @@ switch ($_REQUEST['action']) {
 		/* Delete the sucker, we don't need to check perms as thats done above */
 		Catalog::delete($_GET['catalog_id']); 
 		$next_url = Config::get('web_path') . '/admin/index.php';
-		show_confirmation(_('Catalog Deleted'),_('The Catalog and all associated records have been deleted'),$nexturl);
+		show_confirmation(_('Catalog Deleted'),_('The Catalog and all associated records have been deleted'),$next_url);
 	break;
 	case 'show_delete_catalog': 
 		$catalog_id = scrub_in($_GET['catalog_id']); 
@@ -133,7 +133,7 @@ switch ($_REQUEST['action']) {
 		else {
 			$body = _('No Songs Removed');
 		}
-		$url	= conf('web_path') . '/admin/index.php';
+		$url	= Config::get('web_path') . '/admin/index.php';
 		$title	= ngettext('Disabled Song Processed','Disabled Songs Processed',count($song));
 		show_confirmation($title,$body,$url);
 	break;
@@ -236,7 +236,7 @@ switch ($_REQUEST['action']) {
 			Error::display('catalog_add'); 
 			show_box_bottom(); 
 
-			show_confirmation('','','/admin/index.php'); 
+			show_confirmation('','', Config::get('web_path').'/admin/index.php'); 
 
 		}
 		else {
@@ -259,8 +259,8 @@ switch ($_REQUEST['action']) {
 		require Config::get('prefix') . '/templates/show_add_catalog.inc.php';
 	break;
 	case 'clear_now_playing':
-			if (Config::get('demo_mode')) { access_denied(); break; }
-			Stream::clear_now_playing();
+		if (Config::get('demo_mode')) { access_denied(); break; }
+		Stream::clear_now_playing();
 		show_confirmation(_('Now Playing Cleared'),_('All now playing data has been cleared'),Config::get('web_path') . '/admin/index.php');
 	break;
 	case 'show_disabled':
diff --git a/admin/flag.php b/admin/flag.php
index 6f52e8c2..6ca41ba6 100644
--- a/admin/flag.php
+++ b/admin/flag.php
@@ -83,7 +83,7 @@ switch ($_REQUEST['action']) {
 			$flag->add($song->id,'song','retag','Edited Song, auto-tag');
 		}
 
-		if (isset($cleaned['artist']) || isset($cleaned['album'])) { $_SESSION['source'] = conf('web_path') . '/index.php'; } 
+		if (isset($cleaned['artist']) || isset($cleaned['album'])) { $_SESSION['source'] = Config::get('web_path') . '/index.php'; } 
 		
 		show_confirmation(_('Song Updated'),_('The requested song has been updated'),$_SESSION['source']);
 	break;
@@ -127,7 +127,7 @@ switch ($_REQUEST['action']) {
 		// Clean out the old album 
 		$catalog->clean_albums();
 
-		show_confirmation(_('Album Updated'),'',conf('web_path') . '/admin/index.php'); 
+		show_confirmation(_('Album Updated'),'',Config::get('web_path') . '/admin/index.php'); 
 
 	break;
 	// Show the page for editing a full artist
@@ -169,7 +169,7 @@ switch ($_REQUEST['action']) {
 		// Clean out the old artist(s)
 		$catalog->clean_artists(); 
 
-		show_confirmation(_('Artist Updated'),'',conf('web_path') . '/admin/index.php'); 
+		show_confirmation(_('Artist Updated'),'',Config::get('web_path') . '/admin/index.php');
 
 	break; 
 	/* Done by 'Select' code passes array of song ids */
diff --git a/admin/users.php b/admin/users.php
index 970a1f75..d107e417 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -126,7 +126,7 @@ switch ($_REQUEST['action']) {
 		elseif ($access == 25){ $access = _('User');}
 		elseif ($access == 100){ $access = _('Admin');}
 		
-		show_confirmation(_('New User Added'),__('%user% has been created with an access level of ' . $access,'%user%',$username), Config::get('web_path').'/admin/users.php');
+		show_confirmation(_('New User Added'),sprintf(_('%%user%% has been created with an access level of %s'), $access),'%user%',$username), Config::get('web_path').'/admin/users.php');
 	break;
 	case 'enable':
 		$client = new User($_REQUEST['user_id']);