From 976355e9013b48c27497f01fb5013d8f29a7671b Mon Sep 17 00:00:00 2001 From: Milan Date: Sun, 17 Mar 2024 20:45:54 +0100 Subject: [PATCH 1/5] fixup! create.sql, migrate.sql: limit username length to 100 --- install/create.sql | 3 +++ install/migrate.sql | 3 +++ 2 files changed, 6 insertions(+) diff --git a/install/create.sql b/install/create.sql index 4d2ce63..803dfa0 100644 --- a/install/create.sql +++ b/install/create.sql @@ -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 ; diff --git a/install/migrate.sql b/install/migrate.sql index 23705b0..ee8198d 100644 --- a/install/migrate.sql +++ b/install/migrate.sql @@ -340,3 +340,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 ; From 220f9c974d739ec581fca7ec8af448b06d1f6192 Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 20 Mar 2024 00:04:35 +0100 Subject: [PATCH 2/5] apache2-sites/calcms.conf: add /images --- install/apache2-sites/calcms.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/apache2-sites/calcms.conf b/install/apache2-sites/calcms.conf index 2341144..e931fd0 100644 --- a/install/apache2-sites/calcms.conf +++ b/install/apache2-sites/calcms.conf @@ -25,6 +25,9 @@ Alias /agenda ${web_dir}/agenda # image base Alias /media ${base_dir}/media +# icons +Alias /images ${base_dir}/media/images + # thumbs Alias /thumbs ${base_dir}/media/thumbs From b01dd910105207bf29e49d6aa78807cadd56bc8e Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 20 Mar 2024 00:05:33 +0100 Subject: [PATCH 3/5] fixup! audio-recordings.cgi: set permissions to update event --- website/agenda/planung/audio-recordings.cgi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/agenda/planung/audio-recordings.cgi b/website/agenda/planung/audio-recordings.cgi index 3b0c7e5..53bf727 100755 --- a/website/agenda/planung/audio-recordings.cgi +++ b/website/agenda/planung/audio-recordings.cgi @@ -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 " From bd869a5c91d2988c1a98646ad44f20d1c6aaf4d3 Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 20 Mar 2024 00:07:40 +0100 Subject: [PATCH 4/5] install/migrate.sql: remove paths from image entries --- install/migrate.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/install/migrate.sql b/install/migrate.sql index ee8198d..0bcbedb 100644 --- a/install/migrate.sql +++ b/install/migrate.sql @@ -343,3 +343,13 @@ 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/%'; + From 295faea68d6838c518e54a90c20d71a6c374082a Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 20 Mar 2024 00:21:46 +0100 Subject: [PATCH 5/5] lib/calcms/startup.pl: get include path from startup.pl directory --- lib/calcms/startup.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/calcms/startup.pl b/lib/calcms/startup.pl index dc49356..d1f5914 100644 --- a/lib/calcms/startup.pl +++ b/lib/calcms/startup.pl @@ -1,5 +1,7 @@ -use lib qw(/home/radio/calcms/calcms/); -use lib qw(/home/calcms/lib/calcms/); +BEGIN { + use File::Basename qw(dirname); + use lib dirname(__FILE__); +} use Apache2::Log; local *CORE::GLOBAL::warn = \&Apache2::ServerRec::warn; @@ -8,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);