diff --git a/install/apache2-sites/calcms.conf b/install/apache2-sites/calcms.conf index 589dc20..8cea477 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 ${web_dir}/media +# icons +Alias /images ${base_dir}/media/images + # thumbs Alias /thumbs ${web_dir}/media/thumbs 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..0bcbedb 100644 --- a/install/migrate.sql +++ b/install/migrate.sql @@ -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/%'; + diff --git a/lib/calcms/startup.pl b/lib/calcms/startup.pl index e83ce8a..d1f5914 100644 --- a/lib/calcms/startup.pl +++ b/lib/calcms/startup.pl @@ -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); 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 "