Added users_prefs table and removed users.(skin|customcss)

Will convert the other preferences later.

9 files changed, 76 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 64676fe5..8c5f8920 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
 	- Improved VN tag filter selection with a dynamic HTML list of selected tags
 	- Don't send 'tagspoil' filter when 'tag_inc' isn't active
 	- Don't allow page > 100 or sorting on username or title on tag link browser
+	- Added users_prefs table and removed users.(skin|customcss)
 
 2.15 - 2010-12-15
 	- Removed expand/collapse from history browser and /u+/posts and switched to
diff --git a/lib/VNDB/DB/Users.pm b/lib/VNDB/DB/Users.pm
index 7440f495..73479784 100644
--- a/lib/VNDB/DB/Users.pm
+++ b/lib/VNDB/DB/Users.pm
@@ -6,14 +6,14 @@ use warnings;
 use Exporter 'import';
 
 our @EXPORT = qw|
-  dbUserGet dbUserEdit dbUserAdd dbUserDel
+  dbUserGet dbUserEdit dbUserAdd dbUserDel dbUserPrefSet
   dbSessionAdd dbSessionDel dbSessionUpdateLastUsed
   dbNotifyGet dbNotifyMarkRead dbNotifyRemove
 |;
 
 
 # %options->{ username passwd mail session uid ip registered search results page what sort reverse }
