some fixes for the localplay, you can now install the MPD controller, and add instances, just not actually play to it... realized I need to think on how to do that a little...

4 files changed, 32 insertions, 3 deletions

diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php
index c2ab559f..3e158f3b 100644
--- a/templates/show_localplay_add_instance.inc.php
+++ b/templates/show_localplay_add_instance.inc.php
@@ -22,5 +22,19 @@
 
 ?>
 <?php show_box_top(_('Add Localplay Instance')); ?>
-
+<form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=add_instance">
+<table border="0" cellpadding="3" cellspacing="0" class="table-data">
+<?php foreach ($fields as $key=>$field) { ?>
+<tr>
+	<td><?php echo $field['description']; ?></td>
+	<td><input type="textbox" name="<?php echo $key; ?>" /></td>
+</tr>
+<?php } ?>
+<tr>
+	<td colspan="2">
+		<input type="submit" value="<?php echo _('Add Instance'); ?>" />
+	</td>
+</tr>
+</table>
+</form>
 <?php show_box_bottom(); ?>
diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php
index cfbe7e30..68611d45 100644
--- a/templates/show_localplay_controllers.inc.php
+++ b/templates/show_localplay_controllers.inc.php
@@ -33,7 +33,7 @@ foreach ($controllers as $controller) {
 	$localplay = new Localplay($controller); 
 	if (!$localplay->player_loaded()) { continue; } 
 	$localplay->format(); 
-	if ($localplay->is_enabled()) { 
+	if (Localplay::is_enabled($controller)) { 
 		$action 	= 'confirm_uninstall_localplay'; 
 		$action_txt	= _('Disable'); 
 	} 
@@ -46,7 +46,7 @@ foreach ($controllers as $controller) {
 	<td><?php echo scrub_out($localplay->f_name); ?></td>
 	<td><?php echo scrub_out($localplay->f_description); ?></td>
 	<td><?php echo scrub_out($localplay->f_version); ?></td>
-	<td><a href="<?php echo $web_path; ?>/admin/modules.php?action=<?php echo $action; ?>&amp;type="<?php urlencode($localplay->type); ?>"><?php echo $action_txt; ?></a></td>
+	<td><a href="<?php echo $web_path; ?>/admin/modules.php?action=<?php echo $action; ?>&amp;type=<?php echo urlencode($controller); ?>"><?php echo $action_txt; ?></a></td>
 </tr>
 <?php } if (!count($controllers)) { ?>
 <tr class="<?php echo flip_class(); ?>">
diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php
index 815ffc2b..7525fd7f 100644
--- a/templates/sidebar_localplay.inc.php
+++ b/templates/sidebar_localplay.inc.php
@@ -1,12 +1,26 @@
 <ul class="sb2" id="sb_localplay">
+<?php if (Config::get('allow_localplay_playback')) { ?>
+<?php if ($GLOBALS['user']->has_access('50')) { ?>
   <li><h4><?php echo _('Localplay'); ?></h4>
     <ul class="sb3" id="sb_localplay_info">
 	<li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo _('Add Instance'); ?></a></li>
     </ul>
   </li>
+<?php } ?>
   <li><h4><?php echo _('Active Instance'); ?></h4>
     <ul class="sb3" id="sb_localplay_instances">
 	<li id="sb_localplay_instances_none"><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0',_('None'),'localplay_instance_none');  ?></li>
+	<?php 
+		// Requires a little work.. :(
+		$localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']); 
+		$instances = $localplay->get_instances(); 
+		foreach ($instances as $uid=>$name) { 
+	?>
+	<li id="sb_localplay_instances_<?php echo $uid; ?>"><?php echo Ajax::text('?page=localplay&action=set_instance&instance=' . $uid,$name,'localplay_instance_' . $uid); ?></li>
+	<?php } ?>
     </ul>
   </li>
+<?php } else { ?>
+  <li><h4><?php echo _('Localplay Disabled'); ?></h4></li>
+<?php } ?>
 </ul>
diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php
index a960e667..be018df9 100644
--- a/templates/sidebar_preferences.inc.php
+++ b/templates/sidebar_preferences.inc.php
@@ -15,6 +15,7 @@ $catagories = Preference::get_catagories();
 ?>
       <li id="sb_preferences_sections_<?php echo $f_name; ?>"><a href="<?php echo $web_path; ?>/preferences.php?tab=<?php echo $name; ?>"><?php echo _($f_name); ?></a></li>
 <?php } ?>
+      <li id="sb_preferences_sections_account"><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a></li>
     </ul>
   </li>
 <?php if ($GLOBALS['user']->has_access('100')) { ?>