diff --git a/copri4/main/css/local_style20221205.css b/copri4/main/css/local_style20230105.css
similarity index 98%
rename from copri4/main/css/local_style20221205.css
rename to copri4/main/css/local_style20230105.css
index 3e1d5c7..376b732 100755
--- a/copri4/main/css/local_style20221205.css
+++ b/copri4/main/css/local_style20230105.css
@@ -5,14 +5,21 @@ html {
overflow-y: scroll;
}
-html, body {
- background-color:#d9d6ce;
- color: black;
- font-family: Arial;
- font-size:100.01%;
- margin: 0; padding: 0;
- text-align:left;
+html,body {
+ background-color: #d9d6ce;
+ color: #3f3f3f;
+ font-family:'Arial';
+ background-repeat: no-repeat;
+ background-position: right bottom;
+ background-attachment: fixed;
+ background-size: cover;
+ font-size: 100.01%;
+ line-height: 1;
+ margin: 0;
+ padding: 0;
+ text-align: center;
}
+
div {
font-family: Arial,sans-serif;
font-size: 1em;
diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm
index c6ecfb3..503b361 100755
--- a/copri4/main/src/Mod/APIfunc.pm
+++ b/copri4/main/src/Mod/APIfunc.pm
@@ -832,13 +832,15 @@ sub service_work {
$key_change .= "_" . $j;
}
+ my $work_val = "$pos_record->{$id}->{$key}";
+ $work_val = "" if($pos_record->{$id}->{$key} eq "::new_task::");
$return->{$article}->{$key_change}->{service_id} = "$pos_record->{$id}->{c_id}";
$return->{$article}->{$key_change}->{work_id} = "$key";
$return->{$article}->{$key_change}->{work_name} = "$val";
$return->{$article}->{$key_change}->{interval} = "$interval";
$return->{$article}->{$key_change}->{time_over} = "$time_over";
$return->{$article}->{$key_change}->{service_type} = "$service_type";
- $return->{$article}->{$key_change}->{work_val} = "$pos_record->{$id}->{$key}";
+ $return->{$article}->{$key_change}->{work_val} = "$work_val";
$return->{$article}->{$key_change}->{mtime} = "$pos_record->{$id}->{mtime}";
$return->{$article}->{$key_change}->{user_name} = "$u_name";
$return->{$article}->{$key_change}->{owner} = "$pos_record->{$id}->{owner}";
diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm
index ebef4ce..02b0668 100755
--- a/copri4/main/src/Mod/APIjsonserver.pm
+++ b/copri4/main/src/Mod/APIjsonserver.pm
@@ -753,10 +753,12 @@ elsif($q->param('request') eq "service_done"){
if(ref($xresponse->{$article}) eq "HASH"){
#$bw->log("service_done xresponse",$xresponse->{$article},"");
+ #if no new_task then select last service_id with work_duration < 1 day
my $service_id = "";
- #select last service_id with work_duration < 1 day
- foreach my $id (sort { $xresponse->{$article}->{$a}->{mtime} cmp $xresponse->{$article}->{$b}->{mtime} } keys (%{$xresponse->{$article}})){
+ if(!$q->param('new_task') && $q->param('work_val') ne "::new_task::"){
+ foreach my $id (sort { $xresponse->{$article}->{$a}->{mtime} cmp $xresponse->{$article}->{$b}->{mtime} } keys (%{$xresponse->{$article}})){
$service_id = $id if($id > 1);
+ }
}
my $rows=0;
diff --git a/copri4/main/src/Mod/APIsigclient.pm b/copri4/main/src/Mod/APIsigclient.pm
index 6d9759c..415cb76 100755
--- a/copri4/main/src/Mod/APIsigclient.pm
+++ b/copri4/main/src/Mod/APIsigclient.pm
@@ -418,7 +418,7 @@ sub sig_booking {
my $endpoint = "$dbt->{operator}->{$varenv->{dbname}}->{endpoint}/";
my %json = ();
- $ctadr->{txt08} =~ s/[a-z]-/-/; $ctadr->{txt08} =~ s/[a-z]_/_/; $ctadr->{txt08} =~ s/[a-z]\@/\@/i;
+ $ctadr->{txt08} =~ s/[a-z]-/-/; $ctadr->{txt08} =~ s/[a-z]_/_/; $ctadr->{txt08} =~ s/[0-9a-z]\@/\@/i; $ctadr->{txt08} =~ s/[0-9a-z]\@/\@/i; $ctadr->{txt08} =~ s/\@(\w{1,2})\w+\.(\w+)/\@$1email\.$2/i;
$ctadr->{txt08} =~ s/[a-z]\./\./ if($ctadr->{txt08} =~ /\.\w+\@/);
#reservation start
if($todo eq "reserve"){
diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm
index 6fe9d77..0e6fb79 100755
--- a/copri4/main/src/Mod/Indexsharee.pm
+++ b/copri4/main/src/Mod/Indexsharee.pm
@@ -706,25 +706,6 @@ sub handler {
}
my $dyn_css = "";
- if(1==1){
- my $background = "";
- $background = "$varenv{metahost}/img/$varenv{background_image}" if($varenv{background_image});
- $dyn_css = "
- html,body {
- background-image:url('$background');
- background-repeat: $varenv{background_repeat};
- background-position: right bottom;
- background-attachment:fixed;
- background-size:$varenv{background_size};
- font-size: $varenv{font_size};
- line-height: $varenv{line_height};
- margin: 0; padding: 0;
- text-align:$varenv{background_align};
-
- }\n";
- }
-
-
my $url = "$varenv{wwwhost}/$path";
my $onload="";
diff --git a/copri4/main/src/Mod/NodeEdit.pm b/copri4/main/src/Mod/NodeEdit.pm
index 05c2460..61c9899 100755
--- a/copri4/main/src/Mod/NodeEdit.pm
+++ b/copri4/main/src/Mod/NodeEdit.pm
@@ -128,7 +128,7 @@ sub admin_tpl(){
print $q->Tr();
if(1==1){
if(($users_dms->{u_id} > 0) || ($u_group eq "admin")){
- print "| \n";
+ print " | \n";
#print " | \n";
print $but->singlesubmit7("rel_edit","save_relation","$ib{save_relation}","","modal_position(xpos,ypos)");
#look at dialog4menu, it seems better. vise a verse
diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm
index 21b8f4d..4a52ccc 100755
--- a/copri4/main/src/Tpl/Calorin.pm
+++ b/copri4/main/src/Tpl/Calorin.pm
@@ -221,9 +221,9 @@ sub tpl(){
#8=get_position after validate
if(!$R::theft_details){
$search->{int10} = "IN::(7,8)";
- $search->{int03} = ">::1";#move count
- $search->{int07} = ">::1";#speed
- $search->{int08} = ">::50";#meter
+ $search->{int03} = ">::$dbt->{copri_conf}->{theftalarm}->{move_count}";#move count
+ $search->{int07} = ">::$dbt->{copri_conf}->{theftalarm}->{speed}";#speed
+ $search->{int08} = ">::$dbt->{copri_conf}->{theftalarm}->{meter}";#meter
}
$cttpos = $dbt->collect_theftpos($dbh,$search);
}
@@ -415,7 +415,7 @@ sub tpl(){
if($users_dms_primary->{u_id} && $dbt->{copri_conf}->{contributors} && $users_dms_primary->{u_id} =~ /$dbt->{copri_conf}->{contributors}/){
$pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$pid')"},"$cttpos->{$pid}->{c_id}", $q->span({-class=>"popuptext",-id=>"$pid"},"$pos_details"));
$user_device = "";
- $user_device .= " → end-ack" if($cttpos->{$pid}->{int27});
+ $user_device .= " → endAck" if($cttpos->{$pid}->{int27});
my $txt26 = $cttpos->{$pid}->{txt26};
$txt26 = substr($cttpos->{$pid}->{txt26},0,25) if(length($cttpos->{$pid}->{txt26}) > 20);
$user_device .= " → $txt26" if($txt26);
diff --git a/copri4/main/src/Tpl/Liste3.pm b/copri4/main/src/Tpl/Liste3.pm
index 5fc6248..cc825e8 100755
--- a/copri4/main/src/Tpl/Liste3.pm
+++ b/copri4/main/src/Tpl/Liste3.pm
@@ -171,7 +171,7 @@ sub tpl(){
$db->users_up("col_sort","0",$users_dms->{owner}) if("$scol" ne "$users_dms->{col_sort}");
}
- my $limit = $R::limit || $varenv{limit};
+ my $limit = $R::limit || 250;
my $offset = $R::offset || "0";
#backward | forward
diff --git a/copri4/main/src/Tpl/SubListe.pm b/copri4/main/src/Tpl/SubListe.pm
index 2eb5e41..6a87678 100755
--- a/copri4/main/src/Tpl/SubListe.pm
+++ b/copri4/main/src/Tpl/SubListe.pm
@@ -60,8 +60,7 @@ sub tpl(){
my $message = "";
my $s_owner_id = "";
my $offset = $R::offset || "0";
- $offset = 0 if($node_meta->{int10} && $node_meta->{int10} < $varenv{limit});
- my $limit = $R::limit || $varenv{limit};
+ my $limit = $R::limit || 250;
my $searchref = {
time => $time,
diff --git a/copri4/main/src/scripts/Ilockit_cloud.pl b/copri4/main/src/scripts/Ilockit_cloud.pl
index 4c85632..7929cf4 100755
--- a/copri4/main/src/scripts/Ilockit_cloud.pl
+++ b/copri4/main/src/scripts/Ilockit_cloud.pl
@@ -426,6 +426,14 @@ sub get_positions {
my $c_id = $dbt->insert_contentoid($dbh,$insert);
print FILE "insert sub get_positions:" . Dumper($insert);
+
+ #theft mailing
+ if($theftmove_count > $dbt->{copri_conf}->{theftalarm}->{move_count} && $resp->{speed} $dbt->{copri_conf}->{theftalarm}->{speed} && $resp->{attributes}->{distance} > $dbt->{copri_conf}->{theftalarm}->{meter}){
+ #send mail
+ #system("$varenv{basedir}/src/scripts/mailTransportcms.pl '$varenv->{syshost}' 'send_alarm2hotline' '' ''");
+ print FILE "send_alarm2hotline, condition: $theftmove_count > $dbt->{copri_conf}->{theftalarm}->{move_count} && $resp->{speed} $dbt->{copri_conf}->{theftalarm}->{speed} && $resp->{attributes}->{distance} > $dbt->{copri_conf}->{theftalarm}->{meter}\n";
+ }
+
}
}
}
diff --git a/copri4/main/src/scripts/Ilockit_trackingcloud.pl b/copri4/main/src/scripts/Ilockit_trackingcloud.pl
index da4afef..0d2a76e 100755
--- a/copri4/main/src/scripts/Ilockit_trackingcloud.pl
+++ b/copri4/main/src/scripts/Ilockit_trackingcloud.pl
@@ -169,10 +169,12 @@ sub get_tripsum {
if(1==1){
my $update_pos = {
table => "contenttranspos",
- owner => $owner,
- mtime => "now()",
int26 => 0,
};
+ #disabled to keep real rental owner id
+ #owner => $owner,
+ #mtime => "now()",
+
foreach my $resp (@{ $response_in }) {
if($ctpos->{int13} eq $resp->{deviceId}){
print FILE "device Id: $resp->{deviceId}" . "\n";
diff --git a/copri4/main/src/scripts/mailTransportcms.pl b/copri4/main/src/scripts/mailTransportcms.pl
new file mode 120000
index 0000000..0bc6af8
--- /dev/null
+++ b/copri4/main/src/scripts/mailTransportcms.pl
@@ -0,0 +1 @@
+../../../../../sharee.bike/copri-bike/main/src/scripts/mailTransportcms.pl
\ No newline at end of file
diff --git a/copri4/shareeapp-operator/css/local_style2022-03-20.css b/copri4/shareeapp-operator/css/local_style20230105.css
similarity index 86%
rename from copri4/shareeapp-operator/css/local_style2022-03-20.css
rename to copri4/shareeapp-operator/css/local_style20230105.css
index 5199409..988e6c7 100755
--- a/copri4/shareeapp-operator/css/local_style2022-03-20.css
+++ b/copri4/shareeapp-operator/css/local_style20230105.css
@@ -4,6 +4,15 @@ html,body {
background-color: white;
color: #3f3f3f;
font-family:'Arial';
+ background-repeat: no-repeat;
+ background-position: right bottom;
+ background-attachment: fixed;
+ background-size: cover;
+ font-size: 100.01%;
+ line-height: 1;
+ margin: 0;
+ padding: 0;
+ text-align: center;
}
.tdint {
diff --git a/copri4/shareeapp-operator/src/Lib/Config.pm b/copri4/shareeapp-operator/src/Lib/Config.pm
index 8ca8cb3..7ee1601 100755
--- a/copri4/shareeapp-operator/src/Lib/Config.pm
+++ b/copri4/shareeapp-operator/src/Lib/Config.pm
@@ -45,32 +45,17 @@ sub envonline(){
accounting_1_5 => $globalconf{shareeapp_conf}->{accounting_1_5},
accounting_2 => $globalconf{shareeapp_conf}->{accounting_2},
accounting_3 => $globalconf{shareeapp_conf}->{accounting_3},
-
superu_id => $globalconf{copri_conf}->{superu_id},
debug => $globalconf{copri_conf}->{debug},
logdir => $globalconf{copri_conf}->{logdir},
live_hostname => $globalconf{$server_type}{$server_key}->{live_hostname},
metahost=>"$metahost",
orga => "",
- style_font => "$metahost/img/OfficinaSansITCStd-Book.otf",
- font_family => "OfficinaSansITCStd-Book,Arial",
- background_image => "",
- background_size => "cover",
- background_color => "white",
- background_color2 => "#c7c8ca",
- background_align => "center",
- background_repeat => "no-repeat",
- font_size => "100.01%",
- line_height => "1",
basedir => "$basedir",
pdf => "$basedir/pdf",
pdfinvoice => "$basedir/pdfinvoice",
data => "$basedir/data",
xmlfile => "$basedir/xml",
- Anrede => "Anrede,Frau,Herr,Firma",
- Einheit => "Stück,Paar,Satz,Meter,Liter",
- head_logo => "",
- barcode => "",
printer => "PDF"
);
return %varenv;
diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
index 3c94099..42afd34 100755
--- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
+++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
@@ -605,7 +605,7 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
print $q->div({-id=>"$key"},$but->checkbox("1","$key","$ctrel->{$key}","","$required","$autofocus"), " $sharee_agb"),"\n";
print $q->hidden(-name=>"$key",-override=>1,-value=>"null");
- my $sharee_privacy = "\n";
+ my $sharee_privacy = "\n";
print $q->div({-style=>'padding-top:10px;'},"$sharee_privacy"),"\n";
diff --git a/copri4/shareedms-operator/src/Lib/Config.pm b/copri4/shareedms-operator/src/Lib/Config.pm
index 152eceb..edfcb9e 100755
--- a/copri4/shareedms-operator/src/Lib/Config.pm
+++ b/copri4/shareedms-operator/src/Lib/Config.pm
@@ -41,38 +41,18 @@ sub envonline(){
mandant => $globalconf{shareedms_conf}->{parent_node},
start => $globalconf{shareedms_conf}->{start},
profile => $globalconf{shareedms_conf}->{profile},
-
superu_id => $globalconf{copri_conf}->{superu_id},
debug => $globalconf{copri_conf}->{debug},
logdir => $globalconf{copri_conf}->{logdir},
live_hostname => $globalconf{$server_type}{$server_key}->{live_hostname},
metahost=>"$metahost",
orga => "dms",
- term_active_color => "#$globalconf{shareedms_conf}->{term_active_color}",
- background_image => "",
- background_size => "cover",
- background_color => "#5c5c5c",
- background_color2 => "#a7a18f",
- background_align => "center",
- background_repeat => "no-repeat",
- font_family => "Arial",
- font_size => "100.01%",
- line_height => "1",
basedir => "$basedir",
csv => "$basedir/csv",
pdf => "$basedir/pdf",
data => "$basedir/data",
xmlfile => "$basedir/xml",
- Anrede => "Anrede,Frau,Herr,Firma",
- Einheit => "Stück,Paar,Satz,Meter,Liter",
- map_activ => "",
- min_width => "1100",
head_logo => "$metahost/img/sharee_bike_Logo.jpg",
- barcode => "",
- limit => "200",
- 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",
printer => "PDF"
);
return %varenv;
diff --git a/copri4/shareedms-operator/src/Lib/Mlogic.pm b/copri4/shareedms-operator/src/Lib/Mlogic.pm
index 1e8debb..935d5e1 100755
--- a/copri4/shareedms-operator/src/Lib/Mlogic.pm
+++ b/copri4/shareedms-operator/src/Lib/Mlogic.pm
@@ -69,7 +69,7 @@ sub tpl(){
if($users_dms->{u_id}){
###header start
- print "\n";
+ print " \n";
print " \n";
#cleanup
diff --git a/copri4/shareeweb-project/src/Lib/Config.pm b/copri4/shareeweb-project/src/Lib/Config.pm
index be7b45c..aac6159 100755
--- a/copri4/shareeweb-project/src/Lib/Config.pm
+++ b/copri4/shareeweb-project/src/Lib/Config.pm
@@ -45,30 +45,16 @@ sub envonline(){
accounting_1_5 => $globalconf{shareeapp_conf}->{accounting_1_5},
accounting_2 => $globalconf{shareeapp_conf}->{accounting_2},
accounting_3 => $globalconf{shareeapp_conf}->{accounting_3},
-
superu_id => $globalconf{copri_conf}->{superu_id},
debug => $globalconf{copri_conf}->{debug},
logdir => $globalconf{copri_conf}->{logdir},
- live_hostname => $globalconf{primary}{sharee_primary}->{live_hostname},
metahost=>"$metahost",
orga => "",
- style_font => "$metahost/img/OfficinaSansITCStd-Book.otf",
- font_family => "OfficinaSansITCStd-Book,Arial",
- background_image => "",
- background_size => "cover",
- background_color => "white",
- background_color2 => "#c7c8ca",
- background_align => "center",
- background_repeat => "no-repeat",
- font_size => "100.01%",
- line_height => "1",
- basedir => "$basedir",
+ basedir => "$basedir",
pdf => "$basedir/pdf",
pdfinvoice => "$basedir/pdfinvoice",
data => "$basedir/data",
xmlfile => "$basedir/xml",
- head_logo => "",
- barcode => "",
printer => "PDF"
);
return %varenv;
|