-# what: notifycount stats extended
+# what: notifycount stats extended prefs
 # sort: username registered votes changes tags
 sub dbUserGet {
   my $s = shift;
@@ -54,7 +54,7 @@ sub dbUserGet {
     qw|id username c_votes c_changes show_list c_tags|,
     q|extract('epoch' from registered) as registered|,
     $o{what} =~ /extended/ ? (
-      qw|mail rank salt skin customcss show_nsfw ign_votes notify_dbedit notify_announce|,
+      qw|mail rank salt show_nsfw ign_votes notify_dbedit notify_announce|,
       q|encode(passwd, 'hex') AS passwd|
     ) : (),
     $o{what} =~ /notifycount/ ?
@@ -90,6 +90,20 @@ sub dbUserGet {
       ORDER BY !s|,
     join(', ', @select), join(' ', @join), \%where, $order
   );
+
+  if($o{what} =~ /prefs/) {
+    my %r = map {
+      $r->[$_]{prefs} = {};
+      ($r->[$_]{id}, $r->[$_])
+    } 0..$#$r;
+
+    $r{$_->{uid}}{prefs}{$_->{key}} = $_->{value} for (@{$s->dbAll(q|
+      SELECT uid, key, value
+        FROM users_prefs
+        WHERE uid IN(!l)|,
+      [ keys %r ]
+    )});
+  }
   return wantarray ? ($r, $np) : $r;
 }
 
@@ -100,7 +114,7 @@ sub dbUserEdit {
 
   my %h;
   defined $o{$_} && ($h{$_.' = ?'} = $o{$_})
-    for (qw| username mail rank show_nsfw show_list skin customcss salt ign_votes notify_dbedit notify_announce |);
+    for (qw| username mail rank show_nsfw show_list salt ign_votes notify_dbedit notify_announce |);
   $h{'passwd = decode(?, \'hex\')'} = $o{passwd}
     if defined $o{passwd};
 
@@ -127,6 +141,15 @@ sub dbUserDel {
 }
 
 
+# uid, key, val
+sub dbUserPrefSet {
+  my($s, $uid, $key, $val) = @_;
+  !$val ? $s->dbExec('DELETE FROM users_prefs WHERE uid = ? AND key = ?', $uid, $key)
+   : $s->dbExec('UPDATE users_prefs SET value = ? WHERE uid = ? AND key = ?', $val, $uid, $key)
+  || $s->dbExec('INSERT INTO users_prefs (uid, key, value) VALUES (?, ?, ?)', $uid, $key, $val);
+}
+
+
 # Adds a session to the database
 # uid, 40 character session token
 sub dbSessionAdd {
diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm
index 3e2a1aef..31de6bd7 100644
--- a/lib/VNDB/Handler/Users.pm
+++ b/lib/VNDB/Handler/Users.pm
@@ -291,7 +291,7 @@ sub edit {
   return $self->htmlDenied if !$self->authInfo->{id} || $self->authInfo->{id} != $uid && !$self->authCan('usermod');
 
   # fetch user info (cached if uid == loggedin uid)
-  my $u = $self->authInfo->{id} == $uid ? $self->authInfo : $self->dbUserGet(uid => $uid, what => 'extended')->[0];
+  my $u = $self->authInfo->{id} == $uid ? $self->authInfo : $self->dbUserGet(uid => $uid, what => 'extended prefs')->[0];
   return 404 if !$u->{id};
 
   # check POST data
@@ -315,12 +315,11 @@ sub edit {
     push @{$frm->{_err}}, 'passmatch'
       if ($frm->{usrpass} || $frm->{usrpass2}) && (!$frm->{usrpass} || !$frm->{usrpass2} || $frm->{usrpass} ne $frm->{usrpass2});
     if(!$frm->{_err}) {
+      $self->dbUserPrefSet($uid, $_ => $frm->{$_}) for (qw|skin customcss|);
       my %o;
       $o{username} = $frm->{usrname} if $frm->{usrname};
       $o{rank} = $frm->{rank} if $frm->{rank};
       $o{mail} = $frm->{mail};
-      $o{skin} = $frm->{skin};
-      $o{customcss} = $frm->{customcss};
       ($o{passwd}, $o{salt}) = $self->authPreparePass($frm->{usrpass}) if $frm->{usrpass};
       $o{show_list} = $frm->{flags_list} ? 1 : 0;
       $o{show_nsfw} = $frm->{flags_nsfw} ? 1 : 0;
@@ -334,7 +333,8 @@ sub edit {
 
   # fill out default values
   $frm->{usrname}    ||= $u->{username};
-  $frm->{$_} ||= $u->{$_} for(qw|rank mail skin customcss|);
+  $frm->{$_} ||= $u->{$_} for(qw|rank mail|);
+  $frm->{$_} ||= $u->{prefs}{$_} for(qw|skin customcss|);
   $frm->{flags_list} = $u->{show_list} if !defined $frm->{flags_list};
   $frm->{flags_nsfw} = $u->{show_nsfw} if !defined $frm->{flags_nsfw};
   $frm->{ign_votes} = $u->{ign_votes} if !defined $frm->{ign_votes};
diff --git a/lib/VNDB/Util/Auth.pm b/lib/VNDB/Util/Auth.pm
index 24e316ce..50b81eb2 100644
--- a/lib/VNDB/Util/Auth.pm
+++ b/lib/VNDB/Util/Auth.pm
@@ -14,7 +14,7 @@ use YAWF ':html';
 use VNDB::Func;
 
 
-our @EXPORT = qw| authInit authLogin authLogout authInfo authCan authPreparePass authGetCode authCheckCode |;
+our @EXPORT = qw| authInit authLogin authLogout authInfo authCan authPreparePass authGetCode authCheckCode authPref |;
 
 
 # initializes authentication information and checks the vndb_auth cookie
@@ -27,7 +27,7 @@ sub authInit {
   return _rmcookie($self) if length($cookie) < 41;
   my $token = substr($cookie, 0, 40);
   my $uid  = substr($cookie, 40);
-  $self->{_auth} = $uid =~ /^\d+$/ && $self->dbUserGet(uid => $uid, session => $token, what => 'extended notifycount')->[0];
+  $self->{_auth} = $uid =~ /^\d+$/ && $self->dbUserGet(uid => $uid, session => $token, what => 'extended notifycount prefs')->[0];
   # update the sessions.lastused column if lastused < now()'6 hours'
   $self->dbSessionUpdateLastUsed($uid, $token) if $self->{_auth} && $self->{_auth}{session_lastused} < time()-6*3600;
   return _rmcookie($self) if !$self->{_auth};
@@ -196,5 +196,13 @@ sub _incorrectcode {
 }
 
 
+sub authPref {
+  my($self, $key, $val) = @_;
+  return '' if !$self->authInfo->{id};
+  return $self->{_auth}{prefs}{$key}||'' if @_ == 2;
+  $self->{_auth}{prefs}{$key} = $val;
+  $self->dbUserPrefSet($key, $val);
+}
+
 1;
 
diff --git a/lib/VNDB/Util/LayoutHTML.pm b/lib/VNDB/Util/LayoutHTML.pm
index c241101f..a94289fa 100644
--- a/lib/VNDB/Util/LayoutHTML.pm
+++ b/lib/VNDB/Util/LayoutHTML.pm
@@ -12,7 +12,7 @@ our @EXPORT = qw|htmlHeader htmlFooter|;
 
 sub htmlHeader { # %options->{ title, noindex, search, feeds }
   my($self, %o) = @_;
-  my $skin = $self->reqParam('skin') || $self->authInfo->{skin} || $self->{skin_default};
+  my $skin = $self->reqParam('skin') || $self->authPref('skin') || $self->{skin_default};
   $skin = $self->{skin_default} if !$self->{skins}{$skin} || !-d "$VNDB::ROOT/static/s/$skin";
 
   # heading
@@ -22,8 +22,8 @@ sub htmlHeader { # %options->{ title, noindex, search, feeds }
     Link rel => 'shortcut icon', href => '/favicon.ico', type => 'image/x-icon';
     Link rel => 'stylesheet', href => $self->{url_static}.'/s/'.$skin.'/style.css?'.$self->{version}, type => 'text/css', media => 'all';
     Link rel => 'search', type => 'application/opensearchdescription+xml', title => 'VNDB VN Search', href => $self->{url}.'/opensearch.xml';
-    if($self->authInfo->{customcss}) {
-      (my $css = $self->authInfo->{customcss}) =~ s/\n/ /g;
+    if($self->authPref('customcss')) {
+      (my $css = $self->authPref('customcss')) =~ s/\n/ /g;
       style type => 'text/css', $css;
     }
     Link rel => 'alternate', type => 'application/atom+xml', href => "/feeds/$_.atom", title => $self->{atom_feeds}{$_}[1]
diff --git a/util/dbgraph.pl b/util/dbgraph.pl
index b785f582..f7cb9923 100755
--- a/util/dbgraph.pl
+++ b/util/dbgraph.pl
@@ -23,7 +23,7 @@ my %subgraphs = (
   'Producers'        => [qw| FFFFCC producers producers_rev producers_relations |],
   'Releases'         => [qw| C8FFC8 releases releases_rev releases_media releases_platforms releases_producers releases_lang releases_vn |],
   'Visual Novels'    => [qw| FFE6BE vn vn_rev vn_relations vn_anime vn_screenshots |],
-  'Users'            => [qw| CCFFFF users votes rlists wlists vnlists sessions notifications |],
+  'Users'            => [qw| CCFFFF users votes rlists wlists vnlists sessions notifications users_prefs |],
   'Discussion board' => [qw| FFDCDC threads threads_boards threads_posts |],
   'Tags'             => [qw| FFC8C8 tags tags_aliases tags_parents tags_vn |],
   'Misc'             => [qw| F5F5F5 changes anime screenshots stats_cache quotes relgraphs |],
diff --git a/util/sql/all.sql b/util/sql/all.sql
index 8f55ed88..6ecb96f1 100644
--- a/util/sql/all.sql
+++ b/util/sql/all.sql
@@ -10,6 +10,7 @@ CREATE TYPE language          AS ENUM('cs', 'da', 'de', 'en', 'es', 'fi', 'fr',
 CREATE TYPE medium            AS ENUM ('cd', 'dvd', 'gdr', 'blr', 'flp', 'mrt', 'mem', 'umd', 'nod', 'in', 'otc');
 CREATE TYPE notification_ntype AS ENUM ('pm', 'dbdel', 'listdel', 'dbedit', 'announce');
 CREATE TYPE notification_ltype AS ENUM ('v', 'r', 'p', 't');
+CREATE TYPE prefs_key         AS ENUM ('l10n', 'skin', 'customcss', 'show_nsfw', 'hide_list', 'notify_dbedit', 'notify_announce');
 CREATE TYPE producer_relation AS ENUM ('old', 'new', 'sub', 'par', 'imp', 'ipa', 'spa', 'ori');
 CREATE TYPE release_type      AS ENUM ('complete', 'partial', 'trial');
 CREATE TYPE vn_relation       AS ENUM ('seq', 'preq', 'set', 'alt', 'char', 'side', 'par', 'ser', 'fan', 'orig');
diff --git a/util/sql/schema.sql b/util/sql/schema.sql
index eff5edde..02fb7d60 100644
--- a/util/sql/schema.sql
+++ b/util/sql/schema.sql
@@ -270,8 +270,6 @@ CREATE TABLE users (
   show_list boolean NOT NULL DEFAULT TRUE,
   c_votes integer NOT NULL DEFAULT 0,
   c_changes integer NOT NULL DEFAULT 0,
-  skin varchar(128) NOT NULL DEFAULT '',
-  customcss text NOT NULL DEFAULT '',
   ip inet NOT NULL DEFAULT '0.0.0.0',
   c_tags integer NOT NULL DEFAULT 0,
   salt character(9) NOT NULL DEFAULT '',
@@ -280,6 +278,14 @@ CREATE TABLE users (
   notify_announce boolean NOT NULL DEFAULT FALSE
 );
 
+-- users_prefs
+CREATE TABLE users_prefs (
+  uid integer NOT NULL,
+  key prefs_key NOT NULL,
+  value varchar NOT NULL,
+  PRIMARY KEY(uid, key)
+);
+
 -- vn
 CREATE TABLE vn (
   id SERIAL NOT NULL PRIMARY KEY,
@@ -404,6 +410,7 @@ ALTER TABLE threads             ADD FOREIGN KEY (id, count) REFERENCES threads_p
 ALTER TABLE threads_posts       ADD FOREIGN KEY (tid)       REFERENCES threads       (id);
 ALTER TABLE threads_posts       ADD FOREIGN KEY (uid)       REFERENCES users         (id) ON DELETE SET DEFAULT;
 ALTER TABLE threads_boards      ADD FOREIGN KEY (tid)       REFERENCES threads       (id);
+ALTER TABLE users_prefs         ADD FOREIGN KEY (uid)       REFERENCES users         (id) ON DELETE CASCADE;
 ALTER TABLE vn                  ADD FOREIGN KEY (latest)    REFERENCES vn_rev        (id) DEFERRABLE INITIALLY DEFERRED;
 ALTER TABLE vn                  ADD FOREIGN KEY (rgraph)    REFERENCES relgraphs     (id);
 ALTER TABLE vn_anime            ADD FOREIGN KEY (aid)       REFERENCES anime         (id);
diff --git a/util/updates/update_2.16.sql b/util/updates/update_2.16.sql
index 9ff96b32..86654c72 100644
--- a/util/updates/update_2.16.sql
+++ b/util/updates/update_2.16.sql
@@ -47,3 +47,23 @@ CREATE CONSTRAINT TRIGGER update_vnlist_rlist AFTER INSERT ON rlists  DEFERRABLE
 ALTER TABLE rlists DROP COLUMN vstat;
 ALTER TABLE rlists RENAME COLUMN rstat TO status;
 
+
+
+-- add users_prefs table
+CREATE TYPE prefs_key AS ENUM ('l10n', 'skin', 'customcss', 'show_nsfw', 'hide_list', 'notify_dbedit', 'notify_announce');
+CREATE TABLE users_prefs (
+  uid integer NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+  key prefs_key NOT NULL,
+  value varchar NOT NULL,
+  PRIMARY KEY(uid, key)
+);
+
+-- convert from users.* to users_prefs
+INSERT INTO users_prefs (uid, key, value)
+    SELECT id, 'skin'::prefs_key, skin FROM users WHERE skin <> ''
+  UNION
+    SELECT id, 'customcss', customcss FROM users WHERE customcss <> '';
+
+ALTER TABLE users DROP COLUMN skin;
+ALTER TABLE users DROP COLUMN customcss;
+