prep for beta1 release, update sql files

6 files changed, 38 insertions, 24 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 632076b0..b4dd6409 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,7 +3,7 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
-  v.3.5-Beta1
+  v.3.5-Beta1 03/15/2009
 	- Fixed xmlrpc get image. getEncoding doesn't static function
 	- Add democratic methods to api, can now vote, devote, get url
 		and the current democratic playlist through the api
diff --git a/lib/class/xmlrpcclient.class.php b/lib/class/xmlrpcclient.class.php
index b35f2a27..49bf4439 100644
--- a/lib/class/xmlrpcclient.class.php
+++ b/lib/class/xmlrpcclient.class.php
@@ -51,7 +51,7 @@ class xmlRpcClient {
 
 		// Build our key
 		$timestamp      = time();
-        $handshake_key  = hash('sha256',$timestamp . hash('sha256',$key)); 
+	        $handshake_key  = hash('sha256',$timestamp . hash('sha256',$key)); 
 
 		$encoded_key    = new XML_RPC_Value($handshake_key,'string');
 		$timestamp      = new XML_RPC_Value($timestamp,'int');
diff --git a/lib/init.php b/lib/init.php
index 26cc6fc0..12849f5c 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -20,7 +20,7 @@
 */
 
 // SVN Fluf
-$svn_version = 'Subversion ' . trim('$Rev$','$ '); 
+//$svn_version = 'Subversion ' . trim('$Rev$','$ '); 
 
 // Use output buffering, this gains us a few things and 
 // fixes some CSS issues
@@ -87,7 +87,7 @@ if (!count($results)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.5-Alpha3 '. $svn_version; 
+$results['version']		= '3.5-Beta1 '. $svn_version; 
 $results['int_config_version']	= '10'; 
 
 $results['raw_web_path']	= $results['web_path'];
diff --git a/sql/ampache.sql b/sql/ampache.sql
index a08dc189..0aaf7f0a 100644
--- a/sql/ampache.sql
+++ b/sql/ampache.sql
@@ -107,7 +107,8 @@ CREATE TABLE `album_data` (
   `art_mime` varchar(64) character set utf8 default NULL,
   `thumb` mediumblob,
   `thumb_mime` varchar(64) character set utf8 default NULL,
-  UNIQUE KEY `album_id` (`album_id`)
+  UNIQUE KEY `album_id` (`album_id`),
+  KEY `art_mime` (`art_mime`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
 
@@ -159,7 +160,8 @@ CREATE TABLE `artist_data` (
   `thumb` mediumblob,
   `thumb_mime` varchar(32) character set utf8 default NULL,
   `bio` text collate utf8_unicode_ci NOT NULL,
-  UNIQUE KEY `artist_id` (`artist_id`)
+  UNIQUE KEY `artist_id` (`artist_id`),
+  KEY `art_mime` (`art_mime`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
 
@@ -392,10 +394,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `now_playing` (
   `id` varchar(64) character set utf8 NOT NULL default '',
-  `song_id` int(11) unsigned NOT NULL default '0',
+  `object_id` int(11) unsigned NOT NULL,
+  `object_type` varchar(255) collate utf8_unicode_ci NOT NULL,
   `user` int(11) NOT NULL,
   `expire` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  (`id`),
+  KEY `expire` (`expire`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
 
@@ -632,7 +636,6 @@ 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) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   KEY `album` (`album`),
   KEY `artist` (`artist`),
@@ -744,6 +747,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `tmp_browse` (
   `sid` varchar(128) collate utf8_unicode_ci NOT NULL,
+  `type` varchar(255) collate utf8_unicode_ci NOT NULL,
   `data` longtext collate utf8_unicode_ci NOT NULL,
   UNIQUE KEY `sid` (`sid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -832,7 +836,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','350007');
+INSERT INTO `update_info` VALUES ('db_version','350008');
 /*!40000 ALTER TABLE `update_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -856,7 +860,7 @@ CREATE TABLE `user` (
   `validation` varchar(128) character set utf8 default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`)
-) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -995,11 +999,15 @@ CREATE TABLE `video` (
   `time` int(11) unsigned NOT NULL,
   `size` bigint(20) unsigned NOT NULL,
   `mime` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `addition_time` int(11) unsigned NOT NULL,
+  `update_time` int(11) unsigned default NULL,
   `enabled` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id`),
   KEY `file` (`file`),
   KEY `enabled` (`enabled`),
-  KEY `title` (`title`)
+  KEY `title` (`title`),
+  KEY `addition_time` (`addition_time`),
+  KEY `update_time` (`update_time`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SET character_set_client = @saved_cs_client;
 
@@ -1021,4 +1029,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2009-03-08  5:04:46
+-- Dump completed on 2009-03-15 23:52:10
diff --git a/sql/ampache40.sql b/sql/ampache40.sql
index d0f7b546..3c782809 100644
--- a/sql/ampache40.sql
+++ b/sql/ampache40.sql
@@ -102,7 +102,8 @@ CREATE TABLE `album_data` (
   `art_mime` varchar(64) default NULL,
   `thumb` mediumblob,
   `thumb_mime` varchar(64) default NULL,
-  UNIQUE KEY `album_id` (`album_id`)
+  UNIQUE KEY `album_id` (`album_id`),
+  KEY `art_mime` (`art_mime`)
 ) TYPE=MyISAM;
 SET character_set_client = @saved_cs_client;
 
@@ -154,7 +155,8 @@ CREATE TABLE `artist_data` (
   `thumb` mediumblob,
   `thumb_mime` varchar(32) default NULL,
   `bio` text NOT NULL,
-  UNIQUE KEY `artist_id` (`artist_id`)
+  UNIQUE KEY `artist_id` (`artist_id`),
+  KEY `art_mime` (`art_mime`)
 ) TYPE=MyISAM;
 SET character_set_client = @saved_cs_client;
 
@@ -387,10 +389,12 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `now_playing` (
   `id` varchar(64) NOT NULL default '',
-  `song_id` int(11) unsigned NOT NULL default '0',
+  `object_id` int(11) unsigned NOT NULL,
+  `object_type` varchar(255) NOT NULL,
   `user` int(11) NOT NULL,
   `expire` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  (`id`),
+  KEY `expire` (`expire`)
 ) TYPE=MyISAM;
 SET character_set_client = @saved_cs_client;
 
@@ -627,7 +631,6 @@ 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) default NULL,
   PRIMARY KEY  (`id`),
   KEY `album` (`album`),
   KEY `artist` (`artist`),
@@ -739,6 +742,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `tmp_browse` (
   `sid` varchar(128) NOT NULL,
+  `type` varchar(255) NOT NULL,
   `data` longtext NOT NULL,
   UNIQUE KEY `sid` (`sid`)
 ) TYPE=MyISAM;
@@ -827,7 +831,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','350007');
+INSERT INTO `update_info` VALUES ('db_version','350008');
 /*!40000 ALTER TABLE `update_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -851,7 +855,7 @@ CREATE TABLE `user` (
   `validation` varchar(128) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`)
-) TYPE=MyISAM AUTO_INCREMENT=2;
+) TYPE=MyISAM;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -990,11 +994,15 @@ CREATE TABLE `video` (
   `time` int(11) unsigned NOT NULL,
   `size` bigint(20) unsigned NOT NULL,
   `mime` varchar(255) NOT NULL,
+  `addition_time` int(11) unsigned NOT NULL,
+  `update_time` int(11) unsigned default NULL,
   `enabled` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id`),
   KEY `file` (`file`),
   KEY `enabled` (`enabled`),
-  KEY `title` (`title`)
+  KEY `title` (`title`),
+  KEY `addition_time` (`addition_time`),
+  KEY `update_time` (`update_time`)
 ) TYPE=MyISAM;
 SET character_set_client = @saved_cs_client;
 
@@ -1013,4 +1021,4 @@ UNLOCK TABLES;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2009-03-08  5:05:52
+-- Dump completed on 2009-03-15 23:54:50
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index 72094209..cbd5998d 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -38,8 +38,6 @@
 		<option value="-1"><?php echo _('All'); ?></option>
 		</select>
 	</td>
-	<td rowspan="5" valign="top"><?php echo  _('Tags'); ?></td>
-	<td rowspan="5">
 	</td>
 </tr>
 <tr>