Use theme and language from DB

diff --git a/miniserv.pl b/miniserv.pl
index f0c9911..c52cd30 100755 (executable)
--- a/miniserv.pl
+++ b/miniserv.pl
@@ -1797,6 +1797,7 @@ if ($config{'userfile'}) {
                return 0;
                }
        }
+$uinfo = &get_user_details($baseauthuser);
 
 # Validate the path, and convert to canonical form
 rerun:
@@ -1816,9 +1817,8 @@ local $preroots = $mobile_device && defined($config{'mobile_preroot'}) ?
                        $config{'mobile_preroot'} :
                 $authuser && defined($config{'preroot_'.$authuser}) ?
                        $config{'preroot_'.$authuser} :
-                $authuser && $baseauthuser &&
-                    defined($config{'preroot_'.$baseauthuser}) ?
-                       $config{'preroot_'.$baseauthuser} :
+                $uinfo && defined($uinfo->{'preroot'}) ?
+                       $uinfo->{'preroot'} :
                        $config{'preroot'};
 local @preroots = reverse(split(/\s+/, $preroots));
 
@@ -2061,7 +2061,6 @@ if (&get_type($full) eq "internal/cgi" && $validated != 4) {
                                        $baseauthuser : undef;
        $ENV{"REMOTE_PASS"} = $authpass if (defined($authpass) &&
                                            $config{'pass_password'});
-       $uinfo = &get_user_details($baseauthuser);
        if ($uinfo && $uinfo->{'proto'}) {
                $ENV{"REMOTE_USER_PROTO"} = $uinfo->{'proto'};
                $ENV{"REMOTE_USER_ID"} = $uinfo->{'id'};
@@ -4090,6 +4089,7 @@ if (exists($users{$username})) {
                 'lastchanges' => $lastchanges{$username},
                 'nochange' => $nochange{$username},
                 'temppass' => $temppass{$username},
+                'preroot' => $config{'preroot_'.$username},
               };
        }
 if ($config{'userdb'}) {
@@ -4167,6 +4167,7 @@ if ($config{'userdb'}) {
                $user->{'lastchanges'} = $attrs{'lastchange'};
                $user->{'nochange'} = $attrs{'nochange'};
                $user->{'temppass'} = $attrs{'temppass'};
+               $user->{'preroot'} = $attrs{'theme'};
                }
        elsif ($proto eq "ldap") {
                # Fetch with LDAP

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index bc079ca..161ed39 100755 (executable)
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -3852,8 +3852,29 @@ my $u = $ENV{'BASE_REMOTE_USER'} || $ENV{'REMOTE_USER'};
 $base_remote_user = $u;
 $remote_user = $ENV{'REMOTE_USER'};
 
-# Work out if user is definitely in the DB
+# Work out if user is definitely in the DB, and if so get his attrs
 $remote_user_proto = $ENV{"REMOTE_USER_PROTO"};
+%remote_user_attrs = ( );
+if ($remote_user_proto) {
+       my $userdb = &get_userdb_string();
+       my ($dbh, $proto) = $userdb ? &connect_userdb($userdb) : ( );
+       if (ref($dbh)) {
+               if ($proto eq "mysql" || $proto eq "postgresql") {
+                       # Read attrs from SQL
+                       my $cmd = $dbh->prepare("select webmin_user_attr.attr,webmin_user_attr.value from webmin_user_attr,webmin_user where webmin_user_attr.id = webmin_user.id and webmin_user.name = ?");
+                       if ($cmd && $cmd->execute($base_remote_user)) {
+                               while(my ($attr, $value) = $cmd->fetchrow()) {
+                                       $remote_user_attrs{$attr} = $value;
+                                       }
+                               $cmd->finish();
+                               }
+                       }
+               elsif ($proto eq "ldap") {
+                       # XXX read attrs from LDAP
+                       }
+               &disconnect_userdb($userdb, $dbh);
+               }
+       }
 
 if ($module_name) {
        # Find and load the configuration file for this module
@@ -3894,6 +3915,8 @@ $main::initial_module_name ||= $module_name;
 my $current_themes;
 $current_themes = $ENV{'MOBILE_DEVICE'} && defined($gconfig{'mobile_theme'}) ?
                    $gconfig{'mobile_theme'} :
+                 defined($remote_user_attrs{'theme'}) ?
+                   $remote_user_attrs{'theme'} :
                  defined($gconfig{'theme_'.$remote_user}) ?
                    $gconfig{'theme_'.$remote_user} :
                  defined($gconfig{'theme_'.$base_remote_user}) ?
@@ -3946,6 +3969,7 @@ if ($gconfig{'acceptlang'}) {
        }
 $current_lang = $force_lang ? $force_lang :
     $accepted_lang ? $accepted_lang :
+    $remote_user_attrs{'lang'} ? $remote_user_attrs{'lang'} :
     $gconfig{"lang_$remote_user"} ? $gconfig{"lang_$remote_user"} :
     $gconfig{"lang_$base_remote_user"} ? $gconfig{"lang_$base_remote_user"} :
     $gconfig{"lang"} ? $gconfig{"lang"} : $default_lang;
@@ -4060,6 +4084,7 @@ if ($main::export_to_caller) {
                       '$path_separator', '@root_directories',
                       '$root_directory', '$module_name',
                       '$base_remote_user', '$remote_user',
+                      '$remote_user_proto', '%remote_user_attrs',
                       '$module_config_directory', '$module_config_file',
                       '%config', '@current_themes', '$current_theme',
                       '@theme_root_directories', '$theme_root_directory',