bunch of fixes, and some breaks for the browsing

4 files changed, 15 insertions, 15 deletions

diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index 59ebe83a..e2f2e069 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -23,9 +23,8 @@ $web_path = Config::get('web_path');
 $ajax_url = Config::get('ajax_url'); 
 
 // Title for this album
-if ($album->disk)
-{
-  $disk = "<span class=\"discnb disc" .$album->disk. "\">, " . _('Disk') . " " . $album->disk . "</span>";
+if ($album->disk) {
+	$disk = "<span class=\"discnb disc" .$album->disk. "\">, " . _('Disk') . " " . $album->disk . "</span>";
 }
 $title		= scrub_out($album->name) . '&nbsp;(' . $album->year . ')' . $disk .'&nbsp;-&nbsp;' . $album->f_artist_link;
 ?>
@@ -86,6 +85,7 @@ $title		= scrub_out($album->name) . '&nbsp;(' . $album->year . ')' . $disk .'&nb
 </div>
 <?php 
 	Browse::set_type('song');
+	Browse::set_simple_browse(1); 
 	Browse::set_filter('album', $album->id);
 	Browse::set_sort('track','ASC'); 
 	Browse::get_objects(); 
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index c868a306..9fc4e932 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -39,7 +39,7 @@ $ajax_url = Config::get('ajax_url');
 	<th class="cel_add"><?php echo _('Add'); ?></th>
 	<th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=title',_('Song Title'),'sort_song_title'); ?></th>
 	<th class="cel_artist"><?php echo _('Artist'); ?></th>
-	<th class="cel_album"><?php echo _('Album'); ?></th>
+	<th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=album',_('Album'),'sort_song_album'); ?></th>
         <th class="cel_tags"><?php echo _('Tags'); ?></th>
 	<th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=track',_('Track'),'sort_song_track'); ?></th>
 	<th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=time',_('Time'),'sort_song_time'); ?></th>
diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php
index 92f78804..3cf4ad5a 100644
--- a/templates/show_users.inc.php
+++ b/templates/show_users.inc.php
@@ -36,9 +36,9 @@ $web_path = Config::get('web_path');
   <col id="col_online" />
 </colgroup>
 <tr class="th-top">
-	<th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&sort=fullname',_('Fullname'),'users_sort_fullname'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&sort=username',_('Username'),'users_sort_username');?>)</th>
-  <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&sort=last_seen',_('Last Seen'),'users_sort_lastseen'); ?></th>
-  <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&sort=create_date',_('Registration Date'),'users_sort_createdate'); ?></th>
+  <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname',_('Fullname'),'users_sort_fullname'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username',_('Username'),'users_sort_username');?>)</th>
+  <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen',_('Last Seen'),'users_sort_lastseen'); ?></th>
+  <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date',_('Registration Date'),'users_sort_createdate'); ?></th>
   <th class="cel_activity"><?php echo _('Activity'); ?></th>
 	<?php if (Config::get('track_user_ip')) { ?>
   <th class="cel_lastip"><?php echo _('Last Ip'); ?></th>
@@ -101,9 +101,9 @@ foreach ($object_ids as $user_id) {
 </tr>
 <?php } //end foreach users ?>
 <tr class="th-bottom">
-	<th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&sort=fullname',_('Fullname'),'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&sort=username',_('Username'),'users_sort_username1');?>)</th>
-  <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&sort=last_seen',_('Last Seen'),'users_sort_lastseen1'); ?></th>
-  <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&sort=create_date',_('Registration Date'),'users_sort_createdate1'); ?></th>
+	<th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname',_('Fullname'),'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username',_('Username'),'users_sort_username1');?>)</th>
+  <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen',_('Last Seen'),'users_sort_lastseen1'); ?></th>
+  <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date',_('Registration Date'),'users_sort_createdate1'); ?></th>
   <th class="cel_activity"><?php echo _('Activity'); ?></th>
 	<?php if (Config::get('track_user_ip')) { ?>
   <th class="cel_lastip"><?php echo _('Last Ip'); ?></th>
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index 4c483575..114cb256 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -43,15 +43,15 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path');
         <?php if (in_array('starts_with',$allowed_filters)) { ?>
         <form id="multi_alpha_filter_form" method="post" action="javascript:void(0);">
                 <label id="multi_alpha_filterLabel" for="multi_alpha_filter"><?php echo _('Starts With'); ?></label>
-                <input type="textbox" id="multi_alpha_filter" name="multi_alpha_filter" value="<?php echo scrub_out(Browse::get_filter('starts_with')); ?>" onKeyUp="DelayRun(this,'400','ajaxState','<?php echo Config::get('ajax_url'); ?>?page=browse&action=browse&key=starts_with','multi_alpha_filter');">
+                <input type="textbox" id="multi_alpha_filter" name="multi_alpha_filter" value="<?php echo scrub_out(Browse::get_filter('starts_with')); ?>" onKeyUp="DelayRun(this,'400','ajaxState','<?php echo Config::get('ajax_url'); ?>?page=browse&action=browse&type=<?php echo Browse::get_type(); ?>&key=starts_with','multi_alpha_filter');">
         </form>
         <?php } // end if alpha_match ?>
         <?php if (in_array('minimum_count',$allowed_filters)) { ?>
-                <input id="mincountCB" type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=min_count&amp;value=1');return true;" value="1" />
+                <input id="mincountCB" type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=min_count&amp;type=<?php echo Browse::get_type(); ?>&amp;value=1');return true;" value="1" />
                 <label id="mincountLabel" for="mincountCB"><?php echo _('Minimum Count'); ?></label><br />
         <?php } ?>
         <?php if (in_array('rated',$allowed_filters)) { ?>
-                <input id="ratedCB" type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=rated&amp;value=1');return true;" value="1" />
+                <input id="ratedCB" type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;type=<?php echo Browse::get_type(); ?>&amp;key=rated&amp;value=1');return true;" value="1" />
                 <label id="ratedLabel" for="ratedCB"><?php echo _('Rated'); ?></label><br />
         <?php } ?>
         <?php if (in_array('unplayed',$allowed_filters)) { ?>
@@ -61,12 +61,12 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path');
         <?php if (in_array('show_art',$allowed_filters)) { ?>
                 <input id="show_artCB" type="checkbox" <?php echo $string = Browse::get_filter('show_art') ? 'checked="checked"' : ''; ?>/>
                 <label id="show_artLabel" for="show_artCB"><?php echo _('Show Art'); ?></label><br />
-                <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=browse&key=show_art&value=1','')); ?>
+                <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=browse&type=' . Browse::get_type() . '&key=show_art&value=1','')); ?>
         <?php } // if show_art ?>
         <?php if (in_array('playlist_type',$allowed_filters)) { ?>
                 <input id="show_allplCB" type="checkbox" <?php echo $string = Browse::get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/>
                 <label id="show_allplLabel" for="showallplCB"><?php echo _('All Playlists'); ?></label><br />
-                <?php echo Ajax::observe('show_allplCB','click',Ajax::action('?page=browse&action=browse&key=playlist_type&value=1','')); ?>
+                <?php echo Ajax::observe('show_allplCB','click',Ajax::action('?page=browse&action=browse&type=' . Browse::get_type() . '&key=playlist_type&value=1','')); ?>
         <?php } // if playlist_type ?>
     </div>
   </li>