diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-12-04 00:10:23 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-12-04 00:10:23 +0000 |
| commit | 487aed695cc24d95d6f1df872251526a4322e9b7 (patch) | |
| tree | aab132b95e915ce523a1400e58cf6c43e5a67b51 | |
| parent | 78b2ab0640c620ff42985c73182c0b9d73b47099 (diff) | |
| download | ampache-487aed695cc24d95d6f1df872251526a4322e9b7.tar.gz ampache-487aed695cc24d95d6f1df872251526a4322e9b7.tar.bz2 ampache-487aed695cc24d95d6f1df872251526a4322e9b7.zip | |
reverting unnessecary changes
| -rw-r--r-- | server/ajax.server.php | 8 | ||||
| -rw-r--r-- | templates/show_playtype_switch.inc.php | 4 | ||||
| -rw-r--r-- | templates/sidebar.inc.php | 9 |
3 files changed, 4 insertions, 17 deletions
diff --git a/server/ajax.server.php b/server/ajax.server.php index 3393cb0b..9b399d60 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -82,13 +82,7 @@ switch ($action) { $_SESSION['data']['old_play_type'] = conf('play_type'); $pref_id = get_preference_id('play_type'); $GLOBALS['user']->update_preference($pref_id,$_GET['type']); - - /* We need to set the correct playlist type when we want to change it */ - if (!empty($_GET['playlist_type'])){ - $_SESSION['data']['old_playlist_type'] = conf('playlist_type'); - $pref_id = get_preference_id('playlist_type'); - $GLOBALS['user']->update_preference($pref_id,$_GET['playlist_type']); - } + /* Uses a drop down, no need to replace text */ $results['play_type'] = ''; $xml_doc = xml_from_array($results); diff --git a/templates/show_playtype_switch.inc.php b/templates/show_playtype_switch.inc.php index 8be93e31..47248dcf 100644 --- a/templates/show_playtype_switch.inc.php +++ b/templates/show_playtype_switch.inc.php @@ -4,7 +4,7 @@ ${$name} = 'selected="selected" '; ?> <select style="font-size:0.9em;" name="type"> <?php if (conf('allow_stream_playback')) { ?> - <option onclick="ajaxPut('<?php echo $ajax_url; ?>?action=change_play_type&type=stream&playlist_type=m3u<?php echo $required_info; ?>');return true;" <?php echo $is_stream; ?>><?php echo _('Stream'); ?></option> + <option onclick="ajaxPut('<?php echo $ajax_url; ?>?action=change_play_type&type=stream<?php echo $required_info; ?>');return true;" <?php echo $is_stream; ?>><?php echo _('Stream'); ?></option> <?php } if (conf('allow_localplay_playback')) { ?> <option onclick="ajaxPut('<?php echo $ajax_url; ?>?action=change_play_type&type=localplay<?php echo $required_info; ?>');return true;" <?php echo $is_localplay; ?>><?php echo _('Localplay'); ?></option> <?php } if (conf('allow_downsample_playback')) { ?> @@ -12,5 +12,5 @@ ${$name} = 'selected="selected" '; <?php } if (conf('allow_democratic_playback')) { ?> <option onclick="ajaxPut('<?php echo $ajax_url; ?>?action=change_play_type&type=democratic<?php echo $required_info; ?>');return true;" <?php echo $is_democratic; ?>><?php echo _('Democratic'); ?></option> <?php } ?> - <option onclick="ajaxPut('<?php echo $ajax_url; ?>?action=change_play_type&type=xspf_player&playlist_type=xspf<?php echo $required_info; ?>');return true;" <?php echo $is_xspf_player; ?>><?php echo _('XSPF Player'); ?></option> + <option onclick="ajaxPut('<?php echo $ajax_url; ?>?action=change_play_type&type=xspf_player<?php echo $required_info; ?>');return true;" <?php echo $is_xspf_player; ?>><?php echo _('XSPF Player'); ?></option> </select> diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php index 6858c940..03b6392f 100644 --- a/templates/sidebar.inc.php +++ b/templates/sidebar.inc.php @@ -29,7 +29,7 @@ $admin_items[] = array('title'=>_('Users'),'url'=>'admin/users.php','active'=>$location['page']); $admin_items[] = array('title'=>_('Mail Users'),'url'=>'admin/mail.php','active'=>$location['page']); $admin_items[] = array('title'=>_('Catalog'),'url'=>'admin/index.php','active'=>$location['page']); -$admin_items[] = array('title'=>_('Config'),'url'=>'admin/preferences.php','active'=>$location['page']); +$admin_items[] = array('title'=>_('Site Preferences'),'url'=>'admin/preferences.php','active'=>$location['page']); $admin_items[] = array('title'=>_('Access List'),'url'=>'admin/access.php','active'=>$location['page']); $admin_items[] = array('title'=>_('Modules'),'url'=>'admin/modules.php','active'=>$location['page']); @@ -187,10 +187,6 @@ $web_path = conf('web_path'); </li> <?php } // if horizontal orientation ?> <?php } // if localplay access ?> -<?php //If admin hasn't disabled the playtype switch - - if (has_preference_access('play_type')){ -?> <li> <?php $required_info = conf('ajax_info'); @@ -198,9 +194,6 @@ $web_path = conf('web_path'); ?> <?php require_once(conf('prefix') . '/templates/show_playtype_switch.inc.php'); ?> </li> -<?php -} //End if admin hasn't disabled the playtype switch -?> <?php if ($GLOBALS['user']->prefs['play_type'] == 'democratic') { ?> <li> <a href="<?php echo $web_path; ?>/tv.php"><?php echo _('Democratic View'); ?></a> |