From f6668094fd3e56ba06099c88a5e6a95069b308d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rainer=20G=C3=BCmpelein?= Date: Tue, 1 Mar 2022 10:25:13 +0100 Subject: [PATCH] exclude pos template on bikes_all --- copri4/main/src/Mod/APIfunc.pm | 25 ++++++---- copri4/main/src/Mod/Pricing.pm | 1 + copri4/main/src/Mod/SMSTransport.pm | 5 +- copri4/main/src/Tpl/BaseEdit.pm | 16 +++++-- .../css/local_style1344.css | 47 ------------------- 5 files changed, 31 insertions(+), 63 deletions(-) diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index c3ea07c..0544fab 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -340,8 +340,14 @@ sub service_select { fetch => "all", catch => "content_contentpos", keyfield => "c_id", - template_id => "$node_template->{template_id}", }; + + + #Because of different contentpos.template_id in Flot Service we use it only on all others else bikes_all requests + if($q->param('request') ne "bikes_all"){ + $pref->{template_id} = "$node_template->{template_id}"; + } + if(looks_like_number($q->param('service_id'))){ $pref->{c_id} = "=::" . $q->escapeHTML($q->param('service_id')); }elsif(looks_like_number($service_id)){ @@ -688,7 +694,8 @@ sub service_work { my $users_map = $dbt->users_map($dbh,"");#get all serviceAPP users (also without service key) my $channel_map = $dbt->channel_map(); - my @tpl_order = split /,/,$node_template->{tpl_order}; + my @tpl_order = (); + @tpl_order = split /,/,$node_template->{tpl_order} if(ref($node_template) eq "HASH" && $node_template->{tpl_order}); #because of different templates we need template grouping #not safe, pos template_id have to be defined before any service has done! @@ -2073,13 +2080,11 @@ sub auth_verify(){ template_id => "202", txt05 => "like::" . "%" . $q->escapeHTML($cgi_authcookie) . "%", }; + my $auth_primary = { c_id => 0 }; my $auth_operator = { c_id => 0 }; $auth_operator = $dbt->fetch_record($dbh,$authref); $bw->log("auth_verified on operator $varenv{dbname} anchor 1",$auth_operator->{c_id},""); - my $auth_primary = { c_id => 0 }; - my $auth_operator = { c_id => 0 }; - #just part of operator-routing (sharee account management) if($varenv{dbname} ne "sharee_primary"){ #primary select @@ -2096,7 +2101,7 @@ sub auth_verify(){ #first, save operator array which are used my %operator_hash = ();#local DB - $bw->log("booking_request auth_verified by dbname $varenv{dbname}",$auth_operator->{c_id},""); + $bw->log("booking_request auth_verified by dbname $varenv{dbname}",$auth_primary->{c_id},""); print FILE "booking_request auth_verified by dbname $varenv{dbname} | pri $auth_primary->{c_id}\n if($debug)"; if($auth_primary->{txt17} && $auth_primary->{txt17} =~ /\w\s\w/){#append DB's @@ -2194,10 +2199,10 @@ sub auth_verify(){ }else{# if($auth_primary->{c_id}) fails $bw->log("auth_verified on primary anchor 4 FAILS by dbname $varenv{dbname}.",$auth_primary->{c_id},""); print FILE "auth_verified on primary anchor 4 FAILS by dbname $varenv{dbname} | pri $auth_primary->{c_id}\n" if($debug); - $auth_operator = $dbt->fetch_record($dbh,$authref); - $record = $auth_operator; - $bw->log("auth_verified on operator anchor 9 by dbname $varenv{dbname}.",$auth_operator->{c_id},""); - print FILE "auth_verified on operator anchor 9 by dbname $varenv{dbname} | op $auth_operator->{c_id}\n" if($debug); + #$auth_operator = $dbt->fetch_record($dbh,$authref); + #$record = $auth_operator; + #$bw->log("auth_verified on operator anchor 9 by dbname $varenv{dbname}.",$auth_operator->{c_id},""); + #print FILE "auth_verified on operator anchor 9 by dbname $varenv{dbname} | op $auth_operator->{c_id}\n" if($debug); } }else{# if($varenv{dbname} eq "sharee_primary") $auth_primary = $dbt->fetch_record($dbh,$authref); diff --git a/copri4/main/src/Mod/Pricing.pm b/copri4/main/src/Mod/Pricing.pm index b427408..33dd5f1 100755 --- a/copri4/main/src/Mod/Pricing.pm +++ b/copri4/main/src/Mod/Pricing.pm @@ -178,6 +178,7 @@ sub sharee_pricing(){ ($return->{gps}->{latitude},$return->{gps}->{longitude}) = split(/,/,$ctpos->{txt06}); $return->{lock_state} = "locked" if($ctpos->{int20} == 1); $return->{lock_state} = "unlocked" if($ctpos->{int20} == 2); + $return->{lock_state} = "locking" if($ctpos->{int20} == 3); } } $bw->log("hour computed:",$logging,""); diff --git a/copri4/main/src/Mod/SMSTransport.pm b/copri4/main/src/Mod/SMSTransport.pm index f9a7a5e..6547689 100755 --- a/copri4/main/src/Mod/SMSTransport.pm +++ b/copri4/main/src/Mod/SMSTransport.pm @@ -64,8 +64,9 @@ sub sms_ack_digest { } if($ctadr->{txt07} =~ /^0/ || $ctadr->{txt07} !~ /\+[1-9]/){ my $sms_tosub = $ctadr->{txt07}; - $sms_tosub =~ s/^00/\+/g; - $sms_tosub =~ s/^0/\+49/g; + $sms_tosub =~ s/^\+00/\+/; + $sms_tosub =~ s/^00/\+/; + $sms_tosub =~ s/^0/\+49/; $sms_to = $sms_tosub; } $sms_message .= "Ihr Mietradsystem SMS-Bestätigungscode lautet: $sms_ack_digest"; diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm index 4c0b4a9..acd23c8 100755 --- a/copri4/main/src/Tpl/BaseEdit.pm +++ b/copri4/main/src/Tpl/BaseEdit.pm @@ -313,13 +313,21 @@ EOF print $q->td({-class=>'content1_cms',-colspan=>1},$but->radiobox2reverse("$key","$ctrel->{$key}","$a","$b")),"\n"; } elsif($key =~ /int/ && $size =~ /\w\+\w/){ - #if($users_dms->{u_id} eq $varenv{superu_id} || $des !~ /DMS/){#only superu_id can acivate DMS-Admin - if($users_dms->{u_id}){ + + #Ack digest + my $ack_code = ""; + if($node_meta->{tpl_id} == 202 && $ctrel->{txt34}){ + my $ack_digest = $q->unescapeHTML($ctrel->{txt34}); + if($key eq "int04"){ + $ack_code = " ($1)" if($ack_digest =~ /^(.{5})/); + }elsif($key eq "int13"){ + $ack_code = " ($1)" if($ack_digest =~ /(.{5})$/); + } + } my ($a,$b,$c) = split /\+/,$size; print $q->Tr(); print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; - print $q->td({-class=>'content1_cms',-colspan=>1},$but->radiobox2("$key","$ctrel->{$key}","$a","$b","$c")),"\n"; - } + print $q->td({-class=>'content1_cms',-colspan=>1},$but->radiobox2("$key","$ctrel->{$key}","$a","$b","$c"), $ack_code),"\n"; } elsif($key =~ /int/ && $size =~ /checkbox/){ print $q->Tr(); diff --git a/copri4/shareeapp-operator/css/local_style1344.css b/copri4/shareeapp-operator/css/local_style1344.css index 778cb38..2bf6a25 100755 --- a/copri4/shareeapp-operator/css/local_style1344.css +++ b/copri4/shareeapp-operator/css/local_style1344.css @@ -2,55 +2,10 @@ html,body { background-color: white; - background-repeat:repeat-x; - background-position: top left; - background-attachment:fixed; color: #3f3f3f; - line-height:1.4; font-family:'Arial'; - font-size:14px; - line-height:1.0; - margin: 0; - padding: 0; - text-align:left; } -.bgheader{ - background: linear-gradient(top, #eaeaea 0%, #008dd2 25%, #008dd2 100%); - background: -moz-linear-gradient(top, #eaeaea 0%, #008dd2 25%, #008dd2 100%); - background: -webkit-linear-gradient(top, #eaeaea 0%, #008dd2 25%, #008dd2 100%); - background: -ms-linear-gradient(top, #eaeaea 0%, #008dd2 25%, #008dd2 100%); - background: -o-linear-gradient(top, #eaeaea 0%, #008dd2 25%, #008dd2 100%); - -} - - - -#scroll-top-wrapper { - position: fixed; - right: 20px; - bottom: 20px; - - opacity: 0; - visibility: hidden; - overflow: hidden; - z-index: 999; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - transition: all 0.5s ease-in-out; -} -#scroll-top-wrapper a:hover { - color: gray; -} -#scroll-top-wrapper.show { - visibility:visible; - cursor:pointer; - opacity: 1.0; -} - - #map a{ text-decoration:underline; } @@ -417,7 +372,6 @@ div#cody { .leftnav2 {margin:0px; color:#666666; text-decoration: none;} div#Contenttxt { - font-size: 14px; min-height:300px; padding-left:0px; border:0px solid silver; @@ -490,7 +444,6 @@ div#bottom_text { font-weight:bold; } .content2 { - font-size:16px; line-height:1.2; padding-top:22px; max-width:750px;