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

Merge remote-tracking branch 'calcms/master'

Browse Source 
295faea lib/calcms/startup.pl: get include path from startup.pl directory
bd869a5 install/migrate.sql: remove paths from image entries
b01dd91 fixup! audio-recordings.cgi: set permissions to update event
220f9c9 apache2-sites/calcms.conf: add /images
976355e fixup! create.sql, migrate.sql: limit username length to 100
This commit is contained in:
www-data
2024-03-20 00:31:40 +01:00
parent 45066f704c 295faea68d
commit f5611bacdd
5 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install/apache2-sites/calcms.conf
View File

@@ -25,6 +25,9 @@ Alias /agenda ${web_dir}/agenda
# image base
Alias /media ${web_dir}/media
# icons
Alias /images ${base_dir}/media/images
# thumbs
Alias /thumbs ${web_dir}/media/thumbs

3
install/create.sql
View File

@@ -1813,3 +1813,6 @@ CHANGE COLUMN `modified_by` `modified_by` VARCHAR(100) NULL DEFAULT NULL ;
ALTER TABLE `calcms`.`calcms_comments`
CHANGE COLUMN `author` `author` VARCHAR(100) NULL DEFAULT NULL ,
CHANGE COLUMN `email` `email` VARCHAR(100) NULL DEFAULT NULL ;
ALTER TABLE `calcms`.`calcms_user_selected_events`
CHANGE COLUMN `user` `user` VARCHAR(100) NOT NULL ;

13
install/migrate.sql
View File

@@ -340,3 +340,16 @@ CHANGE COLUMN `modified_by` `modified_by` VARCHAR(100) NULL DEFAULT NULL ;
ALTER TABLE `calcms`.`calcms_comments`
CHANGE COLUMN `author` `author` VARCHAR(100) NULL DEFAULT NULL ,
CHANGE COLUMN `email` `email` VARCHAR(100) NULL DEFAULT NULL ;
ALTER TABLE `calcms`.`calcms_user_selected_events`
CHANGE COLUMN `user` `user` VARCHAR(100) NOT NULL ;
-- remove dirs from images
update calcms_events set image = replace(image , '/agenda_files/media/images/', '') where image like '%/agenda_files/media/images/%';
update calcms_events set image = replace(image , '/agenda_files/media/icons/', '') where image like '%/agenda_files/media/icons/%';
update calcms_events set image = replace(image , '/agenda_files/media/thumbs/', '') where image like '%/agenda_files/media/thumbs/%';
update calcms_series set image = replace(image , '/agenda_files/media/images/', '') where image like '%/agenda_files/media/images/%';
update calcms_series set image = replace(image , '/agenda_files/media/icons/', '') where image like '%/agenda_files/media/icons/%';
update calcms_series set image = replace(image , '/agenda_files/media/thumbs/', '') where image like '%/agenda_files/media/thumbs/%';

9
lib/calcms/startup.pl
View File

@@ -1,7 +1,7 @@
use lib qw(/home/calcms/racalmas/lib/calcms/);
use lib qw(/home/radio/calcms/calcms/);
use lib qw(/home/calcms/lib/calcms/);
use lib qw(/srv/www/sites/testing-calcms.datenkollektiv.net/lib/calcms/);
BEGIN {
use File::Basename qw(dirname);
use lib dirname(__FILE__);
}
use Apache2::Log;
local *CORE::GLOBAL::warn = \&Apache2::ServerRec::warn;
@@ -10,7 +10,6 @@ local $SIG{__WARN__} = \&Apache2::ServerRec::warn;
# see https://perl.apache.org/docs/2.0/api/Apache2/Log.html for details
use Data::Dumper;
#use Apache::DBI();
use Time::Local();
use Date::Calc();
use Calendar::Simple qw(date_span);

2
website/agenda/planung/audio-recordings.cgi
View File

@@ -150,7 +150,9 @@ sub uploadRecording {
}
if ( $params->{error} ne '' ) {
$config->{access}->{write} = 1;
events::set_upload_status($config, {event_id=>$params->{event_id}, upload_status=>'upload failed' });
$config->{access}->{write} = 0;
if ( $params->{error} =~ /limit/ ) {
$params->{error} .=
"audio file size is limited to "