From ec5994296480b76cea9e30ace1c1d2464f8c2332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rainer=20G=C3=BCmpelein?= <ragu@sharee.bike>
Date: Sat, 12 Mar 2022 08:21:41 +0100
Subject: [PATCH] test_account excluded from pwforgotten

---
 copri4/main/src/Mod/APIfunc.pm      | 12 +++++++-----
 copri4/main/src/Mod/SMSTransport.pm |  2 +-
 copri4/main/src/Mod/Shareework.pm   | 10 +++++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm
index c86b5ac..3ae30b7 100755
--- a/copri4/main/src/Mod/APIfunc.pm
+++ b/copri4/main/src/Mod/APIfunc.pm
@@ -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
diff --git a/copri4/main/src/Mod/SMSTransport.pm b/copri4/main/src/Mod/SMSTransport.pm
index bad3412..da8263f 100755
--- a/copri4/main/src/Mod/SMSTransport.pm
+++ b/copri4/main/src/Mod/SMSTransport.pm
@@ -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");
diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm
index 6803104..cd146c8 100755
--- a/copri4/main/src/Mod/Shareework.pm
+++ b/copri4/main/src/Mod/Shareework.pm
@@ -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"`);
+ }
+
 }