roko.li/sharee.bike
4
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-05-25 09:56:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

mobile nr country substitute

Browse source
This commit is contained in:
Rainer Gümpelein 2022-01-10 12:33:49 +01:00
parent 4ccea2b0a1
commit d928abe0ec
7 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copri4/main/src/Mod/APIfunc.pm
View file

@ -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/);
}

3
copri4/main/src/Mod/APIjsonserver.pm
View file

@ -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{

2
copri4/main/src/Mod/Indexsharee.pm
View file

@ -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

6
copri4/main/src/Mod/SMSTransport.pm
View file

@ -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"));

2
copri4/main/src/Mod/Shareework.pm
View file

@ -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;

13
copri4/main/src/Tpl/Address3.pm
View file

@ -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<div style='position:absolute;text-align:left;background-color:white;width:100%;'>\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");
}

2
copri4/main/src/scripts/tests/index.pl
View file

@ -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;