diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-24 02:09:07 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-24 02:09:07 +0000 |
| commit | 0f9c1f245c35e533171cda4b433718f24ca8a707 (patch) | |
| tree | 5e6088588bbedf88c8016dc08dfa7d6fbb514512 | |
| parent | 78661866532f77e66d46a1f81c33739dfa0f20f3 (diff) | |
| download | ampache-0f9c1f245c35e533171cda4b433718f24ca8a707.tar.gz ampache-0f9c1f245c35e533171cda4b433718f24ca8a707.tar.bz2 ampache-0f9c1f245c35e533171cda4b433718f24ca8a707.zip | |
fixed nowplaying refresh
| -rw-r--r-- | index.php | 6 | ||||
| -rw-r--r-- | server/ajax.server.php | 5 | ||||
| -rw-r--r-- | templates/javascript_refresh.inc.php | 3 |
3 files changed, 4 insertions, 10 deletions
@@ -31,13 +31,9 @@ $action = scrub_in($_REQUEST['action']); * going to let them break their servers */ if (Config::get('refresh_limit') > 5) { -/* $refresh_limit = Config::get('refresh_limit'); - $ajax_url = Config::get('ajax_url') . '?action=reloadnp' . Config::get('ajax_info'); - - $ajax_url = str_replace("&","&",$ajax_url); + $ajax_url = Config::get('ajax_url') . '?action=reloadnp'; require_once Config::get('prefix') . '/templates/javascript_refresh.inc.php'; -*/ } require_once Config::get('prefix') . '/templates/show_index.inc.php'; diff --git a/server/ajax.server.php b/server/ajax.server.php index 9021065a..56edeca7 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -220,11 +220,10 @@ switch ($action) { $results['np_data'] = ob_get_contents(); ob_clean(); $data = get_recently_played(); - if (count($data)) { require_once(conf('prefix') . '/templates/show_recently_played.inc.php'); } + if (count($data)) { require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; } $results['recently_played'] = ob_get_contents(); ob_end_clean(); - $xml_doc = xml_from_array($results); - echo $xml_doc; + echo xml_from_array($results); break; /* Setting ratings */ case 'set_rating': diff --git a/templates/javascript_refresh.inc.php b/templates/javascript_refresh.inc.php index 7362f2f3..080201c2 100644 --- a/templates/javascript_refresh.inc.php +++ b/templates/javascript_refresh.inc.php @@ -42,7 +42,6 @@ function refresh() } // start with page-load -doLoad; +doLoad(); // End --> </script> - |