kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove brackets from conditions that are not needed

Browse Source
This commit is contained in:
Milan
2020-03-07 23:18:42 +01:00
parent 4584125923
commit ea9590f6dc
13 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/calcms/aggregator.pm
View File

@@ -103,7 +103,7 @@ sub get_calendar($$$) {
my $debug = $config->{system}->{debug};
$request->{params}->{original}->{template} = 'calendar.html';
$request->{params}->{original}->{date} = $date if ( defined $date );
$request->{params}->{original}->{date} = $date if defined $date;
$request->{params}->{checked} = calendar::check_params( $config, $request->{params}->{original} );
$params = $request->{params}->{checked};

6
lib/calcms/creole_wiki.pm
View File

@@ -71,14 +71,14 @@ sub extractEventFromWikiText($;$) {
$category =~ s/\s+/ /g;
$category =~ s/^\s+|\s+$//g;
$category =~ s/\&/\+/g;
push @categories, $category if ( defined $category && $category =~ /\S/ );
push @categories, $category if defined $category && $category =~ /\S/;
$category = '';
$category = $2 if ( defined $2 );
$category =~ s/\s+/ /g;
$category =~ s/^\s+|\s+$//g;
$category =~ s/\&/\+/g;
push @categories, $category if ( defined $category && $category =~ /\S/ );
push @categories, $category if defined $category && $category =~ /\S/;
$title =~ s/\((.*?),(.*?)\)/\($2\)/;
}
if ( $title =~ /\((.*?)\)/ ) {
@@ -87,7 +87,7 @@ sub extractEventFromWikiText($;$) {
$category =~ s/^\s+|\s+$//g;
$category =~ s/\&/\+/g;
push @categories, $category if ( defined $category && $category =~ /\S/ );
push @categories, $category if defined $category && $category =~ /\S/;
$title =~ s/\((.*?)\)//;
}
$event->{categories} = \@categories if ( @categories > 0 );

2
lib/calcms/events.pm
View File

@@ -371,7 +371,7 @@ sub modify_results ($$$$) {
)
{
for my $key ( keys %$result ) {
$result->{$key} =~ s/\|/\\\|/g if ( defined $result->{$key} );
$result->{$key} =~ s/\|/\\\|/g if defined $result->{$key};
}
# $result->{content}='no';

2
lib/calcms/localization.pm
View File

@@ -31,7 +31,7 @@ sub get($$) {
my $language = undef;
#get language from options
$language = $options->{language} if ( defined $options->{language} );
$language = $options->{language} if defined $options->{language};
#get language from user
if ( ( !( defined $language ) ) && ( defined $options->{user} ) ) {

2
lib/calcms/roles.pm
View File

@@ -107,7 +107,7 @@ sub get_user($) {
my $user = $ENV{REMOTE_USER};
my $users = $config->{users};
return $user if ( defined $users->{$user} );
return $user if defined $users->{$user};
return 'nobody';
}

12
lib/calcms/series.pm
View File

@@ -426,12 +426,12 @@ sub search_events ($$$) {
template => 'no'
};
if ( defined $options ) {
$params->{from_date} = $options->{from_date} if ( defined $options->{from_date} );
$params->{till_date} = $options->{till_date} if ( defined $options->{till_date} );
$params->{location} = $options->{location} if ( defined $options->{location} );
$params->{limit} = $options->{limit} if ( defined $options->{limit} );
$params->{archive} = $options->{archive} if ( defined $options->{archive} );
$params->{get} = $options->{get} if ( defined $options->{get} );
$params->{from_date} = $options->{from_date} if defined $options->{from_date};
$params->{till_date} = $options->{till_date} if defined $options->{till_date};
$params->{location} = $options->{location} if defined $options->{location};
$params->{limit} = $options->{limit} if defined $options->{limit};
$params->{archive} = $options->{archive} if defined $options->{archive};
$params->{get} = $options->{get} if defined $options->{get};
}
my $checked_params = events::check_params( $config, $params );