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

reorganize database columns, fix series search, show image licences

Browse Source
This commit is contained in:
Milan
2018-06-18 00:43:02 +02:00
parent aa648f58ef
commit d7e1f02198
13 changed files with 387 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/calcms/events.pm
View File

@@ -911,19 +911,19 @@ sub get_query {
my $search_cond = '';
if ( ( defined $params->{search} ) && ( $params->{search} ne '' ) ) {
my $search = lc $params->{search};
$search =~ s/[^a-z0-9\_\.\-\:\!öäüßÖÄÜ \&]/%/;
$search =~ s/\%+/\%/;
$search =~ s/(?=[\\%_])/\\/g;
$search =~ s/^[\%\s]+//;
$search =~ s/[\%\s]+$//;
if ( $search ne '' ) {
$search = '%' . $search . '%';
my @attr = ( 'title', 'series_name', 'excerpt', 'category', 'content', 'topic' );
$search_cond = "(" . join( " or ", map { 'lower(' . $_ . ') like ?' } @attr ) . ")";
$search_cond = "(" . join( " or ", map { 'lower(' . $_ . ') like ?' } @attr ) . ")";
for my $attr (@attr) {
push @$bind_values, $search;
}
}
}
#print STDERR $search_cond."\n";
my $project_cond = '';

2
lib/calcms/images.pm
View File

@@ -269,7 +269,7 @@ sub delete_files{
return undef;
print log::error($config, 'missing permissions on writing into local media dir ' .$local_media_dir)unless(-w $local_media_dir);
print log::error($config, 'missing permissions on writing into local media dir')unless(-w $local_media_dir);
if ($filename=~/[^a-zA-Z0-9\.\_\-]/){
log::error($config, "invalid filename: '$filename'");

5
lib/calcms/studios.pm
View File

@@ -50,6 +50,11 @@ sub get{
push @bind_values, $condition->{name};
}
if ((defined $condition->{location}) && ($condition->{location} ne '')){
push @conditions, 's.location=?';
push @bind_values, $condition->{location};
}
my $limit='';
if ((defined $condition->{limit}) && ($condition->{limit} ne '')){
$limit= 'limit '.$condition->{limit};