fixed up install script and updated sql file

8 files changed, 146 insertions, 55 deletions

diff --git a/albumart.php b/albumart.php
index d7cfbfd4..fd7c7f41 100644
--- a/albumart.php
+++ b/albumart.php
@@ -29,21 +29,6 @@ and dumps it to the browser as an image mime type.
 
 require('modules/init.php');
 
-$album = new Album($_REQUEST['id']);
-
-// Check db first
-$r = $album->get_art($_REQUEST['fast']);
-
-if (isset($r->art)) {
-    $art = $r->art;
-    $mime = $r->art_mime;
-    $found = 1;
-}
-else { 
-	header('Content-type: image/gif');
-	readfile(conf('prefix') . conf('theme_path') . "/images/blankalbum.gif");
-} // else no image
-
 /* Decide what size this image is */
 switch ($_REQUEST['thumb']) { 
 	case '1':
@@ -65,6 +50,21 @@ switch ($_REQUEST['type']) {
 		show_template('show_big_art');
 	break;
 	default: 
+		$album = new Album($_REQUEST['id']);
+
+		// Check db first
+		$r = $album->get_art($_REQUEST['fast']);
+
+		if (isset($r->art)) {
+		    $art = $r->art;
+		    $mime = $r->art_mime;
+		}
+		else { 
+			header('Content-type: image/gif');
+			readfile(conf('prefix') . conf('theme_path') . "/images/blankalbum.gif");
+			break;
+		} // else no image
+
 		// Print the album art
 		$extension = substr($mime,strlen($mime)-3,3);
 		header("Content-type: $mime");
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index a866f5c5..da0bbc49 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,9 @@
 
 --------------------------------------------------------------------------
   v.3.3.2-Beta1
+  	- Updated SQL file
+	- Fixed Install script so it throws errors and is now able to
+		if specified create the database user for you
   	- Added Popup Album Art (Thx Di-Fosfor)
   	- Fixed Typo in Amazon Search debug statement
   	- Added sort_files.php.inc to /bin 
diff --git a/install.php b/install.php
index f0f6bf53..7832509d 100644
--- a/install.php
+++ b/install.php
@@ -30,6 +30,7 @@ require_once('lib/install.php');
 require_once('modules/lib.php');
 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');
@@ -63,6 +64,8 @@ $username = scrub_in($_REQUEST['local_username']);
 $password = scrub_in($_REQUEST['local_pass']);
 $hostname = scrub_in($_REQUEST['local_host']);
 $database = scrub_in($_REQUEST['local_db']);
+$php_self = preg_replace("/^\/(.+\.php)\/?.*/","$1",$_SERVER['PHP_SELF']);
+$error	  = new Error();
 
 /* Catch the Current Action */
 switch ($action) { 
@@ -73,7 +76,7 @@ switch ($action) {
 			break;
 		}
 		
-		header ("Location: " . $_SERVER['PHP_SELF'] . "?action=show_create_config&local_db=$database&local_host=$hostname");
+		header ("Location: " . $php_self . "?action=show_create_config&local_db=$database&local_host=$hostname");
 		
 		break;
 	case 'create_config':
diff --git a/lib/install.php b/lib/install.php
index 4e6edc1c..e0a4492a 100644
--- a/lib/install.php
+++ b/lib/install.php
@@ -110,17 +110,28 @@ function install_insert_db($username,$password,$hostname,$database) {
 	/* Attempt to make DB connection */
 	$dbh = @mysql_pconnect($hostname,$username,$password);
 	
-
 	/* Check/Create Database as needed */
 	$db_selected = @mysql_select_db($database, $dbh);
 	if (!$db_selected) { 
 		$sql = "CREATE DATABASE `" . $database . "`";
 		if (!$db_results = @mysql_query($sql, $dbh)) { 
+			$GLOBALS['error']->add_error('general',"Error: Unable to Create Database " . mysql_error());
 			return false;
 		}
 		@mysql_select_db($database, $dbh);
 	} // if db can't be selected
-		
+	/* Check and see if we should create a user here */
+	if ($_REQUEST['db_user'] == 'create_db_user') { 
+		$db_user = scrub_in($_REQUEST['db_username']);
+		$db_pass = scrub_in($_REQUEST['db_password']);
+		$sql = "GRANT ALL PRIVILEGES ON " . sql_escape($database,$dbh) . ".* TO " .
+			"'" . sql_escape($db_user,$dbh) . "'@'" . sql_escape($hostname,$dbh) . "' IDENTIFIED BY '" . sql_escape($db_pass,$dbh) . "' WITH GRANT OPTION";	
+
+		if (!$db_results = @mysql_query($sql, $dbh)) { 
+			$GLOBALS['error']->add_error('general',"Error: Unable to Insert $db_user with permissions to $database on $hostname " . mysql_error());
+			return false;
+		}
+	} // end if we are creating a user
 
 	/* Attempt to insert database */
          $query = fread(fopen("sql/ampache.sql", "r"), filesize("sql/ampache.sql"));
@@ -154,9 +165,11 @@ function install_create_config($web_path,$username,$password,$hostname,$database
 	*/
 	// Connect to the DB
 	if(!$dbh = @mysql_pconnect($hostname,$username,$password)) { 
+		$GLOBALS['error']->add_error('general',"Database Connection Failed Check Hostname, Username and Password");
 		return false;
 	}
 	if (!$db_selected = @mysql_select_db($database, $dbh)) { 
+		$GLOBALS['error']->add_error('general',"Database Selection Failure Check Existance of $database");
 		return false;
 	}
 
@@ -197,12 +210,12 @@ function install_create_config($web_path,$username,$password,$hostname,$database
 	if (!$config_handle = @fopen("config/ampache.cfg.php",'w')) { 
 		$browser = new Browser();
 		$browser->downloadHeaders("ampache.cfg.php","text/plain",false,filesize("config/ampache.cfg.php.dist"));
-
 		echo $config_data;
 		exit();
 		
 	}
 	if (!@fwrite($config_handle,$config_data)) {
+		$GLOBALS['error']->add_error('general',"Error: Unable to write Config File but file writeable?");
 		return false;
 	}
 
@@ -229,7 +242,10 @@ function install_create_account($username,$password) {
 	
 	$insert_id = mysql_insert_id($dbh);
 	
-	if (!$insert_id) { return false; }
+	if (!$insert_id) { 
+		$GLOBALS['error']->add_error('general',"Insert of Base User Failed, Check test.php");
+		return false; 
+	}
 
 	return true;
 		
diff --git a/sql/ampache.sql b/sql/ampache.sql
index 70da30cc..efcd6e8e 100755
--- a/sql/ampache.sql
+++ b/sql/ampache.sql
@@ -19,6 +19,8 @@ CREATE TABLE `access_list` (
   `start` int(11) unsigned NOT NULL default '0',
   `end` int(11) unsigned NOT NULL default '0',
   `level` smallint(3) unsigned NOT NULL default '5',
+  `user` varchar(128) default NULL,
+  `key` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   KEY `ip` (`start`)
 ) TYPE=MyISAM;
@@ -96,8 +98,7 @@ CREATE TABLE `catalog` (
   `catalog_type` enum('local','remote') NOT NULL default 'local',
   `last_update` int(11) unsigned NOT NULL default '0',
   `last_add` int(11) unsigned NOT NULL default '0',
-  `enabled` enum('true','false') NOT NULL default 'true',
-  `private` int(1) unsigned NOT NULL default '0',
+  `enabled` tinyint(1) unsigned NOT NULL default '1',
   `id3_set_command` varchar(255) NOT NULL default '/usr/bin/id3v2 -a "%a" -A "%A" -t "%t" -g %g -y %y -T %T -c "%c" "%filename"',
   `rename_pattern` varchar(255) NOT NULL default '%a - %T - %t.mp3',
   `sort_pattern` varchar(255) NOT NULL default '%C/%a/%A',
@@ -123,10 +124,10 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `flagged`;
 CREATE TABLE `flagged` (
   `id` int(11) NOT NULL auto_increment,
-  `user` int(10) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `type` enum('badmp3','badid3','newid3','setid3','del','sort','ren','notify','done') NOT NULL default 'badid3',
   `song` int(11) unsigned NOT NULL default '0',
-  `date` int(10) unsigned NOT NULL default '0',
+  `date` int(11) unsigned NOT NULL default '0',
   `comment` text,
   UNIQUE KEY `id` (`id`),
   UNIQUE KEY `song` (`song`),
@@ -150,7 +151,7 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `flagged_song`;
 CREATE TABLE `flagged_song` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `song` int(10) unsigned NOT NULL default '0',
+  `song` int(11) unsigned NOT NULL default '0',
   `file` varchar(255) NOT NULL default '',
   `catalog` int(11) unsigned NOT NULL default '0',
   `album` int(11) unsigned NOT NULL default '0',
@@ -166,9 +167,9 @@ CREATE TABLE `flagged_song` (
   `size` mediumint(4) unsigned NOT NULL default '0',
   `time` mediumint(5) NOT NULL default '0',
   `track` int(11) unsigned default NULL,
-  `genre` int(10) default NULL,
-  `played` enum('true','false') NOT NULL default 'false',
-  `enabled` enum('true','false') NOT NULL default 'true',
+  `genre` int(11) unsigned default NULL,
+  `played` tinyint(1) unsigned NOT NULL default '0',
+  `enabled` tinyint(1) unsigned NOT NULL default '1',
   `update_time` int(11) unsigned default '0',
   `addition_time` int(11) unsigned default '0',
   PRIMARY KEY  (`id`),
@@ -203,7 +204,7 @@ CREATE TABLE `flagged_types` (
   `id` int(11) NOT NULL auto_increment,
   `type` varchar(32) NOT NULL default '',
   `value` varchar(128) NOT NULL default '',
-  `access` enum('user','admin') NOT NULL default 'user',
+  `access` smallint(3) unsigned NOT NULL default '25',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
@@ -214,7 +215,7 @@ CREATE TABLE `flagged_types` (
 
 /*!40000 ALTER TABLE `flagged_types` DISABLE KEYS */;
 LOCK TABLES `flagged_types` WRITE;
-INSERT INTO `flagged_types` VALUES (1,'badmp3','Corrupt or low-quality mp3','user'),(2,'badid3','Incomplete or incorrect song information','user'),(3,'newid3','Updated id3 information is available','admin'),(4,'del','Remove this file','admin'),(5,'sort','Put this file in a directory matching the conventions of its catalog','admin'),(6,'ren','Rename this file from id3 info','admin'),(7,'notify','Notify the user who flagged this song that it has been updated.','admin'),(8,'done','Take no action on this song.','admin'),(9,'setid3','Schedule file for id3 update','admin'),(10,'disabled','Disabled this song','admin');
+INSERT INTO `flagged_types` VALUES (1,'badmp3','Corrupt or low-quality mp3',25),(2,'badid3','Incomplete or incorrect song information',25),(3,'newid3','Updated id3 information is available',100),(4,'del','Remove this file',100),(5,'sort','Put this file in a directory matching the conventions of its catalog',100),(6,'ren','Rename this file from id3 info',100),(7,'notify','Notify the user who flagged this song that it has been updated.',100),(8,'done','Take no action on this song.',100),(9,'setid3','Schedule file for id3 update',100),(10,'disabled','Disabled this song',100);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `flagged_types` ENABLE KEYS */;
 
@@ -240,6 +241,30 @@ UNLOCK TABLES;
 /*!40000 ALTER TABLE `genre` ENABLE KEYS */;
 
 --
+-- Table structure for table `ip_history`
+--
+
+DROP TABLE IF EXISTS `ip_history`;
+CREATE TABLE `ip_history` (
+  `username` varchar(128) default NULL,
+  `ip` int(11) unsigned NOT NULL default '0',
+  `connections` int(11) unsigned NOT NULL default '1',
+  `date` int(11) unsigned NOT NULL default '0',
+  KEY `username` (`username`),
+  KEY `date` (`date`)
+) TYPE=MyISAM;
+
+--
+-- Dumping data for table `ip_history`
+--
+
+
+/*!40000 ALTER TABLE `ip_history` DISABLE KEYS */;
+LOCK TABLES `ip_history` WRITE;
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `ip_history` ENABLE KEYS */;
+
+--
 -- Table structure for table `now_playing`
 --
 
@@ -247,8 +272,9 @@ DROP TABLE IF EXISTS `now_playing`;
 CREATE TABLE `now_playing` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `song_id` int(11) unsigned NOT NULL default '0',
-  `user_id` int(11) unsigned default NULL,
+  `user` varchar(128) default NULL,
   `start_time` int(11) unsigned NOT NULL default '0',
+  `session` varchar(64) default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
@@ -269,7 +295,7 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `object_count`;
 CREATE TABLE `object_count` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `object_type` enum('album','artist','song','playlist') NOT NULL default 'song',
+  `object_type` enum('album','artist','song','playlist','genre','catalog') NOT NULL default 'song',
   `object_id` int(11) unsigned NOT NULL default '0',
   `date` int(11) unsigned NOT NULL default '0',
   `count` int(11) unsigned NOT NULL default '0',
@@ -297,9 +323,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `playlist`;
 CREATE TABLE `playlist` (
-  `id` int(10) unsigned NOT NULL auto_increment,
+  `id` int(11) unsigned NOT NULL auto_increment,
   `name` varchar(128) NOT NULL default '',
-  `owner` int(10) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `type` enum('private','public') NOT NULL default 'private',
   `date` timestamp NOT NULL,
   PRIMARY KEY  (`id`),
@@ -323,9 +349,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `playlist_data`;
 CREATE TABLE `playlist_data` (
+  `id` int(11) unsigned NOT NULL auto_increment,
   `playlist` int(11) unsigned NOT NULL default '0',
-  `song` int(11) unsigned NOT NULL default '0',
+  `song` int(11) unsigned default NULL,
+  `dyn_song` varchar(255) default NULL,
   `track` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
   KEY `playlist` (`playlist`)
 ) TYPE=MyISAM;
 
@@ -387,11 +416,36 @@ CREATE TABLE `preferences` (
 
 /*!40000 ALTER TABLE `preferences` DISABLE KEYS */;
 LOCK TABLES `preferences` WRITE;
-INSERT INTO `preferences` VALUES (1,'download','0','Allow Downloads',100,'user',0),(2,'upload','0','Allow Uploads',100,'user',0),(3,'quarantine','1','Quarantine All Uploads',100,'user',0),(4,'popular_threshold','10','Popular Threshold',25,'user',0),(5,'font','Verdana, Helvetica, sans-serif','Interface Font',25,'user',0),(6,'bg_color1','#ffffff','Background Color 1',25,'user',0),(7,'bg_color2','#000000','Background Color 2',25,'user',0),(8,'base_color1','#bbbbbb','Base Color 1',25,'user',0),(9,'base_color2','#dddddd','Base Color 2',25,'user',0),(10,'font_color1','#222222','Font Color 1',25,'user',0),(11,'font_color2','#000000','Font Color 2',25,'user',0),(12,'font_color3','#ffffff','Font Color 3',25,'user',0),(13,'row_color1','#cccccc','Row Color 1',25,'user',0),(14,'row_color2','#bbbbbb','Row Color 2',25,'user',0),(15,'row_color3','#dddddd','Row Color 3',25,'user',0),(16,'error_color','#990033','Error Color',25,'user',0),(17,'font_size','10','Font Size',25,'user',0),(18,'upload_dir','/tmp','Upload Directory',25,'user',0),(19,'sample_rate','32','Downsample Bitrate',25,'user',0),(20,'refresh_limit','0','Refresh Rate for Homepage',100,'system',0),(21,'local_length','900','Session Expire in Seconds',100,'system',0),(22,'site_title','For The Love of Music','Website Title',100,'system',0),(23,'lock_songs','0','Lock Songs',100,'system',1),(24,'force_http_play','1','Forces Http play regardless of port',100,'system',1),(25,'http_port','80','Non-Standard Http Port',100,'system',1),(26,'catalog_echo_count','100','Catalog Echo Interval',100,'system',0),(27,'album_cache_limit','25','Album Cache Limit',100,'system',0),(28,'artist_cache_limit','50','Artist Cache Limit',100,'system',0),(29,'play_type','stream','Type of Playback',25,'user',0),(30,'direct_link','1','Allow Direct Links',100,'user',0),(31,'lang','en_US','Language',100,'user',0),(32,'playlist_type','m3u','Playlist Type',100,'user',0),(33,'theme_name','classic','Theme',0,'user',0),(34,'ellipse_threshold_album','27','Album Ellipse Threshold',0,'user',0),(35,'ellipse_threshold_artist','27','Artist Ellipse Threshold',0,'user',0),(36,'ellipse_threshold_title','27','Title Ellipse Threshold',0,'user',0),(37,'display_menu','1','Show Bottom Menu',0,'user',0);
+INSERT INTO `preferences` VALUES (1,'download','0','Allow Downloads',100,'options',0),(2,'upload','0','Allow Uploads',100,'options',0),(3,'quarantine','1','Quarantine All Uploads',100,'options',0),(4,'popular_threshold','10','Popular Threshold',25,'interface',0),(5,'font','Verdana, Helvetica, sans-serif','Interface Font',25,'theme',0),(6,'bg_color1','#ffffff','Background Color 1',25,'theme',0),(7,'bg_color2','#000000','Background Color 2',25,'theme',0),(8,'base_color1','#bbbbbb','Base Color 1',25,'theme',0),(9,'base_color2','#dddddd','Base Color 2',25,'theme',0),(10,'font_color1','#222222','Font Color 1',25,'theme',0),(11,'font_color2','#000000','Font Color 2',25,'theme',0),(12,'font_color3','#ffffff','Font Color 3',25,'theme',0),(13,'row_color1','#cccccc','Row Color 1',25,'theme',0),(14,'row_color2','#bbbbbb','Row Color 2',25,'theme',0),(15,'row_color3','#dddddd','Row Color 3',25,'theme',0),(16,'error_color','#990033','Error Color',25,'theme',0),(17,'font_size','10','Font Size',25,'theme',0),(18,'upload_dir','/tmp','Upload Directory',25,'options',0),(19,'sample_rate','32','Downsample Bitrate',25,'streaming',0),(20,'refresh_limit','0','Refresh Rate for Homepage',100,'interface',0),(21,'local_length','900','Session Expire in Seconds',100,'system',0),(22,'site_title','For The Love of Music','Website Title',100,'system',0),(23,'lock_songs','0','Lock Songs',100,'system',1),(24,'force_http_play','1','Forces Http play regardless of port',100,'system',1),(25,'http_port','80','Non-Standard Http Port',100,'system',1),(26,'catalog_echo_count','100','Catalog Echo Interval',100,'system',0),(27,'album_cache_limit','25','Album Cache Limit',100,'system',0),(28,'artist_cache_limit','50','Artist Cache Limit',100,'system',0),(29,'play_type','stream','Type of Playback',25,'streaming',0),(30,'direct_link','1','Allow Direct Links',100,'options',0),(31,'lang','en_US','Language',100,'interface',0),(32,'playlist_type','m3u','Playlist Type',100,'streaming',0),(33,'theme_name','classic','Theme',0,'theme',0),(34,'ellipse_threshold_album','27','Album Ellipse Threshold',0,'interface',0),(35,'ellipse_threshold_artist','27','Artist Ellipse Threshold',0,'interface',0),(36,'ellipse_threshold_title','27','Title Ellipse Threshold',0,'interface',0),(38,'condPL','1','Condense Localplay Playlist',0,'interface',0),(39,'quarantine_dir','/tmp','Quarantine Directory',100,'system',0);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `preferences` ENABLE KEYS */;
 
 --
+-- Table structure for table `ratings`
+--
+
+DROP TABLE IF EXISTS `ratings`;
+CREATE TABLE `ratings` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `user` varchar(128) NOT NULL default '',
+  `object_type` enum('artist','album','song') NOT NULL default 'artist',
+  `object_id` int(11) unsigned NOT NULL default '0',
+  `user_rating` enum('00','0','1','2','3','4','5') NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `object_id` (`object_id`)
+) TYPE=MyISAM;
+
+--
+-- Dumping data for table `ratings`
+--
+
+
+/*!40000 ALTER TABLE `ratings` DISABLE KEYS */;
+LOCK TABLES `ratings` WRITE;
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `ratings` ENABLE KEYS */;
+
+--
 -- Table structure for table `session`
 --
 
@@ -401,7 +455,8 @@ CREATE TABLE `session` (
   `username` varchar(16) NOT NULL default '',
   `expire` int(11) unsigned NOT NULL default '0',
   `value` text NOT NULL,
-  `type` enum('sso','mysql','ldap') NOT NULL default 'mysql',
+  `ip` int(11) unsigned default NULL,
+  `type` enum('sso','mysql','ldap','http') NOT NULL default 'mysql',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
@@ -435,9 +490,9 @@ CREATE TABLE `song` (
   `size` int(11) unsigned NOT NULL default '0',
   `time` mediumint(5) NOT NULL default '0',
   `track` int(11) unsigned default NULL,
-  `genre` int(10) default NULL,
-  `played` enum('true','false') NOT NULL default 'false',
-  `status` enum('disabled','enabled') NOT NULL default 'enabled',
+  `genre` int(11) unsigned default NULL,
+  `played` tinyint(1) unsigned NOT NULL default '0',
+  `enabled` tinyint(1) unsigned NOT NULL default '1',
   `update_time` int(11) unsigned default '0',
   `addition_time` int(11) unsigned default '0',
   PRIMARY KEY  (`id`),
@@ -450,7 +505,7 @@ CREATE TABLE `song` (
   KEY `addition_time` (`addition_time`),
   KEY `catalog` (`catalog`),
   KEY `played` (`played`),
-  KEY `enabled` (`status`)
+  KEY `enabled` (`enabled`)
 ) TYPE=MyISAM;
 
 --
@@ -481,7 +536,7 @@ CREATE TABLE `update_info` (
 
 /*!40000 ALTER TABLE `update_info` DISABLE KEYS */;
 LOCK TABLES `update_info` WRITE;
-INSERT INTO `update_info` VALUES ('db_version','331003');
+INSERT INTO `update_info` VALUES ('db_version','332005');
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `update_info` ENABLE KEYS */;
 
@@ -492,10 +547,9 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `upload`;
 CREATE TABLE `upload` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `user` int(11) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `file` varchar(255) NOT NULL default '',
-  `comment` varchar(255) NOT NULL default '',
-  `action` enum('add','quarantine','delete') NOT NULL default 'quarantine',
+  `action` enum('add','delete','quarantine') NOT NULL default 'add',
   `addition_time` int(11) unsigned default '0',
   PRIMARY KEY  (`id`),
   KEY `action` (`action`),
@@ -518,7 +572,6 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `user`;
 CREATE TABLE `user` (
-  `id` int(11) unsigned NOT NULL auto_increment,
   `username` varchar(128) NOT NULL default '',
   `fullname` varchar(128) NOT NULL default '',
   `email` varchar(128) default NULL,
@@ -527,7 +580,6 @@ CREATE TABLE `user` (
   `disabled` tinyint(1) NOT NULL default '0',
   `offset_limit` int(5) unsigned NOT NULL default '50',
   `last_seen` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`)
 ) TYPE=MyISAM;
 
@@ -568,7 +620,7 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `user_preference`;
 CREATE TABLE `user_preference` (
-  `user` int(11) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `preference` int(11) unsigned NOT NULL default '0',
   `value` varchar(255) NOT NULL default '',
   KEY `user` (`user`),
diff --git a/templates/show_install.inc b/templates/show_install.inc
index 994cce73..8203af62 100644
--- a/templates/show_install.inc
+++ b/templates/show_install.inc
@@ -29,6 +29,7 @@
 <title>Ampache :: For The Love Of Music - Install</title>
 </head>
 <body>
+<script src="lib/general.js" language="javascript" type="text/javascript"></script>
 <?php require_once(conf('prefix') . "/templates/style.inc"); ?>
 <div class="text-box"> 
 <span class="header1"><?php echo _("Ampache Installation"); ?></span>
@@ -51,6 +52,7 @@
 <?php echo _("Step 3 - Setup Initial Account"); ?><br />
 <br /><br />
 <span class="header2">Insert Ampache Database</span>
+<?php echo $GLOBALS['error']->print_error('general'); ?>
 <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] .  $_SERVER['PHP_SELF'] . "?action=create_db"; ?>" enctype="multipart/form-data" >
 <table cellpadding="5" cellspacing="0" border="0">
 <tr>
@@ -70,6 +72,19 @@
 	<td><input type="password" name="local_pass" /></td>
 </tr>
 <tr>
+	<td><?php echo _("Create Database User for New Database"); ?>? </td>
+	<td>
+		<input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');">
+	</td>
+<tr>
+	<td><?php echo _("Ampache Database Username"); ?></td>
+	<td><input type="textbox" id="db_username" name="db_username" value="ampache" disabled="disabled" /></td>
+</tr>
+<tr>
+	<td><?php echo _("Ampache Database User Password"); ?></td>
+	<td><input type="password" id="db_password" name="db_password" value="" disabled="disabled" /></td>
+</tr>
+<tr>
 	<td>&nbsp;</td>
 	<td><input type="submit" value="<?php echo _("Insert Database"); ?>" /></td>
 </tr>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 1cc18fff..d8a0f721 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -53,7 +53,8 @@
 </dl>
 <br /><br />
 <span class="header2">Create Admin Account</span>
-<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_account"; ?>" enctype="multipart/form-data" >
+<?php echo $GLOBALS['error']->print_error('general'); ?>
+<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account"; ?>" enctype="multipart/form-data" >
 <table cellpadding="5" cellspacing="0" border="0">
 <tr>
 	<td><?php echo _("Username"); ?></td>
diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc
index 2f58215d..ba4478fb 100644
--- a/templates/show_install_config.inc
+++ b/templates/show_install_config.inc
@@ -53,6 +53,7 @@
 <?php echo _("Step 3 - Setup Initial Account"); ?></a><br />
 <br /><br />
 <span class="header2">Generate Config File</span>
+<?php echo $GLOBALS['error']->print_error('general'); ?>
 <form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_config"; ?>" enctype="multipart/form-data" >
 <table cellpadding="5" cellspacing="0" border="0">
 <tr>
@@ -61,15 +62,15 @@
 </tr>
 <tr>
 	<td><?php echo _("Desired Database Name"); ?></td>
-	<td><input type="textbox" name="local_db" value="<?php echo $_REQUEST['local_db']; ?>" /></td>
+	<td><input type="textbox" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
 </tr>
 <tr>
 	<td><?php echo _("MySQL Hostname"); ?></td>
-	<td><input type="textbox" name="local_host" value="<?php echo $_REQUEST['local_host']; ?>" /></td>
+	<td><input type="textbox" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
 </tr>
 <tr>
 	<td><?php echo _("MySQL Username"); ?></td>
-	<td><input type="textbox" name="local_username" value="username" /></td>
+	<td><input type="textbox" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
 </tr>
 <tr>
 	<td><?php echo _("MySQL Password"); ?></td>
@@ -121,12 +122,12 @@
 <tr>
 	<td>&nbsp;</td>
 	<td>
-	<a href="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; ?>?action=show_create_config&local_db=<?php echo $_REQUEST['local_db']; ?>&local_host=<?php echo $_REQUEST['local_host']; ?>">[<?php echo _("Check for Config"); ?>]</a>
+	<a href="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $GLOBALS['php_self']; ?>?action=show_create_config&local_db=<?php echo $_REQUEST['local_db']; ?>&local_host=<?php echo $_REQUEST['local_host']; ?>">[<?php echo _("Check for Config"); ?>]</a>
 	</td>
 </tr>
 </table>
 <br />
-<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=show_create_account"; ?>" enctype="multipart/form-data">
+<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account"; ?>" enctype="multipart/form-data">
 <input type="Submit" value="Continue to Step 3" />
 </form>
 </div>