This commit is contained in:
Maxime Besson 2020-12-28 17:48:47 +01:00
parent 099b1890bc
commit 219aeb1547
3 changed files with 12 additions and 12 deletions

View File

@ -58,7 +58,7 @@ sub getMenuApp {
my @menuApps =
map {
$self->_isCatApp( $cat->{$_} )
$self->_isCatApp( $cat->{$_} )
? $self->_getMenuAppByConfKey( $conf, $catConfKey, $_ )
: ()
}
@ -105,7 +105,7 @@ sub findMenuAppByConfKey {
my @menuApps =
map {
$self->_isCatApp( $cat->{$_} )
$self->_isCatApp( $cat->{$_} )
&& $_ =~ $pattern
? $self->_getMenuAppByConfKey( $conf, $catConfKey, $_ )
: ()
@ -132,8 +132,8 @@ sub addMenuApp {
400 )
if ( ref $add->{confKey} );
return $self->sendError( $req, 'Invalid input: confKey contains invalid characters',
400 )
return $self->sendError( $req,
'Invalid input: confKey contains invalid characters', 400 )
unless ( $add->{confKey} =~ '^\w[\w\.\-]*$' );
return $self->sendError( $req, 'Invalid input: name is missing', 400 )
@ -241,10 +241,10 @@ sub replaceMenuApp {
400 )
if ( ref $replace->{confKey} );
return $self->sendError( $req, 'Invalid input: confKey contains invalid characters',
400 )
return $self->sendError( $req,
'Invalid input: confKey contains invalid characters', 400 )
unless ( $replace->{confKey} =~ '^\w[\w\.\-]*$' );
return $self->sendError( $req, 'Invalid input: name is missing', 400 )
unless ( defined $replace->{options}
&& defined $replace->{options}{name} );

View File

@ -76,8 +76,8 @@ sub addMenuCat {
400 )
if ( ref $add->{confKey} );
return $self->sendError( $req, 'Invalid input: confKey contains invalid characters',
400 )
return $self->sendError( $req,
'Invalid input: confKey contains invalid characters', 400 )
unless ( $add->{confKey} =~ '^\w[\w\.\-]*$' );
return $self->sendError( $req, 'Invalid input: catname is missing', 400 )
@ -159,8 +159,8 @@ sub replaceMenuCat {
400 )
if ( ref $replace->{confKey} );
return $self->sendError( $req, 'Invalid input: confKey contains invalid characters',
400 )
return $self->sendError( $req,
'Invalid input: confKey contains invalid characters', 400 )
unless ( $replace->{confKey} =~ '^\w[\w\.\-]*$' );
return $self->sendError( $req, 'Invalid input: catname is missing', 400 )

View File

@ -86,7 +86,7 @@ sub _getSessionDBState {
# Handle DBI-type session stores
if ( $fakeobj->{object_store}->isa("Apache::Session::Store::DBI") ) {
# The 'connection' method will fail if the DB is unreachable
# this is good enough a test for now
eval { $fakeobj->{object_store}->connection($fakeobj) };