diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/localplay.ajax.php | 12 | ||||
| -rw-r--r-- | server/stream.ajax.php | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/server/localplay.ajax.php b/server/localplay.ajax.php index a9ef949f..d5945a3a 100644 --- a/server/localplay.ajax.php +++ b/server/localplay.ajax.php @@ -34,7 +34,7 @@ switch ($_REQUEST['action']) { $type = $_REQUEST['instance'] ? 'localplay' : 'stream'; - $localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']); + $localplay = new Localplay(Config::get('localplay_controller')); $localplay->set_active_instance($_REQUEST['instance']); Preference::update('play_type',$GLOBALS['user']->id,$type); @@ -54,7 +54,7 @@ switch ($_REQUEST['action']) { exit; } - $localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']); + $localplay = new Localplay(Config::get('localplay_controller')); $localplay->connect(); // Switch on valid commands @@ -102,7 +102,7 @@ switch ($_REQUEST['action']) { debug_event('DENIED','Attempted to delete track without access','1'); exit; } - $localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']); + $localplay = new Localplay(Config::get('localplay_controller')); $localplay->connect(); // Scrub in the delete request @@ -129,7 +129,7 @@ switch ($_REQUEST['action']) { } // Scrub it in - $localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']); + $localplay = new Localplay(Config::get('localplay_controller')); $localplay->delete_instance($_REQUEST['instance']); $key = 'localplay_instance_' . $_REQUEST['instance']; @@ -143,7 +143,7 @@ switch ($_REQUEST['action']) { } // Scrub her in - $localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']); + $localplay = new Localplay(Config::get('localplay_controller')); $localplay->connect(); $localplay->repeat(make_bool($_REQUEST['value'])); @@ -161,7 +161,7 @@ switch ($_REQUEST['action']) { } // Scrub her in - $localplay = new Localplay($GLOBALS['user']->prefs['localplay_controller']); + $localplay = new Localplay(Config::get('localplay_controller')); $localplay->connect(); $localplay->random(make_bool($_REQUEST['value'])); diff --git a/server/stream.ajax.php b/server/stream.ajax.php index c92a654a..7983c2c7 100644 --- a/server/stream.ajax.php +++ b/server/stream.ajax.php @@ -57,7 +57,7 @@ switch ($_REQUEST['action']) { case 'basket': // 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">reload_util("'.$_SESSION['iframe']['target'].'")</script>'; + $results['rfc3514'] = '<script type="text/javascript">reload_util(\''.$_SESSION['iframe']['target'] . '\');</script>'; break; default: $results['rfc3514'] = '0x1'; |