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

test_account excluded from pwforgotten

Browse source
This commit is contained in:
Rainer Gümpelein 2022-03-12 08:21:41 +01:00
parent 7b24b1dca8
commit ec59942964
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1236,6 +1236,12 @@ sub booking_update(){
$booking_values->{response_state} = "OK: bike " . $q->param('bike') . " locking in progress";
$booking_values->{response_text} = "Abschließen von Fahrrad Nr. " . $q->param('bike') . " ist im Prozess. Bitte warten bis das smartlock vollständig geschlossen wurde und das abschließen bestätigt wird.";
}
if($varenv{dbname} ne "sharee_lv" && !$record_pos->{int32}){
$bw->log("$varenv{basedir}/src/scripts/sms_message.pl $varenv{syshost} locking_progress $auth->{txt07} $record_pos->{c_id}",$record_pos->{c_id},"");
system("$varenv{basedir}/src/scripts/sms_message.pl $varenv{syshost} locking_progress $auth->{txt07} $record_pos->{c_id} &");
}
$update_pos->{int32} = $record_pos->{int32} + 1;#sms_message sent marker
}
$dbt->update_record($dbh,$update_pos,$record_pos);
@ -1257,13 +1263,9 @@ sub booking_update(){
$booking_values->{state} = "$dbt->{copri_conf}->{bike_state}->{$booking->{int10}}";
$booking_values->{lock_state} = "locked" if($booking->{int20} == 1);
$booking_values->{lock_state} = "unlocked" if($booking->{int20} == 2);
if($booking->{int20} == 3){
$booking_values->{lock_state} = "locking";
system(`$varenv{basedir}/src/scripts/sms_message.pl $varenv{syshost} locking_progress $auth->{txt07} $booking->{c_id}`);
}
$booking_values->{lock_state} = "locking" if($booking->{int20} == 3);
#fetch tracking distance on Ilockit cloud by summary trip if(tracking && deviceId && available)
$bw->log("Ilockit_trackingcloud.pl $varenv{syshost} get_tripsum",$booking,"") if($booking->{int25});
if($booking->{int25} == 1 && $booking->{int10} == 1){
$bw->log("$varenv{basedir}/src/scripts/Ilockit_trackingcloud.pl $varenv{syshost} get_tripsum $booking->{c_id}",$booking->{c_id},"");
system(`$varenv{basedir}/src/scripts/Ilockit_trackingcloud.pl $varenv{syshost} get_tripsum $booking->{c_id}`) if($booking->{int13});#if ilockit clouid

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

@ -120,7 +120,7 @@ sub sms_message {
$sms_tosub =~ s/^0/\+49/;
$sms_to = $sms_tosub;
}
$sms_message .= "Die Miete zu $bike wurde nicht beendet! Bitte überprüfe ob das Schloss wirklich geschlossen wurde. Ist ihr smartphone online?";
$sms_message .= "Ihre Miete von $bike wurde nicht beendet! Ihre kostenpflichtige Miete läuft weiter! Stellen Sie sicher, dass das Schloss geschlossen ist. Hotline 0761-45370099";
my $message = Encode::encode('iso-8859-1', Encode::decode('utf-8',"$sms_message"));
open(FILE,">>$dbt->{copri_conf}->{logdir}/sms_gtx.log");

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

@ -1022,12 +1022,16 @@ sub send_password(){
$email = $q->escapeHTML($email);
$email =~ s/\s//g;
$bw->log("$varenv{basedir}/src/Mod/newsletter_tink.pl",$email,"");
my $pwmd5 = md5_hex($coo);
$db->updater("contentadr","1","1","txt11","$pwmd5","$owner","txt08","ilike","$email");
$bw->log("$varenv{basedir}/src/Mod/newsletter_tink.pl",$email,"");
system(`$varenv{basedir}/src/Mod/newsletter_tink.pl "$varenv{basedir}" "$varenv{wwwhost}" "send_password" "$email" "$coo"`);
#don't change/hassle pw on tester for ex. apple@sharee.bike|google@sharee.bike
if($email && $email !~ /$dbt->{copri_conf}->{test_accounts}/i){
$db->updater("contentadr","1","1","txt11","$pwmd5","$owner","txt08","ilike","$email");
system(`$varenv{basedir}/src/Mod/newsletter_tink.pl "$varenv{basedir}" "$varenv{wwwhost}" "send_password" "$email" "$coo"`);
}
}