Merge pull request #415 from va-net/beta

v2.0.1
va-net · Sep 6, 2021 · 43dca51 · 43dca51
2 parents 1e1aabe + a4058d7
commit 43dca51
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 47 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -3,46 +3,48 @@ description: File a bug report
 labels: [bug]
 assignees: []
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report! 
-        If your issue is a design issue or otherwise requires screenshots, please post them as a reply once the issue is created.
-  - type: textarea
-    id: description
-    attributes:
-      label: Bug Description
-      description: Please describe the bug in great detail. Ensure you are clear and concise. 
-    validations:
-      required: true
-  - type: textarea
-    id: repro-steps
-    attributes:
-      label: Steps to Reproduce
-      description: How can we reproduce this bug?
-      value: |
-        1. ...
-        2. ...
-        3. ...
-    validations:
-      required: true
-  - type: input
-    id: expected-behavior
-    attributes:
-      label: Expected Behavior
-      description: What did you expect to happen?
-    validations:
-      required: true
-  - type: dropdown
-    id: version
-    attributes:
-      label: Flare Version
-      description: This can be found in Site Settings under Updater. If you are not on the latest version, please update then check if the bug is still present.
-      options:
-        - v1.2.9
-        - v2.0.0-beta
-  - type: textarea
-    id: notes
-    attributes:
-      label: Additional Information
-      description: Anything else you think we should know?
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to fill out this bug report! 
+              If your issue is a design issue or otherwise requires screenshots, please post them as a reply once the issue is created.
+    - type: textarea
+      id: description
+      attributes:
+          label: Bug Description
+          description: Please describe the bug in great detail. Ensure you are clear and concise.
+      validations:
+          required: true
+    - type: textarea
+      id: repro-steps
+      attributes:
+          label: Steps to Reproduce
+          description: How can we reproduce this bug?
+          value: |
+              1. ...
+              2. ...
+              3. ...
+      validations:
+          required: true
+    - type: input
+      id: expected-behavior
+      attributes:
+          label: Expected Behavior
+          description: What did you expect to happen?
+      validations:
+          required: true
+    - type: dropdown
+      id: version
+      attributes:
+          label: Flare Version
+          description: This can be found in Site Settings under Updater. If you are not on the latest version, please update then check if the bug is still present.
+          options:
+              - v2.0.0
+              - v2.1.0-beta
+      validations:
+          required: true
+    - type: textarea
+      id: notes
+      attributes:
+          label: Additional Information
+          description: Anything else you think we should know?
diff --git a/api.php b/api.php
@@ -1066,6 +1066,32 @@ function accessDenied()
         Config::replace('CHECK_PRERELEASE', $v['prerelease'] ? '1' : '0');
     }
 
+    // Remove old plugins
+    $files = [
+        'classes/ActivityPlugin.php',
+        'admin/activity.php',
+        'admin/activity_settings.php',
+        'admin/loa.php',
+        'leave.php',
+        'classes/Example.php',
+        'admin/exampleplugin.php',
+        'classes/HubsPlugin.php',
+        'admin/hubs_plugin.php',
+        'hub.php',
+        'classes/MenuPlugin.php',
+        'admin/menu_plugin.php',
+        'classes/NotifyPlugin.php',
+        'admin/notify_plugin.php',
+        'classes/SecurityPlugin.php',
+        'admin/security_plugin.php',
+        'temppass.php'
+    ];
+    foreach ($files as $file) {
+        if (file_exists(__DIR__ . '/' . $file)) {
+            unlink(__DIR__ . '/' . $file);
+        }
+    }
+
     echo Json::encode([
         'status' => ErrorCode::NoError,
         'result' => null,

diff --git a/classes/controllers/admin/OperationsController.php b/classes/controllers/admin/OperationsController.php
@@ -259,6 +259,7 @@ private function import_choose()
             Session::flash('error', 'Upload failed. Maybe your file is too big?');
             $this->redirect('/admin/operations/routes/import');
         }
+
         $route_data = file_get_contents($file["tmp_name"]);
         preg_match_all('/\r?\n.*/m', $route_data, $routelines);
         $data->routes = array_map(function ($l) {
@@ -276,6 +277,16 @@ private function import_choose()
                 "aircraftid" => $segments[5]
             );
         }, $routelines[0]);
+
+        foreach ($data->routes as $r) {
+            foreach ($r as $k => $v) {
+                if (strlen($v) < 1) {
+                    Session::flash('error', 'Invalid CSV File');
+                    $this->import_get();
+                }
+            }
+        }
+
         $this->render('admin/import_choose', $data);
     }
 

diff --git a/themes/default/views/admin/recruitment.php b/themes/default/views/admin/recruitment.php
@@ -178,7 +178,7 @@
                                             </button>
                                         </div>
                                         <div class="modal-body">
-                                            <form action="/admin/users/pending" method="post" id="declinemodal">
+                                            <form action="/admin/users/pending" method="post" id="declinemodal<?= $x ?>-form">
                                                 <input hidden class="form-control" name="action" value="declineapplication" />
                                                 <input hidden class="form-control" name="id" value="<?= $user['id'] ?>">
                                                 <div class="form-group">
@@ -188,7 +188,7 @@
                                             </form>
                                         </div>
                                         <div class="modal-footer">
-                                            <button class="btn btn-danger" form="declinemodal" type="submit">Decline</button>
+                                            <button class="btn btn-danger" form="declinemodal<?= $x ?>-form" type="submit">Decline</button>
                                             <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                                         </div>
                                     </div>

diff --git a/updates.json b/updates.json
@@ -1100,5 +1100,21 @@
             "themes/tailwind/includes",
             "themes/tailwind/views"
         ]
+    },
+    {
+        "tag": "v2.0.1",
+        "name": "Version 2.0.1",
+        "date": "2021-09-06",
+        "notes": "Various bug fixes",
+        "prerelease": false,
+        "useUpdater": true,
+        "files": [
+            "themes/default/views/admin/recruitment.php",
+            "api.php",
+            "classes/controllers/admin/OperationsController.php"
+        ],
+        "queries": [],
+        "deletedFiles": [],
+        "newFolders": []
     }
 ]
diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-    "tag": "v2.0.0",
-    "name": "Version 2.0.0",
+    "tag": "v2.0.1",
+    "name": "Version 2.0.1",
     "prerelease": false
 }