Updated 5 files, added login/android/index.php and deleted .idea/jsLibraryMappings.xml (automated)

7 files changed, 47 insertions, 10 deletions

diff --git a/.idea/delta.iml b/.idea/delta.iml
index 456fa0e..f8d023a 100644
--- a/.idea/delta.iml
+++ b/.idea/delta.iml
@@ -6,6 +6,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="bootstrap" level="application" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
deleted file mode 100644
index b843835..0000000
--- a/.idea/jsLibraryMappings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="PROJECT" libraries="{bootstrap}" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/includes/header.php b/includes/header.php
index d08f029..b6d3254 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -15,6 +15,11 @@ if (isset($_PROFILE)) {
 require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/functions.php";
 initLang();
 
+if (isset($_COOKIE["DeltaHandoffPalette"]) && !str_starts_with($_SERVER['REQUEST_URI'], "/login")) {
+    header("Location: /login/android/");
+    die();
+}
+
 $palettes = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/themes.json"), true);
 
 if (isset($_PROFILE)) {
diff --git a/lang/en.json b/lang/en.json
index 10505af..068f20b 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -605,7 +605,16 @@
     "end": [
       "The Delta Android app is going away.",
       "We are discontinuing the Delta mobile application soon. Please use Delta in your web browser instead from now on."
-    ]
+    ],
+    "bye": {
+      "title": "This app is not functional anymore",
+      "text": [
+        "Thank you for your continued support of the Delta for Android platform.",
+        "Unfortunately, the Delta for Android application has now been discontinued and will not be working anymore. You are strongly invited to use Delta in another way instead.",
+        "To use Delta in your default web browser, enter \"delta.equestria.dev\" as the address and log in again from there. Note that you will not be getting mobile notifications from your browser.",
+        "You may now close this app and uninstall it."
+      ]
+    }
   },
   "support": {
     "title": "Help center",
diff --git a/lang/fr.json b/lang/fr.json
index ef291db..13e8359 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -605,7 +605,16 @@
     "end": [
       "L'application Delta Android s'en va.",
       "Nous arrêtons l'application mobile Delta prochainement. Merci d'utiliser Delta dans votre navigateur Web dès à présent."
-    ]
+    ],
+    "bye": {
+      "title": "Cette application ne fonctionne plus désormais",
+      "text": [
+        "Merci pour votre long soutien envers la plateforme Delta pour Android.",
+        "Malheurseuement, l'application Delta pour Android a été abandonnée et ne pourra plus fonctionner à nouveau. Vous êtes fortement invité·e à utiliser Delta d'une autre façon désormais.",
+        "Pour utiliser Delta depuis votre navigateur Web par défaut, entrez « delta.equestria.dev » comme adresse et connectez-vous de nouveau à cet endroit. Notez que vous ne recevrez pas de notifications mobiles depuis votre navigateur.",
+        "Vous pouvez maintenant fermer cette application et la désinstaller."
+      ]
+    }
   },
   "support": {
     "title": "Centre d'aide",
diff --git a/login/android/index.php b/login/android/index.php
new file mode 100644
index 0000000..4151f1a
--- /dev/null
+++ b/login/android/index.php
@@ -0,0 +1,21 @@
+<?php
+
+$title = "lang_mobile_bye_title";
+require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php";
+require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php";
+global $_PROFILE; global $_USER; global $unreadAlerts;
+
+?>
+
+    <div class="container">
+        <br><br><br>
+        <div class="alert alert-danger">
+            <p><?= l("lang_mobile_bye_text_0") ?></p>
+            <p><?= l("lang_mobile_bye_text_1") ?></p>
+            <p><?= l("lang_mobile_bye_text_2") ?></p>
+            <?= l("lang_mobile_bye_text_3") ?>
+        </div>
+    </div>
+
+<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php"; ?>
\ No newline at end of file
diff --git a/version b/version
index e3d01e4..303cf7f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-5.2.22
\ No newline at end of file
+5.2.23
\ No newline at end of file