Various Fixes & Version Info

va-net · Dec 31, 2024 · 54424a9 · 54424a9
1 parent eebf73c
commit 54424a9
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 9 deletions.
diff --git a/api.php b/api.php
@@ -867,7 +867,7 @@ function accessDenied()
         $ac = -1;
         if (!array_key_exists($route['aircraftLiveryId'], $dbaircraft)) {
             Aircraft::add($route['aircraftLiveryId'], $lowrank->id);
-            $ac = Aircraft::nextId() - 1;
+            $ac = Aircraft::lastId();
         } else {
             $ac = $dbaircraft[$route['aircraftLiveryId']]->id;
         }
@@ -877,7 +877,7 @@ function accessDenied()
             'arr' => $route['arrivalIcao'],
             'duration' => $route['flightTime'],
         ]);
-        Route::addAircraft(Route::nextId() - 1, $ac);
+        Route::addAircraft(Route::lastId(), $ac);
     }
     VANet::deleteCodeshare($codeshare["id"]);
     Cache::delete('badge_codeshares');
@@ -1069,7 +1069,7 @@ function accessDenied()
         "arr" => Input::get('arr'),
         "duration" => Input::get('duration'),
     ]);
-    $routeId = Route::nextId() - 1;
+    $routeId = Route::lastId();
     foreach (Input::get('aircraft') as $a) {
         Route::addAircraft($routeId, $a);
     }

diff --git a/classes/controllers/OauthController.php b/classes/controllers/OauthController.php
@@ -94,7 +94,7 @@ public function auth_callback()
         if ($user->vanetLogin($profile['sub'])) {
             if (!$user->data()->vanet_memberid) VANet::refreshMembership($user);
             $this->redirect(Session::exists('login_redirect') ? Session::get('login_redirect') : '/home');
-        } elseif (!$profile['vanet_admin']) {
+        } elseif ($profile['vanet_admin']) {
             $id = User::nextId();
             $user->create([
                 'id' => $id,

diff --git a/classes/controllers/admin/AdminRoutesController.php b/classes/controllers/admin/AdminRoutesController.php
@@ -124,7 +124,7 @@ private function create()
             "duration" => Time::strToSecs(Input::get('duration')),
             "notes" => $notes,
         ]);
-        $id = Route::nextId() - 1;
+        $id = Route::lastId();
         foreach (explode(',', Input::get('aircraft')) as $acId) {
             Route::addAircraft($id, $acId);
         }

diff --git a/classes/controllers/admin/CodesharesController.php b/classes/controllers/admin/CodesharesController.php
@@ -126,7 +126,7 @@ private function import()
             $ac = -1;
             if (!array_key_exists($route['aircraftLiveryId'], $dbaircraft)) {
                 Aircraft::add($route['aircraftLiveryId'], $lowrank->id);
-                $ac = Aircraft::nextId() - 1;
+                $ac = Aircraft::lastId();
             } else {
                 $ac = $dbaircraft[$route['aircraftLiveryId']]->id;
             }
@@ -136,7 +136,7 @@ private function import()
                 'arr' => $route['arrivalIcao'],
                 'duration' => $route['flightTime'],
             ]);
-            Route::addAircraft(Route::nextId() - 1, $ac);
+            Route::addAircraft(Route::lastId(), $ac);
         }
         VANet::deleteCodeshare($codeshare["id"]);
         Cache::delete('badge_codeshares');

diff --git a/classes/data/Aircraft.php b/classes/data/Aircraft.php
@@ -318,6 +318,16 @@ public static function nextId()
         return $table->Auto_increment;
     }
 
+    /**
+     * @return int
+     */
+    public static function lastId()
+    {
+        self::init();
+        $data = self::$_db->query("SELECT MAX(id) AS value FROM aircraft")->results();
+        return $data[0]->value;
+    }
+
     public static function unlockedAtRank($rankId)
     {
         self::init();

diff --git a/classes/data/Route.php b/classes/data/Route.php
@@ -148,6 +148,16 @@ public static function nextId()
         return $table->Auto_increment;
     }
 
+    /**
+     * @return int
+     */
+    public static function lastId()
+    {
+        self::init();
+        $data = self::$_db->query("SELECT MAX(id) AS value FROM routes")->results();
+        return $data[0]->value;
+    }
+
     /**
      * @return array
      * @param int $fltnum Flight Number

diff --git a/updates.json b/updates.json
@@ -1629,5 +1629,24 @@
         "queries": [],
         "deletedFiles": [],
         "newFolders": []
+    },
+    {
+        "tag": "v2.5.8",
+        "name": "Version 2.5.8",
+        "date": "2024-12-31",
+        "notes": "Various bug fixes",
+        "prerelease": false,
+        "useUpdater": true,
+        "files": [
+            "classes/controllers/admin/RoutesController.php",
+            "classes/data/Route.php",
+            "classes/controllers/admin/CodesharesController.php",
+            "classes/controllers/OauthController.php",
+            "classes/data/Aircraft.php",
+            "api.php"
+        ],
+        "queries": [],
+        "deletedFiles": [],
+        "newFolders": []
     }
 ]
diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-    "tag": "v2.5.7",
-    "name": "Version 2.5.7",
+    "tag": "v2.5.8",
+    "name": "Version 2.5.8",
     "prerelease": false
 }