diff options
author | Yorhel <git@yorhel.nl> | 2010-12-23 11:48:09 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2010-12-23 11:48:09 +0100 |
commit | e0131b6ab501eaeda1003ac5131f803a36192d46 (patch) | |
tree | f18682fd8e087264e73631bcd12b662627e631ca /lib/VNDB/Util | |
parent | aca465c568a4fba065d04fdb236309a9fcb1c37c (diff) |
Added users_prefs table and removed users.(skin|customcss)
Will convert the other preferences later.
Diffstat (limited to 'lib/VNDB/Util')
-rw-r--r-- | lib/VNDB/Util/Auth.pm | 12 | ||||
-rw-r--r-- | lib/VNDB/Util/LayoutHTML.pm | 6 |
2 files changed, 13 insertions, 5 deletions
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] |