Updated 8 files (automated)

8 files changed, 25 insertions, 23 deletions

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 9c9d978..02a0456 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="zephyrheights" remoteFilesAllowedToDisappearOnAutoupload="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="dabssi" remoteFilesAllowedToDisappearOnAutoupload="false">
     <serverData>
-      <paths name="zephyrheights">
+      <paths name="dabssi">
         <serverdata>
           <mappings>
-            <mapping deploy="/mnt/delta" local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/pool/web/delta" local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
diff --git a/includes/email.php b/includes/email.php
index a85d5f6..89c3710 100644
--- a/includes/email.php
+++ b/includes/email.php
@@ -20,7 +20,7 @@ function sendCode($email, $code) {
     $mail->SMTPSecure = "none";
     $mail->Port = 587;
 
-    $mail->setFrom('delta@auto.minteck.org', 'Delta');
+    $mail->setFrom('delta@equestria.dev', 'Delta');
     $mail->addAddress($email);
     $mail->addReplyTo(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email")), 'Equestria.dev');
 
@@ -51,7 +51,7 @@ function sendRegistration($email, $name, $id) {
     $mail->SMTPSecure = "none";
     $mail->Port = 587;
 
-    $mail->setFrom('delta@auto.minteck.org', 'Delta');
+    $mail->setFrom('delta@equestria.dev', 'Delta');
     $mail->addAddress($email);
     $mail->addReplyTo(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email")), 'Equestria.dev');
 
@@ -83,7 +83,7 @@ function sendRegistrationApproval($email, $name, $id) {
     $mail->SMTPSecure = "none";
     $mail->Port = 587;
 
-    $mail->setFrom('delta@auto.minteck.org', 'Delta');
+    $mail->setFrom('delta@equestria.dev', 'Delta');
     $mail->addAddress($email);
     $mail->addReplyTo(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email")), 'Equestria.dev');
 
@@ -115,7 +115,7 @@ function sendRegistrationRejection($email, $name, $id, $reason) {
     $mail->SMTPSecure = "none";
     $mail->Port = 587;
 
-    $mail->setFrom('delta@auto.minteck.org', 'Delta');
+    $mail->setFrom('delta@equestria.dev', 'Delta');
     $mail->addAddress($email);
     $mail->addReplyTo(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email")), 'Equestria.dev');
 
@@ -167,7 +167,7 @@ function sendPlanUpdate($email, $plan) {
     $mail->SMTPSecure = "none";
     $mail->Port = 587;
 
-    $mail->setFrom('delta@auto.minteck.org', 'Delta');
+    $mail->setFrom('delta@equestria.dev', 'Delta');
     $mail->addAddress($email);
     $mail->addReplyTo(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email")), 'Equestria.dev');
 
@@ -199,7 +199,7 @@ function sendAlerts($email, $alerts) {
     $mail->SMTPSecure = "none";
     $mail->Port = 587;
 
-    $mail->setFrom('delta@auto.minteck.org', 'Delta');
+    $mail->setFrom('delta@equestria.dev', 'Delta');
     $mail->addAddress($email);
     $mail->addReplyTo(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email")), 'Equestria.dev');
 
@@ -243,7 +243,7 @@ function sendLogin($email) {
     $mail->SMTPSecure = "none";
     $mail->Port = 587;
 
-    $mail->setFrom('delta@auto.minteck.org', 'Delta');
+    $mail->setFrom('delta@equestria.dev', 'Delta');
     $mail->addAddress($email);
     $mail->addReplyTo(trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/email")), 'Equestria.dev');
 
diff --git a/includes/jobs-handler.php b/includes/jobs-handler.php
index 5639091..75a31dd 100644
--- a/includes/jobs-handler.php
+++ b/includes/jobs-handler.php
@@ -17,6 +17,8 @@ $list = array_filter(scandir($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profile
 
 foreach ($list as $file) {
     $data = json_decode(pf_utf8_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/profiles/$file")), true);
+    if (is_null($data)) continue;
+
     genLang($data["language"]);
 
     println($data["first_name"], " ", $data["last_name"]);
diff --git a/lang/en.json b/lang/en.json
index 068f20b..c002ba6 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -288,7 +288,7 @@
     "change": "Change subscription",
     "notice": "Current subscription is %1. May require a Delta coins balance.",
     "perks": "What do we get with Delta Plus (for 4 coins a month)?",
-    "perks2": "Delta Ultra adds all of this for 8 coins a month:",
+    "perks2": "Delta Ultra adds all of this for 7 coins a month:",
     "list": [
       {
         "title": "Free technical support",
diff --git a/lang/fr.json b/lang/fr.json
index 13e8359..6cb0322 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -288,7 +288,7 @@
     "change": "Changer d'offre",
     "notice": "L'offre actuelle est %1. Peut nécessiter un solde de pièces.",
     "perks": "Qu'est-ce que nous obtenons avec Delta Plus (pour 4 pièces par mois) ?",
-    "perks2": "Delta Ultra ajoute tout ça pour 8 pièces par mois :",
+    "perks2": "Delta Ultra ajoute tout ça pour 7 pièces par mois :",
     "list": [
       {
         "title": "Support technique gratuit",
diff --git a/plus/index.php b/plus/index.php
index cf046cf..8fdd3a5 100644
--- a/plus/index.php
+++ b/plus/index.php
@@ -124,7 +124,7 @@ $age = (int)(explode(" ", timeAgo($_PROFILE["birth"] ?? "1990-01-01", false, tru
                 </div>
             </div>
 
-            <div class="promo-wrapper promo-ultra">
+            <!--<div class="promo-wrapper promo-ultra">
                 <div class="card promo-item">
                     <div class="card-body">
                         <img src="/icons/smartphone.svg" style="width: 48px;"><br>
@@ -132,7 +132,7 @@ $age = (int)(explode(" ", timeAgo($_PROFILE["birth"] ?? "1990-01-01", false, tru
                         <span><?= str_replace("%1", "<sup>7</sup>", l("lang_plus_list_7_description")) ?></span>
                     </div>
                 </div>
-            </div>
+            </div>-->
 
             <div class="promo-wrapper promo-ultra">
                 <div class="card promo-item">
diff --git a/plus/subscribe/index.php b/plus/subscribe/index.php
index 599f5c3..afb8cb1 100644
--- a/plus/subscribe/index.php
+++ b/plus/subscribe/index.php
@@ -44,11 +44,11 @@ if (isset($_GET["plan"])) {
 
         if ($_GET["plan"] === "delta") $planTarget = 0 and $planTargetName = "Delta Free"  and $planTargetCost = 0;
         if ($_GET["plan"] === "plus")  $planTarget = 1 and $planTargetName = "Delta Plus"  and $planTargetCost = $price;
-        if ($_GET["plan"] === "ultra") $planTarget = 2 and $planTargetName = "Delta Ultra" and $planTargetCost = $price * 2;
+        if ($_GET["plan"] === "ultra") $planTarget = 2 and $planTargetName = "Delta Ultra" and $planTargetCost = $price * 1.75;
 
-        if ($currentPlan === 0 && $planTarget === 1) $updateCost = 4;
-        if ($currentPlan === 0 && $planTarget === 2) $updateCost = 8;
-        if ($currentPlan === 1 && $planTarget === 2) $updateCost = 4;
+        if ($currentPlan === 0 && $planTarget === 1) $updateCost = 3;
+        if ($currentPlan === 0 && $planTarget === 2) $updateCost = 7;
+        if ($currentPlan === 1 && $planTarget === 2) $updateCost = 3;
 
         $updatePossible = $_PROFILE["balance"] === -1 || $_PROFILE["balance"] - $updateCost >= 0;
     }
@@ -168,7 +168,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php";
                         <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_4_pretty") ?></li>
                         <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_5_pretty") ?></li>
                         <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_6_pretty") ?></li>
-                        <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>
+                        <!--<li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>-->
                     </ul>
 
                     <?php if (!$_PROFILE["plus"]): ?>
@@ -201,7 +201,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php";
                         <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_5_pretty") ?></li>
                         <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_0_pretty") ?></li>
                         <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_6_pretty") ?></li>
-                        <li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>
+                        <!--<li class="plus-compare-placeholder" style="opacity:0;"><?= l("lang_plus_list_7_pretty") ?></li>-->
                     </ul>
 
                     <?php if ($_PROFILE["plus"] && !$_PROFILE["ultra"]): ?>
@@ -236,7 +236,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php";
                         <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_5_pretty") ?></li>
                         <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_0_pretty") ?></li>
                         <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_6_pretty") ?></li>
-                        <li style="color: var(--bs-link-color);"><?= l("lang_plus_list_7_pretty") ?></li>
+                        <!--<li style="color: var(--bs-link-color);"><?= l("lang_plus_list_7_pretty") ?></li>-->
                     </ul>
 
                     <?php if ($_PROFILE["plus"] && $_PROFILE["ultra"]): ?>
@@ -245,7 +245,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/navigation.php";
                         <a href="/plus/subscribe/?plan=ultra" class="btn btn-primary"><?= l("lang_plus_subscribe_up") ?></a><br>
                     <?php endif; ?>
 
-                    <div style="margin-top: 10px;" class="small text-muted"><?= $price * 2 ?> <?= l("lang_plus_subscribe_coin") ?> · <?= str_replace("%1", coinsToEur($price * 2), l("lang_plus_subscribe_monthly")) ?></div>
+                    <div style="margin-top: 10px;" class="small text-muted"><?= $price * 1.75 ?> <?= l("lang_plus_subscribe_coin") ?> · <?= str_replace("%1", coinsToEur($price * 1.75), l("lang_plus_subscribe_monthly")) ?></div>
                 </div>
             </div>
         </div>
diff --git a/version b/version
index 303cf7f..af06dab 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-5.2.23
\ No newline at end of file
+5.2.26
\ No newline at end of file