This update includes a full rewrite of the Localplay code, only update

to this version if you don't care about losing a lot of functionality
while I am still finishing it up. Also the only working localplay
method is currently MPD. UPDATE AT YOUR OWN RISK!

2 files changed, 53 insertions, 71 deletions

diff --git a/admin/modules.php b/admin/modules.php
new file mode 100644
index 00000000..ea2fb6f0
--- /dev/null
+++ b/admin/modules.php
@@ -0,0 +1,53 @@
+<?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.
+
+*/
+
+require('../modules/init.php');
+
+if (!$GLOBALS['user']->has_access(100)) {
+	access_denied();
+	exit();
+}
+
+
+$action = scrub_in($_REQUEST['action']);
+
+/* Always show the header */
+show_template('header');
+
+switch ($action) { 
+	case 'insert_localplay_preferences':
+		$type = scrub_in($_REQUEST['type']);
+		insert_localplay_preferences($type);
+		$url 	= conf('web_path') . '/admin/modules.php';
+		$title 	= _('Module Activated');
+		$body	= '';
+		show_confirmation($title,$body,$url);
+	break;
+	default: 
+		require_once (conf('prefix') . '/templates/show_modules.inc.php');
+	break;
+} // end switch
+
+show_footer(); 
+
+
+?>
diff --git a/admin/orphan.php b/admin/orphan.php
deleted file mode 100644
index 500b6dbf..00000000
--- a/admin/orphan.php
+++ /dev/null
@@ -1,71 +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
- 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.
-
-*/
-
-
-/*!
-	@header Orphaned Admin Page
- View and edit orphan files
-
-*/
-
-require('../modules/init.php');
-
-
-if (!$user->has_access(100)) { 
-  header("Location: " . conf('web_path') . "/index.php?access=denied");
-  exit();
-}
-
-
-if ( $type and $action == 'show_songs' ) {
-  print("<p style=\"font-size: 12px; font-weight: bold;\"> Orphaned Songs with missing $type information </p>");
-
-  $song_ids = get_orphan_songs($type);
-  show_songs($song_ids);
-}
-
-show_template('header');
-
-show_menu_items('Admin');
-show_admin_menu('Catalog');
-
-if ( $action == 'show_orphan_songs' ) {
-	print("<p style=\"font-size: 12px; font-weight: bold;\"> Orphaned songs with no artist </p>");
-
-	$song_ids = get_orphan_songs();
-	show_songs($song_ids);
-}
-elseif ( $action == 'show_orphan_albums' ) {
-	print("<p style=\"font-size: 12px; font-weight: bold;\"> Orphaned albums with no name </p>");
-
-	$song_ids = get_orphan_albums();
-	show_songs($song_ids);
-}
-
-?>
-
-
-<hr />
-
-</body>
-</html>