diff options
Diffstat (limited to 'lib/class')
| -rw-r--r-- | lib/class/browse.class.php | 13 | ||||
| -rw-r--r-- | lib/class/preference.class.php | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index cd424ec1..cc72e4ca 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -196,6 +196,7 @@ class Browse { case 'album': case 'artist': case 'tag': + case 'playlist_localplay': case 'shoutbox': case 'live_stream': // Set it @@ -215,7 +216,6 @@ class Browse { // Rien a faire break; } // end type whitelist - } // set_type /** @@ -790,10 +790,10 @@ class Browse { * and requires the correct template based on the * type that we are currently browsing */ - public static function show_objects($object_ids='', $ajax=false) { + public static function show_objects($object_ids=false, $ajax=false) { $object_ids = $object_ids ? $object_ids : self::get_saved(); - + // Reset the total items self::$total_objects = count($object_ids); @@ -818,7 +818,7 @@ class Browse { Ajax::start_container('browse_content'); // Switch on the type of browsing we're doing - switch ($_SESSION['browse']['type']) { + switch (self::$type) { case 'song': show_box_top(_('Songs') . $match, $class); Song::build_cache($object_ids); @@ -857,6 +857,11 @@ class Browse { require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php'; show_box_bottom(); break; + case 'playlist_localplay': + show_box_top(_('Current Playlist')); + require_once Config::get('prefix') . '/templates/show_localplay_playlist.inc.php'; + show_box_bottom(); + break; case 'catalog': show_box_top(_('Catalogs'), $class); require_once Config::get('prefix') . '/templates/show_catalogs.inc.php'; diff --git a/lib/class/preference.class.php b/lib/class/preference.class.php index aae1d9aa..853e69a9 100644 --- a/lib/class/preference.class.php +++ b/lib/class/preference.class.php @@ -66,6 +66,7 @@ class Preference { $sql = "UPDATE `user_preference` SET `value`='$value' " . "WHERE `preference`='$id'$user_check"; $db_results = Dba::query($sql); + Preference::clear_from_session(); return true; } else { @@ -338,6 +339,17 @@ class Preference { } // load_from_session /** + * clear_from_session + * This clears the users preferences, this is done whenever modifications are made to the preferences + * or the admin resets something + */ + public static function clear_from_session() { + + unset($_SESSION['userdata']['preferences']); + + } // clear_from_session + + /** * init * This grabs the preferences and then loads them into conf it should be run on page load * to initialize the needed variables |