Browse Source

As usual, you find the bugs in production

George Baugh 1 year ago
parent
commit
357ff1bc44
4 changed files with 6 additions and 3 deletions
  1. 1 1
      Installer.mk
  2. 2 0
      Makefile.PL
  3. 1 1
      lib/Trog/Auth.pm
  4. 2 1
      lib/Trog/Routes/HTML.pm

+ 1 - 1
Installer.mk

@@ -13,7 +13,7 @@ install:
 	test -d www/statics || mkdir -p www/statics
 	test -d www/statics || mkdir -p www/statics
 	test -d totp/ || mkdir -p totp
 	test -d totp/ || mkdir -p totp
 	test -d ~/.tcms || mkdir ~/.tcms
 	test -d ~/.tcms || mkdir ~/.tcms
-	test -d logs/db/ && mkdir -p logs/db/; /bin/true
+	test -d logs/ && mkdir -p logs/; /bin/true
 	$(RM) pod2htmd.tmp;
 	$(RM) pod2htmd.tmp;
 
 
 .PHONY: install-service
 .PHONY: install-service

+ 2 - 0
Makefile.PL

@@ -66,6 +66,8 @@ WriteMakefile(
     'Email::Sender::Simple'     => '0',
     'Email::Sender::Simple'     => '0',
     'POSIX::strptime'           => '0',
     'POSIX::strptime'           => '0',
     'Log::Dispatch::DBI'        => '0',
     'Log::Dispatch::DBI'        => '0',
+    'Email::MIME'               => '0',
+    'Email::Sender::Simple'     => '0',
   },
   },
   test => {TESTS => 't/*.t'}
   test => {TESTS => 't/*.t'}
 );
 );

+ 1 - 1
lib/Trog/Auth.pm

@@ -52,7 +52,7 @@ If the user has an active session, things like password reset requests should fa
 
 
 sub user_has_session ($user) {
 sub user_has_session ($user) {
     my $dbh  = _dbh();
     my $dbh  = _dbh();
-    my $rows = $dbh->selectall_arrayref( "SELECT session FROM sess_user WHERE user=?", { Slice => {} }, $user );
+    my $rows = $dbh->selectall_arrayref( "SELECT session FROM sess_user WHERE name=?", { Slice => {} }, $user );
     return 0 unless ref $rows eq 'ARRAY' && @$rows;
     return 0 unless ref $rows eq 'ARRAY' && @$rows;
     return 1;
     return 1;
 }
 }

+ 2 - 1
lib/Trog/Routes/HTML.pm

@@ -285,7 +285,8 @@ sub index ( $query, $content = '', $i_styles = [], $i_scripts = [] ) {
     # Grab the avatar class for the logged in user
     # Grab the avatar class for the logged in user
     if ( $query->{user} ) {
     if ( $query->{user} ) {
         $query->{user_class} = Trog::Auth::username2display( $query->{user} );
         $query->{user_class} = Trog::Auth::username2display( $query->{user} );
-        $query->{user_class} =~ tr/ /_/;
+        # For "wizi" users with no user page, suppress warnings here
+        $query->{user_class} =~ tr/ /_/ if $query->{user_class};
     }
     }
 
 
     state $data;
     state $data;