summaryrefslogtreecommitdiffstats
path: root/lib/class/update.class.php
blob: f09047cc7e66b306a5f63151d06e7e429edebc47 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
<?php
/*

 Copyright (c) Ampache.org
 All rights reserved.

 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License v2
 as published by the Free Software Foundation.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 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.
*/

/**
 * Update Class
 * this class handles updating from one version of 
 * ampache to the next. Versions are a 6 digit number
 *  220000
 *  ^
 *  Major Revision
 *	
 *  220000
 *   ^
 *  Minor Revision
 *
 * The last 4 digits are a build number...
 * If Minor can't go over 9 Major can go as high as we want
 */
class Update {

	public $key;
	public $value;
	public static $versions; // array containing version information

	/**
	 * Update
	 * Constructor, pulls out information about the desired key
	 */
	function Update ( $key=0 ) {

		if (!$key) { return false; } 

		$this->key = intval($key);
		$info = $this->_get_info();
		$this->value = $info['value'];
		$this->versions = $this->populate_version();

	} // constructor

	/**
	 * _get_info
	 * gets the information for the zone
	 */
	private function _get_info() {

		$sql = "SELECT * FROM `update_info` WHERE `key`='$this->key'";
		$db_results = Dba::query($sql);

		return Dba::fetch_assoc($db_results);		

	} // _get_info

	/**
	 * get_version
	 * this checks to see what version you are currently running
	 * because we may not have the update_info table we have to check 
	 * for it's existance first. 
	 */
	public static function get_version() {

		/* Make sure that update_info exits */
		$sql = "SHOW TABLES LIKE 'update_info'";
		$db_results = Dba::query($sql);
		if (!is_resource(Dba::dbh())) { header("Location: test.php"); } 

		// If no table
		if (!Dba::num_rows($db_results)) {
			// They can't upgrade, they are too old
			header("Location: test.php");
			
		} // if table isn't found

		else {
			// If we've found the update_info table, let's get the version from it
			$sql = "SELECT * FROM `update_info` WHERE `key`='db_version'";
			$db_results = Dba::query($sql);
			$results = Dba::fetch_assoc($db_results);
			$version = $results['value'];
		} 

		return $version;

	} // get_version

	/**
	 * format_version
	 * make the version number pretty
	 */
	public static function format_version($data) {

		$new_version = substr($data,0,strlen($data) - 5) . "." . substr($data,strlen($data)-5,1) . " Build:" . 
				substr($data,strlen($data)-4,strlen($data));

		return $new_version;

	} // format_version

	/**
	 * need_update
	 * checks to see if we need to update 
	 * ampache at all
	 */
	public static function need_update() {

		$current_version = self::get_version();
		
		if (!is_array(self::$versions)) {
			self::$versions = self::populate_version();
		}
		
		/* 
		   Go through the versions we have and see if
		   we need to apply any updates
		*/
		foreach (self::$versions as $update) {
			if ($update['version'] > $current_version) {
				return true;
			}

		} // end foreach version

		return false;

	} // need_update

	/**
	 * plugins_installed
	 * This function checks to make sure that there are no plugins
	 * installed before allowing you to run the update. this is
	 * to protect the integrity of the database
	 */
	public static function plugins_installed() { 

		/* Pull all version info */
		$sql = "SELECT * FROM `update_info`";
		$db_results = Dba::query($sql);

		while ($results = Dba::fetch_assoc($db_results)) { 

			/* We have only one allowed string */
			if ($results['key'] != 'db_version') { 
				return false; 
			}

		} // while update_info results
	
		return true; 

	} // plugins_installed

