Merge pull request #184 from cyklokoalicia/bug_fix2

Fix bike rent

actions-web.php

@@ -375,13 +375,13 @@ function userbikes($userId)
         $bicycles[] = $bikenum;
         $codes[] = str_pad($row['currentCode'], 4, '0', STR_PAD_LEFT);
         // get rented seconds and the old code
-        $result2 = $db->query("SELECT TIMESTAMPDIFF(SECOND, time, NOW()), parameter FROM history WHERE bikeNum=$bikenum AND action IN ('RENT','FORCERENT') ORDER BY time DESC LIMIT 2");
+        $result2 = $db->query("SELECT TIMESTAMPDIFF(SECOND, time, NOW()) as rentedSeconds, parameter FROM history WHERE bikeNum=$bikenum AND action IN ('RENT','FORCERENT') ORDER BY time DESC LIMIT 2");
 
-        $row2 = $result2->fetch_row();
-        $rentedseconds[] = $row2[0];
+        $row2 = $result2->fetchAssoc();
+        $rentedseconds[] = $row2['rentedSeconds'];
 
-        $row2 = $result2->fetch_row();
-        $oldcodes[] = str_pad($row2[1], 4, '0', STR_PAD_LEFT);
+        $row2 = $result2->fetchAssoc();
+        $oldcodes[] = str_pad($row2['parameter'], 4, '0', STR_PAD_LEFT);
     }
 
     if (!$result->num_rows) {

docker-compose.yml

@@ -49,3 +49,4 @@ services:
       - PMA_HOST=db
       - PMA_USER=root
       - PMA_PASSWORD=password
+      - UPLOAD_LIMIT=30M

src/Db/MysqliDbResult.php

@@ -44,6 +44,21 @@ public function rowCount()
         return $this->result ? (int)$this->result->num_rows : 0;
     }
 
+    /**
+     * @TODO temporary solution, should be removed
+     */
+    public function __call($name, $arguments)
+    {
+        if (method_exists($this->result, $name)) {
+            return call_user_func_array([$this->result, $name], $arguments);
+        } else {
+            throw new \Exception("Method $name not found");
+        }
+    }
+
+    /**
+     * @TODO temporary solution, should be removed
+     */
     public function __get($name)
     {
         if ($name === 'num_rows') {