summaryrefslogtreecommitdiffstats
path: root/modules/init.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-01-15 06:27:55 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-01-15 06:27:55 +0000
commit2d5ed879bd17024154e87de22c811bbfd0e69433 (patch)
treefbc39798312d1799510cc5ef0f103ebb554e3776 /modules/init.php
parente3e529394d526608e3ebeadb69234120f0f300ed (diff)
downloadampache-2d5ed879bd17024154e87de22c811bbfd0e69433.tar.gz
ampache-2d5ed879bd17024154e87de22c811bbfd0e69433.tar.bz2
ampache-2d5ed879bd17024154e87de22c811bbfd0e69433.zip
more flagging fixes, you can flag files now you just cant do anything about it
Diffstat (limited to 'modules/init.php')
-rw-r--r--modules/init.php35
1 files changed, 16 insertions, 19 deletions
diff --git a/modules/init.php b/modules/init.php
index 22ca81b6..27144e27 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -83,7 +83,7 @@ if (!$results['conf']['allow_stream_playback']) {
$results['conf']['raw_web_path'] = $results['conf']['web_path'];
$results['conf']['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
-$results['conf']['version'] = '3.3.2-Beta2 (Build 002)';
+$results['conf']['version'] = '3.3.2-Beta2 (Build 003)';
$results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx|ra';
$results['conf']['http_port'] = $_SERVER['SERVER_PORT'];
if (!$results['conf']['prefix']) {
@@ -164,15 +164,11 @@ require_once(conf('prefix') . "/lib/xmlrpc.php");
require_once(conf('prefix') . "/modules/xmlrpc/xmlrpc.inc");
if (conf('allow_slim_playback')) {
- require_once(conf('prefix') . "/modules/slimserver/slim.class.php");
+ require_once(conf('prefix') . '/modules/slimserver/slim.class.php');
}
if (conf('allow_mpd_playback')) {
- require_once(conf('prefix') . "/modules/mpd/mpd.class.php");
-}
-
-if (conf('allow_xmms2_playback')) {
- require_once(conf('prefix') . "/modules/xmms2/xmms2.class.php");
+ require_once(conf('prefix') . '/modules/mpd/mpd.class.php');
}
if (conf('ratings')) {
@@ -181,18 +177,19 @@ if (conf('ratings')) {
}
// Classes
-require_once(conf('prefix') . "/lib/class/catalog.class.php");
-require_once(conf('prefix') . "/lib/class/stream.class.php");
-require_once(conf('prefix') . "/lib/class/playlist.class.php");
-require_once(conf('prefix') . "/lib/class/song.class.php");
-require_once(conf('prefix') . "/lib/class/view.class.php");
-require_once(conf('prefix') . "/lib/class/update.class.php");
-require_once(conf('prefix') . "/lib/class/user.class.php");
-require_once(conf('prefix') . "/lib/class/album.class.php");
-require_once(conf('prefix') . "/lib/class/artist.class.php");
-require_once(conf('prefix') . "/lib/class/access.class.php");
-require_once(conf('prefix') . "/lib/class/error.class.php");
-require_once(conf('prefix') . "/lib/class/genre.class.php");
+require_once(conf('prefix') . '/lib/class/catalog.class.php');
+require_once(conf('prefix') . '/lib/class/stream.class.php');
+require_once(conf('prefix') . '/lib/class/playlist.class.php');
+require_once(conf('prefix') . '/lib/class/song.class.php');
+require_once(conf('prefix') . '/lib/class/view.class.php');
+require_once(conf('prefix') . '/lib/class/update.class.php');
+require_once(conf('prefix') . '/lib/class/user.class.php');
+require_once(conf('prefix') . '/lib/class/album.class.php');
+require_once(conf('prefix') . '/lib/class/artist.class.php');
+require_once(conf('prefix') . '/lib/class/access.class.php');
+require_once(conf('prefix') . '/lib/class/error.class.php');
+require_once(conf('prefix') . '/lib/class/genre.class.php');
+require_once(conf('prefix') . '/lib/class/flag.class.php');
/* Set a new Error Handler */
$old_error_handler = set_error_handler("ampache_error_handler");