	/**
	 * populate_version
	 * just sets an array the current differences
	 * that require an update
	 */
	public static function populate_version() {

		/* Define the array */
		$version = array();
	
		$update_string = '- Moved back to ID for user tracking internally.<br />' . 
				'- Added date to user_vote to allow sorting by vote time.<br />' . 
				'- Added Random Method and Object Count Preferences.<br />' . 
				'- Removed some unused tables/fields.<br />' . 
				'- Added Label, Catalog # and Language to Extended Song Data Table.';

		$version[] = array('version' => '340001','description' => $update_string);

		$update_string = '- Added Offset Limit to Preferences and removed from user table.';

		$version[] = array('version' => '340002','description' => $update_string); 

		$update_string = '- Moved Art from the Album table into album_data to improve performance.<br />' . 
				'- Made some minor changes to song table to reduce size of each row.<br />' . 
				'- Moved song_ext_data to song_data to match album_data pattern.<br />' . 
				'- Added Playlist Method and Rate Limit Preferences.<br />' . 
				'- Renamed preferences and ratings to preference and rating to fit table pattern.<br />' . 
				'- Fixed rating table, renamed user_rating to rating and switched 00 for -1.<br />';

		$version[] = array('version' => '340003','description' => $update_string); 

		$update_string = '- Alter the Session.id to be VARCHAR(64) to account for all potential configs.<br />' . 
				'- Added new user_shout table for Sticky objects / shoutbox.<br />' . 
				'- Added new playlist preferences, and new preference catagory of playlist.<br />' . 
				'- Tweaked Now Playing Table.<br />'; 

		$version[] = array('version' => '340004','description' => $update_string); 

		$update_string = '- Altered Ratings table so the fields make more sense.<br />' . 
				'- Moved Random Method to Playlist catagory.<br />' . 
				'- Added Transcode Method to Streaming.<br />'; 

		$version[] = array('version' => '340005','description' => $update_string); 

		$update_string = '- Remove Random Method config option, ended up being useless.<br />' . 
				'- Check and change album_data.art to a MEDIUMBLOB if needed.<br />';

		$version[] = array('version' => '340006','description' => $update_string); 

		$update_string = '- Added new session_stream table for sessions tied directly to stream instances.<br />' . 
				'- Altered the session table, making value a LONGTEXT.<br />'; 

		$version[] = array('version' => '340007','description' => $update_string); 

		$update_string = '- Modified Playlist_Data table to account for multiple object types.<br />' . 
				'- Verified previous updates, adjusting as needed.<br />' . 
				'- Dropped Allow Downsampling pref, configured in cfg file.<br />' . 
				'- Renamed Downsample Rate --> Transcode Rate to reflect new terminiology.<br />';

		$version[] = array('version' => '340008','description' => $update_string); 

		$update_string = '- Added disk to Album table.<br />' . 
				'- Added artist_data for artist images and bios.<br />' . 
				'- Added DNS to access list to allow for dns based ACLs.<br />';

		$version[] = array('version' => '340009','description' => $update_string); 

		$update_string = '- Removed Playlist Add preference.<br />' . 
				'- Moved Localplay* preferences to options.<br />' . 
				'- Tweaked Default Playlist Method.<br />' . 
				'- Change wording on Localplay preferences.<br />'; 
		$version[] = array('version' => '340010','description'=>$update_string); 

		$update_string =  '- Added api session table, will eventually recombine with others.<br />'; 

		$version[] = array('version' => '340011','description'=>$update_string); 

		$update_string = '- Added Democratic Table for new democratic play features.<br />' . 
				'- Added Add Path to Catalog to improve add speeds on large catalogs.<br />'; 
		
		$version[] = array('version' => '340012','description'=>$update_string); 

		$update_string = '- Removed Unused Preferences.<br />' . 
				'- Changed Localplay Config to Localplay Access.<br />' . 
				'- Changed all XML-RPC acls to RPC to reflect inclusion of new API.<br />';
		
		$version[] = array('version' => '340013','description'=>$update_string);

		$update_string = '- Removed API Session table, been a nice run....<br />' . 
				'- Alterted Session table to handle API sessions correctly.<br />';

		$version[] = array('version' => '340014','description'=>$update_string); 

		$update_string = '- Alter Playlist Date Field to fix issues with some MySQL configurations.<br />' . 
				'- Alter Rating type to correct AVG issue on searching.<br />'; 
		
		$version[] = array('version' => '340015','description'=>$update_string); 

		$update_string = '- Alter the Democratic Playlist table, adding base_playlist.<br />' . 
				'- Alter tmp_playlist to account for Democratic changes.<br />' . 
				'- Cleared Existing Democratic playlists due to changes.<br />'; 

		$version[] = array('version' => '340016','description'=>$update_string); 

		$update_string = '- Fix Tables for new Democratic Play methodology.<br />';

		$version[] = array('version' => '340017','description'=>$update_string); 

		$update_string = '- Attempt to detect and correct charset issues between filesystem and database.<br />'; 

		$version[] = array('version' => '340018','description'=>$update_string); 

		$update_string = '- Modify the Tag tables so that they actually work.<br />' . 
				'- Alter the Prefix fields to allow for more prefixs.<br />'; 
		
		$version[] = array('version' => '350001','description'=>$update_string); 

		$update_string = '- Remove Genre Field from song table.<br />' . 
				'- Add user_catalog table for tracking user<-->catalog mappings.<br />' . 
				'- Add tmp_browse to handle caching rather then session table.<br />';  

		$version[] = array('version' => '350002','description'=>$update_string); 


		return $version;

	} // populate_version

	/**
	 * display_update
	 * This displays a list of the needed
	 * updates to the database. This will actually
	 * echo out the list...
	 */
	public static function display_update() {

		$current_version = self::get_version();
		if (!is_array(self::$versions)) {
			self::$versions = self::populate_version();
		} 

		echo "<ul>\n";

		foreach (self::$versions as $version) {
		
			if ($version['version'] > $current_version) {
				$updated = true;
				echo "<li><b>Version: " . self::format_version($version['version']) . "</b><br />";
				echo $version['description'] . "<br /></li>\n"; 
			} // if newer
		
		} // foreach versions

		echo "</ul>\n";

		if (!$updated) { echo "<p align=\"center\">No Updates Needed [<a href=\"" . Config::get('web_path') . "\">Return]</a></p>"; }
	} // display_update

	/**
	 * run_update
	 * This function actually updates the db.
	 * it goes through versions and finds the ones 
	 * that need to be run. Checking to make sure
	 * the function exists first.
	 */
	public static function run_update() {
	
		/* Nuke All Active session before we start the mojo */
		$sql = "TRUNCATE session";
		$db_results = Dba::query($sql);
                
		// Prevent the script from timing out, which could be bad
		set_time_limit(0);

		/* Verify that there are no plugins installed 
		//FIXME: provide a link to remove all plugins, otherwise this could turn into a catch 22
		if (!$self::plugins_installed()) { 
			$GLOBALS['error']->add_error('general',_('Plugins detected, please remove all Plugins and try again'));
			return false; 
		} */

		$methods = array();
		
		$current_version = self::get_version();

		// Run a check to make sure that they don't try to upgrade from a version that
		// won't work. 
		if ($current_version < '340001') { 
			echo "<p align=\"center\">Database version too old, please upgrade to <a href=\"http://ampache.org/downloads/ampache-3.3.3.5.tar.gz\">Ampache-3.3.3.5</a> first</p>";			
			return false; 
		} 
			
		
		$methods = get_class_methods('Update');
		
		if (!is_array((self::$versions))) { 
			self::$versions = self::populate_version();
		}

		foreach (self::$versions as $version) { 

			// If it's newer than our current version
			// let's see if a function exists and run the 
			// bugger
			if ($version['version'] > $current_version) { 
				$update_function = "update_" . $version['version'];
				if (in_array($update_function,$methods)) {
					$success = call_user_func(array('Update',$update_function)); 

					// If the update fails drop out
					if (!$success) { 
						Error::display('update'); 
						return false; 
					} 
				}

			} 
		
		} // end foreach version

	} // run_update

