diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-07-26 07:43:18 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-07-26 07:43:18 +0000 |
| commit | 392354df0a4f2c21aabad2f1b527448251a60f99 (patch) | |
| tree | ab34820cef4990e4139326ccd2e507c5731d216c /server | |
| parent | 975af37b254ebc74533f1562005dccf75ef0f021 (diff) | |
| download | ampache-392354df0a4f2c21aabad2f1b527448251a60f99.tar.gz ampache-392354df0a4f2c21aabad2f1b527448251a60f99.tar.bz2 ampache-392354df0a4f2c21aabad2f1b527448251a60f99.zip | |
switched to sha() password encryption not using sha2 because of limitations of amarok, also added some caching and fixed some misc bugs
Diffstat (limited to 'server')
| -rw-r--r-- | server/ajax.server.php | 15 | ||||
| -rw-r--r-- | server/index.ajax.php | 17 |
2 files changed, 15 insertions, 17 deletions
diff --git a/server/ajax.server.php b/server/ajax.server.php index 5e586895..5a7a8f7d 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -293,21 +293,6 @@ switch ($_REQUEST['action']) { $results['rightbar'] = ajax_include('rightbar.inc.php'); break; - /* reloading the now playing information */ - case 'reloadnp': - ob_start(); - show_now_playing(); - $results['now_playing'] = ob_get_contents(); - ob_clean(); - $data = Song::get_recently_played(); - if (count($data)) { - show_box_top(_('Recently Played')); - require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; - show_box_bottom(); - } - $results['recently_played'] = ob_get_contents(); - ob_end_clean(); - break; /* Setting ratings */ case 'set_rating': ob_start(); diff --git a/server/index.ajax.php b/server/index.ajax.php index e8029de2..2573e7d2 100644 --- a/server/index.ajax.php +++ b/server/index.ajax.php @@ -30,10 +30,23 @@ switch ($_REQUEST['action']) { if (count($albums)) { ob_start(); require_once Config::get('prefix') . '/templates/show_random_albums.inc.php'; - $results['random_selection'] = ob_get_contents(); - ob_end_clean(); + $results['random_selection'] = ob_get_clean(); } break; + case 'reloadnp': + ob_start(); + show_now_playing(); + $results['now_playing'] = ob_get_clean(); + ob_start(); + $data = Song::get_recently_played(); + Song::build_cache(array_keys($data)); + if (count($data)) { + show_box_top(_('Recently Played')); + require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; + show_box_bottom(); + } + $results['recently_played'] = ob_get_clean(); + break; case 'sidebar': switch ($_REQUEST['button']) { case 'home': |