[livejournal] r9136: brad on a cleaning rampage:
Committer: bradfitzbrad on a cleaning rampage:
-- make update-db.pl clean and sane. no more eighty page functions. lots of small ones.
-- take all the proplist crap out of basedata.sql and into its own file.
U trunk/bin/dumpsql.pl
U trunk/bin/upgrading/base-data.sql
A trunk/bin/upgrading/proplists.dat
U trunk/bin/upgrading/update-db.pl
Modified: trunk/bin/dumpsql.pl
===================================================================
--- trunk/bin/dumpsql.pl 2006-10-05 21:11:03 UTC (rev 9135)
+++ trunk/bin/dumpsql.pl 2006-10-05 22:24:31 UTC (rev 9136)
@@ -20,9 +20,7 @@
# what tables don't we want to export the auto_increment columns from
# because they already have their own unique string, which is what matters
-my %skip_auto = ("userproplist" => "name",
- "talkproplist" => "name",
- "logproplist" => "name",
+my %skip_auto = (
"priv_list" => "privcode",
"supportcat" => "catkey",
"ratelist" => "name",
@@ -43,6 +41,8 @@
# dump each table.
foreach my $table (sort keys %tables)
{
+ next if $table =~ /^(user|talk|log)proplist$/;
+
my $where;
if ($tables{$table}->{'where'}) {
$where = "WHERE $tables{$table}->{'where'}";
@@ -102,6 +102,7 @@
}
}
+
# don't use $dbh->quote because it's changed between versions
# and developers sending patches can't generate concise patches
# it used to not quote " in a single quoted string, but later it does.
@@ -129,6 +130,44 @@
close F;
}
+# dump proplists, etc
+print "Dumping proplists.dat\n";
+open (my $plg, ">$ENV{LJHOME}/bin/upgrading/proplists.dat") or die;
+open (my $pll, ">$ENV{LJHOME}/bin/upgrading/proplists-local.dat") or die;
+foreach my $table ('userproplist', 'talkproplist', 'logproplist') {
+ my $sth = $dbh->prepare("DESCRIBE $table");
+ $sth->execute;
+ my @cols = ();
+ while (my $c = $sth->fetchrow_hashref) {
+ die "Where is the 'Extra' column?" unless exists $c->{'Extra'}; # future-proof
+ next if $c->{'Extra'} =~ /auto_increment/;
+ push @cols, $c;
+ }
+ @cols = sort { $a->{'Field'} cmp $b->{'Field'} } @cols;
+ my $cols = join(", ", map { $_->{'Field'} } @cols);
+
+ my $pri_key = "name"; # for now they're all 'name'. might add more tables.
+ $sth = $dbh->prepare("SELECT $cols FROM $table ORDER BY $pri_key");
+ $sth->execute;
+ while (my @r = $sth->fetchrow_array) {
+ my %vals;
+ my $i = 0;
+ foreach (map { $_->{'Field'} } @cols) {
+ $vals{$_} = $r[$i++];
+ }
+ my $scope = $vals{'scope'} && $vals{'scope'} eq "local" ? "local" : "general";
+ my $fh = $scope eq "local" ? $pll : $plg;
+ print $fh "$table.$vals{$pri_key}:\n";
+ foreach my $c (map { $_->{'Field'} } @cols) {
+ next if $c eq $pri_key;
+ next if $c eq "scope"; # implied by filenamea
+ print $fh " $c: $vals{$c}\n";
+ }
+ print $fh "\n";
+ }
+
+}
+
# now dump school related information
print "Dumping schools.dat\n";
open(F, ">$ENV{LJHOME}/bin/upgrading/schools.dat") or die;
@@ -169,7 +208,7 @@
"WHERE moodthemeid=$id ORDER BY moodid");
$std->execute;
while (@_ = $std->fetchrow_array) {
- print F "@_\n";
+ print F "@_\n";
}
}
close F;
Modified: trunk/bin/upgrading/base-data.sql
===================================================================
--- trunk/bin/upgrading/base-data.sql 2006-10-05 21:11:03 UTC (rev 9135)
+++ trunk/bin/upgrading/base-data.sql 2006-10-05 22:24:31 UTC (rev 9136)
@@ -419,54 +419,6 @@
REPLACE INTO codes (code, item, sortorder, type) VALUES ('vi', 'Victoria', '0', 'stateau');
REPLACE INTO codes (code, item, sortorder, type) VALUES ('wa', 'Western Australia', '0', 'stateau');
REPLACE INTO codes (code, item, sortorder, type) VALUES ('yt', 'Yukon Territory', '0', 'stateca');
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('num', 'Unix time of the last change to number of comments to this post.', 'commentalter', 'Comments altered', 'general', '99');
-UPDATE logproplist SET datatype='num',des='Unix time of the last change to number of comments to this post.',prettyname='Comments altered',scope='general',sortorder='99' WHERE name='commentalter';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Current coordinates at time of post, in form \'45.2935N 123.3452W\'', 'current_coords', 'Current Coordinates', 'general', '103');
-UPDATE logproplist SET datatype='char',des='Current coordinates at time of post, in form \'45.2935N 123.3452W\'',prettyname='Current Coordinates',scope='general',sortorder='103' WHERE name='current_coords';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Current location at time of post, free form text', 'current_location', 'Current Location', 'general', '103');
-UPDATE logproplist SET datatype='char',des='Current location at time of post, free form text',prettyname='Current Location',scope='general',sortorder='103' WHERE name='current_location';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Your current mood.', 'current_mood', 'Current Mood', 'general', '5');
-UPDATE logproplist SET datatype='char',des='Your current mood.',prettyname='Current Mood',scope='general',sortorder='5' WHERE name='current_mood';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('num', 'Your current mood ID number, if known.', 'current_moodid', 'Current Mood ID#', 'general', '6');
-UPDATE logproplist SET datatype='num',des='Your current mood ID number, if known.',prettyname='Current Mood ID#',scope='general',sortorder='6' WHERE name='current_moodid';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Music you\'re currently listening to.', 'current_music', 'Current Music', 'general', '10');
-UPDATE logproplist SET datatype='char',des='Music you\'re currently listening to.',prettyname='Current Music',scope='general',sortorder='10' WHERE name='current_music';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('bool', 'True if comments to this item include screened comments', 'hasscreened', 'Has screened replies', 'general', '99');
-UPDATE logproplist SET datatype='bool',des='True if comments to this item include screened comments',prettyname='Has screened replies',scope='general',sortorder='99' WHERE name='hasscreened';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('bool', 'Set to true if this item shouldn\'t show up on people\'s friends lists (because it occurred in the past)', 'opt_backdated', 'Back-dated', 'general', '35');
-UPDATE logproplist SET datatype='bool',des='Set to true if this item shouldn\'t show up on people\'s friends lists (because it occurred in the past)',prettyname='Back-dated',scope='general',sortorder='35' WHERE name='opt_backdated';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Y=I will promote others, promote me; S=show other promotions, do not promote me; N=do not show other promotions, do not promote me', '0', '0', 'opt_comm_promo', 'User settings for promotion of other communities', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Y=I will promote others, promote me; S=show other promotions, do not promote me; N=do not show other promotions, do not promote me',indexed='0',multihomed='0',prettyname='User settings for promotion of other communities',scope='general' WHERE name='opt_comm_promo';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'community promo blurb', '0', '0', 'comm_promo_blurb', 'A short description of a community that is displayed in the community promo box', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='community promo blurb',indexed='0',multihomed='0',prettyname='A short description of a community that is displayed in the community promo box',scope='general' WHERE name='comm_promo_blurb';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'set to force disable of community promo', '0', '0', 'disable_comm_promo', 'Administratively disable community promo features for a user', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='set to force disable of community promo',indexed='0',multihomed='0',prettyname='Administratively disable community promo features',scope='general' WHERE name='opt_comm_promo';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('bool', 'Turn on if readers can\'t post comments on this entry.', 'opt_nocomments', 'Don\'t Allow Comments', 'general', '25');
-UPDATE logproplist SET datatype='bool',des='Turn on if readers can\'t post comments on this entry.',prettyname='Don\'t Allow Comments',scope='general',sortorder='25' WHERE name='opt_nocomments';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('bool', 'Turn on if the poster isn\'t interested in receiving comments to this post by email', 'opt_noemail', 'Don\'t email comments', 'general', '40');
-UPDATE logproplist SET datatype='bool',des='Turn on if the poster isn\'t interested in receiving comments to this post by email',prettyname='Don\'t email comments',scope='general',sortorder='40' WHERE name='opt_noemail';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('bool', 'Turn on if post contains HTML and shouldn\'t be formatted', 'opt_preformatted', 'Don\'t Auto-Format', 'general', '20');
-UPDATE logproplist SET datatype='bool',des='Turn on if post contains HTML and shouldn\'t be formatted',prettyname='Don\'t Auto-Format',scope='general',sortorder='20' WHERE name='opt_preformatted';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Like opt_whoscreened: A = All, R = Remote needed (anonymous only), F = non-Friends, N = None, else use userprop.', 'opt_screening', 'Custom Screening Level', 'general', '45');
-UPDATE logproplist SET datatype='char',des='Like opt_whoscreened: A = All, R = Remote needed (anonymous only), F = non-Friends, N = None, else use userprop.',prettyname='Custom Screening Level',scope='general',sortorder='45' WHERE name='opt_screening';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'A keyword that should align to a defined picture', 'picture_keyword', 'Picture Keyword', 'general', '30');
-UPDATE logproplist SET datatype='char',des='A keyword that should align to a defined picture',prettyname='Picture Keyword',scope='general',sortorder='30' WHERE name='picture_keyword';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('num', 'Number of times this post has been edited.', 'revnum', 'Revision number', 'general', '99');
-UPDATE logproplist SET datatype='num',des='Number of times this post has been edited.',prettyname='Revision number',scope='general',sortorder='99' WHERE name='revnum';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('num', 'Unix time of the last edit', 'revtime', 'Revision time', 'general', '99');
-UPDATE logproplist SET datatype='num',des='Unix time of the last edit',prettyname='Revision time',scope='general',sortorder='99' WHERE name='revtime';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('num', 'SMS Message ID of the message which led to this journal entry', 'sms_msgid', 'SMS Message ID', 'general', '99');
-UPDATE logproplist SET datatype='num',des='SMS Message ID of the message which led to this journal entry',prettyname='SMS Message ID',scope='general',sortorder='99' WHERE name='sms_msgid';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Unique id of syndication item', 'syn_id', 'Syndicated item id', 'general', '99');
-UPDATE logproplist SET datatype='char',des='Unique id of syndication item',prettyname='Syndicated item id',scope='general',sortorder='99' WHERE name='syn_id';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Original URL of syndication item', 'syn_link', 'Syndication item link URL', 'general', '99');
-UPDATE logproplist SET datatype='char',des='Original URL of syndication item',prettyname='Syndication item link URL',scope='general',sortorder='99' WHERE name='syn_link';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('char', 'Comma separated list of tags on the entry', 'taglist', 'Tag List', 'general', '101');
-UPDATE logproplist SET datatype='char',des='Comma separated list of tags on the entry',prettyname='Tag List',scope='general',sortorder='101' WHERE name='taglist';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('bool', 'True if text has 8-bit data that\'s not in UTF-8', 'unknown8bit', 'Unknown 8-bit text', 'general', '99');
-UPDATE logproplist SET datatype='bool',des='True if text has 8-bit data that\'s not in UTF-8',prettyname='Unknown 8-bit text',scope='general',sortorder='99' WHERE name='unknown8bit';
-INSERT IGNORE INTO logproplist (datatype, des, name, prettyname, scope, sortorder) VALUES ('bool', 'True if entry was composed using the rich text editor', 'used_rte', 'Composed in RTE', 'general', '102');
-UPDATE logproplist SET datatype='bool',des='True if entry was composed using the rich text editor',prettyname='Composed in RTE',scope='general',sortorder='102' WHERE name='used_rte';
INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to grant or revoke privileges to/from other users. arg=Unique privcode that the user has access to grant/deny for, or \"*\" for all privileges.', '0', 'admin', 'Administer privileges', 'general');
UPDATE priv_list SET des='Allows a user to grant or revoke privileges to/from other users. arg=Unique privcode that the user has access to grant/deny for, or \"*\" for all privileges.',is_public='0',privname='Administer privileges',scope='general' WHERE privcode='admin';
INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to set an IP address as being allowed if it\'s listed as an open proxy.', '0', 'allowopenproxy', 'Allow Open Proxy', 'general');
@@ -527,6 +479,8 @@
UPDATE priv_list SET des='Allows a user to view internal comments on support requests. arg=Unique support category',is_public='1',privname='Support - View Internal Comments',scope='general' WHERE privcode='supportviewinternal';
INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to read screened responses on support requests. arg=Unique support category', '1', 'supportviewscreened', 'Support - See Screened Responses', 'general');
UPDATE priv_list SET des='Allows a user to read screened responses on support requests. arg=Unique support category',is_public='1',privname='Support - See Screened Responses',scope='general' WHERE privcode='supportviewscreened';
+INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to make use of the stock answers in a support category. arg=Unique support category', '1', 'supportviewstocks', 'View stock answers', 'general');
+UPDATE priv_list SET des='Allows a user to make use of the stock answers in a support category. arg=Unique support category',is_public='1',privname='View stock answers',scope='general' WHERE privcode='supportviewstocks';
INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to suspend or unsuspend user accounts. Used by the Abuse Team.', '0', 'suspend', 'Suspend accounts', 'general');
UPDATE priv_list SET des='Allows a user to suspend or unsuspend user accounts. Used by the Abuse Team.',is_public='0',privname='Suspend accounts',scope='general' WHERE privcode='suspend';
INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows editing settings of syndicated journal that shouldn\'t be editable by users.', '0', 'syn_edit', 'Edit Syndicated Settings', 'general');
@@ -541,8 +495,6 @@
UPDATE priv_list SET des='Allows a user to approve or deny entries that are submitted to the directory. arg=Unique category number that the user has access in, or \"*\" for all categories',is_public='1',privname='Topic Dir - Screen Submissions',scope='general' WHERE privcode='topicscreencat';
INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to edit site text in a given language. arg=Unique language code, optionally appended by |domainid.domaincode', '1', 'translate', 'Translate/Update Text', 'general');
UPDATE priv_list SET des='Allows a user to edit site text in a given language. arg=Unique language code, optionally appended by |domainid.domaincode',is_public='1',privname='Translate/Update Text',scope='general' WHERE privcode='translate';
-INSERT IGNORE INTO priv_list (des, is_public, privcode, privname, scope) VALUES ('Allows a user to make use of the stock answers in a support category. arg=Unique support category', '1', 'supportviewstocks', 'View stock answers', 'general');
-UPDATE priv_list SET des='Allows a user to make use of the stock answers in a support category. arg=Unique support category',is_public='1',privname='View stock answers',scope='general' WHERE privcode='supportviewstocks';
INSERT IGNORE INTO ratelist (des, name) VALUES ('Logged when wrong username/password is used.', 'failed_login');
UPDATE ratelist SET des='Logged when wrong username/password is used.' WHERE name='failed_login';
INSERT IGNORE INTO ratelist (des, name) VALUES ('Logged when a user sends a friend invite', 'invitefriend');
@@ -701,7 +653,6 @@
REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('This table is the documentation for the database tables.', '0', 'replace', NULL, 'schematables');
REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Tracks user-based disk usage totals.', '0', 'off', NULL, 'dudata');
REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Tracks viewings of the individual [dbtable[faq]]s from logged-in users.', '0', 'off', NULL, 'faquses');
-REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('Unused as of this writing. Part of the \"subscription\" system.', '0', 'off', NULL, 'events');
REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('When authenticating certain actions, the server generates an authaction along with some random characters (the authcode) and emails the aaid+authcode to the user to confirm they actually got it.\n', '0', 'off', NULL, 'authactions');
REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('ZIP Code data for the United States that includes geographic coordinates. Only used with a ljmaint script that generates marker files for use in making xplanet maps. Most the LJ code uses the [dbtable[zip]] table instead.', '0', 'off', NULL, 'zips');
REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES ('ZIP Code table used to validate and auto-complete data that users enter about their location. More information can be found in the redudant table [dbtable[zips]], which was imported later.', '0', 'off', NULL, 'zip');
@@ -711,28 +662,6 @@
REPLACE INTO schematables (des, public_browsable, redist_mode, redist_where, tablename) VALUES (NULL, '1', 'replace', NULL, 'ratelist');
INSERT IGNORE INTO supportcat (allow_screened, basepoints, catkey, catname, hide_helpers, is_selectable, no_autoreply, public_help, public_read, replyaddress, scope, sortorder) VALUES ('1', '1', 'general', 'General/Unknown', '0', '1', '0', '0', '1', NULL, 'general', '2');
UPDATE supportcat SET allow_screened='1',basepoints='1',catname='General/Unknown',hide_helpers='0',is_selectable='1',no_autoreply='0',public_help='0',public_read='1',replyaddress=NULL,scope='general',sortorder='2' WHERE catkey='general';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('char', 'If the comment poster\'s account is deleted, this field gets added to all of their posts, so the UI can show something besides \'anonymous\' when posterid gets set to 0', 'deleted_poster', 'Username of deleted poster', 'general');
-UPDATE talkproplist SET datatype='char',des='If the comment poster\'s account is deleted, this field gets added to all of their posts, so the UI can show something besides \'anonymous\' when posterid gets set to 0',prettyname='Username of deleted poster',scope='general' WHERE name='deleted_poster';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('bool', 'true if auth\'d, false if not', 'guest_auth', 'URL of Guest Poster', 'general');
-UPDATE talkproplist SET datatype='bool',des='true if auth\'d, false if not',prettyname='URL of Guest Poster',scope='general' WHERE name='guest_auth';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('char', 'Anonymous comments with an email attached', 'guest_email', 'Email of Guest Poster', 'general');
-UPDATE talkproplist SET datatype='char',des='Anonymous comments with an email attached',prettyname='Email of Guest Poster',scope='general' WHERE name='guest_email';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('bool', 'If true, mangle guest email', 'guest_mangle_email', 'URL of Guest Poster', 'general');
-UPDATE talkproplist SET datatype='bool',des='If true, mangle guest email',prettyname='URL of Guest Poster',scope='general' WHERE name='guest_mangle_email';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('char', 'Anonymous comments with a name attached', 'guest_name', 'Name of Guest Poster', 'general');
-UPDATE talkproplist SET datatype='char',des='Anonymous comments with a name attached',prettyname='Name of Guest Poster',scope='general' WHERE name='guest_name';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('char', 'Anonymous comments with a URL attached', 'guest_url', 'Website of Guest Poster', 'general');
-UPDATE talkproplist SET datatype='char',des='Anonymous comments with a URL attached',prettyname='Website of Guest Poster',scope='general' WHERE name='guest_url';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('bool', 'Turn on if post contains HTML and shouldn\'t be formatted', 'opt_preformatted', 'Don\'t Auto-Format', 'general');
-UPDATE talkproplist SET datatype='bool',des='Turn on if post contains HTML and shouldn\'t be formatted',prettyname='Don\'t Auto-Format',scope='general' WHERE name='opt_preformatted';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('char', 'A keyword that should align to a defined picture', 'picture_keyword', 'Picture Keyword', 'general');
-UPDATE talkproplist SET datatype='char',des='A keyword that should align to a defined picture',prettyname='Picture Keyword',scope='general' WHERE name='picture_keyword';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('char', 'The poster\'s IP address, optionally logged.', 'poster_ip', 'Poster\'s IP address', 'general');
-UPDATE talkproplist SET datatype='char',des='The poster\'s IP address, optionally logged.',prettyname='Poster\'s IP address',scope='general' WHERE name='poster_ip';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('char', 'partial filename for subject icon to use', 'subjecticon', 'Subject Icon', 'general');
-UPDATE talkproplist SET datatype='char',des='partial filename for subject icon to use',prettyname='Subject Icon',scope='general' WHERE name='subjecticon';
-INSERT IGNORE INTO talkproplist (datatype, des, name, prettyname, scope) VALUES ('bool', 'True if text has 8-bit data that\'s not in UTF-8', 'unknown8bit', 'Unknown 8-bit text', 'general');
-UPDATE talkproplist SET datatype='bool',des='True if text has 8-bit data that\'s not in UTF-8',prettyname='Unknown 8-bit text',scope='general' WHERE name='unknown8bit';
REPLACE INTO themedata (color, coltype, themeid) VALUES ('#000000', 'page_back', '3');
REPLACE INTO themedata (color, coltype, themeid) VALUES ('#000000', 'page_back', '5');
REPLACE INTO themedata (color, coltype, themeid) VALUES ('#000000', 'page_text', '1');
@@ -915,217 +844,3 @@
REPLACE INTO themelist (name, themeid) VALUES ('Watermelon', '13');
REPLACE INTO themelist (name, themeid) VALUES ('White on Black w/ dark grays', '5');
REPLACE INTO themelist (name, themeid) VALUES ('Yellow/Green Pastels', '2');
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'User selectable Ad categories', '0', '0', 'ad_categories', 'Ad Content Categories', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='User selectable Ad categories',indexed='0',multihomed='0',prettyname='Ad Content Categories',scope='general' WHERE name='ad_categories';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'char', 'AOL IM ScreenName', '1', '1', 'aolim', 'AOL Instant Messanger', 'general');
-UPDATE userproplist SET cldversion='0',datatype='char',des='AOL IM ScreenName',indexed='1',multihomed='1',prettyname='AOL Instant Messanger',scope='general' WHERE name='aolim';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'num', 'If this user has a bad password and should change it', '0', '0', 'badpassword', 'Bad Password', 'general');
-UPDATE userproplist SET cldversion='4',datatype='num',des='If this user has a bad password and should change it',indexed='0',multihomed='0',prettyname='Bad Password',scope='general' WHERE name='badpassword';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'num', 'The ID of the blob cluster user\'s media resides on.', '1', '0', 'blob_clusterid', 'Blob Cluster ID', 'general');
-UPDATE userproplist SET cldversion='0',datatype='num',des='The ID of the blob cluster user\'s media resides on.',indexed='1',multihomed='0',prettyname='Blob Cluster ID',scope='general' WHERE name='blob_clusterid';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'LJ lang code in ml_langs', '1', '0', 'browselang', 'Language to browse with', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='LJ lang code in ml_langs',indexed='1',multihomed='0',prettyname='Language to browse with',scope='general' WHERE name='browselang';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'City lived in.', '1', '0', 'city', 'City', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='City lived in.',indexed='1',multihomed='0',prettyname='City',scope='general' WHERE name='city';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', '2 letter country code', '1', '0', 'country', 'Country', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='2 letter country code',indexed='1',multihomed='0',prettyname='Country',scope='general' WHERE name='country';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'Used for large communities to prevent loading and displaying the complete list of members', '0', '0', 'dont_load_members', 'Don\'t load membership information', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='Used for large communities to prevent loading and displaying the complete list of members',indexed='0',multihomed='0',prettyname='Don\'t load membership information',scope='general' WHERE name='dont_load_members';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'On each postevent, the dupsig is checked and updated to prevent accidental duplicate posts', '0', '0', 'dupsig_post', 'Duplicate signature for last post', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='On each postevent, the dupsig is checked and updated to prevent accidental duplicate posts',indexed='0',multihomed='0',prettyname='Duplicate signature for last post',scope='general' WHERE name='dupsig_post';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Comma separated list of email addresses allowed to send mail via gateway', '0', '0', 'emailpost_allowfrom', 'Allowed addresses to post via email', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Comma separated list of email addresses allowed to send mail via gateway',indexed='0',multihomed='0',prettyname='Allowed addresses to post via email',scope='general' WHERE name='emailpost_allowfrom';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default comment options for post-by-email entries', '', '', 'emailpost_comments', 'Comment options for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default comment options for post-by-email entries',indexed='',multihomed='',prettyname='Comment options for email posting',scope='general' WHERE name='emailpost_comments';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default gallery name for post-by-email pictures', '', '', 'emailpost_gallery', 'Gallery name for email imgs', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default gallery name for post-by-email pictures',indexed='',multihomed='',prettyname='Gallery name for email imgs',scope='general' WHERE name='emailpost_gallery';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default image cut type for post-by-email images', '', '', 'emailpost_imgcut', 'Image cut type for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default image cut type for post-by-email images',indexed='',multihomed='',prettyname='Image cut type for email posting',scope='general' WHERE name='emailpost_imgcut';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default image layout for post-by-email images', '', '', 'emailpost_imglayout', 'Image layout for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default image layout for post-by-email images',indexed='',multihomed='',prettyname='Image layout for email posting',scope='general' WHERE name='emailpost_imglayout';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default security for post-by-email images', '', '', 'emailpost_imgsecurity', 'Image security for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default security for post-by-email images',indexed='',multihomed='',prettyname='Image security for email posting',scope='general' WHERE name='emailpost_imgsecurity';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default image size for post-by-email images', '', '', 'emailpost_imgsize', 'Image size for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default image size for post-by-email images',indexed='',multihomed='',prettyname='Image size for email posting',scope='general' WHERE name='emailpost_imgsize';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Numeric or alpha PIN used for posting via email gateway', '0', '0', 'emailpost_pin', 'PIN for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Numeric or alpha PIN used for posting via email gateway',indexed='0',multihomed='0',prettyname='PIN for email posting',scope='general' WHERE name='emailpost_pin';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default security for post-by-email entries', '', '', 'emailpost_security', 'Entry security for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default security for post-by-email entries',indexed='',multihomed='',prettyname='Entry security for email posting',scope='general' WHERE name='emailpost_security';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Default userpic for post-by-email entries', '', '', 'emailpost_userpic', 'Userpic for email posting', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Default userpic for post-by-email entries',indexed='',multihomed='',prettyname='Userpic for email posting',scope='general' WHERE name='emailpost_userpic';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'blobchar', 'Backup of a user\'s most recent unposted entry', '0', '0', 'entry_draft', 'New Entry Draft', 'general');
-UPDATE userproplist SET cldversion='4',datatype='blobchar',des='Backup of a user\'s most recent unposted entry',indexed='0',multihomed='0',prettyname='New Entry Draft',scope='general' WHERE name='entry_draft';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Editor that should be used when creating a new entry', '0', '0', 'entry_editor', 'Default entry editor', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Editor that should be used when creating a new entry',indexed='0',multihomed='0',prettyname='Default entry editor',scope='general' WHERE name='entry_editor';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Location of External FOAF file', '0', '0', 'external_foaf_url', 'FOAF address', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Location of External FOAF file',indexed='0',multihomed='0',prettyname='FOAF address',scope='general' WHERE name='external_foaf_url';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'num', 'Number of Public Fotobilder Pictures', '0', '0', 'fb_num_pubpics', 'Num FB Pics', 'general');
-UPDATE userproplist SET cldversion='4',datatype='num',des='Number of Public Fotobilder Pictures',indexed='0',multihomed='0',prettyname='Num FB Pics',scope='general' WHERE name='fb_num_pubpics';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Base Title of Friends Page', '0', '0', 'friendspagetitle', 'Friends Page Title', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Base Title of Friends Page',indexed='0',multihomed='0',prettyname='Friends Page Title',scope='general' WHERE name='friendspagetitle';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'M: male, F: female, U: unspecified', '1', '0', 'gender', 'Gender', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='M: male, F: female, U: unspecified',indexed='1',multihomed='0',prettyname='Gender',scope='general' WHERE name='gender';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'char', 'Gizmo VoIP account ID', '1', '0', 'gizmo', 'Gizmo Project ID', 'general');
-UPDATE userproplist SET cldversion='0',datatype='char',des='Gizmo VoIP account ID',indexed='1',multihomed='0',prettyname='Gizmo Project ID',scope='general' WHERE name='gizmo';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'char', 'Google\'s \'Talk\' Service address', '1', '1', 'google_talk', 'Google Talk Address', 'general');
-UPDATE userproplist SET cldversion='0',datatype='char',des='Google\'s \'Talk\' Service address',indexed='1',multihomed='1',prettyname='Google Talk Address',scope='general' WHERE name='google_talk';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'How the user heard about LiveJournal', '0', '0', 'howhear', 'How heard about LiveJouranl', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='How the user heard about LiveJournal',indexed='0',multihomed='0',prettyname='How heard about LiveJouranl',scope='general' WHERE name='howhear';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Of form 45.2343,-102.2352', '0', '0', 'icbm', 'ICBM Address', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Of form 45.2343,-102.2352',indexed='0',multihomed='0',prettyname='ICBM Address',scope='general' WHERE name='icbm';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'char', 'ICQ Number', '1', '1', 'icq', 'ICQ', 'general');
-UPDATE userproplist SET cldversion='0',datatype='char',des='ICQ Number',indexed='1',multihomed='1',prettyname='ICQ',scope='general' WHERE name='icq';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Birthdate user enters for age verification', '0', '0', 'init_bdate', 'Birthdate', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Birthdate user enters for age verification',indexed='0',multihomed='0',prettyname='Birthdate',scope='general' WHERE name='init_bdate';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'blobchar', 'Packed blob of a user\'s interest ids (4 bytes per id)', '1', '0', 'interest_ids_blob', 'Interest IDs blob', 'general');
-UPDATE userproplist SET cldversion='4',datatype='blobchar',des='Packed blob of a user\'s interest ids (4 bytes per id)',indexed='1',multihomed='0',prettyname='Interest IDs blob',scope='general' WHERE name='interest_ids_blob';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'char', 'Jabber address (username@server)', '1', '1', 'jabber', 'Jabber Address', 'general');
-UPDATE userproplist SET cldversion='0',datatype='char',des='Jabber address (username@server)',indexed='1',multihomed='1',prettyname='Jabber Address',scope='general' WHERE name='jabber';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Specifies whether to use the horizontal or vertical box(es) in S2 layouts', '0', '0', 'journal_box_placement', 'Journal Box Placement', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Specifies whether to use the horizontal or vertical box(es) in S2 layouts',indexed='0',multihomed='0',prettyname='Journal Box Placement',scope='general' WHERE name='journal_box_placement';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Domain which will load user\'s journal', '0', '0', 'journaldomain', 'Domain Alias', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Domain which will load user\'s journal',indexed='0',multihomed='0',prettyname='Domain Alias',scope='general' WHERE name='journaldomain';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Subtitle of Journal', '0', '0', 'journalsubtitle', 'Journal Subtitle', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Subtitle of Journal',indexed='0',multihomed='0',prettyname='Journal Subtitle',scope='general' WHERE name='journalsubtitle';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Base Title of Journal', '0', '0', 'journaltitle', 'Journal Title', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Base Title of Journal',indexed='0',multihomed='0',prettyname='Journal Title',scope='general' WHERE name='journaltitle';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Comma separated: Unix time user agreed to the Terms of Service, revision number', '0', '1', 'legal_tosagree', 'Agreed to Terms of Service', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Comma separated: Unix time user agreed to the Terms of Service, revision number',indexed='0',multihomed='1',prettyname='Agreed to Terms of Service',scope='general' WHERE name='legal_tosagree';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'num', 'Encoding in which to mail comments to the user. Defaults to UTF-8.', '0', '0', 'mailencoding', 'Mail Encoding', 'general');
-UPDATE userproplist SET cldversion='4',datatype='num',des='Encoding in which to mail comments to the user. Defaults to UTF-8.',indexed='0',multihomed='0',prettyname='Mail Encoding',scope='general' WHERE name='mailencoding';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '1: This community is moderated', '0', '0', 'moderated', 'Moderation status', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='1: This community is moderated',indexed='0',multihomed='0',prettyname='Moderation status',scope='general' WHERE name='moderated';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'char', 'MSN Username', '1', '1', 'msn', 'MSN Username', 'general');
-UPDATE userproplist SET cldversion='0',datatype='char',des='MSN Username',indexed='1',multihomed='1',prettyname='MSN Username',scope='general' WHERE name='msn';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Time (user-side) of the user\'s last entry in their personal journal', '0', '0', 'newesteventtime', 'Newest event time', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Time (user-side) of the user\'s last entry in their personal journal',indexed='0',multihomed='0',prettyname='Newest event time',scope='general' WHERE name='newesteventtime';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Minimal security for new events; values are: public, private or friends', '0', '0', 'newpost_minsecurity', 'Minimal Security', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Minimal security for new events; values are: public, private or friends',indexed='0',multihomed='0',prettyname='Minimal Security',scope='general' WHERE name='newpost_minsecurity';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'If true, mail to user\'s site email address isn\'t forwarded to their real address.', '0', '0', 'no_mail_alias', 'Disable site e-mail alias', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='If true, mail to user\'s site email address isn\'t forwarded to their real address.',indexed='0',multihomed='0',prettyname='Disable site e-mail alias',scope='general' WHERE name='no_mail_alias';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'True if this community allows non-member posting access', '0', '0', 'nonmember_posting', 'Non-Member posting access', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='True if this community allows non-member posting access',indexed='0',multihomed='0',prettyname='Non-Member posting access',scope='general' WHERE name='nonmember_posting';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'bool', '0: don\'t get birthday reminder mail, 1: do get birthday reminder mail', '1', '0', 'opt_bdaymail', 'Get Birthday Reminders', 'general');
-UPDATE userproplist SET cldversion='0',datatype='bool',des='0: don\'t get birthday reminder mail, 1: do get birthday reminder mail',indexed='1',multihomed='0',prettyname='Get Birthday Reminders',scope='general' WHERE name='opt_bdaymail';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '1: don\'t allow robots, 0: do', '1', '0', 'opt_blockrobots', 'Block Robots & Spiders', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='1: don\'t allow robots, 0: do',indexed='1',multihomed='0',prettyname='Block Robots & Spiders',scope='general' WHERE name='opt_blockrobots';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Y = send email, else don\'t.', '0', '0', 'opt_comminvitemail', 'Get Emails for Community Invites', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Y = send email, else don\'t.',indexed='0',multihomed='0',prettyname='Get Emails for Community Invites',scope='general' WHERE name='opt_comminvitemail';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'N = send no email, D = send daily digest, else send email always.', '0', '0', 'opt_communityjoinemail', 'Get Emails for Join Requests', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='N = send no email, D = send daily digest, else send email always.',indexed='0',multihomed='0',prettyname='Get Emails for Join Requests',scope='general' WHERE name='opt_communityjoinemail';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', '1 = send poster comments they make, else don\'t.', '0', '0', 'opt_getselfemail', 'Get Emails for Comments You Make', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='1 = send poster comments they make, else don\'t.',indexed='0',multihomed='0',prettyname='Get Emails for Comments You Make',scope='general' WHERE name='opt_getselfemail';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '0: show friendofs, 1: hide friendofs', '0', '0', 'opt_hidefriendofs', 'Hide Friend-Of List', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='0: show friendofs, 1: hide friendofs',indexed='0',multihomed='0',prettyname='Hide Friend-Of List',scope='general' WHERE name='opt_hidefriendofs';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '0: show memberofs, 1: hide memberofs', '0', '0', 'opt_hidememberofs', 'Hide Member-Of and Posting Access List', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='0: show memberofs, 1: hide memberofs',indexed='0',multihomed='0',prettyname='Hide Member-Of and Posting Access List',scope='general' WHERE name='opt_hidememberofs';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'width|height: specifies maximum image size on a user\'s friends page. 0 for either field replaces all images.', '0', '0', 'opt_imagelinks', 'Use Placeholders on Your Friend\'s Page', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='width|height: specifies maximum image size on a user\'s friends page. 0 for either field replaces all images.',indexed='0',multihomed='0',prettyname='Use Placeholders on Your Friend\'s Page',scope='general' WHERE name='opt_imagelinks';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'LJCUT disabled in friends view', '1', '0', 'opt_ljcut_disable_friends', 'LJCUT disabled in friends view', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='LJCUT disabled in friends view',indexed='1',multihomed='0',prettyname='LJCUT disabled in friends view',scope='general' WHERE name='opt_ljcut_disable_friends';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'LJCUT disabled in lastn and day views', '1', '0', 'opt_ljcut_disable_lastn', 'LJCUT disabled in lastn and day views', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='LJCUT disabled in lastn and day views',indexed='1',multihomed='0',prettyname='LJCUT disabled in lastn and day views',scope='general' WHERE name='opt_ljcut_disable_lastn';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'N: No, S: some (anonymous), A: all', '1', '0', 'opt_logcommentips', 'Log Comment IPs', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='N: No, S: some (anonymous), A: all',indexed='1',multihomed='0',prettyname='Log Comment IPs',scope='general' WHERE name='opt_logcommentips';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', '', 'Maxium picture height to be shown in journal before being linkitized. 0: for no max', '1', '0', 'opt_maxpicheight', 'Max Picture Height', 'general');
-UPDATE userproplist SET cldversion='4',datatype='',des='Maxium picture height to be shown in journal before being linkitized. 0: for no max',indexed='1',multihomed='0',prettyname='Max Picture Height',scope='general' WHERE name='opt_maxpicheight';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', '', 'Maxium picture width to be shown in journal before being linkitized. 0: for no max', '1', '0', 'opt_maxpicwidth', 'Max Picture Width', 'general');
-UPDATE userproplist SET cldversion='4',datatype='',des='Maxium picture width to be shown in journal before being linkitized. 0: for no max',indexed='1',multihomed='0',prettyname='Max Picture Width',scope='general' WHERE name='opt_maxpicwidth';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', '', 'Maxium word length before forced word breaks. 0: for no max', '1', '0', 'opt_maxwordlength', 'Max Word Length', 'general');
-UPDATE userproplist SET cldversion='0',datatype='',des='Maxium word length before forced word breaks. 0: for no max',indexed='1',multihomed='0',prettyname='Max Word Length',scope='general' WHERE name='opt_maxwordlength';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'Show number of comments in URL', '0', '0', 'opt_nctalklinks', 'Show number of comments in URL', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='Show number of comments in URL',indexed='0',multihomed='0',prettyname='Show number of comments in URL',scope='general' WHERE name='opt_nctalklinks';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'Disable Friend Nudges', '0', '0', 'opt_no_nudge', 'Disable Friend Nudges', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='Disable Friend Nudges',indexed='0',multihomed='0',prettyname='Disable Friend Nudges',scope='general' WHERE name='opt_no_nudge';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'Disable QuickReply', '0', '0', 'opt_no_quickreply', 'Disable QuickReply', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='Disable QuickReply',indexed='0',multihomed='0',prettyname='Disable QuickReply',scope='general' WHERE name='opt_no_quickreply';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '1: do not send moderation emails, 0: default, send them', '0', '0', 'opt_nomodemail', 'No Moderation Email', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='1: do not send moderation emails, 0: default, send them',indexed='0',multihomed='0',prettyname='No Moderation Email',scope='general' WHERE name='opt_nomodemail';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '1: no forum icons shown, 0: default, show them', '1', '0', 'opt_notalkicons', 'No Forum Icons', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='1: no forum icons shown, 0: default, show them',indexed='1',multihomed='0',prettyname='No Forum Icons',scope='general' WHERE name='opt_notalkicons';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'User selected security setting to show birthday', '0', '0', 'opt_showbday', 'Show Birthday', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='User selected security setting to show birthday',indexed='0',multihomed='0',prettyname='Show Birthday',scope='general' WHERE name='opt_showbday';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'User selected security setting to show location', '0', '0', 'opt_showlocation', 'Show Location', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='User selected security setting to show location',indexed='0',multihomed='0',prettyname='Show Location',scope='general' WHERE name='opt_showlocation';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', 'Boolean: 1 means show only mutual friends on your userinfo page, 0 (default) means to use the standard mode of showing everybody.', '1', '0', 'opt_showmutualfriends', 'Mutual Friends Display', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='Boolean: 1 means show only mutual friends on your userinfo page, 0 (default) means to use the standard mode of showing everybody.',indexed='1',multihomed='0',prettyname='Mutual Friends Display',scope='general' WHERE name='opt_showmutualfriends';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Show school info on userinfo Y: everyone, F: friends only N: don\'t show', '0', '0', 'opt_showschools', 'Show School Information on Userinfo', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Show school info on userinfo Y: everyone, F: friends only N: don\'t show',indexed='0',multihomed='0',prettyname='Show School Information on Userinfo',scope='general' WHERE name='opt_showschools';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('0', 'char', 'Y: include links to topic directory, N: don\'t.', '1', '0', 'opt_showtopicstuff', 'Topic Directory Integration', 'general');
-UPDATE userproplist SET cldversion='0',datatype='char',des='Y: include links to topic directory, N: don\'t.',indexed='1',multihomed='0',prettyname='Topic Directory Integration',scope='general' WHERE name='opt_showtopicstuff';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '1: use journal style when commenting on other journals from friends page', '0', '0', 'opt_stylemine', 'Style=Mine', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='1: use journal style when commenting on other journals from friends page',indexed='0',multihomed='0',prettyname='Style=Mine',scope='general' WHERE name='opt_stylemine';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'How much content to put into syndication (Atom/RSS) feeds; values are: title, summary, or friends', '', '', 'opt_synlevel', 'Syndication Level', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='How much content to put into syndication (Atom/RSS) feeds; values are: title, summary, or friends',indexed='',multihomed='',prettyname='Syndication Level',scope='general' WHERE name='opt_synlevel';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'User defined permissions for tags. Format of prop: \"add,control\". (Who can add tags, who can manage tags.) Format of both is one of \"public\",\"private\",\"friends\",\"group:N\" where N is the group id.', '0', '0', 'opt_tagpermissions', 'User Tag Permissions', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='User defined permissions for tags. Format of prop: \"add,control\". (Who can add tags, who can manage tags.) Format of both is one of \"public\",\"private\",\"friends\",\"group:N\" where N is the group id.',indexed='0',multihomed='0',prettyname='User Tag Permissions',scope='general' WHERE name='opt_tagpermissions';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'bool', '1: friends view uses shared pictures, 0: uses poster\'s picture', '1', '0', 'opt_usesharedpic', 'Use Shared Journal Pic', 'general');
-UPDATE userproplist SET cldversion='4',datatype='bool',des='1: friends view uses shared pictures, 0: uses poster\'s picture',indexed='1',multihomed='0',prettyname='Use Shared Journal Pic',scope='general' WHERE name='opt_usesharedpic';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', '1: ping weblogs.com with updates', '0', '0', 'opt_weblogscom', 'Ping Weblogs.com', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='1: ping weblogs.com with updates',indexed='0',multihomed='0',prettyname='Ping Weblogs.com',scope='general' WHERE name='opt_weblogscom';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'N: none, A: actual, L: livejournal, B: both', '1', '0', 'opt_whatemailshow', 'Which email address to display', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='N: none, A: actual, L: livejournal, B: both',indexed='1',multihomed='0',prettyname='Which email address to display',scope='general' WHERE name='opt_whatemailshow';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Screen new comments: A=All, N=None, F=from non-Friends, R=from non-users', '0', '0', 'opt_whoscreened', 'Screening comments', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Screen new comments: A=All, N=None, F=from non-Friends, R=from non-users',indexed='0',multihomed='0',prettyname='Screening comments',scope='general' WHERE name='opt_whoscreened';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'num', 'Has the user had their portal initialized yet?', '0', '0', 'portalinit', 'Portal Init', 'general');
-UPDATE userproplist SET cldversion='4',datatype='num',des='Has the user had their portal initialized yet?',indexed='0',multihomed='0',prettyname='Portal Init',scope='general' WHERE name='portalinit';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'blobchar', 'Public key used for email gateway signature verification', '0', '0', 'public_key', 'PGP or GPG public key', 'general');
-UPDATE userproplist SET cldversion='4',datatype='blobchar',des='Public key used for email gateway signature verification',indexed='0',multihomed='0',prettyname='PGP or GPG public key',scope='general' WHERE name='public_key';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, indexed, multihomed, name, prettyname, scope) VALUES ('4', 'char', 'Username of other journal to redirect to, if u.statusvis==\"R\"', '1', '0', 'renamedto', 'Redirect to other account', 'general');
-UPDATE userproplist SET cldversion='4',datatype='char',des='Username of other journal to redirect to, if u.statusvis==\"R\"',indexed='1',multihomed='0',prettyname='Redirect to other account',scope='general' WHERE name='renamedto';
-INSERT IGNORE INTO userproplist (cldversion, datatype, des, in...
(truncated)