	/**
	 * set_version
	 * This updates the 'update_info' which is used by the updater
	 * and plugins
	 */
	private static function set_version($key,$value) {

		$sql = "UPDATE update_info SET value='$value' WHERE `key`='$key'";
		$db_results = Dba::query($sql);		

	} //set_version

	/**
 	 * update_340001
	 * This update moves back to the ID for user UID and 
	 * adds date to the user_vote so that it can be sorted
	 * correctly
	 */
	private function update_340001() { 


		// Build the User -> ID map using the username as the key
		$sql = "SELECT `id`,`username` FROM `user`"; 
		$db_results = Dba::query($sql);

		$user_array = array(); 

		while ($r = mysql_fetch_assoc($db_results)) { 
			$username = $r['username'];
			$user_array[$username] = Dba::escape($r['id']); 
		} // end while

		// Alter the user table so that you can't have an ID beyond the 
		// range of the other tables which have to allow for -1
		$sql = "ALTER TABLE `user` CHANGE `id` `id` INT ( 11 ) NOT NULL AUTO_INCREMENT";
		$db_results = Dba::query($sql); 

		// Now pull the access list users, alter table and then re-insert
		$sql = "SELECT DISTINCT(`user`) FROM `access_list`"; 
		$db_results = Dba::query($sql); 

		while ($r = Dba::fetch_assoc($db_results)) { 
			// Build the new SQL
			$username	= $r['user'];
			$user_id	= $user_array[$username]; 
			$username	= Dba::escape($username); 

			$sql = "UPDATE `access_list` SET `user`='$user_id' WHERE `user`='$username'"; 
			$update_results = Dba::query($sql); 

		} // end while access_list

		// Alter the table
		$sql = "ALTER TABLE `access_list` CHANGE `user` `user` INT ( 11 ) NOT NULL";
		$db_results = Dba::query($sql);

		// Now pull flagged users, update and alter
		$sql = "SELECT DISTINCT(`user`) FROM `flagged`";
		$db_results = Dba::query($sql); 

		while ($r = Dba::fetch_assoc($db_results)) { 
			$username	= $r['user']; 
			$user_id	= $user_array[$username];
			$username	= Dba::escape($username); 

			$sql = "UPDATE `flagged` SET `user`='$user_id' WHERE `user`='$username'";
			$update_results = Dba::query($sql); 

		} // end while 

		// Alter the table
		$sql = "ALTER TABLE `flagged` CHANGE `user` `user` INT ( 11 ) NOT NULL";
		$db_results = Dba::query($sql); 


		// Now fix up the ip history
		$sql = "SELECT DISTINCT(`user`) FROM `ip_history`";
		$db_results = Dba::query($sql); 

		while ($r = Dba::fetch_assoc($db_results)) { 
			$username 	= $r['user'];
			$user_id	= $user_array[$username];
			$username	= Dba::escape($username); 

			$sql = "UPDATE `ip_history` SET `user`='$user_id' WHERE `user`='$username'";
			$update_results = Dba::query($sql); 

		} // end while

		// Alter the table
		$sql = "ALTER TABLE `ip_history` CHANGE `user` `user` INT ( 11 ) NOT NULL";
		$db_results = Dba::query($sql); 

		// Now fix now playing
		$sql = "SELECT DISTINCT(`user`) FROM `now_playing`";
		$db_results = Dba::query($sql); 

		while ($r = Dba::fetch_assoc($db_results)) { 
			$username	= $r['user'];
			$user_id	= $user_array[$username];
			$username	= Dba::escape($username); 

			$sql = "UPDATE `now_playing` SET `user`='$user_id' WHERE `user`='$username'";
			$update_results = Dba::query($sql); 

		} // end while

		// Alter the table
		$sql = "ALTER TABLE `now_playing` CHANGE `user` `user` INT ( 11 ) NOT NULL";
		$db_results = Dba::query($sql); 

		// Now fix the playlist table
		$sql = "SELECT DISTINCT(`user`) FROM `playlist`";
		$db_results = Dba::query($sql); 

		while ($r = Dba::fetch_assoc($db_results)) { 
			$username	= $r['user'];
			$user_id	= $user_array[$username];
			$username	= Dba::escape($username); 

			$sql = "UPDATE `playlist` SET `user`='$user_id' WHERE `user`='$username'";
			$update_results = Dba::query($sql); 

		} // end while

		// Alter the table
		$sql = "ALTER TABLE `playlist` CHANGE `user` `user` INT ( 11 ) NOT NULL";
		$db_results = Dba::query($sql); 

		// Drop unused table
		$sql = "DROP TABLE `playlist_permission`";
		$db_results = Dba::query($sql); 

		// Now fix the ratings table
		$sql = "SELECT DISTINCT(`user`) FROM `ratings`";
		$db_results = Dba::query($sql); 

		while ($r = Dba::fetch_assoc($db_results)) { 
			$username	= $r['user'];
			$user_id	= $user_array[$username];
			$username	= Dba::escape($username); 

			$sql = "UPDATE `ratings` SET `user`='$user_id' WHERE `user`='$username'";
			$update_results = Dba::query($sql); 

		} // end while

		$sql = "ALTER TABLE `ratings` CHANGE `user` `user` INT ( 11 ) NOT NULL";
		$db_results = Dba::query($sql); 
		
		// Now work on the tag_map 
		$sql = "ALTER TABLE `tag_map` CHANGE `user_id` `user` INT ( 11 ) NOT NULL"; 
		$db_results = Dba::query($sql); 

		// Now fix user preferences
		$sql = "SELECT DISTINCT(`user`) FROM `user_preference`";
		$db_results = Dba::query($sql); 

		while ($r = Dba::fetch_assoc($db_results)) { 
			$username	 = $r['user'];
			$user_id	 = $user_array[$username];
			$username	 = Dba::escape($username); 

			$sql = "UPDATE `user_preference` SET `user`='$user_id' WHERE `user`='$username'"; 
			$update_results = Dba::query($sql); 

		} // end while

		// Alter the table
		$sql = "ALTER TABLE `user_preference` CHANGE `user` `user` INT ( 11 ) NOT NULL";
		$db_results = Dba::query($sql); 

		// Add a date to the user_vote
		$sql = "ALTER TABLE `user_vote` ADD `date` INT( 11 ) UNSIGNED NOT NULL";
		$db_results = Dba::query($sql); 

		// Add the index for said field
		$sql = "ALTER TABLE `user_vote` ADD INDEX(`date`)";
		$db_results = Dba::query($sql); 

		// Add the thumb fields to album
		$sql = "ALTER TABLE `album` ADD `thumb` TINYBLOB NULL ,ADD `thumb_mime` VARCHAR( 128 ) NULL";
		$db_results = Dba::query($sql); 

		// Now add in the min_object_count preference and the random_method
		$sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . 
			"VALUES('min_object_count','1','Min Element Count','5','integer','interface')";
		$db_results = Dba::query($sql); 

		$sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . 
			"VALUES('random_method','default','Random Method','5','string','interface')"; 
		$db_results = Dba::query($sql); 

		// Delete old preference
		$sql = "DELETE FROM `preferences` WHERE `name`='min_album_size'"; 
		$db_results = Dba::query($sql); 

		// Make Hash a non-required field and smaller
		$sql = "ALTER TABLE `song` CHANGE `hash` `hash` VARCHAR ( 64 ) NULL";
		$db_results = Dba::query($sql); 

		// Make user access an int, nothing else
		$sql = "UPDATE `user` SET `access`='100' WHERE `access`='admin'";
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `user` SET `access`='25' WHERE `access`='user'";
		$db_results = Dba::query($sql); 
		
		$sql = "UPDATE `user` SET `access`='5' WHERE `access`='guest'";
		$db_results = Dba::query($sql); 	

		// Alter the table
		$sql = "ALTER TABLE `user` CHANGE `access` `access` TINYINT ( 4 ) UNSIGNED NOT NULL";
		$db_results = Dba::query($sql); 

		// Add in Label and Catalog # and language
		$sql = "ALTER TABLE `song_ext_data` ADD `label` VARCHAR ( 128 ) NULL, ADD `catalog_number` VARCHAR ( 128 ) NULL, ADD `language` VARCHAR ( 128 ) NULL";
		$db_results = Dba::query($sql); 

                /* Fix every users preferences */
                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql); 
         
