From d928abe0ec892c448a652483c8554e2d16177bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rainer=20G=C3=BCmpelein?= Date: Mon, 10 Jan 2022 12:33:49 +0100 Subject: [PATCH] mobile nr country substitute --- copri4/main/src/Mod/APIfunc.pm | 2 +- copri4/main/src/Mod/APIjsonserver.pm | 3 ++- copri4/main/src/Mod/Indexsharee.pm | 2 +- copri4/main/src/Mod/SMSTransport.pm | 6 ++++++ copri4/main/src/Mod/Shareework.pm | 2 +- copri4/main/src/Tpl/Address3.pm | 13 ++++++++----- copri4/main/src/scripts/tests/index.pl | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 002562f..21974cc 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -1454,7 +1454,7 @@ sub bikes_available(){ my $op_return = {}; my @adr_tariff = (); - if(@adr_tariff){ + if($auth->{txt30}){ @adr_tariff = ("$auth->{txt30}"); @adr_tariff = split(/\s+/,$auth->{txt30}) if($auth->{txt30} =~ /\w\s+\w/); } diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm index e96526f..7c67cf3 100755 --- a/copri4/main/src/Mod/APIjsonserver.pm +++ b/copri4/main/src/Mod/APIjsonserver.pm @@ -192,7 +192,8 @@ elsif($q->param('request') eq "booking_request"){ foreach my $id (keys(%$bikes_occupied)){ $count++; } - if($count >= 3){ + #only if not debug + if(!$authraw->{int11} && $count >= 3){ $response->{response_state} = "Failure: booking_request declined. max count of 3 occupied bikes has been reached"; $response->{response_text} = "Die maximale Anzahl von 3 Reservierungen wurde erreicht"; }else{ diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm index 49b7621..c041d17 100755 --- a/copri4/main/src/Mod/Indexsharee.pm +++ b/copri4/main/src/Mod/Indexsharee.pm @@ -477,7 +477,7 @@ sub handler { if(($users_sharee->{int04} != 1 || $R::sharee_edit =~ /send_email/) && ($users_sharee->{txt08} =~ /\w\@\w/)){ $tk->emailack($users_sharee->{c_id}); } - if(($users_sharee->{int13} != 1 || $R::sharee_edit =~ /send_sms/) && ($users_sharee->{txt07} =~ /\d{9}/ && length($users_sharee->{txt07}) <= 16 && $users_sharee->{txt07} =~ /\+[1-9]{3}/)){ + if(($users_sharee->{int13} != 1 || $R::sharee_edit =~ /send_sms/) && ($users_sharee->{txt07} =~ /\d{9}/ && length($users_sharee->{txt07}) <= 16)){ $tk->smsack($users_sharee); } }#send confirm code diff --git a/copri4/main/src/Mod/SMSTransport.pm b/copri4/main/src/Mod/SMSTransport.pm index 9df8e24..6412a21 100755 --- a/copri4/main/src/Mod/SMSTransport.pm +++ b/copri4/main/src/Mod/SMSTransport.pm @@ -55,6 +55,12 @@ sub sms_ack_digest { my $sms_from = "Mietradcode"; my $sms_to = $ctadr->{txt07};# || "+491799xxxx72"; + 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_to = $sms_tosub; + } my $sms_message = "Ihr Mietradsystem SMS-Bestätigungscode lautet: $sms_ack_digest"; my $message = Encode::encode('iso-8859-1', Encode::decode('utf-8',"$sms_message")); diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm index e8441f5..26c5958 100755 --- a/copri4/main/src/Mod/Shareework.pm +++ b/copri4/main/src/Mod/Shareework.pm @@ -366,7 +366,7 @@ sub save_account(){ #phonenr }elsif($_ eq "txt07"){ $valxx =~ s/[\s\-\/]//g; - if($valxx !~ /\d{9}/ || length($valxx) > 16 || $valxx !~ /\+[1-9]{3}/){ + if($valxx !~ /\d{9}/ || length($valxx) > 16){ $ret = "failure::$_#top"; }else{ my $lastnum = $valxx; diff --git a/copri4/main/src/Tpl/Address3.pm b/copri4/main/src/Tpl/Address3.pm index 66ee46d..30b16bd 100755 --- a/copri4/main/src/Tpl/Address3.pm +++ b/copri4/main/src/Tpl/Address3.pm @@ -52,19 +52,22 @@ sub tpl(){ #get Firma my $ctf = $db->get_content1("contentuser",$dbt->{shareedms_conf}->{parent_id}); - - my $rel4tpl = $db->get_rel4tpl("",$lang,$users_dms->{c_id4trans},$users_dms->{tpl_id4trans}); + my $rel4tpl = { c_id => 0 }; + if($R::c_id4trans && $R::tpl_id4trans && $users_dms->{u_id} > 0){ + $rel4tpl = $db->get_rel4tpl("",$lang,$R::c_id4trans,$R::tpl_id4trans); + $db->update_users4trans($R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans,$users_dms->{u_id}); + } my @tpl_order = split /,/,$rel4tpl->{tpl_order}; my $node = $db->get_node4multi($rel4tpl->{main_id},$lang) if($rel4tpl->{main_id}); if(!$node->{main_id} && $users->{owner}){ - $db->update_users4trans("0","0",$users_dms->{kind_of_trans},$users_dms->{u_id}); + $db->update_users4trans("0","0",$R::kind_of_trans,$users_dms->{u_id}); $users = $db->select_users($u_id); } #edit marker for "question save" dialog if($u_id && $R::trans2edit && $R::c_id4trans){ $db->users_up("c_id4edit","$R::c_id4trans","$users->{owner}"); } - my $ctx = $db->get_content1("contenttrans",$users_dms->{c_id4trans}); + my $ctx = $db->get_content1("contenttrans",$R::c_id4trans); my $c_idadr = $ctx->{int10};#c_id orig from contentadr my $ctadr = $db->get_content1("contentadr",$c_idadr); my $rel_adr = $db->get_rel4tpl("","$lang","$c_idadr","202"); @@ -124,7 +127,7 @@ EOF } print "\n
\n"; - if(!$users_dms->{c_id4trans} || !$users_dms->{tpl_id4trans}){ + if(!$R::c_id4trans || !$R::tpl_id4trans){ $lb->failure3("Das Formular wurde gelöscht bzw. ist nicht vorhanden"); } diff --git a/copri4/main/src/scripts/tests/index.pl b/copri4/main/src/scripts/tests/index.pl index a83742e..4b18942 100755 --- a/copri4/main/src/scripts/tests/index.pl +++ b/copri4/main/src/scripts/tests/index.pl @@ -3,7 +3,7 @@ ## SPDX-License-Identifier: AGPL-3.0-or-later # Copyright (c) Rainer Gümpelein, TeilRad GmbH # -use lib "/var/www/copri4/shareeweb-project/src"; +use lib "/var/www/copri-bike/shareeapp-primary/src"; use strict; use warnings; use POSIX;