Merge branch 'v1-1-0'

install/Installer.php

@@ -63,17 +63,6 @@ public static function appendConfig($data = array())
         fwrite($file, $currentConf);
         fclose($file);
 
-        // write init file
-        $newConf = file_get_contents(__DIR__.'/templates/init.php');
-        $file = fopen(__DIR__.'/../core/init.php', 'w+');
-
-        if (!$file) {
-            return false;
-        }
-
-        fwrite($file, $newConf);
-        fclose($file);
-
         return true;
 
     }   

update.php

@@ -806,8 +806,9 @@
     }
 
     $routes = Json::decode($routes);
+    $lastId = Route::lastId();
 
-    $sql = "INSERT INTO routes (fltnum, dep, arr, duration, aircraftid) VALUES";
+    $sql = "INSERT INTO routes (id, fltnum, dep, arr, duration) VALUES";
     $params = array();
     $j = 0;
     foreach ($routes as $item) {
@@ -824,11 +825,12 @@
         }
 
         $sql .= "\n(?, ?, ?, ?, ?),";
+        array_push($params, $lastId + $j + 1);
         array_push($params, $item["fltnum"]);
         array_push($params, $item["dep"]);
         array_push($params, $item["arr"]);
         array_push($params, $item["duration"]);
-        array_push($params, $item["aircraftid"]);
+        Route::addAircraft($lastId + $j + 1, $item["aircraftid"]);
 
         $j++;
     }

updates.json

@@ -297,5 +297,17 @@
         "queries": [],
         "deletedFiles": [],
         "newFolders": []
+    },
+    {
+        "tag": "v1.1.2",
+        "name": "Version 1.1.2",
+        "date": "2021-01-08",
+        "notes": "Various Bug Fixes",
+        "prerelease": false,
+        "useUpdater": true,
+        "files": ["admin/repair.php", "core/init.php", "update.php"],
+        "queries": [],
+        "deletedFiles": [],
+        "newFolders": []
     }
 ]

version.json

@@ -1,5 +1,5 @@
 {
-    "tag": "v1.1.1",
-    "name": "Version 1.1.1",
+    "tag": "v1.1.2",
+    "name": "Version 1.1.2",
     "prerelease": false
 }