re-added ability to delete catalogs, fixed exception error with id3 library

3 files changed, 13 insertions, 121 deletions

diff --git a/admin/catalog.php b/admin/catalog.php
index 8c29fa9c..37403d0c 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -99,13 +99,12 @@ switch ($_REQUEST['action']) {
 	break;
 	case 'delete_catalog':
 		/* Make sure they aren't in demo mode */
-	        if (conf('demo_mode')) { break; }
+	        if (Config::get('demo_mode')) { break; }
 	
 		/* Delete the sucker, we don't need to check perms as thats done above */
-		$catalog = new Catalog($_REQUEST['catalog_id']);
-		$catalog->delete_catalog();
-		$next_url = conf('web_path') . '/admin/index.php';
-		show_confirmation(_('Catalog Deleted'),_('The Catalog and all associated records has been deleted'),$nexturl);
+		Catalog::delete($_REQUEST['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);
 	break;
 	case 'remove_disabled':
 	        if (conf('demo_mode')) { break; }
@@ -226,9 +225,10 @@ switch ($_REQUEST['action']) {
 	break;
 	case 'show_delete_catalog':
 		/* Stop the demo hippies */
-	        if (conf('demo_mode')) { break; }
+	        if (Config::get('demo_mode')) { break; } 
+
 		$catalog = new Catalog($_REQUEST['catalog_id']); 	
-		$nexturl = conf('web_path') . '/admin/catalog.php?action=delete_catalog&catalog_id=' . scrub_out($_REQUEST['catalog_id']);
+		$nexturl = Config::get('web_path') . '/admin/catalog.php?action=delete_catalog&catalog_id=' . scrub_out($_REQUEST['catalog_id']);
 		show_confirmation(_('Delete Catalog'),_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)",$nexturl,1);
 	break;
 	case 'show_customize_catalog':
diff --git a/admin/index.php b/admin/index.php
index 99631f29..3fd759af 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -22,19 +22,13 @@
 
 require '../lib/init.php';
 
-$action = scrub_in($_REQUEST['action']);
-
 if (!$GLOBALS['user']->has_access(100)) { 
 	access_denied();
 	exit();
 }
 
-require_once Config::get('prefix') . '/templates/header.inc.php';
-?>
-<div id="admin-tools">
-	<?php require Config::get('prefix') . '/templates/show_admin_tools.inc.php'; ?>
-</div>
-<div id="admin-info">
-	<?php require Config::get('prefix') . '/templates/show_admin_info.inc.php'; ?>
-</div>
-<?php show_footer(); ?>
+show_header(); 
+
+
+
+show_footer(); 
diff --git a/admin/preferences.php b/admin/preferences.php
deleted file mode 100644
index bc3c653f..00000000
--- a/admin/preferences.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2005 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.
-
-*/
-
-/**
- * Preferences page
- * Preferences page for whole site, and where
- * the admins do editing of other users preferences
- * @package Preferences
- * @catagory Admin
- * @author Karl Vollmer
- */
-
-require('../lib/init.php');
-
-if (!$GLOBALS['user']->has_access(100)) {
-	access_denied();
-}
-
-$user_id = scrub_in($_REQUEST['user_id']);
-$action  = scrub_in($_REQUEST['action']);
-if (!$user_id) { $user_id ='-1'; } 
-
-$temp_user = new User($user_id);
-$temp_user->username = $user_id;
-
-show_template('header');
-
-switch($action) { 
-	case 'user':
-		$fullname = "ADMIN - " . $temp_user->fullname;
-		$preferences = $temp_user->get_preferences();
-	break;
-	case 'update_preferences':
-		if (conf('demo_mode')) { break; }
-		update_preferences($user_id);	
-		if ($user_id != '-1') { 
-			$fullname = "ADMIN - " . $temp_user->fullname;
-			$_REQUEST['action'] = 'user';
-			$preferences = $temp_user->get_preferences();
-		}
-		else {
-			$fullname = _('Site');
-			init_preferences();
-			$GLOBALS['user']->set_preferences();
-			set_theme();
-			$preferences = $temp_user->get_preferences();
-		}
-	break;
-	case 'fix_preferences':
-		$temp_user->fix_preferences($user_id);
-		$preferences = $temp_user->get_preferences($user_id);
-	break;
-	case 'set_preferences':
-		/* Update the preferences */
-		foreach ($_REQUEST['prefs'] as $name=>$level) { 
-			update_preference_level($name,$level);
-		} // end foreach preferences
-	case 'show_set_preferences':
-		/* Get all preferences */
-		$preferences = get_preferences();
-		require_once(conf('prefix') . '/templates/show_preference_admin.inc.php');
-	break;
-	default:
-		$preferences = $temp_user->get_preferences();
-		$fullname = _('Site');
-	break;
-
-} // End Switch Action
-
-
-// OMG HORRIBLE HACK Beatings for the programmer 
-if ($action != 'show_set_preferences' AND $action != 'set_preferences') { 
-	// Set Target
-	$target = "/admin/preferences.php";
-
-	// Show the default preferences page
-	require (conf('prefix') . "/templates/show_preferences.inc");
-}
-
-// FOOTER
-show_footer();
-
-
-?>