summaryrefslogtreecommitdiffstats
path: root/lib/class/update.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-12-18 00:10:07 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-12-18 00:10:07 +0000
commit68ac06b30b06f982f18f4ec31691c94684fc07e2 (patch)
treed0c41afc488aca7eb6b861792fa916979b21454f /lib/class/update.class.php
parent7c661ba685287efd21512f9f0203641200bffed2 (diff)
downloadampache-68ac06b30b06f982f18f4ec31691c94684fc07e2.tar.gz
ampache-68ac06b30b06f982f18f4ec31691c94684fc07e2.tar.bz2
ampache-68ac06b30b06f982f18f4ec31691c94684fc07e2.zip
* Last DB Update for 3.3.3 Stable Branche
* Improved Recommendation view * Removed Upload
Diffstat (limited to 'lib/class/update.class.php')
-rw-r--r--lib/class/update.class.php25
1 files changed, 17 insertions, 8 deletions
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index 9375883b..9db77f45 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -329,11 +329,12 @@ class Update {
$version[] = array('version' => '333001','description' => $update_string);
- $update_string = '- Added object_tag table for Web2.0 Tag information.<br />' .
+ $update_string = '- Added object_tag table for Web2.0 style tag information.<br />' .
'- Added song_ext_data for holding comments,lyrics and other large fields, not commonly used.<br />' .
- '- Added Timezone as a per user preference.';
+ '- Added Timezone as a per user preference.<br />' .
+ '- Delete Upload Table and Upload Preferences.<br />';
- //$version[] = array('version' => '333002','description' => $update_string);
+ $version[] = array('version' => '333002','description' => $update_string);
return $version;
@@ -382,11 +383,12 @@ class Update {
$sql = "DELETE * FROM session";
$db_results = mysql_query($sql, dbh());
- /* Verify that there are no plugins installed */
+ /* Verify that there are no plugins installed
+ //FIXME: provide a link to remove all plugins, otherwise this could turn into a catch 22
if (!$this->plugins_installed()) {
$GLOBALS['error']->add_error('general',_('Plugins detected, please remove all Plugins and try again'));
return false;
- }
+ } */
$methods = array();
@@ -2037,7 +2039,7 @@ class Update {
function update_333002 () {
/* First add the two tables */
- $sql = "CREATE TABLE `song_ext_data` (`song_id` INT( 11 ) UNSIGNED NOT NULL ,`comment` TEXT NULL ,`lyrics` TEXT NULL , UNIQUE (`song_id`)";
+ $sql = "CREATE TABLE `song_ext_data` (`song_id` INT( 11 ) UNSIGNED NOT NULL ,`comment` TEXT NULL ,`lyrics` TEXT NULL , UNIQUE (`song_id`))";
$db_results = mysql_query($sql,dbh());
$sql = "CREATE TABLE `tags` (`map_id` INT( 11 ) UNSIGNED NOT NULL ,`name` VARCHAR( 32 ) NOT NULL ,`order` TINYINT( 2 ) NOT NULL)";
@@ -2074,15 +2076,18 @@ class Update {
} // end while comments fetching
-
$sql = "ALTER TABLE `song` DROP `comment`";
$db_results = mysql_query($sql,dbh());
/* Add the Preference for Timezone */
$sql = "INSERT INTO preferences (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
- " VALUES ('time_zone','GMT','Local Timezone','5','string','interface')";
+ " VALUES ('time_zone','GMT','Local Timezone','100','string','system')";
$db_results = mysql_query($sql,dbh());
+ /* Delete the upload related preferences */
+ $sql = "DELETE FROM preferences WHERE `name`='upload' OR `name`='upload_dir' OR `name`='quarantine_dir'";
+ $db_results = mysql_query($sql,dbh());
+
/* Fix every users preferences */
$sql = "SELECT * FROM user";
$db_results = mysql_query($sql, dbh());
@@ -2098,6 +2103,10 @@ class Update {
$sql = "DROP TABLE `user_catalog`";
$db_results = mysql_query($sql,dbh());
+ /* Drop the defunct Upload table */
+ $sql = "DROP TABLE `upload`";
+ $db_results = mysql_query($sql,dbh());
+
$this->set_version('db_version','333002');
} // update_333002