mirror of
https://github.com/Yetangitu/ampache
synced 2025-10-03 17:59:21 +02:00
added config version check, fixed play selected bug reported by chenb and fixed wmp11 now playing issue
This commit is contained in:
Karl 'vollmerk' Vollmer
parent
595b211d5e
commit
56ce11f771
7 changed files with 51 additions and 28 deletions
|
|
@ -3,6 +3,12 @@
|
|||
# General Config #
|
||||
####################
|
||||
|
||||
# This value is used to detect quickly
|
||||
# if this config file is up to date
|
||||
# this is compared against a value hardcoded
|
||||
# into the init script
|
||||
config_version = 1
|
||||
|
||||
####################
|
||||
# Path Vars #
|
||||
####################
|
||||
|
|
@ -198,7 +204,8 @@ ratings = "true"
|
|||
# ampache to search if you want to disable one of the search
|
||||
# method simply comment it out valid values are
|
||||
# POSSIBLE VALUES: id3 folder amazon
|
||||
# DEFAULT: id3,folder,amazon
|
||||
# DEFAULT: db,id3,folder,amazon
|
||||
album_art_order = "db"
|
||||
album_art_order = "id3"
|
||||
album_art_order = "folder"
|
||||
album_art_order = "amazon"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,12 @@
|
|||
|
||||
--------------------------------------------------------------------------
|
||||
v.3.3.3
|
||||
- Fixed a redirect to a blank page if you hit play selected when
|
||||
nothing was selected (Thx Chenb)
|
||||
- Added detection of old config files, message displayed to admins
|
||||
upon login
|
||||
- Fixed an issue with WMP11 and Lock Songs that prevented playback
|
||||
due to the way Now Playing was being calculated
|
||||
- Fixed comment searching, broken when split out into its own
|
||||
table
|
||||
- Fixed a issue with Catalog builds in Windows
|
||||
|
|
@ -23,7 +29,7 @@
|
|||
- Improved performance of Amazon album art search by reducing the
|
||||
queries made on gather album art
|
||||
- Fixed an issue with all numeric usernames
|
||||
- Fixed some minor catalog cleaning issues that could arrise due
|
||||
- Fixed some minor catalog cleaning issues that could arise due
|
||||
to the order of the clean functions
|
||||
- Added missing functions to the HttpQ controller, should now have
|
||||
all capabilities that MPD has.
|
||||
|
|
@ -91,7 +97,7 @@
|
|||
- Improved Sidebar CSS making it more compliant with different
|
||||
browsers (Thx Spocky)
|
||||
- Fixed some logic errors in the Transcoding logic and play logic
|
||||
- Rewrote Album Art collection to correct some seriou logic flaws
|
||||
- Rewrote Album Art collection to correct some serious logic flaws
|
||||
- Added potential fix for FastCGI installations
|
||||
- Updated Snoopy to 1.2.3 (from manually patched 1.2.1)
|
||||
- Fixed sorting of Themes, now sorted by Alpha of theme name
|
||||
|
|
@ -126,7 +132,7 @@
|
|||
|
||||
--------------------------------------------------------------------------
|
||||
v.3.3.3-Beta1 12/18/2006
|
||||
- Moved Comment information to seperate table and added lyrics
|
||||
- Moved Comment information to separate table and added lyrics
|
||||
row, no support for lyrics yet though.
|
||||
- Removed Upload functionality (broken, and time better spent on
|
||||
other features)
|
||||
|
|
@ -135,7 +141,7 @@
|
|||
stored in plain text.
|
||||
- Fixed an issue with Admin -> Streaming -> Localplay Level
|
||||
not correctly displaying the current setting
|
||||
- Integrated LastFM plugin per user requests.
|
||||
- Integrated LastFM plug-in per user requests.
|
||||
- Added /bin/delete_disabled.php.inc to delete any disabled
|
||||
songs in your DB, defaults to Debug only mode
|
||||
- Fixed display issue with players that ignore EXTINF in m3us
|
||||
|
|
@ -143,18 +149,18 @@
|
|||
- Added Refreshing to the Recently Played menu at the same time
|
||||
it refresh the now playing on the index page
|
||||
- Fixed a cataloging issue that was using a round about way of
|
||||
checking to make sure the song wasn't flaged.
|
||||
checking to make sure the song wasn't flagged.
|
||||
- A ton of CSS cleanup (Thx apex)
|
||||
- Fixed an issue with multi-value config options on test.php
|
||||
- Changed default site_charset to UTF-8 in ampache.cfg.php.dist
|
||||
- Fixed some <? in show_test.inc (Thx apex)
|
||||
- Added Plugin Interface under Admin --> Modules
|
||||
- Added Plug-in Interface under Admin --> Modules
|
||||
- Fixed play type switcher so it shows all possible play methods
|
||||
- Tweaked home page a little, remove pop songs and recent artists
|
||||
- Added Recently Played to Main Page
|
||||
- Fixed an issue on Browse by Albums and sorting by Artist after
|
||||
sorting by something else
|
||||
- Added initial Tag writting script (Thx Jirwin)
|
||||
- Added initial Tag writing script (Thx Jirwin)
|
||||
- Updated flag class to make it easier to create a tag writer
|
||||
- Fixed some potential issues with sort_files.php.inc
|
||||
- Added the ability to Upload a M3u and have it attempt to build
|
||||
|
|
@ -184,7 +190,7 @@
|
|||
- Added Export to Itunes DB function (Thx PB1DFT)
|
||||
- Fixed Show All of Song Titles not having any data
|
||||
- Fixed override of local_length to 9000 regardless of config file
|
||||
- Tweaked Remeber Me Checkbox to be disabled if remember_length
|
||||
- Tweaked Remember Me Checkbox to be disabled if remember_length
|
||||
is <= local_length
|
||||
- Fixed issues with date not being set on insert of stats
|
||||
- Fixed style issue on Single Album view when ratings are off
|
||||
|
|
@ -270,7 +276,7 @@
|
|||
while
|
||||
- Fixed some Install issues with incorrectly named templates
|
||||
- Added check for MySQL support to first install page, redirects
|
||||
to /test.php if mysql support is non-existant
|
||||
to /test.php if mysql support is non-existent
|
||||
- Added ability to turn Random/Repeat on and off in localplay
|
||||
and also improved localplay page a tiny bit.
|
||||
- Fixed a problem with pagination on the admin/users.php page
|
||||
|
|
@ -345,7 +351,7 @@
|
|||
- Improved MPD class to use PHP 4.3+ socket timeout settings so
|
||||
that if your MPD server goes down while in MPD mode it
|
||||
doesn't hard-lock ampache.
|
||||
- Supressed deprecated var warnings in PHP5
|
||||
- Suppressed deprecated var warnings in PHP5
|
||||
- Fixed link to playlist import
|
||||
- Fixed playlist add on every catalog add (I'm not kidding this
|
||||
time... really..)
|
||||
|
|
@ -371,10 +377,10 @@
|
|||
- Added Localplay API, check the wiki for more information
|
||||
https://ampache.bountysource.com/wiki/Localplay
|
||||
- Added Download to Random play along with Size limitation
|
||||
usefull for downloading a set amount of music for your
|
||||
useful for downloading a set amount of music for your
|
||||
mp3 player.
|
||||
- Fixed mime detection, wasn't strtolowering the value
|
||||
- Fixed a few more Charset issues specificaly with Russian
|
||||
- Fixed a few more Charset issues specifically with Russian
|
||||
(Thx Nikk)
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
|
@ -405,7 +411,7 @@
|
|||
- Fixed a problem with browsing genres that would incorrectly put
|
||||
'Browse' in the Showing Genres Starting With: box
|
||||
- Fixed some unescaped ID's in class constructors.
|
||||
- Added debug_level config option to allow fine tunning of logging
|
||||
- Added debug_level config option to allow fine tuning of logging
|
||||
- Fixed catalog functions hopefully increasing speed and removing a bug
|
||||
with fast search
|
||||
- Fixed cookie code to account for violation of RFC's by IIS 5 where
|
||||
|
|
@ -442,9 +448,9 @@
|
|||
- Added new Session Handling code called vauth (Vollmer's Auth)
|
||||
- Moved xml-rpc server file to /server/xmlrpc.server.php keeping
|
||||
with the location of the ajax server mojo.. This will
|
||||
break compatiblity with previous versions, sorry!
|
||||
break compatibility with previous versions, sorry!
|
||||
- Added ability to search from non-us amazon webservices website
|
||||
and retrive more then one page (Thx nhorloc)
|
||||
and retrieve more then one page (Thx nhorloc)
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
v.3.3.2-Beta1 01/08/2006
|
||||
|
|
@ -455,7 +461,7 @@
|
|||
- Fixed some minor theme issues with the built in themes
|
||||
- Fixed some RSS problems, and linked it on header (Thx pb1dft)
|
||||
- Fixed bug where you couldn't delete admin users because of an
|
||||
overzelous permission check
|
||||
overzealous permission check
|
||||
- Fixed Search Album art page so it correctly shows results
|
||||
(Thx nhorlock)
|
||||
- Fixed stylesheet so all old Themes work again (Thx Sigger)
|
||||
|
|
@ -817,7 +823,7 @@
|
|||
- Fixed problem with user create and user edit where it wasn't doing
|
||||
any really good error checking, or notifying you when it
|
||||
failed to update/create
|
||||
- Tweaked now playing in an attempt to allivate some now playing
|
||||
- Tweaked now playing in an attempt to correct some now playing
|
||||
floods that people were seeing
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -163,7 +163,6 @@ class Song {
|
|||
$this->type = strtolower($results['1']);
|
||||
}
|
||||
|
||||
|
||||
switch ($this->type) {
|
||||
case 'spx':
|
||||
case 'ogg':
|
||||
|
|
@ -201,7 +200,9 @@ class Song {
|
|||
break;
|
||||
}
|
||||
|
||||
} // get_type
|
||||
return true;
|
||||
|
||||
} // format_type
|
||||
|
||||
/*!
|
||||
@function get_album_songs
|
||||
|
|
@ -817,10 +818,10 @@ class Song {
|
|||
}
|
||||
|
||||
/* Account for retarded players */
|
||||
if ($song->type == 'flac') { $type = 'ogg'; }
|
||||
if ($this->type == 'flac') { $type = 'ogg'; }
|
||||
|
||||
$this->format();
|
||||
$song_name = rawurlencode($this->f_artist_full . " - " . $this->title . "." . $this->type);
|
||||
$song_name = rawurlencode($this->f_artist_full . " - " . $this->title . "." . $type);
|
||||
|
||||
$web_path = conf('web_path');
|
||||
|
||||
|
|
@ -856,7 +857,7 @@ class Song {
|
|||
if (conf($conf_var)) {
|
||||
$this->_transcode = true;
|
||||
$this->format_type(conf($conf_type));
|
||||
debug_event('auto_transcode','Transcoding to ' . conf($conf_type),'5');
|
||||
debug_event('auto_transcode','Transcoding to ' . $this->type,'5');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,8 @@ if (!$results = read_config($configfile,0)) {
|
|||
}
|
||||
|
||||
/** This is the version.... fluf nothing more... **/
|
||||
$results['version'] = '3.3.3 Build (003)';
|
||||
$results['version'] = '3.3.3 Build (004)';
|
||||
$results['int_config_version'] = '1';
|
||||
|
||||
$results['raw_web_path'] = $results['web_path'];
|
||||
$results['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
|
||||
|
|
|
|||
|
|
@ -85,12 +85,12 @@ function insert_now_playing($song_id,$uid,$song_length) {
|
|||
if (stristr($user_agent,"Windows-Media-Player")) { return false; }
|
||||
|
||||
/* Check for Windows Media Player 11 */
|
||||
if (strstr($user_agent,"WMFSDK/11")) { return false; }
|
||||
if (strstr($user_agent,'NSPlayer/11') AND !strstr($user_agent,'WMFSDK/11')) { return false; }
|
||||
|
||||
/* Set the Expire Time */
|
||||
|
||||
// If they are using Windows media player
|
||||
if (stristr($user_agent,"NSPlayer") || $_REQUEST['flash_hack'] == 1) {
|
||||
if (strstr($user_agent,"NSPlayer") || $_REQUEST['flash_hack'] == 1) {
|
||||
// WMP does keep the session open so we need to cheat a little here
|
||||
$session_id = sql_escape($_REQUEST['sid']);
|
||||
}
|
||||
|
|
|
|||
2
song.php
2
song.php
|
|
@ -37,6 +37,8 @@ $method = scrub_in($_REQUEST['method']);
|
|||
|
||||
switch ($action) {
|
||||
case 'play_selected':
|
||||
// Make sure they actually passed soemthing
|
||||
if (!count($_POST['song'])) { header("Location:" . return_referer()); exit; }
|
||||
$type = scrub_in($_REQUEST['type']);
|
||||
if ($type == 'album') {
|
||||
$song_ids = get_songs_from_type($type, $_POST['song'], $_REQUEST['artist_id']);
|
||||
|
|
|
|||
|
|
@ -69,3 +69,9 @@ if (conf('use_rss')) { ?>
|
|||
<div id="content">
|
||||
<!-- I hate IE... -->
|
||||
<table class="smeg-ie"><tr><td>
|
||||
<?php if (conf('int_config_version') != conf('config_version') AND $GLOBALS['user']->has_access(100)) { ?>
|
||||
<div class="fatalerror">
|
||||
<?php echo _('Error Config File Out of Date'); ?>
|
||||
<a href="<?php conf('web_path'); ?>/admin/system.php?action=generate_config"><?php echo _('Generate New Config'); ?></a>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue