last commit before beta3 release

15 files changed, 166 insertions, 149 deletions

diff --git a/bin/sort_files.inc b/bin/sort_files.inc
index 3a1d71cc..01ed030d 100644
--- a/bin/sort_files.inc
+++ b/bin/sort_files.inc
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved
 
  This program is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@
  */
 
 /* Don't do anything just tell me what you would do */
-$test_mode = true; 
+//$test_mode = true; 
 
 /* m(__)m */
 $alphabet_prefix = true;
@@ -46,13 +46,14 @@ ob_end_clean();
 
 /* First Clean the catalog to we don't try to write anything we shouldn't */
 
-$sql = "SELECT id FROM catalog WHERE catalog_type='local'";
+$sql = "SELECT `id` FROM `catalog` WHERE `catalog_type`='local'";
 $db_results = Dba::query($sql);
 
 $catalogs = array();
 
 while ($r = Dba::fetch_row($db_results)) { 
 
+
 	$catalog = new Catalog($r['0']);
 	$songs = $catalog->get_catalog_files();
 
@@ -256,13 +257,13 @@ function sort_move_file($song,$fullname) {
 		debug_event('copy','Copied ' . $song->file . ' to ' . $fullname,'5'); 
 		
 		/* Look for the folder art and copy that as well */
-		if (!conf('album_art_preferred_filename')) { 
+		if (!Config::get('album_art_preferred_filename')) { 
 			$folder_art 	= $directory . '/folder.jpg';
 			$old_art 	= $old_dir . '/folder.jpg';
 		}
 		else { 
-			$folder_art 	= $directory . "/" . conf('album_art_preferred_filename'); 
-			$old_art 	= $old_dir . "/" . conf('album_art_preferred_filename');
+			$folder_art 	= $directory . "/" . Config::get('album_art_preferred_filename'); 
+			$old_art 	= $old_dir . "/" . Config::get('album_art_preferred_filename');
 		}
 
 		debug_event('copy_art','Copied ' . $old_art . ' to ' . $folder_art,'5');
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index ca001da1..6e31681e 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,7 +3,7 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
-  v.3.4-Beta3 
+  v.3.4-Beta3 04/20/2008 
 	- Fixed Rating display and Rating Advanced Search
 	- Added ability to specify new Genre when adding a Radio Station
 	- Fixed Recently Played to do Distinct over last X rather then
@@ -28,7 +28,7 @@
 	- Fixed enabling of localplay modules, now correctly enables
 		localplay for the activating user
 	- Added single genre and playlist XML methods
-	- Changed erorr message on XML api, now based of HTTP error codes
+	- Changed error message on XML api, now based of HTTP error codes
 	- Split out ACL and Session Expire errors on XML API 
 	- Made Alpha Match box on browse "find as you type" (Thx Spocky)
 	- Modified Shoutbox Styles (Thx Spocky)
diff --git a/docs/README b/docs/README
index 36f18652..1feb581d 100755
--- a/docs/README
+++ b/docs/README
@@ -8,7 +8,7 @@ Contents:
      a) Supported File-Types
      b) Supported Stream Methods
      c) Current Translations
-     d) Thanx
+     d) Special Thanks
  2. Getting all the components
  3. Setting Up
      a) Upgrading
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index 713b8a0a..ae96e61e 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2008 Ampache.org
+ Copyright (c) Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 2ec23dea..311697cf 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php
index 71e6b6c8..e9d0304d 100644
--- a/lib/class/dba.class.php
+++ b/lib/class/dba.class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2008 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -130,6 +130,17 @@ class Dba {
 	} // num_rows 
 
 	/**
+	 * finish
+	 * This closes a result handle and clears the memory assoicated with it
+	 */
+	public static function finish($resource) { 
+
+		// Clear the result memory
+		mysql_free_result($resource); 
+
+	} // finish
+
+	/**
 	 * affected_rows
 	 * This emulates the mysql_affected_rows function
 	 */
diff --git a/lib/init.php b/lib/init.php
index 58d846db..f68c3eb7 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2008 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -81,7 +81,7 @@ if (!count($results)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.4-Beta3 Build (001)';
+$results['version']		= '3.4-Beta3';
 $results['int_config_version']	= '6'; 
 
 $results['raw_web_path']	= $results['web_path'];
diff --git a/lib/install.php b/lib/install.php
index 6bfc2f6f..ae873a46 100644
--- a/lib/install.php
+++ b/lib/install.php
@@ -136,14 +136,24 @@ function install_insert_db($username,$password,$hostname,$database) {
 		Error::add('general','Error: Database Already exists and Overwrite not checked'); 
 		return false; 
 	} 
-	if (!$db_selected) { 
-		$sql = "CREATE DATABASE `" . $database . "`";
+	elseif (!$db_selected) { 
+		$sql = "CREATE DATABASE `" . Dba::escape($database) . "`";
 		if (!$db_results = @mysql_query($sql, $dbh)) { 
 			Error::add('general',"Error: Unable to Create Database " . mysql_error());
 			return false;
 		}
 		@mysql_select_db($database, $dbh);
 	} // if db can't be selected
+	else { 
+		$sql = "DROP DATABASE `" . Dba::escape($database) . "`"; 
+		$db_results = @mysql_query($sql,$dbh); 
+		$sql = "CREATE DATABASE `" . Dba::escape($database) . "`"; 
+                if (!$db_results = @mysql_query($sql, $dbh)) {
+                        Error::add('general',"Error: Unable to Create Database " . mysql_error());
+                        return false;
+                }
+                @mysql_select_db($database, $dbh);
+	} // end if selected and overwrite
 
 	/* Check and see if we should create a user here */
 	if ($_REQUEST['db_user'] == 'create_db_user') { 
diff --git a/server/xml.server.php b/server/xml.server.php
index cfe688c7..af00ec85 100644
--- a/server/xml.server.php
+++ b/server/xml.server.php
@@ -39,6 +39,7 @@ header("Content-Disposition: attachment; filename=information.xml");
 // If we don't even have access control on then we can't use this!
 if (!Config::get('access_control')) { 
 	ob_end_clean(); 
+	debug_event('Access Control','Error Attempted to use XML API with Access Control turned off','3'); 
 	echo xmlData::error('501','Access Control not Enabled');
 	exit; 
 }  
@@ -48,14 +49,14 @@ if (!Config::get('access_control')) {
  * login via this interface so we do have an exception for action=login
  */
 if (!Access::check_network('init-api',$_SERVER['REMOTE_ADDR'],$_REQUEST['user'],'5')) { 
-	debug_event('Access Denied','Unathorized access attempt to API [' . $_SERVER['REMOTE_ADDR'] . ']', '5');
+	debug_event('Access Denied','Unathorized access attempt to API [' . $_SERVER['REMOTE_ADDR'] . ']', '3');
 	ob_end_clean(); 
         echo xmlData::error('403','ACL Error');
 	exit(); 
 }
 
 if ((!vauth::session_exists('api', $_REQUEST['auth']) AND $_REQUEST['action'] != 'handshake')) { 
-	debug_event('Access Denied','Invalid Session attempt to API [' . $_REQUEST['action'] . ']','5'); 
+	debug_event('Access Denied','Invalid Session attempt to API [' . $_REQUEST['action'] . ']','3'); 
 	ob_end_clean(); 
 	echo xmlData::error('401','Session Expired');
 	exit(); 
diff --git a/sql/ampache.sql b/sql/ampache.sql
index 02de0e2b..efe7de68 100644
--- a/sql/ampache.sql
+++ b/sql/ampache.sql
@@ -1,4 +1,4 @@
--- Copyright (c) 2001 - 2008 Ampache.org
+-- Copyright (c) Ampache.org
 -- All rights reserved.
 --
 -- This program is free software; you can redistribute it and/or
@@ -13,7 +13,6 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 -- MySQL dump 10.11
 --
 -- Host: localhost    Database: ampache
@@ -40,14 +39,14 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `access_list` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(255) character set utf8 default NULL,
   `start` int(11) unsigned NOT NULL default '0',
   `end` int(11) unsigned NOT NULL default '0',
-  `dns` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `dns` varchar(255) character set utf8 default NULL,
   `level` smallint(3) unsigned NOT NULL default '5',
-  `type` varchar(64) collate utf8_unicode_ci NOT NULL default 'interface',
+  `type` varchar(64) character set utf8 default NULL,
   `user` int(11) NOT NULL,
-  `key` varchar(255) collate utf8_unicode_ci default NULL,
+  `key` varchar(255) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `start` (`start`),
   KEY `end` (`end`),
@@ -73,7 +72,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `album` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(255) character set utf8 default NULL,
   `prefix` enum('The','An','A','Der','Die','Das','Ein','Eine') collate utf8_unicode_ci default NULL,
   `year` int(4) unsigned NOT NULL default '1984',
   `disk` smallint(5) unsigned default NULL,
@@ -103,9 +102,9 @@ SET character_set_client = utf8;
 CREATE TABLE `album_data` (
   `album_id` int(11) unsigned NOT NULL,
   `art` mediumblob,
-  `art_mime` varchar(64) collate utf8_unicode_ci default NULL,
+  `art_mime` varchar(64) character set utf8 default NULL,
   `thumb` blob,
-  `thumb_mime` varchar(64) collate utf8_unicode_ci default NULL,
+  `thumb_mime` varchar(64) character set utf8 default NULL,
   UNIQUE KEY `album_id` (`album_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
@@ -128,7 +127,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `artist` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(255) character set utf8 default NULL,
   `prefix` enum('The','An','A','Der','Die','Das','Ein','Eine') collate utf8_unicode_ci default NULL,
   PRIMARY KEY  (`id`),
   KEY `name` (`name`)
@@ -154,9 +153,9 @@ SET character_set_client = utf8;
 CREATE TABLE `artist_data` (
   `artist_id` int(11) unsigned NOT NULL,
   `art` mediumblob NOT NULL,
-  `art_mime` varchar(32) collate utf8_unicode_ci NOT NULL,
+  `art_mime` varchar(32) character set utf8 default NULL,
   `thumb` blob NOT NULL,
-  `thumb_mime` varchar(32) collate utf8_unicode_ci NOT NULL,
+  `thumb_mime` varchar(32) character set utf8 default NULL,
   `bio` text collate utf8_unicode_ci NOT NULL,
   UNIQUE KEY `artist_id` (`artist_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -180,17 +179,17 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `catalog` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) collate utf8_unicode_ci NOT NULL,
-  `path` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `add_path` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(128) character set utf8 default NULL,
+  `path` varchar(255) character set utf8 default NULL,
+  `add_path` varchar(255) character set utf8 default NULL,
   `catalog_type` enum('local','remote') collate utf8_unicode_ci NOT NULL default 'local',
   `last_update` int(11) unsigned NOT NULL default '0',
   `last_add` int(11) unsigned NOT NULL default '0',
   `enabled` tinyint(1) unsigned NOT NULL default '1',
-  `rename_pattern` varchar(255) collate utf8_unicode_ci NOT NULL default '%a - %T - %t.mp3',
-  `sort_pattern` varchar(255) collate utf8_unicode_ci NOT NULL default '%C/%a/%A',
-  `gather_types` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `key` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `rename_pattern` varchar(255) character set utf8 default NULL,
+  `sort_pattern` varchar(255) character set utf8 default NULL,
+  `gather_types` varchar(255) character set utf8 default NULL,
+  `key` varchar(255) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `enabled` (`enabled`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -214,17 +213,15 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `democratic` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(64) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(64) character set utf8 default NULL,
   `cooldown` tinyint(4) unsigned default NULL,
   `level` tinyint(4) unsigned NOT NULL default '25',
   `user` int(11) NOT NULL,
   `primary` tinyint(1) unsigned NOT NULL default '0',
   `base_playlist` int(11) unsigned NOT NULL,
   PRIMARY KEY  (`id`),
-  KEY `primary_2` (`primary`),
   KEY `level` (`level`),
-  KEY `primary_3` (`primary`),
-  KEY `level_2` (`level`)
+  KEY `primary_2` (`primary`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
 
@@ -252,7 +249,7 @@ CREATE TABLE `flagged` (
   `flag` enum('delete','retag','reencode','other') collate utf8_unicode_ci NOT NULL default 'other',
   `date` int(11) unsigned NOT NULL default '0',
   `approved` tinyint(1) unsigned NOT NULL default '0',
-  `comment` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `comment` varchar(255) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `date` (`date`,`approved`),
   KEY `object_id` (`object_id`),
@@ -279,7 +276,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `genre` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(255) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `name` (`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -331,13 +328,13 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `live_stream` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) collate utf8_unicode_ci NOT NULL,
-  `site_url` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `url` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(128) character set utf8 default NULL,
+  `site_url` varchar(255) character set utf8 default NULL,
+  `url` varchar(255) character set utf8 default NULL,
   `genre` int(11) unsigned NOT NULL default '0',
   `catalog` int(11) unsigned NOT NULL default '0',
-  `frequency` varchar(32) collate utf8_unicode_ci NOT NULL,
-  `call_sign` varchar(32) collate utf8_unicode_ci NOT NULL,
+  `frequency` varchar(32) character set utf8 default NULL,
+  `call_sign` varchar(32) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `catalog` (`catalog`),
   KEY `genre` (`genre`),
@@ -362,7 +359,7 @@ DROP TABLE IF EXISTS `now_playing`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `now_playing` (
-  `id` varchar(64) collate utf8_unicode_ci NOT NULL,
+  `id` varchar(64) character set utf8 NOT NULL default '',
   `song_id` int(11) unsigned NOT NULL default '0',
   `user` int(11) NOT NULL,
   `expire` int(11) unsigned NOT NULL default '0',
@@ -418,7 +415,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `playlist` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(128) character set utf8 default NULL,
   `user` int(11) NOT NULL,
   `type` enum('private','public') collate utf8_unicode_ci NOT NULL default 'private',
   `genre` int(11) unsigned NOT NULL,
@@ -449,7 +446,7 @@ CREATE TABLE `playlist_data` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `playlist` int(11) unsigned NOT NULL default '0',
   `object_id` int(11) unsigned default NULL,
-  `object_type` varchar(32) collate utf8_unicode_ci NOT NULL default 'song',
+  `object_type` varchar(32) character set utf8 default NULL,
   `dynamic_song` text collate utf8_unicode_ci,
   `track` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
@@ -475,12 +472,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `preference` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) collate utf8_unicode_ci NOT NULL,
-  `value` varchar(255) collate utf8_unicode_ci NOT NULL,
-  `description` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(128) character set utf8 default NULL,
+  `value` varchar(255) character set utf8 default NULL,
+  `description` varchar(255) character set utf8 default NULL,
   `level` int(11) unsigned NOT NULL default '100',
-  `type` varchar(128) collate utf8_unicode_ci NOT NULL,
-  `catagory` varchar(128) collate utf8_unicode_ci NOT NULL,
+  `type` varchar(128) character set utf8 default NULL,
+  `catagory` varchar(128) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `catagory` (`catagory`),
   KEY `name` (`name`)
@@ -532,13 +529,13 @@ DROP TABLE IF EXISTS `session`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `session` (
-  `id` varchar(64) collate utf8_unicode_ci NOT NULL,
-  `username` varchar(16) collate utf8_unicode_ci NOT NULL,
+  `id` varchar(64) character set utf8 NOT NULL default '',
+  `username` varchar(16) character set utf8 default NULL,
   `expire` int(11) unsigned NOT NULL default '0',
   `value` longtext collate utf8_unicode_ci NOT NULL,
   `ip` int(11) unsigned default NULL,
   `type` enum('mysql','ldap','http','api','xml-rpc') collate utf8_unicode_ci NOT NULL,
-  `agent` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `agent` varchar(255) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `expire` (`expire`),
   KEY `type` (`type`)
@@ -562,9 +559,9 @@ DROP TABLE IF EXISTS `session_stream`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `session_stream` (
-  `id` varchar(64) collate utf8_unicode_ci NOT NULL,
+  `id` varchar(64) character set utf8 NOT NULL default '',
   `user` int(11) unsigned NOT NULL,
-  `agent` varchar(255) collate utf8_unicode_ci default NULL,
+  `agent` varchar(255) character set utf8 default NULL,
   `expire` int(11) unsigned NOT NULL,
   `ip` int(11) unsigned default NULL,
   PRIMARY KEY  (`id`)
@@ -589,12 +586,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `song` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `file` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `file` varchar(255) character set utf8 default NULL,
   `catalog` int(11) unsigned NOT NULL default '0',
   `album` int(11) unsigned NOT NULL default '0',
   `year` mediumint(4) unsigned NOT NULL default '0',
   `artist` int(11) unsigned NOT NULL default '0',
-  `title` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `title` varchar(255) character set utf8 default NULL,
   `bitrate` mediumint(8) unsigned NOT NULL default '0',
   `rate` mediumint(8) unsigned NOT NULL default '0',
   `mode` enum('abr','vbr','cbr') collate utf8_unicode_ci default 'cbr',
@@ -606,7 +603,7 @@ CREATE TABLE `song` (
   `enabled` tinyint(1) unsigned NOT NULL default '1',
   `update_time` int(11) unsigned default '0',
   `addition_time` int(11) unsigned default '0',
-  `hash` varchar(64) collate utf8_unicode_ci default NULL,
+  `hash` varchar(64) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `genre` (`genre`),
   KEY `album` (`album`),
@@ -640,9 +637,9 @@ CREATE TABLE `song_data` (
   `song_id` int(11) unsigned NOT NULL,
   `comment` text collate utf8_unicode_ci,
   `lyrics` text collate utf8_unicode_ci,
-  `label` varchar(128) collate utf8_unicode_ci default NULL,
-  `catalog_number` varchar(128) collate utf8_unicode_ci default NULL,
-  `language` varchar(128) collate utf8_unicode_ci default NULL,
+  `label` varchar(128) character set utf8 default NULL,
+  `catalog_number` varchar(128) character set utf8 default NULL,
+  `language` varchar(128) character set utf8 default NULL,
   UNIQUE KEY `song_id` (`song_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
@@ -666,7 +663,7 @@ SET character_set_client = utf8;
 CREATE TABLE `tag_map` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `object_id` int(11) unsigned NOT NULL,
-  `object_type` varchar(16) collate utf8_unicode_ci NOT NULL,
+  `object_type` varchar(16) character set utf8 default NULL,
   `user` int(11) NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `object_id` (`object_id`),
@@ -693,7 +690,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `tags` (
   `map_id` int(11) unsigned NOT NULL,
-  `name` varchar(32) collate utf8_unicode_ci NOT NULL,
+  `name` varchar(32) character set utf8 default NULL,
   `order` tinyint(2) NOT NULL,
   KEY `order` (`order`),
   KEY `map_id` (`map_id`)
@@ -718,10 +715,9 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `tmp_playlist` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `session` varchar(32) collate utf8_unicode_ci NOT NULL,
-  `type` varchar(32) collate utf8_unicode_ci NOT NULL,
-  `object_type` varchar(32) collate utf8_unicode_ci NOT NULL,
-  `base_playlist` int(11) unsigned NOT NULL,
+  `session` varchar(32) character set utf8 default NULL,
+  `type` varchar(32) character set utf8 default NULL,
+  `object_type` varchar(32) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `session` (`session`),
   KEY `type` (`type`)
@@ -747,7 +743,7 @@ SET character_set_client = utf8;
 CREATE TABLE `tmp_playlist_data` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `tmp_playlist` int(11) unsigned NOT NULL,
-  `object_type` varchar(32) collate utf8_unicode_ci default NULL,
+  `object_type` varchar(32) character set utf8 default NULL,
   `object_id` int(11) unsigned NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `tmp_playlist` (`tmp_playlist`)
@@ -771,8 +767,8 @@ DROP TABLE IF EXISTS `update_info`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `update_info` (
-  `key` varchar(128) collate utf8_unicode_ci NOT NULL,
-  `value` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `key` varchar(128) character set utf8 default NULL,
+  `value` varchar(255) character set utf8 default NULL,
   UNIQUE KEY `key` (`key`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
@@ -783,7 +779,7 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `update_info` WRITE;
 /*!40000 ALTER TABLE `update_info` DISABLE KEYS */;
-INSERT INTO `update_info` VALUES ('db_version','340016');
+INSERT INTO `update_info` VALUES ('db_version','340017');
 /*!40000 ALTER TABLE `update_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -796,15 +792,15 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `user` (
   `id` int(11) NOT NULL auto_increment,
-  `username` varchar(128) collate utf8_unicode_ci NOT NULL,
-  `fullname` varchar(128) collate utf8_unicode_ci NOT NULL,
-  `email` varchar(128) collate utf8_unicode_ci default NULL,
-  `password` varchar(64) collate utf8_unicode_ci NOT NULL,
+  `username` varchar(128) character set utf8 default NULL,
+  `fullname` varchar(128) character set utf8 default NULL,
+  `email` varchar(128) character set utf8 default NULL,
+  `password` varchar(64) character set utf8 default NULL,
   `access` tinyint(4) unsigned NOT NULL,
   `disabled` tinyint(1) unsigned NOT NULL default '0',
   `last_seen` int(11) unsigned NOT NULL default '0',
   `create_date` int(11) unsigned default NULL,
-  `validation` varchar(128) collate utf8_unicode_ci default NULL,
+  `validation` varchar(128) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -829,7 +825,7 @@ SET character_set_client = utf8;
 CREATE TABLE `user_preference` (
   `user` int(11) NOT NULL,
   `preference` int(11) unsigned NOT NULL default '0',
-  `value` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `value` varchar(255) character set utf8 default NULL,
   KEY `user` (`user`),
   KEY `preference` (`preference`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -841,7 +837,7 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `user_preference` WRITE;
 /*!40000 ALTER TABLE `user_preference` DISABLE KEYS */;
-INSERT INTO `user_preference` VALUES (-1,1,'0'),(-1,4,'10'),(-1,19,'32'),(-1,22,'Ampache :: Pour l\'Amour de la Musique'),(-1,23,'0'),(-1,24,'1'),(-1,25,'80'),(-1,26,'100'),(-1,41,'0'),(-1,29,'stream'),(-1,30,'1'),(-1,31,'en_US'),(-1,32,'m3u'),(-1,33,'classic'),(-1,34,'27'),(-1,35,'27'),(-1,36,'27'),(-1,51,'50'),(-1,40,'0'),(-1,44,'1'),(-1,45,'0'),(-1,46,'0'),(-1,47,'7'),(-1,49,'1'),(-1,52,'8192'),(-1,53,'normal'),(-1,54,'append'),(-1,55,'default');
+INSERT INTO `user_preference` VALUES (-1,1,'0'),(-1,4,'10'),(-1,19,'32'),(-1,22,'Ampache :: Pour l\'Amour de la Musique'),(-1,23,'0'),(-1,24,'1'),(-1,25,'80'),(-1,41,'0'),(-1,29,'stream'),(-1,31,'en_US'),(-1,32,'m3u'),(-1,33,'classic'),(-1,34,'27'),(-1,35,'27'),(-1,36,'27'),(-1,51,'50'),(-1,40,'0'),(-1,44,'1'),(-1,45,'0'),(-1,46,'0'),(-1,47,'7'),(-1,49,'1'),(-1,52,'8192'),(-1,53,'default'),(-1,55,'default');
 /*!40000 ALTER TABLE `user_preference` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -859,7 +855,7 @@ CREATE TABLE `user_shout` (
   `date` int(11) unsigned NOT NULL,
   `sticky` tinyint(1) unsigned NOT NULL default '0',
   `object_id` int(11) unsigned NOT NULL,
-  `object_type` varchar(32) collate utf8_unicode_ci NOT NULL,
+  `object_type` varchar(32) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `sticky` (`sticky`),
   KEY `date` (`date`),
@@ -911,4 +907,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2008-03-17  5:40:22
+-- Dump completed on 2008-04-21  2:09:45
diff --git a/sql/ampache40.sql b/sql/ampache40.sql
index a468752d..3732d6ca 100644
--- a/sql/ampache40.sql
+++ b/sql/ampache40.sql
@@ -1,4 +1,4 @@
--- Copyright (c) 2001 - 2008 Ampache.org
+-- Copyright (c) Ampache.org
 -- All rights reserved.
 --
 -- This program is free software; you can redistribute it and/or
@@ -13,7 +13,6 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 -- MySQL dump 10.11
 --
 -- Host: localhost    Database: ampache
@@ -35,12 +34,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `access_list` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL,
+  `name` varchar(255) default NULL,
   `start` int(11) unsigned NOT NULL default '0',
   `end` int(11) unsigned NOT NULL default '0',
-  `dns` varchar(255) NOT NULL,
+  `dns` varchar(255) default NULL,
   `level` smallint(3) unsigned NOT NULL default '5',
-  `type` varchar(64) NOT NULL default 'interface',
+  `type` varchar(64) default NULL,
   `user` int(11) NOT NULL,
   `key` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
@@ -68,7 +67,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `album` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL,
+  `name` varchar(255) default NULL,
   `prefix` enum('The','An','A','Der','Die','Das','Ein','Eine') default NULL,
   `year` int(4) unsigned NOT NULL default '1984',
   `disk` smallint(5) unsigned default NULL,
@@ -123,7 +122,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `artist` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL,
+  `name` varchar(255) default NULL,
   `prefix` enum('The','An','A','Der','Die','Das','Ein','Eine') default NULL,
   PRIMARY KEY  (`id`),
   KEY `name` (`name`)
@@ -149,9 +148,9 @@ SET character_set_client = utf8;
 CREATE TABLE `artist_data` (
   `artist_id` int(11) unsigned NOT NULL,
   `art` mediumblob NOT NULL,
-  `art_mime` varchar(32) NOT NULL,
+  `art_mime` varchar(32) default NULL,
   `thumb` blob NOT NULL,
-  `thumb_mime` varchar(32) NOT NULL,
+  `thumb_mime` varchar(32) default NULL,
   `bio` text NOT NULL,
   UNIQUE KEY `artist_id` (`artist_id`)
 ) TYPE=MyISAM;
@@ -175,17 +174,17 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `catalog` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL,
-  `path` varchar(255) NOT NULL,
-  `add_path` varchar(255) NOT NULL,
+  `name` varchar(128) default NULL,
+  `path` varchar(255) default NULL,
+  `add_path` varchar(255) default NULL,
   `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` tinyint(1) unsigned NOT NULL default '1',
-  `rename_pattern` varchar(255) NOT NULL default '%a - %T - %t.mp3',
-  `sort_pattern` varchar(255) NOT NULL default '%C/%a/%A',
-  `gather_types` varchar(255) NOT NULL,
-  `key` varchar(255) NOT NULL,
+  `rename_pattern` varchar(255) default NULL,
+  `sort_pattern` varchar(255) default NULL,
+  `gather_types` varchar(255) default NULL,
+  `key` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   KEY `enabled` (`enabled`)
 ) TYPE=MyISAM;
@@ -209,15 +208,15 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `democratic` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(64) NOT NULL,
+  `name` varchar(64) default NULL,
   `cooldown` tinyint(4) unsigned default NULL,
   `level` tinyint(4) unsigned NOT NULL default '25',
   `user` int(11) NOT NULL,
   `primary` tinyint(1) unsigned NOT NULL default '0',
   `base_playlist` int(11) unsigned NOT NULL,
   PRIMARY KEY  (`id`),
-  KEY `primary_2` (`primary`),
-  KEY `level` (`level`)
+  KEY `level` (`level`),
+  KEY `primary_2` (`primary`)
 ) TYPE=MyISAM;
 SET character_set_client = @saved_cs_client;
 
@@ -245,7 +244,7 @@ CREATE TABLE `flagged` (
   `flag` enum('delete','retag','reencode','other') NOT NULL default 'other',
   `date` int(11) unsigned NOT NULL default '0',
   `approved` tinyint(1) unsigned NOT NULL default '0',
-  `comment` varchar(255) NOT NULL,
+  `comment` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   KEY `date` (`date`,`approved`),
   KEY `object_id` (`object_id`),
@@ -272,7 +271,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `genre` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL,
+  `name` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   KEY `name` (`name`)
 ) TYPE=MyISAM;
@@ -324,13 +323,13 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `live_stream` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL,
-  `site_url` varchar(255) NOT NULL,
-  `url` varchar(255) NOT NULL,
+  `name` varchar(128) default NULL,
+  `site_url` varchar(255) default NULL,
+  `url` varchar(255) default NULL,
   `genre` int(11) unsigned NOT NULL default '0',
   `catalog` int(11) unsigned NOT NULL default '0',
-  `frequency` varchar(32) NOT NULL,
-  `call_sign` varchar(32) NOT NULL,
+  `frequency` varchar(32) default NULL,
+  `call_sign` varchar(32) default NULL,
   PRIMARY KEY  (`id`),
   KEY `catalog` (`catalog`),
   KEY `genre` (`genre`),
@@ -355,7 +354,7 @@ DROP TABLE IF EXISTS `now_playing`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `now_playing` (
-  `id` varchar(64) NOT NULL,
+  `id` varchar(64) NOT NULL default '',
   `song_id` int(11) unsigned NOT NULL default '0',
   `user` int(11) NOT NULL,
   `expire` int(11) unsigned NOT NULL default '0',
@@ -411,7 +410,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `playlist` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL,
+  `name` varchar(128) default NULL,
   `user` int(11) NOT NULL,
   `type` enum('private','public') NOT NULL default 'private',
   `genre` int(11) unsigned NOT NULL,
@@ -442,7 +441,7 @@ CREATE TABLE `playlist_data` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `playlist` int(11) unsigned NOT NULL default '0',
   `object_id` int(11) unsigned default NULL,
-  `object_type` varchar(32) NOT NULL default 'song',
+  `object_type` varchar(32) default NULL,
   `dynamic_song` text,
   `track` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
@@ -468,12 +467,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `preference` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL,
-  `value` varchar(255) NOT NULL,
-  `description` varchar(255) NOT NULL,
+  `name` varchar(128) default NULL,
+  `value` varchar(255) default NULL,
+  `description` varchar(255) default NULL,
   `level` int(11) unsigned NOT NULL default '100',
-  `type` varchar(128) NOT NULL,
-  `catagory` varchar(128) NOT NULL,
+  `type` varchar(128) default NULL,
+  `catagory` varchar(128) default NULL,
   PRIMARY KEY  (`id`),
   KEY `catagory` (`catagory`),
   KEY `name` (`name`)
@@ -502,7 +501,7 @@ CREATE TABLE `rating` (
   `user` int(11) NOT NULL,
   `object_type` enum('artist','album','song','steam','video') NOT NULL default 'artist',
   `object_id` int(11) unsigned NOT NULL default '0',
-  `rating` enum('-1','0','1','2','3','4','5') NOT NULL default '0',
+  `rating` tinyint(4) NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `object_id` (`object_id`)
 ) TYPE=MyISAM;
@@ -525,13 +524,13 @@ DROP TABLE IF EXISTS `session`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `session` (
-  `id` varchar(64) NOT NULL,
-  `username` varchar(16) NOT NULL,
+  `id` varchar(64) NOT NULL default '',
+  `username` varchar(16) default NULL,
   `expire` int(11) unsigned NOT NULL default '0',
   `value` longtext NOT NULL,
   `ip` int(11) unsigned default NULL,
   `type` enum('mysql','ldap','http','api','xml-rpc') NOT NULL,
-  `agent` varchar(255) NOT NULL,
+  `agent` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   KEY `expire` (`expire`),
   KEY `type` (`type`)
@@ -555,7 +554,7 @@ DROP TABLE IF EXISTS `session_stream`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `session_stream` (
-  `id` varchar(64) NOT NULL,
+  `id` varchar(64) NOT NULL default '',
   `user` int(11) unsigned NOT NULL,
   `agent` varchar(255) default NULL,
   `expire` int(11) unsigned NOT NULL,
@@ -582,12 +581,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `song` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `file` varchar(255) NOT NULL,
+  `file` varchar(255) default NULL,
   `catalog` int(11) unsigned NOT NULL default '0',
   `album` int(11) unsigned NOT NULL default '0',
   `year` mediumint(4) unsigned NOT NULL default '0',
   `artist` int(11) unsigned NOT NULL default '0',
-  `title` varchar(255) NOT NULL,
+  `title` varchar(255) default NULL,
   `bitrate` mediumint(8) unsigned NOT NULL default '0',
   `rate` mediumint(8) unsigned NOT NULL default '0',
   `mode` enum('abr','vbr','cbr') default 'cbr',
@@ -659,7 +658,7 @@ SET character_set_client = utf8;
 CREATE TABLE `tag_map` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `object_id` int(11) unsigned NOT NULL,
-  `object_type` varchar(16) NOT NULL,
+  `object_type` varchar(16) default NULL,
   `user` int(11) NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `object_id` (`object_id`),
@@ -686,7 +685,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `tags` (
   `map_id` int(11) unsigned NOT NULL,
-  `name` varchar(32) NOT NULL,
+  `name` varchar(32) default NULL,
   `order` tinyint(2) NOT NULL,
   KEY `order` (`order`),
   KEY `map_id` (`map_id`)
@@ -711,14 +710,13 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `tmp_playlist` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `session` varchar(32) NOT NULL,
-  `type` varchar(32) NOT NULL,
-  `object_type` varchar(32) NOT NULL,
-  `base_playlist` int(11) unsigned NOT NULL,
+  `session` varchar(32) default NULL,
+  `type` varchar(32) default NULL,
+  `object_type` varchar(32) default NULL,
   PRIMARY KEY  (`id`),
   KEY `session` (`session`),
   KEY `type` (`type`)
-) TYPE=MyISAM AUTO_INCREMENT=12;
+) TYPE=MyISAM AUTO_INCREMENT=8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -764,8 +762,8 @@ DROP TABLE IF EXISTS `update_info`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `update_info` (
-  `key` varchar(128) NOT NULL,
-  `value` varchar(255) NOT NULL,
+  `key` varchar(128) default NULL,
+  `value` varchar(255) default NULL,
   UNIQUE KEY `key` (`key`)
 ) TYPE=MyISAM;
 SET character_set_client = @saved_cs_client;
@@ -776,7 +774,7 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `update_info` WRITE;
 /*!40000 ALTER TABLE `update_info` DISABLE KEYS */;
-INSERT INTO `update_info` VALUES ('db_version','340016');
+INSERT INTO `update_info` VALUES ('db_version','340017');
 /*!40000 ALTER TABLE `update_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -789,10 +787,10 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `user` (
   `id` int(11) NOT NULL auto_increment,
-  `username` varchar(128) NOT NULL,
-  `fullname` varchar(128) NOT NULL,
+  `username` varchar(128) default NULL,
+  `fullname` varchar(128) default NULL,
   `email` varchar(128) default NULL,
-  `password` varchar(64) NOT NULL,
+  `password` varchar(64) default NULL,
   `access` tinyint(4) unsigned NOT NULL,
   `disabled` tinyint(1) unsigned NOT NULL default '0',
   `last_seen` int(11) unsigned NOT NULL default '0',
@@ -822,7 +820,7 @@ SET character_set_client = utf8;
 CREATE TABLE `user_preference` (
   `user` int(11) NOT NULL,
   `preference` int(11) unsigned NOT NULL default '0',
-  `value` varchar(255) NOT NULL,
+  `value` varchar(255) default NULL,
   KEY `user` (`user`),
   KEY `preference` (`preference`)
 ) TYPE=MyISAM;
@@ -834,7 +832,7 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `user_preference` WRITE;
 /*!40000 ALTER TABLE `user_preference` DISABLE KEYS */;
-INSERT INTO `user_preference` VALUES (-1,1,'0'),(-1,4,'10'),(-1,19,'32'),(-1,22,'Ampache :: Pour l\'Amour de la Musique'),(-1,23,'0'),(-1,24,'1'),(-1,25,'80'),(-1,41,'0'),(-1,29,'stream'),(-1,31,'en_US'),(-1,32,'m3u'),(-1,33,'classic'),(-1,34,'27'),(-1,35,'27'),(-1,36,'27'),(-1,51,'50'),(-1,40,'0'),(-1,44,'1'),(-1,45,'0'),(-1,46,'0'),(-1,47,'7'),(-1,49,'1'),(-1,52,'8192'),(-1,53,'normal'),(-1,55,'default');
+INSERT INTO `user_preference` VALUES (-1,1,'0'),(-1,4,'10'),(-1,19,'32'),(-1,22,'Ampache :: Pour l\'Amour de la Musique'),(-1,23,'0'),(-1,24,'1'),(-1,25,'80'),(-1,41,'0'),(-1,29,'stream'),(-1,31,'en_US'),(-1,32,'m3u'),(-1,33,'classic'),(-1,34,'27'),(-1,35,'27'),(-1,36,'27'),(-1,51,'50'),(-1,40,'0'),(-1,44,'1'),(-1,45,'0'),(-1,46,'0'),(-1,47,'7'),(-1,49,'1'),(-1,52,'8192'),(-1,53,'default'),(-1,55,'default');
 /*!40000 ALTER TABLE `user_preference` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -852,7 +850,7 @@ CREATE TABLE `user_shout` (
   `date` int(11) unsigned NOT NULL,
   `sticky` tinyint(1) unsigned NOT NULL default '0',
   `object_id` int(11) unsigned NOT NULL,
-  `object_type` varchar(32) NOT NULL,
+  `object_type` varchar(32) default NULL,
   PRIMARY KEY  (`id`),
   KEY `sticky` (`sticky`),
   KEY `date` (`date`),
@@ -901,4 +899,4 @@ UNLOCK TABLES;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2008-03-17  5:22:53
+-- Dump completed on 2008-04-21  2:08:18
diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php
index 8a128408..0fdae8c4 100644
--- a/templates/show_access_list.inc.php
+++ b/templates/show_access_list.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
index 28f592a1..bbe87995 100644
--- a/templates/show_add_access.inc.php
+++ b/templates/show_add_access.inc.php
@@ -32,14 +32,14 @@
 	<td><?php echo _('Start IP Address'); ?>:</td>
 	<td>
 		<input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" maxlength="15" />
-		<span class="information">(0.0.0.0)</span>
+		<span class="information">(255.255.255.255)</span>
 	</td>
 </tr>
 <tr>
 	<td><?php echo _('End IP Address'); ?>:</td>
 	<td>
 		<input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" maxlength="15" />
-		<span class="information">(0.0.0.0)</span>
+		<span class="information">(255.255.255.255)</span>
 	</td>
 </tr>
 <tr>
diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php
index c52c33de..e8656586 100644
--- a/templates/show_add_user.inc.php
+++ b/templates/show_add_user.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php
index dc7afc47..7e7226bf 100644
--- a/templates/show_album_art.inc.php
+++ b/templates/show_album_art.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or