diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-20 07:28:52 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-20 07:28:52 +0000 |
commit | a3a19ed1ff4c14297a9418c6462bf7e1f373ab56 (patch) | |
tree | 190b4489a3c21272f74e04b5975c7eeb1423233b /install.php | |
parent | 7a0fcdd836d491c288b94383ebc54de2271bb237 (diff) | |
download | ampache-a3a19ed1ff4c14297a9418c6462bf7e1f373ab56.tar.gz ampache-a3a19ed1ff4c14297a9418c6462bf7e1f373ab56.tar.bz2 ampache-a3a19ed1ff4c14297a9418c6462bf7e1f373ab56.zip |
fixed installer so that it works with new auth
Diffstat (limited to 'install.php')
-rw-r--r-- | install.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/install.php b/install.php index 783f2c18..fab6e5a2 100644 --- a/install.php +++ b/install.php @@ -32,16 +32,14 @@ require_once('lib/debug.php'); require_once('lib/class/user.class.php'); require_once('lib/class/error.class.php'); -// Libglue Requires -require_once('modules/libglue/auth.php'); -require_once('modules/libglue/session.php'); -require_once('modules/libglue/dbh.php'); - +require_once('modules/vauth/dbh.lib.php'); +require_once('modules/vauth/init.php'); if ($_SERVER['HTTPS'] == 'on') { $http_type = "https://"; } else { $http_type = "http://"; } + $prefix = dirname(__FILE__); $configfile = "$prefix/config/ampache.cfg.php"; @@ -100,10 +98,16 @@ switch ($action) { break; } $results = read_config($configfile, 0, 0); + + $results['mysql_hostname'] = $results['local_host']; + $results['mysql_username'] = $results['local_username']; + $results['mysql_password'] = $results['local_pass']; + $results['mysql_db'] = $results['local_db']; + if ($_SERVER['HTTPS'] == 'on') { $http_type = "https://"; } else { $http_type = "http://"; } - - libglue_param($results['libglue']); + + vauth_conf($results); /* Setup Preferences */ $temp_user = new User($username); $temp_user->fix_preferences(); @@ -112,7 +116,7 @@ switch ($action) { $temp_user->fix_preferences(); - $web_path = $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path']; + $web_path = $http_type . $_SERVER['HTTP_HOST'] . $results['web_path']; header ("Location: " . $web_path . "/login.php"); |