diff options
| -rw-r--r-- | lib/class/stream.class.php | 4 | ||||
| -rw-r--r-- | lib/class/update.class.php | 10 | ||||
| -rw-r--r-- | templates/show_album_row.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_albums.inc.php | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 3875da6b..7e60a925 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -728,9 +728,9 @@ class Stream { */ public static function insert_now_playing($oid,$uid,$length,$sid,$type) { - $time = time()+$length; + $time = intval(time()+$length); $session_id = Dba::escape($sid); - $object_type = 'song'; + $object_type = Dba::escape(strtolower($type)); // Do a replace into ensuring that this client always only has a single row $sql = "REPLACE INTO `now_playing` (`id`,`object_id`,`object_type`, `user`, `expire`)" . diff --git a/lib/class/update.class.php b/lib/class/update.class.php index d92a1532..06026084 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -328,6 +328,14 @@ class Update { $version[] = array('version'=>'360001','description'=>$update_string); + $update_string = '- Add Bandwidth and Feature preferences to simplify how interface is presented<br />' . + '- Change Tables to FULLTEXT() for improved searching<br />' . + '- Increase Filename lengths to 4096<br />' . + '- Remove useless "KEY" reference from ACL and Catalog tables<br />' . + '- Add new Remote User / Remote Password fields to Catalog<br />'; + + $version[] = array('version'=>'360002','description'=>$update_string); + return $version; @@ -1857,6 +1865,8 @@ class Update { while ($r = Dba::fetch_assoc($db_results)) { User::fix_preferences($r['id']); } // while results + + self::set_version('db_version','360002'); } // update_360002 diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 42984465..872d84d3 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -40,7 +40,7 @@ if (Browse::is_enabled('show_art')) { <td class="cel_tags"><?php echo $album->f_tags; ?></td> <td class="cel_rating" id="rating_<?php echo $album->id; ?>_album"><?php Rating::show($album->id,'album'); ?></td> <td class="cel_action"> - <?php if (Config::get('sociable')) { + <?php if (Config::get('sociable')) { ?> <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=album&id=<?php echo $album->id; ?>"> <?php echo get_user_icon('comment',_('Post Shout')); ?> </a> diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index 68a6a4ca..25e9c4b6 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -25,7 +25,7 @@ $ajax_url = Config::get('ajax_url'); <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_add" /> -<?php if (Browse::is_enabled('show_art') { ?> +<?php if (Browse::is_enabled('show_art')) { ?> <col id="col_cover" /> <?php } ?> <col id="col_album" /> @@ -38,7 +38,7 @@ $ajax_url = Config::get('ajax_url'); </colgroup> <tr class="th-top"> <th class="cel_add"><?php echo _('Add'); ?></th> - <?php if (Browse::is_enabled('show_art') { ?> + <?php if (Browse::is_enabled('show_art')) { ?> <th class="cel_cover"><?php echo _('Cover'); ?></th> <?php } ?> <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&sort=name',_('Album'),'album_sort_name'); ?></th> @@ -69,7 +69,7 @@ $ajax_url = Config::get('ajax_url'); <?php } ?> <tr class="th-bottom"> <th class="cel_add"><?php echo _('Add'); ?></th> - <?php if (Browse::is_enabled('show_art') { ?> + <?php if (Browse::is_enabled('show_art')) { ?> <th class="cel_cover"><?php echo _('Cover'); ?></th> <?php } ?> <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&sort=name',_('Album'),'album_sort_name_bottom'); ?></th> |