diff --git a/.gitignore b/.gitignore
index 99c4468..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +0,0 @@
-cache/
-data/
-pdf/
-cache/
-*.html
-xml/
-csv/
-ftp/
-site/
-apk/
diff --git a/copri4/main/css/bootstrap-icons-1.8.1 b/copri4/main/css/bootstrap-icons-1.8.1
deleted file mode 120000
index dcac63b..0000000
--- a/copri4/main/css/bootstrap-icons-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-/etc/shareeconf/bootstrap-icons-1.8.1
\ No newline at end of file
diff --git a/copri4/main/external b/copri4/main/external
new file mode 120000
index 0000000..fa6f135
--- /dev/null
+++ b/copri4/main/external
@@ -0,0 +1 @@
+/var/www/external
\ No newline at end of file
diff --git a/copri4/main/js/bootstrap-5.0.2-dist b/copri4/main/js/bootstrap-5.0.2-dist
deleted file mode 120000
index 8d27d79..0000000
--- a/copri4/main/js/bootstrap-5.0.2-dist
+++ /dev/null
@@ -1 +0,0 @@
-/etc/shareeconf/bootstrap-5.0.2-dist
\ No newline at end of file
diff --git a/copri4/main/js/bootstrap-5.1.3-dist b/copri4/main/js/bootstrap-5.1.3-dist
deleted file mode 120000
index 4c7e567..0000000
--- a/copri4/main/js/bootstrap-5.1.3-dist
+++ /dev/null
@@ -1 +0,0 @@
-/etc/shareeconf/bootstrap-5.1.3-dist
\ No newline at end of file
diff --git a/copri4/main/js/jquery-3.3.1.min.js b/copri4/main/js/jquery-3.3.1.min.js
deleted file mode 120000
index 49433bb..0000000
--- a/copri4/main/js/jquery-3.3.1.min.js
+++ /dev/null
@@ -1 +0,0 @@
-/etc/shareeconf/jquery-3.3.1.min.js
\ No newline at end of file
diff --git a/copri4/main/js/jquery-ui-1.12.1 b/copri4/main/js/jquery-ui-1.12.1
deleted file mode 120000
index 85e8f82..0000000
--- a/copri4/main/js/jquery-ui-1.12.1
+++ /dev/null
@@ -1 +0,0 @@
-/etc/shareeconf/jquery-ui-1.12.1
\ No newline at end of file
diff --git a/copri4/main/src/Mod/GBFSout.pm b/copri4/main/src/Mod/GBFSout.pm
index 5d6479e..a5988df 100755
--- a/copri4/main/src/Mod/GBFSout.pm
+++ b/copri4/main/src/Mod/GBFSout.pm
@@ -87,12 +87,14 @@ sub station_information {
my $rest_stations = "request=stations_available&project=$project&authcookie=$authcookie->{authcookie}";
my $gbfs_resp = {};
+ my @gbfs_stations = ();
my $stations_json = fetch_primary_json("",$uri_request,$rest_stations);
#decode json to hash
- my $response_stations = decode_json($stations_json);
- my @gbfs_stations = ();
+ eval {
+ my $response_stations = {};
+ $response_stations = decode_json($stations_json);
- foreach my $station (keys (%{ $response_stations->{shareejson}->{stations} })) {
+ foreach my $station (keys (%{ $response_stations->{shareejson}->{stations} })) {
#print Dumper($response_stations->{shareejson}->{stations}->{$station});
my %gbfs_station = ();
$gbfs_station{$station}{station_id} = $response_stations->{shareejson}->{stations}->{$station}->{station};
@@ -102,9 +104,10 @@ sub station_information {
$gbfs_station{$station}{lon} = $response_stations->{shareejson}->{stations}->{$station}->{gps}->{longitude};
#$gbfs_station{$station}{is_charging_station} = 1 if(grep(/300102/, @{$response_stations->{shareejson}->{stations}->{$station}->{station_group}}));#E-L
push (@gbfs_stations, $gbfs_station{$station});
- }
+ }
+ };
my $last_updated = time();
- $gbfs_resp = {
+ $gbfs_resp = {
"last_updated" => $last_updated,
"ttl" => 10,
"version" => "2.2",
@@ -112,7 +115,10 @@ sub station_information {
"stations" => [ @gbfs_stations ]
}
};
-
+ if ($@){
+ $bw->log("Failure, GBFSout station_information not valid","","");
+ warn $@;
+ }
my $jrout = $json->pretty->encode($gbfs_resp);
print $jrout;
@@ -131,12 +137,14 @@ sub vehicle_status {
my $rest_bikes = "request=bikes_available&project=$project&authcookie=$authcookie->{authcookie}";
my $gbfs_resp = {};
+ my @gbfs_bikes = ();
my $bikes_json = fetch_primary_json("",$uri_request,$rest_bikes);
#decode json to hash
- my $response_bikes = decode_json($bikes_json);
- my @gbfs_bikes = ();
+ eval {
+ my $response_bikes = {};
+ $response_bikes = decode_json($bikes_json);
- foreach my $bike (keys (%{ $response_bikes->{shareejson}->{bikes} })) {
+ foreach my $bike (keys (%{ $response_bikes->{shareejson}->{bikes} })) {
#if($response_bikes->{shareejson}->{bikes}->{$bike}->{station} eq "FR105"){
my %gbfs_bike = ();
$gbfs_bike{$bike}{station_id} = $response_bikes->{shareejson}->{bikes}->{$bike}->{station};
@@ -147,7 +155,7 @@ sub vehicle_status {
#$gbfs_bike{$bike}{is_disabled} = 0;
push (@gbfs_bikes, $gbfs_bike{$bike});
#}
- }
+ }
#{
#"vehicle_id":"987fd100-b822-4347-86a4-b3eef8ca8b53",
@@ -159,7 +167,7 @@ sub vehicle_status {
#"station_id":"86",
#"pricing_plan_id":"plan3"
#}
-
+ };
my $last_updated = time();
$gbfs_resp = {
"last_updated" => $last_updated,
@@ -169,6 +177,10 @@ sub vehicle_status {
"vehicles" => [ @gbfs_bikes ]
}
};
+ if ($@){
+ $bw->log("Failure, GBFSout vehicle_status not valid","","");
+ warn $@;
+ }
my $jrout = $json->pretty->encode($gbfs_resp);
print $jrout;
@@ -194,6 +206,8 @@ sub fetch_primary_json {
#Pass request to the user agent and get a response back
my $res = $ua->request($req);
+ #SSL certificate must be valid
+ #print Dumper($res);
# Check the outcome of the response
if ($res->is_success) {
#print $res->content;
diff --git a/copri4/main/src/Mod/Premain.pm b/copri4/main/src/Mod/Premain.pm
index 03db9ac..c09e9fb 100755
--- a/copri4/main/src/Mod/Premain.pm
+++ b/copri4/main/src/Mod/Premain.pm
@@ -693,58 +693,7 @@ sub maininit(){
my $ctrel_ck;
$ctrel_ck = $db->get_ctrel($table,$R::set_main_id,$lang,"",$R::set_content_id,$R::template_id);
- if($varenv{orga} eq "dms" && $varenv{wwwhost} =~ /wogedms|fsdm/){
- my @set_main_ids = ();
- my $set_main_ids = "";
- foreach(@keywords){
- if($_ =~ /set_main_id/){
- @set_main_ids = $q->param($_);
- }
- }
- $set_main_ids = join(',',@set_main_ids);
-
- my $ct4rel_ck = $db->collect_ct4rel("$table","","$lang","","","","","$R::template_id","","","$R::set_content_id","main_id");
- my $ctrel;
- foreach(@set_main_ids){
- if($_ != $ct4rel_ck->{$_}->{main_id}){
- #print "insert: $table,$_,$lang,$R::set_content_id,$R::template_id,$foreign_key
";
- $return_rel_id = $db->insert_relationlist($table,$_,$lang,$R::set_content_id,$R::template_id,$foreign_key) if($R::rel_edit =~ /relate_/ && $_);
- $ctrel_ck = $db->get_ctrel($table,$_,$lang,"",$R::set_content_id,$R::template_id);
-
- if($ctrel_ck->{int02} == 1 && $return_rel_id && $R::template_id eq "202"){
- `sudo $varenv{basedir}/src/scripts/mailman_member.pl add $return_rel_id $varenv{syshost}`;
- }
- if( -d "$varenv{data}/$R::main_id/$R::set_content_id" ){
- #print "$varenv{data}/$R::main_id/$R::set_content_id --> $varenv{data}/$_/$R::set_content_id";
- rcopy("$varenv{data}/$R::main_id/$R::set_content_id","$varenv{data}/$_/$R::set_content_id");
- rcopy("$varenv{data}/$R::main_id-thumb/$R::set_content_id","$varenv{data}/$_-thumb/$R::set_content_id");
- rcopy("$varenv{data}/$R::main_id-resize/$R::set_content_id","$varenv{data}/$_-resize/$R::set_content_id");
- }
- }
- }
- foreach my $id (keys(%$ct4rel_ck)){
- if($ct4rel_ck->{$id}->{main_id} && $set_main_ids !~ /$ct4rel_ck->{$id}->{main_id}/){
- #print "delete: $ct4rel_ck->{$id}->{main_id},$lang,$ct4rel_ck->{$id}->{rel_id}
";
- if($R::template_id eq "202"){
- `sudo $varenv{basedir}/src/scripts/mailman_member.pl remove $ct4rel_ck->{$id}->{rel_id} $varenv{syshost}`;
- }
- if($R::rel_edit =~ /relate_/ && $ct4rel_ck->{$id}->{c_id}){
- $db->delete_relation($ct4rel_ck->{$id}->{main_id},$lang,$ct4rel_ck->{$id}->{rel_id});
- if( -d "$varenv{data}/$ct4rel_ck->{$id}->{main_id}/$ct4rel_ck->{$id}->{c_id}" ){
- remove_tree("$varenv{data}/$ct4rel_ck->{$id}->{main_id}/$ct4rel_ck->{$id}->{c_id}");
- remove_tree("$varenv{data}/$ct4rel_ck->{$id}->{main_id}-thumb/$ct4rel_ck->{$id}->{c_id}");
- remove_tree("$varenv{data}/$ct4rel_ck->{$id}->{main_id}-resize/$ct4rel_ck->{$id}->{c_id}");
- }
- }
- }
- }
- if($users_dms->{mandant_id} && $users_dms->{mandant_id} < "200000"){
- my $uri_path = $dbt->recurse_node($dbh,$R::set_main_id);
- print redirect("$varenv{wwwhost}/$uri_path?exit_box2=1\&rel_id=$return_rel_id\&return=$i_rows-$u_rows-$d_rows");
- exit 0;
- }
-
- }elsif($varenv{orga} eq "dms"){
+ if($varenv{orga} eq "dms"){
my @ck_ids = $R::rel_id;
@ck_ids = split(/\s/,$R::ck_ids) if($R::ck_ids);
foreach(@ck_ids){
@@ -1039,9 +988,6 @@ sub maininit(){
#delete Only relation ... without content
if("$ib_key" eq "delete_rel4ct" && $R::main_id && $R::rel_id){
- if($varenv{wwwhost} =~ /wogedms|fsdm/){
- `sudo $varenv{basedir}/src/scripts/mailman_member.pl remove $R::rel_id $varenv{syshost}` if($R::rel_id);
- }
$d_rows += $db->delete_relation($R::main_id,$lang,$R::rel_id);
$db->cleanup_users($users_dms->{u_id}) if($users_dms->{u_id});
diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm
index 80216f5..620b9bc 100755
--- a/copri4/main/src/Mod/Shareework.pm
+++ b/copri4/main/src/Mod/Shareework.pm
@@ -451,7 +451,9 @@ sub save_account(){
$u_rows = $dbt->update_one($dbh,$update_primary,"$_=$valxx");
}elsif($_ eq "ct_name" && $R::base_edit){
$u_rows = $dbt->update_one($dbh,$update_primary,"$_='$valxx'");
- #}elsif($_ !~ /ct_name|txt22|txt23|txt15/){
+ }elsif($_ =~ /txt22|txt23/){
+ $valxx =~ s/\s//g;
+ $u_rows = $dbt->update_one($dbh,$update_primary,"$_='$valxx'");
}elsif($_ !~ /ct_name|txt15/){
$u_rows = $dbt->update_one($dbh,$update_primary,"$_='$valxx'");
}
diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm
index 4a90eaa..55cf7a8 100755
--- a/copri4/main/src/Tpl/BaseEdit.pm
+++ b/copri4/main/src/Tpl/BaseEdit.pm
@@ -353,7 +353,7 @@ EOF
}
print "";
- print $q->textarea(-class=>'autos',-style=>"border: 1px solid silver;",-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-rows=>"3",-cols=>50),"\n";
+ print $q->textarea(-class=>'etxt',-style=>"border: 1px solid silver;",-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-rows=>"5",-cols=>50),"\n";
print " | \n";
@@ -764,10 +764,10 @@ EOF
}
}
elsif($key =~ /txt/ && $size =~ /area$/){
- my $h= 1;# if($size =~ /area(\d+)/);
+ my $h= 5;# if($size =~ /area(\d+)/);
print $q->Tr();
print $q->td({-class=>'left_italic_cms',-colspan=>1},"$des"),"\n";
- print $q->td({-class=>'content1_cms', -colspan=>'3'},$q->textarea(-class=>"autos", -style=>'border: 1px solid silver;',-rows=>"$h",-cols=>'35em;', -name=>"$key", -override=>'1',-default=>"$ctrel->{$key}")),"\n";
+ print $q->td({-class=>'content1_cms', -colspan=>'3'},$q->textarea(-class=>"etxt", -style=>'border: 1px solid silver;',-rows=>"$h",-cols=>'35em;', -name=>"$key", -override=>'1',-default=>"$ctrel->{$key}")),"\n";
}
elsif($key =~ /txt/ && $size =~ /area(\d+)/){
#my $h= $1 if($size =~ /area(\d+)/);
@@ -785,7 +785,7 @@ EOF
$ctrel->{txt28} =~ s/\+/ /g;
print $q->td({-style=>'border:1px solid silver;'},$ctrel->{txt28}),"\n";
}else{
- print $q->td({-class=>'content1_cms', -colspan=>'3'},$q->textarea(-id=>"$key", -class=>"autos", -style=>"border: 1px solid silver;$h $w", -name=>"$key", -override=>'1',-default=>"$ctrel->{$key}")),"\n";
+ print $q->td({-class=>'content1_cms', -colspan=>'3'},$q->textarea(-id=>"$key", -class=>"etxt", -style=>"border: 1px solid silver;$h $w", -name=>"$key", -override=>'1',-default=>"$ctrel->{$key}")),"\n";
}
}
elsif($key =~ /txt02/ && $varenv{syshost} =~ /sharee/){
diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm
index 461a761..72038d6 100755
--- a/copri4/main/src/Tpl/TransPositionen.pm
+++ b/copri4/main/src/Tpl/TransPositionen.pm
@@ -312,7 +312,7 @@ EOF
$q->textfield(-class=>'etxt',-name=>"e_mi",-default=>"$e_mi",-size=>"1",-maxlength=>2)),"\n";
}
- print "
Interner Kommentar: $cttpos->{$id}->{txt23}\n" if($cttpos->{$id}->{txt23});
+ print "
Bemerkung (Mietjournal) $cttpos->{$id}->{txt23}\n" if($cttpos->{$id}->{txt23});
print "\n";
}elsif($key =~ /txt/){
print $q->td({-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>100)),"\n";
@@ -430,7 +430,7 @@ EOF
print "
\n";
print $q->span({-style=>"$time_style"}, "Mietzeit: $start_time → $end_time"),"\n";
}
- print "
Interner Kommentar: $cttpos->{$id}->{txt23}\n" if($cttpos->{$id}->{txt23});
+ print "
Bemerkung (Mietjournal) $cttpos->{$id}->{txt23}\n" if($cttpos->{$id}->{txt23});
print "\n";
}elsif($key =~ /txt/){
print $q->td({-class=>'tdtxt'},"$cttpos->{$id}->{$key}"),"\n";
diff --git a/copri4/mkaccess.sh b/copri4/mkaccess.sh
index 12d2a91..0bc1582 100755
--- a/copri4/mkaccess.sh
+++ b/copri4/mkaccess.sh
@@ -4,6 +4,10 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
# Copyright (c) Rainer Gümpelein, TeilRad GmbH
+echo "YOur working directory:";
+pwd
+echo ""
+
chgrp -R www-data *
chmod go-w *
chmod -R o-rwx *
@@ -14,8 +18,8 @@ for i in $(find . -type d -and -name cache); do chmod -R ug+rwx $i;done
for i in $(find . -type d -and -name pdf); do chmod -R ug+rwx $i;done
for i in $(find . -type d -and -name xml); do chmod -R ug+rwx $i;done
for i in $(find . -type d -and -name site); do chmod -R ug+rwx $i;done
-for i in $(find . -type d -and -name apk); do chmod -R ug+rwx $i;done
-
+for i in $(find . -type d -and -name shareeconf); do chmod -R go-rwx $i;done
+for i in $(find . -type d -and -name shareeconf); do chmod -R ug+rx $i;done
for i in $(find . -type d -and -name sql); do chmod -R go-rwx $i;done
for i in $(find . -type d -and -name src); do chmod -R go-w $i;done
for i in $(find . -type d -and -name src); do chmod -R ug+x $i;done
@@ -25,11 +29,41 @@ for i in $(find . -type d -and -name css); do chmod -R go-w $i;done
for i in $(find . -type d -and -name js); do chmod -R go-w $i;done
for i in $(find . -type f -and -iname README*); do chmod -R go-rwx $i;done
for i in $(find . -type d -and -name docs); do chmod -R go-rwx $i;done
-for i in $(find . -type f -and -name .htaccess); do chmod -R go-wx $i;done
for i in $(find . -type f -and -name startup.pl); do chmod -R go-w $i;done
for i in $(find . -type f -and -name robots.txt); do chmod -R go-wx $i;done
for i in $(find . -type d -and -name cronjobs); do chmod -R g-w $i/*;done
for i in $(find . -type d -and -name cronjobs); do chmod -R o+r $i/*;done
for i in $(find . -type d -and -name cronjobs); do chown -R root:root $i/*;done
+#do it only once on migration
+if [ 1 == 2 ]
+then
+#delete jquery and bootstrap links
+for i in $(find . -type l -and -name 'jquery*'); do rm $i;done
+for i in $(find . -type l -and -name 'bootstrap*'); do rm $i;done
+
+mkdir -p /var/www/external
+mv /etc/shareeconf/bootstrap-5.1.3-dist /var/www/external/.
+mv /etc/shareeconf/bootstrap-5.0.2-dist /var/www/external/.
+mv /etc/shareeconf/bootstrap-icons-1.8.1 /var/www/external/.
+mv /etc/shareeconf/jquery-3.3.1.min.js /var/www/external/.
+mv /etc/shareeconf/jquery-ui-1.12.1 /var/www/external/.
+
+#make new links for external bibliothecs
+ln -s main/external /var/www/external
+
+
+#linking operators to main/external
+for i in $(find . -type d -and -name 'shareedms-*')
+ do ln -s ../main/external $i/external
+done
+for i in $(find . -type d -and -name 'shareeapp-*')
+ do ln -s ../main/external $i/external
+done
+for i in $(find . -type d -and -name 'shareeweb-*')
+ do ln -s ../main/external $i/external
+done
+
+fi
+#end
diff --git a/copri4/shareeapp-operator/apache/shareeapp-operator.conf b/copri4/shareeapp-operator/apache/shareeapp-operator.conf
index 1a7ebca..b29b3f0 100644
--- a/copri4/shareeapp-operator/apache/shareeapp-operator.conf
+++ b/copri4/shareeapp-operator/apache/shareeapp-operator.conf
@@ -48,10 +48,8 @@
LogLevel info ssl:warn
CustomLog /var/log/apache2/shareeapp-operator-access.log combined
ServerSignature Off
-Include /etc/letsencrypt/options-ssl-apache.conf
-
-SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
@@ -97,9 +95,8 @@ SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
LogLevel info ssl:warn
CustomLog /var/log/apache2/shareeapp-operator-access.log combined
ServerSignature Off
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
diff --git a/copri4/shareeapp-operator/css/bootstrap-icons-1.8.1 b/copri4/shareeapp-operator/css/bootstrap-icons-1.8.1
deleted file mode 120000
index dcac63b..0000000
--- a/copri4/shareeapp-operator/css/bootstrap-icons-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-/etc/shareeconf/bootstrap-icons-1.8.1
\ No newline at end of file
diff --git a/copri4/shareeapp-operator/external b/copri4/shareeapp-operator/external
new file mode 120000
index 0000000..36882c2
--- /dev/null
+++ b/copri4/shareeapp-operator/external
@@ -0,0 +1 @@
+../main/external
\ No newline at end of file
diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
index f252956..3c94099 100755
--- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
+++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
@@ -481,9 +481,9 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
if($i==1){
print $q->div({-id=>'Rechnungen',-style=>'font-weight:bold;'},"Ihre Rechnungen"),"\n";
- print $q->div({-style=>'padding:0.5em;'},"$dtext"),"\n";
+ print $q->div({-style=>'padding:0.5em 0;'},"$dtext"),"\n";
}
- print $q->div({-style=>'font-size:1em;padding:0.5em;border:0px solid #cccccc;'},$q->a({-href=>"$ctt_all->{$id}->{wwwhost}/FileOut?file=Rechnung-$ctt_all->{$id}->{operator}-$ctt_all->{$id}->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}, $q->img({-src=>"$varenv->{metahost}/glyphicons/file-any.png", -style=>'width:30px;'}), "Rechnung $ctt_all->{$id}->{ct_name}.pdf"), " ($invoice_time)"),"\n";
+ print $q->div({-style=>'padding:0.7em 0;border:0px solid #cccccc;'},$q->a({-href=>"$ctt_all->{$id}->{wwwhost}/FileOut?file=Rechnung-$ctt_all->{$id}->{operator}-$ctt_all->{$id}->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}, $q->span({-class=>"bi bi-file-earmark-pdf"}), "Rechnung $ctt_all->{$id}->{ct_name}.pdf"), " ($invoice_time)"),"\n";
}
}
diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
index a88fba6..006f94b 100755
--- a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
+++ b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
@@ -144,7 +144,7 @@ sub tpl(){
$dtext = "
(Der PDF download öffnet je nach System/Konfiguartion einen externen PDF-Viewer oder Webbrowser)";
}
if( -f "$varenv->{basedir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{praefix}-$ctadr->{ct_name}.pdf"){
- print $q->div({-style=>'padding:10px;margin:10px 0;'},$q->a({-href=>"$varenv->{wwwhost}/FileOut?file=SEPA-Lastschriftmandat-$varenv->{praefix}-$ctadr->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;font-size:1.1em;'}, $q->img({-src=>"$varenv->{metahost}/glyphicons/file-any.png", -style=>'width:30px;'}), "SEPA-Lastschriftmandat.pdf"),"$dtext"),"\n";
+ print $q->div({-style=>'padding:10px;margin:10px 0;'},$q->a({-href=>"$varenv->{wwwhost}/FileOut?file=SEPA-Lastschriftmandat-$varenv->{praefix}-$ctadr->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;font-size:1.1em;'}, $q->span({-class=>"bi bi-file-earmark-pdf"}), "SEPA-Lastschriftmandat.pdf"),"$dtext"),"\n";
}
}else{
print $q->div({-style=>'padding:10px;margin:10px 0;border:1px solid silver;color:#c83434;'},"Es gibt ein Problem! Das SEPA Mandat konnte nicht eingeholt werden. Bitte wenden Sie sich bei Bedarf an den unter \"Kontakt\" hinterlegten Support."),"\n";
diff --git a/copri4/shareeconf/examples/README b/copri4/shareeconf/examples/README
old mode 100644
new mode 100755
diff --git a/copri4/shareeconf/examples/apikeys.cfg b/copri4/shareeconf/examples/apikeys.cfg
old mode 100644
new mode 100755
diff --git a/copri4/shareeconf/examples/global.cfg b/copri4/shareeconf/examples/global.cfg
old mode 100644
new mode 100755
index 74c32d9..613aac1
--- a/copri4/shareeconf/examples/global.cfg
+++ b/copri4/shareeconf/examples/global.cfg
@@ -29,8 +29,8 @@
port=5432
sslmode=
options=""
- user=[your-psql-user]
- passwd=[your-psql-pw]
+ user=your_psql_user
+ passwd=your_psql_pw
@@ -64,8 +64,8 @@
port=5432
sslmode=
options=""
- user=[your-psql-user]
- passwd=[your-psql-pw]
+ user=your_psql_user
+ passwd=your_psql_pw
@@ -97,8 +97,8 @@
port=5432
sslmode=
options=""
- user=[your-psql-user]
- passwd=[your-psql-pw]
+ user=your_psql_user
+ passwd=your_psql_pw
@@ -212,7 +212,7 @@
2 = "lesen & schreiben"
jsscript = "js/mobile_script.js"
- style_bootstrap_icons = "css/bootstrap-icons-1.8.1/font/bootstrap-icons.css"
+ style_bootstrap_icons = "external/bootstrap-icons-1.8.1/font/bootstrap-icons.css"
#sharee WebApp sepcific para
@@ -229,8 +229,8 @@
local_style = "css/local_style2022-03-20.css"
jquery = ""
- js_bootstrap = "js/bootstrap-5.1.3-dist/js/bootstrap.min.js"
- style_bootstrap = "js/bootstrap-5.1.3-dist/css/bootstrap.css"
+ js_bootstrap = "external/bootstrap-5.1.3-dist/js/bootstrap.min.js"
+ style_bootstrap = "external/bootstrap-5.1.3-dist/css/bootstrap.css"
#sharee DMS/COPRI specific para
@@ -255,12 +255,12 @@
order_state = "|angerufen|eMail gesendet|in Arbeit|cronjob fail"
local_style = "css/local_style20221205.css"
- jquery = "js/jquery-3.3.1.min.js"
- jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.js"
- style_jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.css"
- js_bootstrap = "js/bootstrap-5.0.2-dist/js/bootstrap.min.js"
- style_bootstrap = "js/bootstrap-5.0.2-dist/css/bootstrap.min.css"
- mod_active = "Waren|Faktur|Karte|Kunden|Mietjournal|Alarmjournal|Einstellung"
+ jquery = "external/jquery-3.3.1.min.js"
+ jquery_ui = "external/jquery-ui-1.12.1/jquery-ui.min.js"
+ style_jquery_ui = "external/jquery-ui-1.12.1/jquery-ui.min.css"
+ js_bootstrap = "external/bootstrap-5.0.2-dist/js/bootstrap.min.js"
+ style_bootstrap = "external/bootstrap-5.0.2-dist/css/bootstrap.min.css"
+ mod_active = "Waren|Faktura|Karte|Kunden|Mietjournal|Alarmjournal|Einstellung"
modes = "login|logout|logout_sharee|user|manager|supervisor|admin|maintainer"
diff --git a/copri4/shareeconf/examples/mailx.cfg b/copri4/shareeconf/examples/mailx.cfg
old mode 100644
new mode 100755
diff --git a/copri4/shareeconf/examples/sharee_operator.sql.gz b/copri4/shareeconf/examples/sharee_operator.sql.gz
old mode 100644
new mode 100755
index b24abb5..c513e3e
Binary files a/copri4/shareeconf/examples/sharee_operator.sql.gz and b/copri4/shareeconf/examples/sharee_operator.sql.gz differ
diff --git a/copri4/shareedms-operator/apache/shareedms-operator.conf b/copri4/shareedms-operator/apache/shareedms-operator.conf
index 81ad1d7..dd2d934 100644
--- a/copri4/shareedms-operator/apache/shareedms-operator.conf
+++ b/copri4/shareedms-operator/apache/shareedms-operator.conf
@@ -50,10 +50,8 @@
LogLevel info ssl:warn
CustomLog /var/log/apache2/shareedms-operator-access.log combined
ServerSignature Off
-
- Include /etc/letsencrypt/options-ssl-apache.conf
- SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
- SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
@@ -94,7 +92,8 @@
RewriteEngine On
- RedirectMatch ^/$ /DMS/Mietjournal
+ RedirectMatch ^/$ /DMS/Mietjournal
+ RedirectMatch ^/DMS$ /DMS/Mietjournal
SSLProxyEngine On
RewriteCond %{REQUEST_URI} ^/(site|img|data|css|js|jquery)
RewriteRule ^(.*)$ https://shareedms-operator1.example.tld/$1 [P,L]
@@ -104,10 +103,8 @@
LogLevel info ssl:warn
CustomLog /var/log/apache2/shareedms-operator-access.log combined
ServerSignature Off
- Include /etc/letsencrypt/options-ssl-apache.conf
-
- SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
- SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
diff --git a/copri4/shareedms-operator/external b/copri4/shareedms-operator/external
new file mode 120000
index 0000000..36882c2
--- /dev/null
+++ b/copri4/shareedms-operator/external
@@ -0,0 +1 @@
+../main/external
\ No newline at end of file
diff --git a/copri4/shareedms-operator/src/Lib/Config.pm b/copri4/shareedms-operator/src/Lib/Config.pm
index bdeb461..152eceb 100755
--- a/copri4/shareedms-operator/src/Lib/Config.pm
+++ b/copri4/shareedms-operator/src/Lib/Config.pm
@@ -70,7 +70,6 @@ sub envonline(){
head_logo => "$metahost/img/sharee_bike_Logo.jpg",
barcode => "",
limit => "200",
- waren_main_id => $globalconf{shareedms_conf}->{waren},
Zahlungsweise => "SEPA-Lastschrift (payone)|Kreditkarte (payone)|Zahlungseingang (payone txid)|Abbuchung|Bar|EC-Karte|Überweisung|Zahlungsausfall",
order_state => "|angerufen|eMail gesendet|in Arbeit|an FiBu delegiert|txid renewed|cronjob fail|payone Mahnung|COPRI Mahnung",
'Ziel Datei' => "privacy.html|agb.html|impress.html|tariff_info.html|bike_info.html",
diff --git a/copri4/shareeweb-project/apache/shareeweb-operator.conf b/copri4/shareeweb-project/apache/shareeweb-operator.conf
index d66c66d..ac597aa 100644
--- a/copri4/shareeweb-project/apache/shareeweb-operator.conf
+++ b/copri4/shareeweb-project/apache/shareeweb-operator.conf
@@ -28,7 +28,7 @@
- Header set Access-Control-Allow-Origin "example.tld"
+ Header set Access-Control-Allow-Origin "*"
@@ -49,10 +49,8 @@
LogLevel info ssl:warn
CustomLog /var/log/apache2/shareeweb-project-access.log combined
ServerSignature Off
-Include /etc/letsencrypt/options-ssl-apache.conf
-
-SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
@@ -105,9 +103,8 @@ SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
LogLevel info ssl:warn
CustomLog /var/log/apache2/shareeweb-project-access.log combined
ServerSignature Off
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
diff --git a/copri4/shareeweb-project/external b/copri4/shareeweb-project/external
new file mode 120000
index 0000000..36882c2
--- /dev/null
+++ b/copri4/shareeweb-project/external
@@ -0,0 +1 @@
+../main/external
\ No newline at end of file