mirror of
https://github.com/Yetangitu/ampache
synced 2025-10-03 09:49:30 +02:00
Cosmetics: death to tabs
The refactoring I've been doing has reminded me of my strong preference for spaces, and I feel inclined to impose my will on the tree.
This commit is contained in:
parent
8a750c3e87
commit
ef4d366060
304 changed files with 30876 additions and 30875 deletions
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
|
||||
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
|
||||
/**
|
||||
*
|
||||
* LICENSE: GNU General Public License, version 2 (GPLv2)
|
||||
|
@ -26,69 +26,69 @@
|
|||
if (!defined('AJAX_INCLUDE')) { exit; }
|
||||
|
||||
switch ($_REQUEST['action']) {
|
||||
case 'set_play_type':
|
||||
// Make sure they have the rights to do this
|
||||
if (!Preference::has_access('play_type')) {
|
||||
$results['rfc3514'] = '0x1';
|
||||
break;
|
||||
}
|
||||
case 'set_play_type':
|
||||
// Make sure they have the rights to do this
|
||||
if (!Preference::has_access('play_type')) {
|
||||
$results['rfc3514'] = '0x1';
|
||||
break;
|
||||
}
|
||||
|
||||
switch ($_POST['type']) {
|
||||
case 'stream':
|
||||
case 'localplay':
|
||||
case 'democratic':
|
||||
$key = 'allow_' . $_POST['type'] . '_playback';
|
||||
if (!Config::get($key)) {
|
||||
$results['rfc3514'] = '0x1';
|
||||
break 2;
|
||||
}
|
||||
$new = $_POST['type'];
|
||||
break;
|
||||
case 'xspf_player':
|
||||
$new = $_POST['type'];
|
||||
// Rien a faire
|
||||
break;
|
||||
default:
|
||||
$new = 'stream';
|
||||
$results['rfc3514'] = '0x1';
|
||||
break 2;
|
||||
} // end switch
|
||||
switch ($_POST['type']) {
|
||||
case 'stream':
|
||||
case 'localplay':
|
||||
case 'democratic':
|
||||
$key = 'allow_' . $_POST['type'] . '_playback';
|
||||
if (!Config::get($key)) {
|
||||
$results['rfc3514'] = '0x1';
|
||||
break 2;
|
||||
}
|
||||
$new = $_POST['type'];
|
||||
break;
|
||||
case 'xspf_player':
|
||||
$new = $_POST['type'];
|
||||
// Rien a faire
|
||||
break;
|
||||
default:
|
||||
$new = 'stream';
|
||||
$results['rfc3514'] = '0x1';
|
||||
break 2;
|
||||
} // end switch
|
||||
|
||||
$current = Config::get('play_type');
|
||||
$current = Config::get('play_type');
|
||||
|
||||
// Go ahead and update their preference
|
||||
if (Preference::update('play_type',$GLOBALS['user']->id,$new)) {
|
||||
Config::set('play_type', $new, true);
|
||||
}
|
||||
// Go ahead and update their preference
|
||||
if (Preference::update('play_type',$GLOBALS['user']->id,$new)) {
|
||||
Config::set('play_type', $new, true);
|
||||
}
|
||||
|
||||
|
||||
if (($new == 'localplay' AND $current != 'localplay') OR ($current == 'localplay' AND $new != 'localplay')) {
|
||||
$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
|
||||
}
|
||||
if (($new == 'localplay' AND $current != 'localplay') OR ($current == 'localplay' AND $new != 'localplay')) {
|
||||
$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
|
||||
}
|
||||
|
||||
$results['rfc3514'] = '0x0';
|
||||
$results['rfc3514'] = '0x0';
|
||||
|
||||
break;
|
||||
case 'basket':
|
||||
break;
|
||||
case 'basket':
|
||||
|
||||
// Go ahead and see if we should clear the playlist here or not, we might not actually clear it in the session
|
||||
// we'll just have to feed it bad data.
|
||||
// FIXME: This is sad, will be fixed when I switch how streaming works.
|
||||
// Go ahead and see if we should clear the playlist here or not, we might not actually clear it in the session
|
||||
// we'll just have to feed it bad data.
|
||||
// FIXME: This is sad, will be fixed when I switch how streaming works.
|
||||
// Check to see if 'clear' was passed if it was then we need to reset the basket
|
||||
if ( ($_REQUEST['playlist_method'] == 'clear' || Config::get('playlist_method') == 'clear') AND Config::get('play_type') != 'xspf_player') {
|
||||
define('NO_SONGS','1');
|
||||
ob_start();
|
||||
require_once Config::get('prefix') . '/templates/rightbar.inc.php';
|
||||
$results['rightbar'] = ob_get_clean();
|
||||
define('NO_SONGS','1');
|
||||
ob_start();
|
||||
require_once Config::get('prefix') . '/templates/rightbar.inc.php';
|
||||
$results['rightbar'] = ob_get_clean();
|
||||
}
|
||||
|
||||
// We need to set the basket up!
|
||||
$_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=basket&playlist_method=' . scrub_out($_REQUEST['playlist_method']);
|
||||
$results['rfc3514'] = '<script type="text/javascript">reloadUtil(\''.$_SESSION['iframe']['target'] . '\');</script>';
|
||||
break;
|
||||
default:
|
||||
$results['rfc3514'] = '0x1';
|
||||
break;
|
||||
// We need to set the basket up!
|
||||
$_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=basket&playlist_method=' . scrub_out($_REQUEST['playlist_method']);
|
||||
$results['rfc3514'] = '<script type="text/javascript">reloadUtil(\''.$_SESSION['iframe']['target'] . '\');</script>';
|
||||
break;
|
||||
default:
|
||||
$results['rfc3514'] = '0x1';
|
||||
break;
|
||||
} // switch on action;
|
||||
|
||||
// We always do this
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue