diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-31 07:50:45 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-31 07:50:45 +0000 |
| commit | fe4774127f292ce94ab79771bc72cbb7ca4db371 (patch) | |
| tree | d8cba0fe9520260c86f8a7cbe9b06bc077780ce8 /modules | |
| parent | 9e5afd340f0fd74c0da852be1f24cfe5285e38e8 (diff) | |
| download | ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.tar.gz ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.tar.bz2 ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.zip | |
fixed a mistake on the ratings, added it to artist and fixed location detection
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/init.php | 9 | ||||
| -rw-r--r-- | modules/libglue/dbh.php | 2 | ||||
| -rw-r--r-- | modules/libglue/session.php | 7 |
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/init.php b/modules/init.php index 66927a5a..fa57c29e 100644 --- a/modules/init.php +++ b/modules/init.php @@ -37,7 +37,6 @@ $prefix = realpath($ampache_path . "/../"); $configfile = "$prefix/config/ampache.cfg.php"; require_once($prefix . "/lib/general.lib.php"); - /*********************STOP EDITING*********************************/ /* @@ -82,6 +81,7 @@ if (!$results['conf']['allow_stream_playback']) { $results['conf']['allow_stream_playback'] = "true"; } +$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-Beta1 (Build 001)'; $results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx'; @@ -208,15 +208,16 @@ 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"); + +/* Set a new Error Handler */ +$old_error_handler = set_error_handler("ampache_error_handler"); + /* Some Libglue Hacks */ $array['dbh_name'] = 'stupid_pos'; $array['stupid_pos'] = check_sess_db('local'); libglue_param($array); /* End Libglue Hacks */ -/* Set a new Error Handler */ -$old_error_handler = set_error_handler("ampache_error_handler"); - /* Check their PHP Vars to make sure we're cool here */ diff --git a/modules/libglue/dbh.php b/modules/libglue/dbh.php index ca00d0a1..92824efc 100644 --- a/modules/libglue/dbh.php +++ b/modules/libglue/dbh.php @@ -27,7 +27,7 @@ function setup_sess_db($name, $host, $db, $username, $password) { - $dbh = @mysql_connect($host, $username, $password) or header("Location:" . conf('web_path') . "/test.php"); + $dbh = mysql_connect($host, $username, $password) or header("Location:" . conf('web_path') . "/test.php"); if ( !is_resource($dbh) ) { echo "Unable to connect to \"". $host ."\" in order to \n" . diff --git a/modules/libglue/session.php b/modules/libglue/session.php index b0534844..9aa7c70b 100644 --- a/modules/libglue/session.php +++ b/modules/libglue/session.php @@ -14,10 +14,9 @@ */ -function check_sess_db($dbtype = 'local') -{ - if($dbtype === 'sso') - { +function check_sess_db($dbtype = 'local') { + + if($dbtype === 'sso') { $dbh = libglue_param(libglue_param('sso_dbh_name')); if(is_resource($dbh)) return $dbh; $dbh_name = libglue_param('sso_dbh_name'); |