                User::fix_preferences('-1');
        
                while ($r = Dba::fetch_assoc($db_results)) {
                        User::fix_preferences($r['id']);
                } // while results

		self::set_version('db_version','340001');

		return true; 

	} //update_340001

	/**
 	 * update_340002
	 * This update tweaks the preferences a little more and make sure that the 
	 * min_object_count has a rational value
	 */
	private function update_340002() { 

		/* Add the offset_limit preference and remove it from the user table */
		$sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . 
			"VALUES ('offset_limit','50','Offset Limit','5','integer','interface')";
		$db_results = Dba::query($sql); 
		
		self::set_version('db_version','340002'); 

		return true; 

	} // update_340002

	/**
	 * update_340003
	 * This update moves the album art out of the album table
	 * and puts it in an album_data table. It also makes some
	 * minor changes to the song table in an attempt to reduce
	 * the size of each row
	 */
	public static function update_340003() { 

		$sql = "ALTER TABLE `song` CHANGE `mode` `mode` ENUM( 'abr', 'vbr', 'cbr' ) NULL DEFAULT 'cbr'";
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `song` CHANGE `time` `time` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT '0'";
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `song` CHANGE `rate` `rate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'";
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `song` CHANGE `bitrate` `bitrate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'";
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `song` CHANGE `track` `track` SMALLINT( 5 ) UNSIGNED NULL DEFAULT NULL "; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `user` CHANGE `disabled` `disabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'";
		$db_results = Dba::query($sql); 

		$sql = "CREATE TABLE `album_data` (" . 
			"`album_id` INT( 11 ) UNSIGNED NOT NULL , " . 
			"`art` MEDIUMBLOB NULL , " . 
			"`art_mime` VARCHAR( 64 ) NULL , " . 
			"`thumb` BLOB NULL , " . 
			"`thumb_mime` VARCHAR( 64 ) NULL , " . 
			"UNIQUE ( `album_id` )" . 
			") ENGINE = MYISAM";
		$db_results = Dba::query($sql); 

		/* Foreach the Albums and move the data into the new album_data table */
		$sql = "SELECT * FROM album"; 
		$db_results = Dba::query($sql); 

		while ($data = Dba::fetch_assoc($db_results)) { 
			$id = $data['id'];
			$art = Dba::escape($data['art']); 
			$art_mime = Dba::escape($data['art_mime']); 
			$thumb = Dba::escape($data['thumb']); 
			$thumb_mime = Dba::escape($data['thumb_mime']); 
			$sql = "INSERT INTO `album_data` (`album_id`,`art`,`art_mime`,`thumb`,`thumb_mime`)" . 
				" VALUES ('$id','$art','$art_mime','$thumb','$thumb_mime')"; 
			$insert_results = Dba::query($sql); 
		} // end while

		$sql = "RENAME TABLE `song_ext_data`  TO `song_data`"; 
		$db_results = Dba::query($sql); 

		$sql = "RENAME TABLE `preferences` TO `preference`"; 
		$db_results = Dba::query($sql); 

		$sql = "RENAME TABLE `ratings` TO `rating`"; 
		$db_results = Dba::query($sql); 

		// Go ahead and drop the art/thumb stuff
		$sql = "ALTER TABLE `album`  DROP `art`,  DROP `art_mime`,  DROP `thumb`,  DROP `thumb_mime`"; 
		$db_results = Dba::query($sql); 

		// We need to fix the user_vote table
		$sql = "ALTER TABLE `user_vote` CHANGE `user` `user` INT( 11 ) UNSIGNED NOT NULL"; 
		$db_results = Dba::query($sql); 

		// Remove offset limit from the user
		$sql = "ALTER TABLE `user` DROP `offset_limit`"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `rating` CHANGE `user_rating` `rating` ENUM( '-1', '0', '1', '2', '3', '4', '5' ) NOT NULL DEFAULT '0'"; 
		$db_results = Dba::query($sql);

                /* Add the rate_limit preference */
                $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
                        "VALUES ('rate_limit','8192','Rate Limit','100','integer','streaming')";
                $db_results = Dba::query($sql);

                /* Add the playlist_method preference and remove it from the user table */
                $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
                        "VALUES ('playlist_method','normal','Playlist Method','5','string','streaming')";
                $db_results = Dba::query($sql);

		$sql = "ALTER TABLE `update_info` ADD UNIQUE (`key`)"; 
		$db_results = Dba::query($sql); 

                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql);

                User::fix_preferences('-1'); 

                while ($r = Dba::fetch_assoc($db_results)) { 
                        User::fix_preferences($r['id']);
                }

		self::set_version('db_version','340003'); 

		return true; 

	} // update_340003

	/**
 	 * update_340004
	 * Update the session.id to varchar(64) to handle 
	 * newer configs
	 */
	public static function update_340004() { 

                /* Alter the session.id so that it's 64 */
                $sql = "ALTER TABLE `session` CHANGE `id` `id` VARCHAR( 64 ) NOT NULL";
		$db_results = Dba::query($sql); 

		/* Add Playlist Related Preferences */
		$sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . 
			"VALUES ('playlist_add','append','Add Behavior','5','string','playlist')"; 
		$db_results = Dba::query($sql); 

		// Switch the existing preferences over to this new catagory
		$sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='playlist_method' " . 
			" OR `name`='playlist_type'"; 
		$db_results = Dba::query($sql); 
	
		// Change the default value for playlist_method
		$sql = "UPDATE `preference` SET `value`='normal' WHERE `name`='playlist_method'"; 
		$db_results = Dba::query($sql); 
		
		// Add in the shoutbox
		$sql = "CREATE TABLE `user_shout` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . 
			"`user` INT( 11 ) NOT NULL , " . 
			"`text` TEXT NOT NULL , " . 
			"`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 " . 
			") ENGINE = MYISAM"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `user_shout` ADD INDEX ( `sticky` )"; 
		$db_results = Dba::query($sql); 	

		$sql = "ALTER TABLE `user_shout` ADD INDEX ( `date` )"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `user_shout` ADD INDEX ( `user` )"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `now_playing` CHANGE `start_time` `expire` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0'"; 
		$db_results = Dba::query($sql); 

		$sql = "OPTIMIZE TABLE `album`"; 
		$db_results = Dba::query($sql); 

                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql);

                User::fix_preferences('-1');

                while ($r = Dba::fetch_assoc($db_results)) {
                        User::fix_preferences($r['id']);
                }

		// Update our database version now that we are all done
		self::set_version('db_version','340004'); 

		return true; 

	} // update_340004	

	/**
	 * update_340005
	 * This update fixes the preferences types 
 	 */
	public static function update_340005() { 

		// Turn user_rating into a tinyint and call it score
		$sql = "ALTER TABLE `rating` CHANGE `user_rating` `score` TINYINT( 4 ) UNSIGNED NOT NULL DEFAULT '0'";
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='random_method'"; 
		$db_results = Dba::query($sql); 

		$sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . 
			"VALUES ('transcode','default','Transcoding','25','string','streaming')"; 
		$db_results = Dba::query($sql);

		/* We need to check for playlist_method here because I fubar'd an earlier update */
		$sql = "SELECT * FROM `preference` WHERE `name`='playlist_method'"; 
		$db_results = Dba::query($sql); 
		if (!Dba::num_rows($db_results)) { 
	                /* Add the playlist_method preference and remove it from the user table */
	                $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
	                        "VALUES ('playlist_method','default','Playlist Method','5','string','playlist')";
	                $db_results = Dba::query($sql);
		} 

		// Add in the object_type to the tmpplaylist data table so that we can have non-songs in there
		$sql = "ALTER TABLE `tmp_playlist_data` ADD `object_type` VARCHAR( 32 ) NULL AFTER `tmp_playlist`";
		$db_results = Dba::query($sql); 

                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql);

                User::fix_preferences('-1');

                while ($r = Dba::fetch_assoc($db_results)) {
                        User::fix_preferences($r['id']);
                }

		self::set_version('db_version','340005'); 	

		return true; 

	} // update_340005

	/**
	 * update_340006
	 * This just updates the size of the album_data table 
	 * and removes the random_method config option
	 */
	public static function update_340006() { 

		$sql = "DESCRIBE `album_data`"; 
		$db_results = Dba::query($sql); 

		while ($row = Dba::fetch_assoc($db_results)) { 
			if ($row['Field'] == 'art' AND $row['Type'] == 'blob') { 
				$blob_needed = true; 
			} 
		} // end while 
		if ($blob_needed) { 
			$sql = "ALTER TABLE `album_data` CHANGE `art` `art` MEDIUMBLOB NULL DEFAULT NULL";
			$db_results = Dba::query($sql); 
		} 

		// No matter what remove that random method preference
		$sql = "DELETE FROM `preference` WHERE `name`='random_method'";
		$db_results = Dba::query($sql); 

                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql);

                User::fix_preferences('-1');

                while ($r = Dba::fetch_assoc($db_results)) {
                        User::fix_preferences($r['id']);
                }

                self::set_version('db_version','340006');

                return true;


	} // update_340006

	/**
	 * update_340007
	 * This update converts the session.value to a longtext
	 * and adds a session_stream table
	 */
	public static function update_340007() { 

		// Tweak the session table to handle larger session vars for my page-a-nation hotness
		$sql = "ALTER TABLE `session` CHANGE `value` `value` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; 
		$db_results = Dba::query($sql); 

		// Create the new stream table where we will store stream SIDs
		$sql = "CREATE TABLE `session_stream` ( " . 
			"`id` VARCHAR( 64 ) NOT NULL , " . 
			"`user` INT( 11 ) UNSIGNED NOT NULL , " . 
			"`agent` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL , " . 
			"`expire` INT( 11 ) UNSIGNED NOT NULL , " . 
			"`ip` INT( 11 ) UNSIGNED NULL , " . 
			"PRIMARY KEY ( `id` ) " . 
			") ENGINE = MYISAM"; 
		$db_results = Dba::query($sql); 

		// Change the now playing to use stream session ids for its ID
		$sql = "ALTER TABLE `now_playing` CHANGE `id` `id` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; 
		$db_results = Dba::query($sql); 

		// Now longer needed because of the new hotness
		$sql = "ALTER TABLE `now_playing` DROP `session`"; 
		$db_results = Dba::query($sql); 

		self::set_version('db_version','340007'); 

		return true; 

	} // update_340007

	/**
	 * update_340008
	 * This modifies the playlist table to handle the different types of objects that it needs to be able to
	 * store, and tweaks how dynamic playlist stuff works
	 */
	public static function update_340008() { 

		$sql = "ALTER TABLE `playlist_data` CHANGE `song` `object_id` INT( 11 ) UNSIGNED NULL DEFAULT NULL"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `playlist_data` CHANGE `dyn_song` `dynamic_song` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `playlist_data` ADD `object_type` VARCHAR( 32 ) NOT NULL DEFAULT 'song' AFTER `object_id`"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `playlist` ADD `genre` INT( 11 ) UNSIGNED NOT NULL AFTER `type`"; 
		$db_results = Dba::query($sql); 

		$sql = "DELETE FROM `preference` WHERE `name`='allow_downsample_playback'"; 
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `preference` SET `description`='Transcode Bitrate' WHERE `name`='sample_rate'"; 
		$db_results = Dba::query($sql); 

		// Check for old tables and drop if found, seems like there was a glitch that caused them
		// not to get droped.. *shrug*
		$sql = "DROP TABLE IF EXISTS `preferences`"; 
		$db_results = Dba::query($sql); 

		$sql = "DROP TABLE IF EXISTS `song_ext_data`"; 
		$db_results = Dba::query($sql); 

		$sql = "DROP TABLE IF EXISTS `ratings`"; 
		$db_results = Dba::query($sql); 

                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql); 

                User::fix_preferences('-1');

                while ($r = Dba::fetch_assoc($db_results)) {
                        User::fix_preferences($r['id']); 
                }

		self::set_version('db_version','340008'); 

		return true; 

	} // update_340008

	/**
	 * update_340009
	 * This modifies the song table to handle pos fields
	 */
	public static function update_340009() { 

		$sql = "ALTER TABLE `album` ADD `disk` smallint(5) UNSIGNED DEFAULT NULL";
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `album` ADD INDEX (`disk`)";
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `access_list` ADD `dns` VARCHAR( 255 ) NOT NULL AFTER `end`"; 
		$db_results = Dba::query($sql); 

		$sql = "CREATE TABLE `artist_data` (" . 
			"`artist_id` INT( 11 ) UNSIGNED NOT NULL ," . 
			"`art` MEDIUMBLOB NOT NULL ," . 
			"`art_mime` VARCHAR( 32 ) NOT NULL ," . 
			"`thumb` BLOB NOT NULL ," . 
			"`thumb_mime` VARCHAR( 32 ) NOT NULL ," . 
			"`bio` TEXT NOT NULL , " . 
			"UNIQUE (`artist_id`) ) ENGINE = MYISAM";
		$db_results = Dba::query($sql); 

		self::set_version('db_version','340009'); 

		return true; 

	} // update_340009

	/**
	 * update_340010
	 * Bunch of minor tweaks to the preference table
	 */
	public static function update_340010() { 

		$sql = "UPDATE `preference` SET `catagory`='options' WHERE `name` LIKE 'localplay_%'"; 
		$db_results = Dba::query($sql); 

		$sql = "DELETE FROM `preference` WHERE `name`='playlist_add'"; 
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `preference` SET `catagory`='plugins' WHERE (`name` LIKE 'mystrands_%' OR `name` LIKE 'lastfm_%') AND `catagory`='options'"; 
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `preference` SET `value`='default' WHERE `name`='playlist_method'"; 
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `preference` SET `description`='Localplay Config' WHERE `name`='localplay_level'"; 
		$db_results = Dba::query($sql); 

                /* Fix every users preferences */
                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql); 

                User::fix_preferences('-1');

                while ($r = Dba::fetch_assoc($db_results)) {
                        User::fix_preferences($r['id']);
                } // while results

		self::set_version('db_version','340010'); 

		return true; 

	} // update_340010

	/**
	 * update_340011
	 * This updates the democratic play stuff so that can handle a little more complext mojo
	 * It also adds yet another table to the db to handle the sessions for API access. Eventually
	 * should combine all of the session tables, but I'll do that later
	 */
	public static function update_340011() { 

		// First add the new table for the new session stuff
                $sql = "CREATE TABLE `session_api` ( " .
                        "`id` VARCHAR( 64 ) NOT NULL , " .
                        "`user` INT( 11 ) UNSIGNED NOT NULL , " .
                        "`agent` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL , " .
			"`level` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', " . 
                        "`expire` INT( 11 ) UNSIGNED NOT NULL , " .
                        "`ip` INT( 11 ) UNSIGNED NULL , " .
                        "PRIMARY KEY ( `id` ) " .
                        ") ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
                $db_results = Dba::query($sql);

		self::set_version('db_version','340011'); 		

		return true; 

	} // 340011

	/**
	 * update_340012
	 * This update adds in the democratic stuff, checks for some potentially screwed up indexes
	 * and removes the timestamp from the playlist, and adds the field to the catalog for the upload dir
	 */
	public static function update_340012() { 

		$sql = "ALTER TABLE `catalog` ADD `add_path` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER `path`"; 
		$db_results = Dba::query($sql); 

		$sql = "CREATE TABLE `democratic` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . 
			"`name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL ," . 
			"`cooldown` TINYINT( 4 ) UNSIGNED NULL ," . 
			"`level` TINYINT( 4 ) UNSIGNED NOT NULL DEFAULT '25'," . 
			"`user` INT( 11 ) NOT NULL ," . 
			"`primary` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'" . 
			") ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `democratic` ADD INDEX (`primary`)"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `democratic` ADD INDEX (`level`)"; 
		$db_results = Dba::query($sql);

		self::set_version('db_version','340012'); 

		return true; 

	} // update_340012

	/**
 	 * update_340013
	 * This update removes a whole bunch of preferences that are no longer
	 * being used in any way, and changes the ACL XML-RPC to just RPC
	 */
	public static function update_340013() { 

		$sql = "DELETE FROM `preference` WHERE `name`='localplay_mpd_hostname' OR `name`='localplay_mpd_port' " . 
			"OR `name`='direct_link' OR `name`='localplay_mpd_password' OR `name`='catalog_echo_count'"; 
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `preference` SET `description`='Localplay Access' WHERE `name`='localplay_level'"; 
		$db_results = Dba::query($sql); 

		$sql = "UPDATE `access_list` SET `type`='rpc' WHERE `type`='xml-rpc'"; 
		$db_results = Dba::query($sql); 

                $sql = "SELECT `id` FROM `user`";
                $db_results = Dba::query($sql);

                User::fix_preferences('-1');

                while ($r = Dba::fetch_assoc($db_results)) {
                        User::fix_preferences($r['id']);
                } // while we're fixing the useres stuff
		
		self::set_version('db_version','340013');	

		return true; 

	} // update_340013

	/**
	 * update_340014
	 * This update drops the session_api table that I added just two updates ago
	 * it's been nice while it lasted but it's time to pack your stuff and GTFO
	 * at the same time it updates the core session table to handle the additional
	 * stuff we're going to ask it to do. 
	 */
	public static function update_340014() { 

		$sql = "DROP TABLE `session_api`"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `session` CHANGE `type` `type` ENUM ('mysql','ldap','http','api','xml-rpc') NOT NULL"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `session` ADD `agent` VARCHAR ( 255 ) NOT NULL AFTER `type`"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `session` ADD INDEX (`type`)"; 
		$db_results = Dba::query($sql); 

		self::set_version('db_version','340014'); 

		return true; 

	} // update_340014

	/**
	 * update_340015
	 * This update tweaks the playlist table responding to complaints from usres
	 * who say it doesn't work, unreproduceable. This also adds an index to the 
	 * album art table to try to make the random album art faster
	 */	
	public static function update_340015() { 

		$sql = "ALTER TABLE `playlist` DROP `date`"; 
		$db_results = Dba::query($sql); 	

		$sql = "ALTER TABLE `playlist` ADD `date` INT ( 11 ) UNSIGNED NOT NULL"; 
		$db_results = Dba::query($sql); 

		// Pull all of the rating information
		$sql = "SELECT `id`,`rating` FROM `rating`"; 
		$db_results = Dba::query($sql); 

		$results = array(); 

		while ($row = Dba::fetch_assoc($db_results)) { 
			$results[] = $row; 
		} 

		$sql = "ALTER TABLE `rating` DROP `rating`"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `rating` ADD `rating` TINYINT ( 4 ) NOT NULL"; 
		$db_results = Dba::query($sql); 

		foreach ($results as $row) { 
			$rating = Dba::escape($row['rating']);
			$id	= Dba::escape($row['id']); 
			$sql = "UPDATE `rating` SET `rating`='$rating' WHERE `id`='$id'"; 
			$db_results = Dba::query($sql); 
		} 

		self::set_version('db_version','340015'); 

		return true; 
		
	} // update_340015

	/** 
	 * update_340016
	 * This adds in the base_playlist to the democratic table... should have
 	 * done this in the previous one but I screwed up... sigh
	 */
	public static function update_340016() { 

		$sql = "ALTER TABLE `democratic` ADD `base_playlist` INT ( 11 ) UNSIGNED NOT NULL"; 
		$db_results = Dba::query($sql); 

		self::set_version('db_version','340016'); 

		return true; 

	} // update_340016

	/**
	 * update_340017
	 * This finalizes the democratic table. 
	 * and fixes the charset crap
	 */
	public static function update_340017() { 

		$sql = "ALTER TABLE `democratic` ADD `base_playlist` INT( 11 ) UNSIGNED NOT NULL AFTER `name`"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `tmp_playlist` DROP `base_playlist`"; 
		$db_results = Dba::query($sql); 

		$sql = "DELETE FROM `tmp_playlist` WHERE `session`='-1'"; 
		$db_results = Dba::query($sql); 

		$sql = "TRUNCATE `democratic`"; 
		$db_results = Dba::query($sql); 
		
		self::set_version('db_version','340017'); 

		return true; 

	} // update_340017

	/**
	 * update_340018
	 * This attempts to correct the charset on your database, it does some checking
	 * to make sure that if we do this it will actually will work. We will fail this update
	 * if it would cause problems
	 */
	public static function update_340018() { 

		// MySQL translate real charset names into fancy smancy MySQL land names
		switch (strtoupper(Config::get('site_charset'))) { 
			case 'CP1250': 
			case 'WINDOWS-1250': 
			case 'WINDOWS-1252': 
				$target_charset = 'cp1250'; 
				$target_collation = 'cp1250_general_ci'; 
			break; 
			case 'ISO-8859':  
			case 'ISO-8859-2': 
				$target_charset = 'latin2'; 
				$target_collation = 'latin2_general_ci'; 
			break; 
			case 'ISO-8859-1': 
				$target_charset = 'latin1'; 
				$target_charset = 'latin1_general_ci'; 
			break; 
			case 'EUC-KR': 
				$target_charset = 'euckr'; 
				$target_collation = 'euckr_korean_ci'; 
			break; 
			case 'CP932': 
				$target_charset = 'sjis'; 
				$target_collation = 'sjis_japanese_ci'; 
			break; 
			case 'KOI8-U': 
				$target_charset = 'koi8u'; 
				$target_collation = 'koi8u_general_ci'; 
			break; 
			case 'KOI8-R': 
				$target_charset = 'koi8r';
				$target_collation = 'koi8r_general_ci'; 
			break; 
			case 'ISO-8859': 
				$target_charset = 'latin2';
				$target_collation = 'latin2_general_ci'; 
			break; 
			default; 
			case 'UTF-8':
				$target_charset = 'utf8'; 
				$target_collation = 'utf8_unicode_ci'; 
			break; 
		} // end mysql charset translation

                // Alter the charset for the entire database
                $sql = "ALTER DATABASE `" . Config::get('database_name') . "` DEFAULT CHARACTER SET $target_charset COLLATE $target_collation"; 
                $db_results = Dba::query($sql); 
	
		$sql = "SHOW TABLES"; 
		$db_results = Dba::query($sql); 

		// Go through the tables!
		while ($row = Dba::fetch_row($db_results)) { 
			$sql = "DESCRIBE `" . $row['0'] . "`"; 
			$describe_results = Dba::query($sql); 

                        // Change the tables default charset and colliation
                        $sql = "ALTER TABLE `" . $row['0'] . "`  DEFAULT CHARACTER SET $target_charset COLLATE $target_collation"; 
                        $alter_table = Dba::query($sql); 

			// Itterate through the columns of the table
			while ($table = Dba::fetch_assoc($describe_results)) { 
				if (strstr($table['Type'],'varchar')  OR strstr($table['Type'],'enum') OR strstr($table['Table'],'text')) { 
					$sql = "ALTER TABLE `" . $row['0'] . "` MODIFY `" . $table['Field'] . "` " . $table['Type'] . " CHARACTER SET " . $target_charset;
					$charset_results = Dba::query($sql); 
					if (!$charset_results) { 
						debug_event('CHARSET','Unable to update the charset of ' . $table['Field'] . '.' . $table['Type'] . ' to ' . $target_charset,'3'); 
					} // if it fails
				} // if its a varchar 
			} // end columns

		} // end tables
		
		self::set_version('db_version','340018'); 

		return true; 

	} // update_340018

	/**
 	 * update_350001
	 * This updates modifies the tag tables per codeunde1load's specs from his tag patch
	 * it also adjusts the prefix fields so that we can use more prefixes
	 */
	public static function update_350001() { 

		$sql = "ALTER TABLE `tag_map` ADD `tag_id` INT ( 11 ) UNSIGNED NOT NULL AFTER `id`"; 
		$db_results = Dba::query($sql); 

		$sql = "RENAME TABLE `tags`  TO `tag`"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `tag` CHANGE `map_id` `id` INT ( 11 ) UNSIGNED NOT NULL auto_increment"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `album` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; 
		$db_results = Dba::query($sql); 

		$sql = "ALTER TABLE `artist` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; 
		$db_results = Dba::query($sql); 
		
		self::set_version('db_version','350001'); 

		return true; 

	} // update_350001

	/**
	 * update_350002
	 * This update adds in the browse_cache table that we use to hold peoples cached browse results
	 * rather then try to store everything in the session we split them out into one serilized array per
	 * row, per person. A little slow this way when browsing, but faster when now browsing and more flexible
	 */
	public static function update_350002() { 

		$sql = "CREATE TABLE `tmp_browse` (`sid` varchar(128) 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"; 
		$db_results = Dba::write($sql); 

		$sql = "ALTER TABLE `tmp_browse` ADD INDEX ( `type` )"; 
		$db_results = Dba::write($sql); 

		$sql = "ALTER TABLE `song` DROP `genre`"; 
		$db_results = Dba::write($sql); 

		$sql = "CREATE TABLE `user_catalog` (`user` INT( 11 ) UNSIGNED NOT NULL ,`catalog` INT( 11 ) UNSIGNED NOT NULL ,`level` SMALLINT( 4 ) UNSIGNED NOT NULL DEFAULT '5', " . 
			"INDEX ( `user` )) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_unicode_ci";
		$db_results = Dba::write($sql); 

		$sql = "ALTER TABLE `user_catalog` ADD INDEX ( `catalog` )"; 
		$db_results = Dba::write($sql); 

		self::set_version('db_version','350002'); 

		return true; 

	} // update_350002

	/**
	 * update_350003
	 * This update tweakes the tag tables a little bit more, we're going to simplify things for the first little bit and then
	 * then if it all works out we will worry about making it complex again. One thing at a time people...
	 */
	public static function update_350003() { 

		$sql = "ALTER TABLE `tag` DROP `order`"; 
		$db_results = Dba::write($sql); 

		$sql = "ALTER TABLE `tag` DROP INDEX `order`"; 
		$db_results = Dba::write($sql); 

		$sql = "ALTER TABLE `tag` ADD UNIQUE ( `name` )"; 
		$db_results = Dba::write($sql); 

		$sql = "ALTER TABLE `tag` CHANGE `name` `name` VARCHAR( 255 )"; 
		$db_results = Dba::write($sql); 


	} // update_350003

} // end update class
?>