rent system fixes

cyklokoalicia · May 25, 2024 · 529726f · 529726f
1 parent ae5f9c4
commit 529726f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/docker-data/php/override.ini b/docker-data/php/override.ini
@@ -1,2 +1,2 @@
 [Date]
-date.timezone = UTC
+date.timezone = "UTC"
diff --git a/receive.php b/receive.php
@@ -1,9 +1,9 @@
 <?php
 
+use BikeShare\Authentication\Auth;
 use BikeShare\Db\DbInterface;
 use BikeShare\Rent\RentSystemFactory;
 use BikeShare\Rent\RentSystemInterface;
-use BikeShare\Rent\RentSystemSms;
 use BikeShare\SmsConnector\SmsConnectorInterface;
 use Psr\Log\LoggerInterface;
 
@@ -15,7 +15,9 @@
  * @var SmsConnectorInterface $sms
  * @var LoggerInterface $logger
  * @var DbInterface $db
+ * @var Auth $auth
  */
+$auth = new Auth($db);
 log_sms($sms->getUUID(),$sms->getNumber(),$sms->getTime(),$sms->getMessage(),$sms->getIPAddress());
 
 /**

diff --git a/scan.php b/scan.php
@@ -49,7 +49,7 @@
         checkbikeno($bikeno);
         if (!empty($_POST['rent']) && $_POST['rent'] == "yes") {
             $result = $rentSystem->rentBike($userid, $bikeno);
-            response($result['message'], $result['error'], 0);
+            response($result['content'], $result['error'], 0);
         } else {
             showrentform($userid, $bikeno);
         }
@@ -59,7 +59,7 @@
         $stand = $parameter;
         checkstandname($stand);
         $result = $rentSystem->returnBike($userid, 0, $stand);
-        response($result['message'], $result['error'], 0);
+        response($result['content'], $result['error'], 0);
         break;
     default:
         unrecognizedqrcode();

diff --git a/src/Rent/RentSystemSms.php b/src/Rent/RentSystemSms.php
@@ -72,6 +72,8 @@ public function returnBike($number, $bikeId, $standName, $note = '', $force = fa
 
         if (preg_match("/return[\s,\.]+[0-9]+[\s,\.]+[a-zA-Z0-9]+[\s,\.]+(.*)/i", $note, $matches)) {
             $note = $this->db->escape(trim($matches[1]));
+        } else {
+            $note = '';
         }
 
         return parent::returnBike($userId, $bikeId, $standName, $note, $force);