diff --git a/actions-web.php b/actions-web.php
index c4edd97..aa8740d 100644
--- a/actions-web.php
+++ b/actions-web.php
@@ -206,13 +206,11 @@ function where($userId, $bike)
 
 function addnote($userId, $bikeNum, $message)
 {
-    global $db;
+    global $db, $user;
     $userNote = $db->escape(trim($message));
 
-    $result = $db->query("SELECT userName,number from users where userId='$userId'");
-    $row = $result->fetch_assoc();
-    $userName = $row['userName'];
-    $phone = $row['number'];
+    $userName = $user->findUserName($userId);
+    $phone = $user->findPhoneNumber($userId);
     $result = $db->query("SELECT stands.standName FROM bikes LEFT JOIN users on bikes.currentUser=users.userID LEFT JOIN stands on bikes.currentStand=stands.standId WHERE bikeNum=$bikeNum");
     $row = $result->fetch_assoc();
     $standName = $row['standName'];
diff --git a/src/Rent/RentSystemInterface.php b/src/Rent/RentSystemInterface.php
new file mode 100644
index 0000000..550ba4e
--- /dev/null
+++ b/src/Rent/RentSystemInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BikeShare\Rent;
+
+interface RentSystemInterface
+{
+    public function rentBike($userId, $bikeId, $force = false);
+
+    public function returnBike($userId, $bikeId, $standId, $note = '', $force = false);
+}
\ No newline at end of file
diff --git a/src/Rent/RentSystemQR.php b/src/Rent/RentSystemQR.php
new file mode 100644
index 0000000..1eccc47
--- /dev/null
+++ b/src/Rent/RentSystemQR.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace BikeShare\Rent;
+
+class RentSystemQR implements RentSystemInterface
+{
+    public function rentBike($userId, $bike, $force = false)
+    {
+        $force = false; #rent by qr code can not be forced
+        global $db, $forcestack, $watches, $user, $creditSystem;
+
+        $stacktopbike = false;
+        $bikeNum = intval($bike);
+
+        $result = $db->query("SELECT bikeNum FROM bikes WHERE bikeNum=$bikeNum");
+        if ($result->num_rows != 1) {
+            response(_('Bike') . ' ' . $bikeNum . ' ' . _('does not exist.'), ERROR);
+            return;
+        }
+
+        if ($force == false) {
+            if (!$creditSystem->isEnoughCreditForRent($userId)) {
+                $minRequiredCredit = $creditSystem->getMinRequiredCredit();
+                response(_('You are below required credit') . ' ' . $minRequiredCredit . $creditSystem->getCreditCurrency() . '. ' . _('Please, recharge your credit.'), ERROR);
+
+                return;
+            }
+
+            checktoomany(0, $userId);
+
+            $result = $db->query("SELECT count(*) as countRented FROM bikes where currentUser=$userId");
+            $row = $result->fetch_assoc();
+            $countRented = $row['countRented'];
+
+            $result = $db->query("SELECT userLimit FROM limits where userId=$userId");
+            $row = $result->fetch_assoc();
+            $limit = $row['userLimit'];
+
+            if ($countRented >= $limit) {
+                if ($limit == 0) {
+                    response(_('You can not rent any bikes. Contact the admins to lift the ban.'), ERROR);
+                } elseif ($limit == 1) {
+                    response(_('You can only rent') . ' ' . sprintf(ngettext('%d bike', '%d bikes', $limit), $limit) . ' ' . _('at once') . '.', ERROR);
+                } else {
+                    response(_('You can only rent') . ' ' . sprintf(ngettext('%d bike', '%d bikes', $limit), $limit) . ' ' . _('at once') . ' ' . _('and you have already rented') . ' ' . $limit . '.', ERROR);
+                }
+            }
+
+            if ($forcestack or $watches['stack']) {
+                $result = $db->query("SELECT currentStand FROM bikes WHERE bikeNum='$bike'");
+                $row = $result->fetch_assoc();
+                $standid = $row['currentStand'];
+                $stacktopbike = checktopofstack($standid);
+
+                $result = $db->query("SELECT serviceTag FROM stands WHERE standId='$standid'");
+                $row = $result->fetch_assoc();
+                $serviceTag = $row['serviceTag'];
+
+                if ($serviceTag != 0) {
+                    response(_('Renting from service stands is not allowed: The bike probably waits for a repair.'), ERROR);
+                }
+
+                if ($watches['stack'] and $stacktopbike != $bike) {
+                    $result = $db->query("SELECT standName FROM stands WHERE standId='$standid'");
+                    $row = $result->fetch_assoc();
+                    $stand = $row['standName'];
+                    $userName = $user->findUserName($userId);
+                    notifyAdmins(_('Bike') . ' ' . $bike . ' ' . _('rented out of stack by') . ' ' . $userName . '. ' . $stacktopbike . ' ' . _('was on the top of the stack at') . ' ' . $stand . '.', ERROR);
+                }
+                if ($forcestack and $stacktopbike != $bike) {
+                    response(_('Bike') . ' ' . $bike . ' ' . _('is not rentable now, you have to rent bike') . ' ' . $stacktopbike . ' ' . _('from this stand') . '.', ERROR);
+                }
+            }
+        }
+
+        $result = $db->query("SELECT currentUser,currentCode FROM bikes WHERE bikeNum=$bikeNum");
+        $row = $result->fetch_assoc();
+        $currentCode = sprintf('%04d', $row['currentCode']);
+        $currentUser = $row['currentUser'];
+        $result = $db->query("SELECT note FROM notes WHERE bikeNum='$bikeNum' AND deleted IS NULL ORDER BY time DESC");
+        $note = '';
+        while ($row = $result->fetch_assoc()) {
+            $note .= $row['note'] . '; ';
+        }
+        $note = substr($note, 0, strlen($note) - 2); // remove last two chars - comma and space
+
+        $newCode = sprintf('%04d', rand(100, 9900)); //do not create a code with more than one leading zero or more than two leading 9s (kind of unusual/unsafe).
+
+        if ($force == false) {
+            if ($currentUser == $userId) {
+                response(_('You have already rented the bike') . ' ' . $bikeNum . '. ' . _('Code is') . ' ' . $currentCode . '.', ERROR);
+                return;
+            }
+            if ($currentUser != 0) {
+                response(_('Bike') . ' ' . $bikeNum . ' ' . _('is already rented') . '.', ERROR);
+                return;
+            }
+        }
+
+        $message = '<h3>' . _('Bike') . ' ' . $bikeNum . ': <span class="label label-primary">' . _('Open with code') . ' ' . $currentCode . '.</span></h3>' . _('Change code immediately to') . ' <span class="label label-default" style="font-size: 16px;">' . $newCode . '</span><br />' . _('(open, rotate metal part, set new code, rotate metal part back)') . '.';
+        if ($note) {
+            $message .= '<br />' . _('Reported issue') . ': <em>' . $note . '</em>';
+        }
+
+        $result = $db->query("UPDATE bikes SET currentUser=$userId,currentCode=$newCode,currentStand=NULL WHERE bikeNum=$bikeNum");
+        if ($force == false) {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='RENT',parameter=$newCode");
+        } else {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='FORCERENT',parameter=$newCode");
+        }
+        response($message);
+    }
+
+    public function returnBike($userId, $bike, $stand, $note = '', $force = false)
+    {
+        $force = false; #return by qr code can not be forced
+        $note = ''; #note can not be provided via qr code
+
+        global $db, $connectors, $creditSystem;
+        $bikeNum = intval($bike);
+        $stand = strtoupper($stand);
+
+        $result = $db->query("SELECT standId FROM stands WHERE standName='$stand'");
+        if (!$result->num_rows) {
+            response(_('Stand name') . " '" . $stand . "' " . _('does not exist. Stands are marked by CAPITALLETTERS.'), ERROR);
+        }
+        $row = $result->fetch_assoc();
+        $standId = $row["standId"];
+
+        if ($force == false) {
+            $result = $db->query("SELECT bikeNum FROM bikes WHERE currentUser=$userId ORDER BY bikeNum");
+            $bikenumber = $result->num_rows;
+
+            if ($bikenumber == 0) {
+                response(_('You currently have no rented bikes.'), ERROR);
+            } elseif ($bikenumber > 1) {
+                $message = _('You have') . ' ' . $bikenumber . ' ' . _('rented bikes currently. QR code return can be used only when 1 bike is rented. Please, use web');
+                if ($connectors["sms"]) {
+                    $message .= _(' or SMS');
+                }
+                $message .= _(' to return the bikes.');
+                response($message, ERROR);
+            }
+        }
+
+        if ($force == false) {
+            $result = $db->query("SELECT currentCode FROM bikes WHERE currentUser=$userId AND bikeNum=$bikeNum");
+        } else {
+            $result = $db->query("SELECT currentCode FROM bikes WHERE bikeNum=$bikeNum");
+        }
+        $row = $result->fetch_assoc();
+        $currentCode = sprintf('%04d', $row['currentCode']);
+
+        $result = $db->query("UPDATE bikes SET currentUser=NULL,currentStand=$standId WHERE bikeNum=$bikeNum and currentUser=$userId");
+        if ($note) {
+            addNote($userId, $bikeNum, $note);
+        }
+
+        $message = '<h3>' . _('Bike') . ' ' . $bikeNum . ': <span class="label label-primary">' . _('Lock with code') . ' ' . $currentCode . '.</span></h3>';
+        $message .= '<br />' . _('Please') . ', <strong>' . _('rotate the lockpad to') . ' <span class="label label-default">0000</span></strong> ' . _('when leaving') . '.' . _('Wipe the bike clean if it is dirty, please') . '.';
+        if ($note) {
+            $message .= '<br />' . _('You have also reported this problem:') . ' ' . $note . '.';
+        }
+
+        if ($force == false) {
+            $creditchange = changecreditendrental($bikeNum, $userId);
+            if ($creditSystem->isEnabled() && $creditchange) {
+                $message .= '<br />' . _('Credit change') . ': -' . $creditchange . $creditSystem->getCreditCurrency() . '.';
+            }
+
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='RETURN',parameter=$standId");
+        } else {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='FORCERETURN',parameter=$standId");
+        }
+
+        response($message);
+    }
+}
\ No newline at end of file
diff --git a/src/Rent/RentSystemSms.php b/src/Rent/RentSystemSms.php
new file mode 100644
index 0000000..4de1e8b
--- /dev/null
+++ b/src/Rent/RentSystemSms.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace BikeShare\Rent;
+
+class RentSystemSms implements RentSystemInterface
+{
+    public function rentBike($number, $bike, $force = false)
+    {
+        global $db, $forcestack, $watches, $smsSender, $user, $creditSystem;
+
+        $stacktopbike = false;
+        $userId = $user->findUserIdByNumber($number);
+
+        $bikeNum = intval($bike);
+
+        $result = $db->query("SELECT bikeNum FROM bikes WHERE bikeNum=$bikeNum");
+        if ($result->num_rows != 1) {
+            $smsSender->send($number, "Bike $bikeNum does not exist.");
+            return;
+        }
+
+        if ($force == false) {
+            if (!$creditSystem->isEnoughCreditForRent($userId)) {
+                $minRequiredCredit = $creditSystem->getMinRequiredCredit();
+                $userRemainingCredit = $creditSystem->getUserCredit($userId);
+                $smsSender->send(
+                    $number,
+                    _('Please, recharge your credit:') . " " . $userRemainingCredit . $creditSystem->getCreditCurrency() . ". " . _('Credit required:') . " " . $minRequiredCredit . $creditSystem->getCreditCurrency() . "."
+                );
+                return;
+            }
+
+            checktoomany(0, $userId);
+
+            $result = $db->query("SELECT count(*) as countRented FROM bikes where currentUser=$userId");
+            $row = $result->fetch_assoc();
+            $countRented = $row['countRented'];
+
+            $result = $db->query("SELECT userLimit FROM limits where userId=$userId");
+            $row = $result->fetch_assoc();
+            $limit = $row['userLimit'];
+
+            if ($countRented >= $limit) {
+                if ($limit == 0) {
+                    $smsSender->send($number, _('You can not rent any bikes. Contact the admins to lift the ban.'));
+                } elseif ($limit == 1) {
+                    $smsSender->send($number, _('You can only rent') . ' ' . sprintf(ngettext('%d bike', '%d bikes', $limit), $limit) . ' ' . _('at once') . '.');
+                } else {
+                    $smsSender->send($number, _('You can only rent') . ' ' . sprintf(ngettext('%d bike', '%d bikes', $limit), $limit) . ' ' . _('at once') . ' ' . _('and you have already rented') . ' ' . $limit . '.');
+                }
+                return;
+            }
+
+            if ($forcestack or $watches['stack']) {
+                $result = $db->query("SELECT currentStand FROM bikes WHERE bikeNum='$bike'");
+                $row = $result->fetch_assoc();
+                $standid = $row['currentStand'];
+                $stacktopbike = checktopofstack($standid);
+
+                $result = $db->query("SELECT serviceTag FROM stands WHERE standId='$standid'");
+                $row = $result->fetch_assoc();
+                $serviceTag = $row['serviceTag'];
+
+                if ($serviceTag != 0) {
+                    $smsSender->send($number, "Renting from service stands is not allowed: The bike probably waits for a repair.");
+                    return;
+                }
+
+                if ($watches['stack'] and $stacktopbike != $bike) {
+                    $result = $db->query("SELECT standName FROM stands WHERE standId='$standid'");
+                    $row = $result->fetch_assoc();
+                    $stand = $row['standName'];
+                    $userName = $user->findUserName($userId);
+                    notifyAdmins(_('Bike') . ' ' . $bike . ' ' . _('rented out of stack by') . ' ' . $userName . '. ' . $stacktopbike . ' ' . _('was on the top of the stack at') . ' ' . $stand . '.', ERROR);
+                }
+                if ($forcestack and $stacktopbike != $bike) {
+                    $smsSender->send($number, _('Bike') . ' ' . $bike . ' ' . _('is not rentable now, you have to rent bike') . ' ' . $stacktopbike . ' ' . _('from this stand') . '.');
+                    return;
+                }
+            }
+        }
+
+        $result = $db->query("SELECT currentUser,currentCode FROM bikes WHERE bikeNum=$bikeNum");
+        $row = $result->fetch_assoc();
+        $currentCode = sprintf('%04d', $row['currentCode']);
+        $currentUser = $row['currentUser'];
+        $result = $db->query("SELECT note FROM notes WHERE bikeNum='$bikeNum' AND deleted IS NULL ORDER BY time DESC LIMIT 1");
+        $note = '';
+        while ($row = $result->fetch_assoc()) {
+            $note .= $row['note'] . '; ';
+        }
+        $note = substr($note, 0, strlen($note) - 2); // remove last two chars - comma and space
+
+        $newCode = sprintf('%04d', rand(100, 9900)); //do not create a code with more than one leading zero or more than two leading 9s (kind of unusual/unsafe).
+
+        if ($force == false) {
+            if ($currentUser == $userId) {
+                $smsSender->send($number, _('You have already rented the bike') . ' ' . $bikeNum . '. ' . _('Code is') . ' ' . $currentCode . '. ' . _('Return bike with command:') . ' RETURN ' . _('bikenumber') . ' ' . _('standname') . '.');
+                return;
+            }
+            if ($currentUser != 0) {
+                $smsSender->send($number, _('Bike') . ' ' . $bikeNum . ' ' . _('is already rented') . '.');
+                return;
+            }
+        }
+
+        $message = _('Bike') . ' ' . $bikeNum . ': ' . _('Open with code') . ' ' . $currentCode . '. ' . _('Change code immediately to') . ' ' . $newCode . ' ' . _('(open,rotate metal part,set new code,rotate metal part back)') . '.';
+        if ($note) {
+            $message .= '(' . _('bike note') . ':' . $note . ')';
+        }
+
+        $result = $db->query("UPDATE bikes SET currentUser=$userId,currentCode=$newCode,currentStand=NULL WHERE bikeNum=$bikeNum");
+        if ($force == false) {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='RENT',parameter=$newCode");
+        } else {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='FORCERENT',parameter=$newCode");
+            $smsSender->send($number, _('System override') . ": " . _('Your rented bike') . " " . $bikeNum . " " . _('has been rented by admin') . ".");
+        }
+        $smsSender->send($number, $message);
+    }
+
+    public function returnBike($number, $bike, $stand, $message = '', $force = false)
+    {
+        global $db, $smsSender, $user, $creditSystem;
+        $userId = $user->findUserIdByNumber($number);
+        $bikeNum = intval($bike);
+        $stand = strtoupper($stand);
+
+        $result = $db->query("SELECT standId FROM stands WHERE standName='$stand'");
+        if (!$result->num_rows) {
+            $smsSender->send($number, _('Stand name') . " '" . $stand . "' " . _('does not exist. Stands are marked by CAPITALLETTERS.'));
+            return;
+        }
+        $row = $result->fetch_assoc();
+        $standId = $row["standId"];
+
+        if ($force == false) {
+            $result = $db->query("SELECT bikeNum FROM bikes WHERE currentUser=$userId ORDER BY bikeNum");
+            $bikenumber = $result->num_rows;
+
+            if ($bikenumber == 0) {
+                $smsSender->send($number, _('You currently have no rented bikes.'));
+                return;
+            }
+
+            $listBikes = [];
+            while ($row = $result->fetch_assoc()) {
+                $listBikes[] = $row["bikeNum"];
+            }
+            if ($bikenumber > 1)  {
+                $listBikes = implode(',', $listBikes);
+            }
+        }
+
+        if ($force == false) {
+            $result = $db->query("SELECT currentCode FROM bikes WHERE currentUser=$userId AND bikeNum=$bikeNum");
+            if ($result->num_rows != 1) {
+                $smsSender->send($number, _('You does not have bike') . " " . $bikeNum . " rented. " . _('You have rented the following') . " " . sprintf(ngettext('%d bike', '%d bikes', $bikenumber), $bikenumber) . ": $listBikes");
+                return;
+            }
+        } else {
+            $result = $db->query("SELECT currentCode FROM bikes WHERE bikeNum=$bikeNum");
+            if ($result->num_rows != 1) {
+                $smsSender->send($number, _('Bike') . " " . $bikeNum . " " . _('is not rented. Saint Thomas, the patronus of all unrented bikes, prohibited returning unrented bikes.'));
+                return;
+            }
+        }
+        $row = $result->fetch_assoc();
+        $currentCode = sprintf('%04d', $row['currentCode']);
+
+        $result = $db->query("UPDATE bikes SET currentUser=NULL,currentStand=$standId WHERE bikeNum=$bikeNum");
+
+        if ($message) {
+            if (preg_match("/return[\s,\.]+[0-9]+[\s,\.]+[a-zA-Z0-9]+[\s,\.]+(.*)/i", $message, $matches)) {
+                $note = $db->escape(trim($matches[1]));
+            }
+
+            addnote($userId, $bikeNum, $note);
+        } else {
+            $result = $db->query("SELECT note FROM notes WHERE bikeNum=$bikeNum AND deleted IS NULL ORDER BY time DESC LIMIT 1");
+            $row = $result->fetch_assoc();
+            $note = $row["note"];
+        }
+
+        $message = _('Bike') . ' ' . $bikeNum . ' ' . _('returned to stand') . ' ' . $stand . '. ' . _('Make sure you set code to') . ' ' . $currentCode . '.';
+        if ($note) {
+            $message .= "(note:" . $note . ")";
+        }
+        $message .= " " . _('Rotate lockpad to 0000.');
+
+        if ($force == false) {
+            $creditchange = changecreditendrental($bikeNum, $userId);
+            if ($creditSystem->isEnabled() && $creditchange) {
+                $userRemainingCredit = $creditSystem->getUserCredit($userId) . $creditSystem->getCreditCurrency();
+                $message .= _('Credit') . ": " . $userRemainingCredit;
+                $message .= " (-" . $creditchange . ")" . ".";
+            }
+
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='RETURN',parameter=$standId");
+        } else {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='FORCERETURN',parameter=$standId");
+        }
+
+        $smsSender->send($number, $message);
+    }
+}
\ No newline at end of file
diff --git a/src/Rent/RentSystemWeb.php b/src/Rent/RentSystemWeb.php
new file mode 100644
index 0000000..06a6010
--- /dev/null
+++ b/src/Rent/RentSystemWeb.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace BikeShare\Rent;
+
+class RentSystemWeb implements RentSystemInterface
+{
+    public function rentBike($userId, $bike, $force = false)
+    {
+        global $db, $forcestack, $watches, $user, $creditSystem;
+
+        $stacktopbike = false;
+        $bikeNum = intval($bike);
+
+        $result = $db->query("SELECT bikeNum FROM bikes WHERE bikeNum=$bikeNum");
+        if ($result->num_rows != 1) {
+            response(_('Bike') . ' ' . $bikeNum . ' ' . _('does not exist.'), ERROR);
+            return;
+        }
+
+        if ($force == false) {
+            if (!$creditSystem->isEnoughCreditForRent($userId)) {
+                $minRequiredCredit = $creditSystem->getMinRequiredCredit();
+                response(_('You are below required credit') . ' ' . $minRequiredCredit . $creditSystem->getCreditCurrency() . '. ' . _('Please, recharge your credit.'), ERROR);
+
+                return;
+            }
+
+            checktoomany(0, $userId);
+
+            $result = $db->query("SELECT count(*) as countRented FROM bikes where currentUser=$userId");
+            $row = $result->fetch_assoc();
+            $countRented = $row['countRented'];
+
+            $result = $db->query("SELECT userLimit FROM limits where userId=$userId");
+            $row = $result->fetch_assoc();
+            $limit = $row['userLimit'];
+
+            if ($countRented >= $limit) {
+                if ($limit == 0) {
+                    response(_('You can not rent any bikes. Contact the admins to lift the ban.'), ERROR);
+                } elseif ($limit == 1) {
+                    response(_('You can only rent') . ' ' . sprintf(ngettext('%d bike', '%d bikes', $limit), $limit) . ' ' . _('at once') . '.', ERROR);
+                } else {
+                    response(_('You can only rent') . ' ' . sprintf(ngettext('%d bike', '%d bikes', $limit), $limit) . ' ' . _('at once') . ' ' . _('and you have already rented') . ' ' . $limit . '.', ERROR);
+                }
+            }
+
+            if ($forcestack or $watches['stack']) {
+                $result = $db->query("SELECT currentStand FROM bikes WHERE bikeNum='$bike'");
+                $row = $result->fetch_assoc();
+                $standid = $row['currentStand'];
+                $stacktopbike = checktopofstack($standid);
+
+                $result = $db->query("SELECT serviceTag FROM stands WHERE standId='$standid'");
+                $row = $result->fetch_assoc();
+                $serviceTag = $row['serviceTag'];
+
+                if ($serviceTag != 0) {
+                    response(_('Renting from service stands is not allowed: The bike probably waits for a repair.'), ERROR);
+                }
+
+                if ($watches['stack'] and $stacktopbike != $bike) {
+                    $result = $db->query("SELECT standName FROM stands WHERE standId='$standid'");
+                    $row = $result->fetch_assoc();
+                    $stand = $row['standName'];
+                    $userName = $user->findUserName($userId);
+                    notifyAdmins(_('Bike') . ' ' . $bike . ' ' . _('rented out of stack by') . ' ' . $userName . '. ' . $stacktopbike . ' ' . _('was on the top of the stack at') . ' ' . $stand . '.', ERROR);
+                }
+                if ($forcestack and $stacktopbike != $bike) {
+                    response(_('Bike') . ' ' . $bike . ' ' . _('is not rentable now, you have to rent bike') . ' ' . $stacktopbike . ' ' . _('from this stand') . '.', ERROR);
+                }
+            }
+        }
+
+        $result = $db->query("SELECT currentUser,currentCode FROM bikes WHERE bikeNum=$bikeNum");
+        $row = $result->fetch_assoc();
+        $currentCode = sprintf('%04d', $row['currentCode']);
+        $currentUser = $row['currentUser'];
+        $result = $db->query("SELECT note FROM notes WHERE bikeNum='$bikeNum' AND deleted IS NULL ORDER BY time DESC");
+        $note = '';
+        while ($row = $result->fetch_assoc()) {
+            $note .= $row['note'] . '; ';
+        }
+        $note = substr($note, 0, strlen($note) - 2); // remove last two chars - comma and space
+
+        $newCode = sprintf('%04d', rand(100, 9900)); //do not create a code with more than one leading zero or more than two leading 9s (kind of unusual/unsafe).
+
+        if ($force == false) {
+            if ($currentUser == $userId) {
+                response(_('You have already rented the bike') . ' ' . $bikeNum . '. ' . _('Code is') . ' ' . $currentCode . '.', ERROR);
+                return;
+            }
+            if ($currentUser != 0) {
+                response(_('Bike') . ' ' . $bikeNum . ' ' . _('is already rented') . '.', ERROR);
+                return;
+            }
+        }
+
+        $message = '<h3>' . _('Bike') . ' ' . $bikeNum . ': <span class="label label-primary">' . _('Open with code') . ' ' . $currentCode . '.</span></h3>' . _('Change code immediately to') . ' <span class="label label-default" style="font-size: 16px;">' . $newCode . '</span><br />' . _('(open, rotate metal part, set new code, rotate metal part back)') . '.';
+        if ($note) {
+            $message .= '<br />' . _('Reported issue') . ': <em>' . $note . '</em>';
+        }
+
+        $result = $db->query("UPDATE bikes SET currentUser=$userId,currentCode=$newCode,currentStand=NULL WHERE bikeNum=$bikeNum");
+        if ($force == false) {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='RENT',parameter=$newCode");
+        } else {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='FORCERENT',parameter=$newCode");
+        }
+        response($message);
+    }
+
+    public function returnBike($userId, $bike, $stand, $note = '', $force = false)
+    {
+        global $db, $creditSystem;
+        $bikeNum = intval($bike);
+        $stand = strtoupper($stand);
+
+        $result = $db->query("SELECT standId FROM stands WHERE standName='$stand'");
+        if (!$result->num_rows) {
+            response(_('Stand name') . " '" . $stand . "' " . _('does not exist. Stands are marked by CAPITALLETTERS.'), ERROR);
+        }
+        $row = $result->fetch_assoc();
+        $standId = $row["standId"];
+
+        if ($force == false) {
+            $result = $db->query("SELECT bikeNum FROM bikes WHERE currentUser=$userId ORDER BY bikeNum");
+            $bikenumber = $result->num_rows;
+
+            if ($bikenumber == 0) {
+                response(_('You currently have no rented bikes.'), ERROR);
+            }
+        }
+
+        if ($force == false) {
+            $result = $db->query("SELECT currentCode FROM bikes WHERE currentUser=$userId AND bikeNum=$bikeNum");
+        } else {
+            $result = $db->query("SELECT currentCode FROM bikes WHERE bikeNum=$bikeNum");
+        }
+        $row = $result->fetch_assoc();
+        $currentCode = sprintf('%04d', $row['currentCode']);
+
+        $result = $db->query("UPDATE bikes SET currentUser=NULL,currentStand=$standId WHERE bikeNum=$bikeNum and currentUser=$userId");
+        if ($note) {
+            addNote($userId, $bikeNum, $note);
+        }
+
+        $message = '<h3>' . _('Bike') . ' ' . $bikeNum . ': <span class="label label-primary">' . _('Lock with code') . ' ' . $currentCode . '.</span></h3>';
+        $message .= '<br />' . _('Please') . ', <strong>' . _('rotate the lockpad to') . ' <span class="label label-default">0000</span></strong> ' . _('when leaving') . '.' . _('Wipe the bike clean if it is dirty, please') . '.';
+        if ($note) {
+            $message .= '<br />' . _('You have also reported this problem:') . ' ' . $note . '.';
+        }
+
+        if ($force == false) {
+            $creditchange = changecreditendrental($bikeNum, $userId);
+            if ($creditSystem->isEnabled() && $creditchange) {
+                $message .= '<br />' . _('Credit change') . ': -' . $creditchange . $creditSystem->getCreditCurrency() . '.';
+            }
+
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='RETURN',parameter=$standId");
+        } else {
+            $result = $db->query("INSERT INTO history SET userId=$userId,bikeNum=$bikeNum,action='FORCERETURN',parameter=$standId");
+        }
+
+        response($message);
+    }
+}
\ No newline at end of file