From 5f3caeda01c6267d583b9243dc10cfbcf4af64ae Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Tue, 4 Sep 2007 04:55:54 +0000
Subject: fixed an install bug, and bumped version for release

---
 docs/CHANGELOG  | 5 ++++-
 lib/init.php    | 2 +-
 lib/install.php | 6 +++---
 play/index.php  | 1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 9060e41f..b137de6f 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,7 +3,10 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
-  v.3.4-Alpha2 
+  v.3.4-Alpha2 09/03/2007
+	- Fixed a problem where it'd let you go through the install after
+		ampache had already been installed due to a change in the
+		config variable names
 	- Added ability to delete songs from a saved playlist
 	- Added ability to create a new playlist based on active playlist
 	- Fixed the Playlist Method 'Send on Add' so that it works, the
diff --git a/lib/init.php b/lib/init.php
index 7e4c07c4..e644924f 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -71,7 +71,7 @@ if (!count($results)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.4-Alpha2 Build (003)';
+$results['version']		= '3.4-Alpha2';
 $results['int_config_version']	= '5'; 
 
 $results['raw_web_path']	= $results['web_path'];
diff --git a/lib/install.php b/lib/install.php
index 779f9564..a5f7032b 100644
--- a/lib/install.php
+++ b/lib/install.php
@@ -74,12 +74,12 @@ function install_check_status($configfile) {
 	  Check and see if they've got _any_ account
 	  if they don't then they're cool
 	*/
-	$results = parse_ini_file($GLOBALS['configfile']);
+	$results = parse_ini_file($configfile);
 	$dbh = check_database($results['database_hostname'],$results['database_username'],$results['database_password']);	
 
 	if (is_resource($dbh)) { 
-		
-		$sql = "SELECT * FROM user";
+		@mysql_select_db($results['database_name'],$dbh);
+		$sql = "SELECT * FROM `user`";
 		$db_results = @mysql_query($sql, $dbh);
 		if (!@mysql_num_rows($db_results)) { 
 			return true;
diff --git a/play/index.php b/play/index.php
index 497be35a..5ce996dd 100644
--- a/play/index.php
+++ b/play/index.php
@@ -30,7 +30,6 @@ require_once '../lib/init.php';
 require_once Config::get('prefix') . '/modules/horde/Browser.php';
 ob_end_clean(); 
 
-
 /* These parameters had better come in on the url. */
 $uid 		= scrub_in($_REQUEST['uid']);
 $song_id 	= scrub_in($_REQUEST['song']);
-- 
cgit