diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-02-14 01:33:15 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-02-14 01:33:15 +0000 |
| commit | 45bf0c4e0c609fd2c495a9f3fe375a1b4aa371f7 (patch) | |
| tree | 5a95c680f37617aac7d5aa1689750747e97fa25e /lib/class | |
| parent | a7869cad8f8c7290898255e2f8ed8927d42d5426 (diff) | |
| download | ampache-45bf0c4e0c609fd2c495a9f3fe375a1b4aa371f7.tar.gz ampache-45bf0c4e0c609fd2c495a9f3fe375a1b4aa371f7.tar.bz2 ampache-45bf0c4e0c609fd2c495a9f3fe375a1b4aa371f7.zip | |
Fix typos, and tweak insert_now_playing preping for Video now playing
Diffstat (limited to 'lib/class')
| -rw-r--r-- | lib/class/stream.class.php | 4 | ||||
| -rw-r--r-- | lib/class/update.class.php | 10 |
2 files changed, 12 insertions, 2 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 |