• Lastenrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike
";
#print "($station) Lastenrad $bike\n";
}
#if E-Lastenrad
if($station_groupID == $e_lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){
- $place_pin{$station} = "Open_Green.png";
+ $place_pin{$station} = $icon_green;
$place_desc{$station} .= "• E-Lastenrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike
";
#print "($station) E-Lastenrad $bike\n";
}
#if Stadtrad
if($station_groupID == $stadtrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){
- $place_pin{$station} = "Open_Green.png";
+ $place_pin{$station} = $icon_green;
$place_desc{$station} .= "• Stadtrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike
";
#print "($station) Stadtrad $bike\n";
}
diff --git a/copri4/main/src/Mod/NodeEdit.pm b/copri4/main/src/Mod/NodeEdit.pm
index 2b1fc3a..71ec02b 100755
--- a/copri4/main/src/Mod/NodeEdit.pm
+++ b/copri4/main/src/Mod/NodeEdit.pm
@@ -120,6 +120,14 @@ sub admin_tpl(){
#content container
print "$superu_id";
+
+ print $q->hidden(-name=>'last_node_name', -value=>"$node_meta->{node_name}");
+ print $q->hidden(-name=>'owner', -value=>"$users_dms->{u_id}");
+ print $q->hidden(-name=>'parent_id', -value=>"$node_meta->{parent_id}");
+ print $q->hidden(-name=>'main_id', -value=>"$node_meta->{main_id}");
+ print $q->hidden(-name=>'template_id', -value=>"$node_meta->{template_id}");
+ print $q->hidden(-name=>'mode', -value=>"admin");
+
print $q->start_table({-style=>'margin-top:6px;', -border=>'0', -width=>'100%', -align=>'left', -cellpadding=>'3', -cellspacing=>'3'});
print $q->Tr();
if(1==1){
@@ -137,13 +145,6 @@ sub admin_tpl(){
print $q->span({-style=>'margin-left:5em; font-size:0.91em;'}, "$u_name / $change") if($u_name);
print "\n";
- print $q->hidden(-name=>'last_node_name', -value=>"$node_meta->{node_name}");
- print $q->hidden(-name=>'owner', -value=>"$users_dms->{u_id}");
- print $q->hidden(-name=>'parent_id', -value=>"$node_meta->{parent_id}");
- print $q->hidden(-name=>'main_id', -value=>"$node_meta->{main_id}");
- print $q->hidden(-name=>'mode', -value=>"admin");
-
-
print $q->Tr();
print $q->td({-colspan=>'2',-style=>'padding:5px;font-style:italic;'},"Path: $path");
foreach (@tpl_order){
diff --git a/copri4/main/src/Mod/Prelib.pm b/copri4/main/src/Mod/Prelib.pm
index ab649df..7fe04d3 100755
--- a/copri4/main/src/Mod/Prelib.pm
+++ b/copri4/main/src/Mod/Prelib.pm
@@ -233,8 +233,8 @@ sub delete_relation {
my $collect_rows=0;
- if($R::template_id eq "205"){
- (my $collect_node,$collect_rows) = $dbt->collect_noderel($dbh,$noderel->{parent_id},$R::template_id);
+ if($noderel->{template_id} == 205){
+ (my $collect_node,$collect_rows) = $dbt->collect_noderel($dbh,$noderel->{parent_id},$noderel->{template_id});
}
my $subrelnode = $dbt->get_subrelnode($dbh,$main_id,"","");
@@ -242,6 +242,7 @@ sub delete_relation {
my $deleteable_subnode = 1;
my $deleteable_node = 1;
my $deleteable_last_node = 1;
+ #TODO, $subrelnode->{template_id} must be unique in Flotte context
if($subrelnode->{template_id} >= 400 && $subrelnode->{template_id} <= 499){
$deleteable_subnode = 1;
if($collect_rows <= 1){
@@ -254,7 +255,9 @@ sub delete_relation {
if($ct_record->{c_id} > 0){
$deleteable_node = 0;
}
- print FILE "$deleteable_subnode == 0 || $deleteable_node == 0 --> collect_rows: $collect_rows|c_id: $ct_record->{c_id}\n" if($debug);
+ #print "$deleteable_subnode|$deleteable_node|$deleteable_last_node|$collect_rows";
+
+ print FILE "deleteable_subnode:$deleteable_subnode | deleteable_node:$deleteable_node | deleteable_last_node:$deleteable_last_node --> collect_rows: $collect_rows|c_id: $ct_record->{c_id}\n" if($debug);
if($deleteable_last_node == 0){
$ret = "failure::Abbruch, es muss mindestens eine Mietrad Flotte definiert sein. ($collect_rows on $noderel->{parent_id})";
diff --git a/copri4/shareeapp-operator/apache/shareeapp-operator.conf b/copri4/shareeapp-operator/apache/shareeapp-operator.conf
index db26787..5f45e93 100644
--- a/copri4/shareeapp-operator/apache/shareeapp-operator.conf
+++ b/copri4/shareeapp-operator/apache/shareeapp-operator.conf
@@ -1,6 +1,6 @@
- ServerName shareeapp-operator.copri-bike.de
- ServerAlias shareeapp-operator1.copri-bike.de
+ ServerName shareeapp-operator.example.tld
+ ServerAlias shareeapp-operator1.example.tld
ServerAdmin info@gnu-systems.de
DocumentRoot /var/www/copri4/shareeapp-operator
@@ -10,13 +10,13 @@
CustomLog /var/log/apache2/shareeapp-operator-access.log combined
ServerSignature Off
RewriteEngine on
- RewriteCond %{SERVER_NAME} =shareeapp-operator.copri-bike.de
+ RewriteCond %{SERVER_NAME} =shareeapp-operator.example.tld
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
- ServerName shareeapp-operator1.copri-bike.de
+ ServerName shareeapp-operator1.example.tld
ServerAdmin info@gnu-systems.de
DocumentRoot /var/www/copri4/shareeapp-operator
AddHandler cgi-script .cgi .sh .pl
@@ -27,7 +27,7 @@
- Header set Access-Control-Allow-Origin "copri-bike.de"
+ Header set Access-Control-Allow-Origin "example.tld"
@@ -50,13 +50,13 @@
ServerSignature Off
Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem
+SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
- ServerName shareeapp-operator.copri-bike.de
+ ServerName shareeapp-operator.example.tld
ServerAdmin info@gnu-systems.de
DocumentRoot /var/www/copri4/shareeapp-operator
@@ -96,7 +96,7 @@ SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem
RedirectMatch ^/$ /app/Anmelden
SSLProxyEngine On
RewriteCond %{REQUEST_URI} ^/(site|img|data|css|js|jquery)
- RewriteRule ^(.*)$ https://shareeapp-operator1.copri-bike.de/$1 [P,L]
+ RewriteRule ^(.*)$ https://shareeapp-operator1.example.tld/$1 [P,L]
ErrorLog /var/log/apache2/shareeapp-operator-error.log
@@ -104,8 +104,8 @@ SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem
CustomLog /var/log/apache2/shareeapp-operator-access.log combined
ServerSignature Off
Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem
+SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
diff --git a/copri4/shareeconf/apikeys.cfg b/copri4/shareeconf/apikeys.cfg
index dc6515e..a6ddb26 120000
--- a/copri4/shareeconf/apikeys.cfg
+++ b/copri4/shareeconf/apikeys.cfg
@@ -1 +1 @@
-/etc/shareeconf/apikeys.cfg
\ No newline at end of file
+../../../../etc/shareeconf/apikeys.cfg
\ No newline at end of file
diff --git a/copri4/shareeconf/examples/apikeys.cfg b/copri4/shareeconf/examples/apikeys.cfg
new file mode 100644
index 0000000..3d28d01
--- /dev/null
+++ b/copri4/shareeconf/examples/apikeys.cfg
@@ -0,0 +1,11 @@
+
+ google_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+
+
+ gtx_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+
+
+ xxxkey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
diff --git a/copri4/shareeconf/examples/global.cfg b/copri4/shareeconf/examples/global.cfg
new file mode 100644
index 0000000..03bfe9f
--- /dev/null
+++ b/copri4/shareeconf/examples/global.cfg
@@ -0,0 +1,195 @@
+#sharee global configuration
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# Copyright (c) Rainer Gümpelein, TeilRad GmbH
+
+#sub
is the dbname of sharee COPRI-Instanz
+
+
+ merchant_id="your-operator-merchant_id"
+ owner=196
+ operatorApp="https://shareeapp-operator.example.tld"
+ operatorDMS="https://shareedms-operator.example.tld"
+ operatorApp1="https://shareeapp-operator1.example.tld"
+ operatorDMS1="https://shareedms-operator1.example.tld"
+ syshost="shareedms-operator"
+ dir_app="shareeapp-operator"
+ dir_dms="shareedms-operator"
+ oprefix="EXA"
+ project="Example"
+ app_name="sharee.bike"
+ hwtype="none"
+ bgcolor1="009899"
+ initMap="47.976634, 7.825490"
+ map_zoom="13"
+
+ dbname=sharee_operator
+ host=localhost
+ port=5432
+ sslmode=
+ options=""
+ user=[your-psql-user]
+ passwd=[your-psql-pw]
+
+
+
+
+#sub is the syshost path of website
+
+
+ parent_id=100007
+ parent_node="frame"
+ merchant_id="your-webproject-merchant_id"
+ owner=294
+ operatorWeb="https://shareeweb-project.example.tld"
+ operatorWeb1="https://shareeweb-project1.example.tld"
+ dir_web="shareeweb-project"
+ oprefix="EXA"
+ project="Example"
+ app_name="sharee.bike"
+ bgcolor1="009899"
+ initMap="47.976634, 7.825490"
+ map_zoom="13"
+
+ dbname=sharee_operator
+ host=localhost
+ port=5432
+ sslmode=
+ options=""
+ user=[your-psql-user]
+ passwd=[your-psql-pw]
+
+
+
+
+ #contact TeilRad GmbH to get access to our single-sign-on with sharee.bike App
+
+ id = 275
+ name = "example App"
+ project="Example"
+ user_agent = ""
+ initMap = "47.976634, 7.825490"
+ bgcolor1 = "009899"
+
+
+
+ id = 296
+ name = "example DMS"
+ project="all"
+ user_agent = ""
+ initMap = "47.976634, 7.825490"
+ bgcolor1 = "009899"
+
+
+
+ id = 294
+ name = "example Web"
+ project="Example"
+ user_agent = ""
+ initMap = "47.976634, 7.825490"
+ bgcolor1 = "009899"
+
+
+
+#sharee copri globals
+
+ #stage = "test"
+ stage = "live"
+ sms_to = "017xxxxxxx2"
+ debug = 1
+ superu_id = "1234567"
+ logdir = "/var/log/copri4"
+ basedir = "/var/www/copri4"
+
+ 300101 = "Lastenrad"
+ 300102 = "E-Lastenrad"
+ 300103 = "Stadtrad"
+
+
+ 2 = "public"
+ 3 = "private"
+ 5 = "public-bonus"
+
+
+ 1 = "available"
+ 2 = "requested"
+ 3 = "occupied"
+ 4 = "maintanance"
+ 5 = "defect"
+ 6 = "canceled"
+
+
+ 1 = "available"
+ 5 = "defect"
+
+
+ 1 = "locked"
+ 2 = "unlocked"
+ 3 = "locking"
+
+
+ 1 = "locked"
+ 2 = "unlocked"
+
+
+ 2 = "Ilockit"
+
+
+ 0 = "nein"
+ 1 = "ja"
+
+
+ 0 = "keine"
+ 1 = "lesen"
+ 2 = "lesen & schreiben"
+
+ jsscript = "js/mobile_script.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"
+ style_bootstrap_icons = "css/bootstrap-icons-1.5.0/bootstrap-icons.css"
+ jquery_resize = "js/jquery.autosize.js"
+
+
+#sharee WebApp sepcific para
+
+ parent_id = "100005"
+ parent_node="app"
+
+ start = "Profil"
+ profile = "Profil"
+ accounting_1 = "1. Kundendaten"
+ accounting_1_5 = "1.5. Zahlungsart"
+ accounting_2 = "2.0. Zahlungsdaten"
+ accounting_3 = "3. Verleihdaten"
+
+ local_style = "css/local_style1344.css"
+ jquery = "js/jquery-1.9.1.js"
+ js_bootstrap = "js/bootstrap-3.3.6-dist/js/bootstrap.min.js"
+ style_bootstrap = "js/bootstrap-3.3.6-dist/css/bootstrap.css"
+ mod_active = "Fahrradmietsystem|Karte|Anmelden|Kontakt"
+
+
+#sharee DMS/COPRI specific para
+
+ parent_id = "100002"
+ parent_node="DMS"
+
+ start = "Mietjournal"
+ profile = "nothing"
+
+ waren = "200013"
+ kunden = "200011"
+ faktura = "200007"
+ invoicejournal = "300011"
+ mietjournal = "200012"
+ alarmjournal = "200022"
+ einstellung = "200019"
+
+ term_active_color = "f7ae37"
+ local_style = "css/local_style_2.css"
+ jquery = "js/jquery-3.3.1.min.js"
+ 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"
+ modes = "login|logout|logout_sharee|user|manager|supervisor|admin|maintainer"
+
+
diff --git a/copri4/shareeconf/examples/mailx.cfg b/copri4/shareeconf/examples/mailx.cfg
new file mode 100644
index 0000000..afebeb5
--- /dev/null
+++ b/copri4/shareeconf/examples/mailx.cfg
@@ -0,0 +1,10 @@
+#e-mail config
+
+ mail_to = "admin@example.tld"
+ mail_from = "post@example.tld"
+ mail_gateway = "smtp.mailxchanger.tld"
+ sasl_username = "post@example.tld"
+ sasl_password = "xxxxxxxxxxxxxxx"
+
+
+
diff --git a/copri4/shareeconf/global.cfg b/copri4/shareeconf/global.cfg
index c6bb9e9..51ee1de 120000
--- a/copri4/shareeconf/global.cfg
+++ b/copri4/shareeconf/global.cfg
@@ -1 +1 @@
-/etc/shareeconf/global.cfg
\ No newline at end of file
+../../../../etc/shareeconf/global.cfg
\ No newline at end of file
diff --git a/copri4/shareeconf/mailx.cfg b/copri4/shareeconf/mailx.cfg
index b88542f..78242db 120000
--- a/copri4/shareeconf/mailx.cfg
+++ b/copri4/shareeconf/mailx.cfg
@@ -1 +1 @@
-/etc/shareeconf/mailx.cfg
\ No newline at end of file
+../../../../etc/shareeconf/mailx.cfg
\ No newline at end of file
diff --git a/copri4/shareedms-operator/apache/shareedms-operator.conf b/copri4/shareedms-operator/apache/shareedms-operator.conf
index 682a7b5..bb388c4 100644
--- a/copri4/shareedms-operator/apache/shareedms-operator.conf
+++ b/copri4/shareedms-operator/apache/shareedms-operator.conf
@@ -1,6 +1,6 @@
- ServerName shareedms-operator.copri-bike.de
- ServerAlias shareedms-operator1.copri-bike.de
+ ServerName shareedms-operator.example.tld
+ ServerAlias shareedms-operator1.example.tld
ServerAdmin info@gnu-systems.de
DocumentRoot /var/www/copri4/shareedms-operator
@@ -10,14 +10,14 @@
CustomLog /var/log/apache2/shareedms-operator-access.log combined
ServerSignature Off
RewriteEngine on
- RewriteCond %{SERVER_NAME} =shareedms-operator.copri-bike.de
+ RewriteCond %{SERVER_NAME} =shareedms-operator.example.tld
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
- ServerName shareedms-operator1.copri-bike.de
+ ServerName shareedms-operator1.example.tld
ServerAdmin info@gnu-systems.de
DocumentRoot /var/www/copri4/shareedms-operator
AddHandler cgi-script .cgi .sh .pl
@@ -52,12 +52,12 @@
ServerSignature Off
Include /etc/letsencrypt/options-ssl-apache.conf
- SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem
- SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem
+ SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
- ServerName shareedms-operator.copri-bike.de
+ ServerName shareedms-operator.example.tld
ServerAdmin info@gnu-systems.de
DocumentRoot /var/www/copri4/shareedms-operator
@@ -97,7 +97,7 @@
RedirectMatch ^/$ /DMS/Mietjournal
SSLProxyEngine On
RewriteCond %{REQUEST_URI} ^/(site|img|data|css|js|jquery)
- RewriteRule ^(.*)$ https://shareedms-operator1.copri-bike.de/$1 [P,L]
+ RewriteRule ^(.*)$ https://shareedms-operator1.example.tld/$1 [P,L]
ErrorLog /var/log/apache2/shareedms-operator-error.log
@@ -106,8 +106,8 @@
ServerSignature Off
Include /etc/letsencrypt/options-ssl-apache.conf
- SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem
- SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem
+ SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem
diff --git a/copri4/shareeweb-project/apache/index.html b/copri4/shareeweb-project/apache/index.html
deleted file mode 100644
index d8964f8..0000000
--- a/copri4/shareeweb-project/apache/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- iFrame message passing test
-
-
-
-
-
-
-
Lastenrad Bayern
-
-
-
-
Registrieren
-
-
-
-
-
-
-
-
-
-
-
-
-
-