From b4bcb0912c5fe1c7f00c7ac76e5b67620781d3cc Mon Sep 17 00:00:00 2001
From: RaindropsSys <contact@minteck.org>
Date: Thu, 20 Apr 2023 16:20:07 +0200
Subject: Updated 12 files and added 3 files (automated)

---
 pages/relations.inc | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'pages/relations.inc')

diff --git a/pages/relations.inc b/pages/relations.inc
index 7a05def..f872a2f 100644
--- a/pages/relations.inc
+++ b/pages/relations.inc
@@ -1,6 +1,6 @@
 <?php
 
-require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; global $title; global $isLoggedIn; global $lang; global $pages;
+require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; global $title; global $isLoggedIn; global $lang; global $pages; global $isLowerLoggedIn; global $app;
 require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc';
 
 ?>
@@ -10,7 +10,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc';
     <div id="page-content">
         <h2><?= $pages["relations"]["name"][$lang["_name"]] ?></h2>
         <?php foreach (withCaretakersDown(scoreOrderGlobal()) as $member): ?>
-        <div class="relation" style="background-color:rgba(255, 255, 255, .1);margin-bottom:10px;padding:10px;border-radius:10px;display:grid;grid-template-columns: 1.5fr 2fr 2fr 2fr;">
+        <div class="relation" style="background-color:rgba(255, 255, 255, .1);margin-bottom:10px;padding:10px;border-radius:10px;display:grid;grid-template-columns: 2fr 2.25fr 2.25fr 2.25fr 2.25fr;">
             <a class="relation-intro" style="background-color:rgba(255, 255, 255, .05);border-right:1px solid rgba(255, 255, 255, .1);margin:-10px;padding:10px;border-top-left-radius:10px;border-bottom-left-radius:10px;color: white;text-decoration: none;" href="/<?= $member["name"] ?>">
                 <img src="<?= getAsset($member["system"], $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
             </a>
@@ -24,9 +24,9 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc';
                         <?php if (count($member["_metadata"]["marefriends"]) === 0): ?>
                             <span class="text-muted"><?= $lang["relations"]["no"] ?></span>
                         <?php else: ?>
-                            <?php foreach ($member["_metadata"]["marefriends"] as $id): $mfSystem = explode("/", $id)[0]; $marefriend = getSystemMember(explode("/", $id)[0], explode("/", $id)[1]); ?>
+                            <?php foreach ($member["_metadata"]["marefriends"] as $id): $mfSystem = explode("/", $id)[0]; $marefriend = getSystemMember(explode("/", $id)[0], explode("/", $id)[1]); if (!($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn)): ?>
                                 <a title="<?= getMiniName($marefriend["display_name"] ?? $marefriend["name"]) ?>" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="/<?= $marefriend["name"] ?>"><img src="<?= getAsset($mfSystem, $marefriend["id"], "heads") ?>" style="width:24px;"></a>
-                            <?php endforeach; ?>
+                            <?php endif; endforeach; ?>
                         <?php endif; ?>
                     </td>
                 </tr></tbody>
@@ -41,15 +41,14 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc';
                         <?php if (count($member["_metadata"]["sisters"]) === 0): ?>
                             <span class="text-muted"><?= $lang["relations"]["no"] ?></span>
                         <?php else: ?>
-                            <?php foreach ($member["_metadata"]["sisters"] as $id): $mfSystem = explode("/", $id)[0]; $marefriend = getSystemMember(explode("/", $id)[0], explode("/", $id)[1]); ?>
+                            <?php foreach ($member["_metadata"]["sisters"] as $id): $mfSystem = explode("/", $id)[0]; $marefriend = getSystemMember(explode("/", $id)[0], explode("/", $id)[1]); if (!($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn)): ?>
                                 <a title="<?= getMiniName($marefriend["display_name"] ?? $marefriend["name"]) ?>" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="/<?= $marefriend["name"] ?>"><img src="<?= getAsset($mfSystem, $marefriend["id"], "heads") ?>" style="width:24px;"></a>
-                            <?php endforeach; ?>
+                            <?php endif; endforeach; ?>
                         <?php endif; ?>
                     </td>
                 </tr></tbody>
             </table>
 
-            <?php if ($member["_metadata"]["little"] >= 2): ?>
             <table class="relation-item relation-item-caretakers" style="padding:0 20px;">
                 <tbody><tr>
                     <td style="width: 50%;text-align:right;">
@@ -59,14 +58,30 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc';
                         <?php if (count($member["_metadata"]["caretakers"]) === 0): ?>
                             <span class="text-muted"><?= $lang["relations"]["no"] ?></span>
                         <?php else: ?>
-                            <?php foreach ($member["_metadata"]["caretakers"] as $id): $mfSystem = explode("/", $id)[0]; $marefriend = getSystemMember(explode("/", $id)[0], explode("/", $id)[1]); ?>
-                                <a title="<?= getMiniName($marefriend["display_name"] ?? $marefriend["name"]) ?>" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="/<?= $marefriend["name"] ?>"><img src="<?= getAsset($mfSystem, $marefriend["id"], "heads") ?>" style="width:24px;"></a>
-                            <?php endforeach; ?>
+                            <?php foreach ($member["_metadata"]["caretakers"] as $id): $mfSystem = explode("/", $id)[0]; $marefriend = getSystemMember(explode("/", $id)[0], explode("/", $id)[1]); if (!($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn)): ?>
+                                <a title="<?= $marefriend["display_name"] ?? $marefriend["name"] ?>" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="/<?= $marefriend["name"] ?>"><img src="<?= getAsset($mfSystem, $marefriend["id"], "heads") ?>" style="width:24px;"></a>
+                            <?php endif; endforeach; ?>
+                        <?php endif; ?>
+                    </td>
+                </tr></tbody>
+            </table>
+
+            <table class="relation-item relation-item-friends" style="padding:0 20px;">
+                <tbody><tr>
+                    <td style="width: 50%;text-align:right;">
+                        <b style="padding-right:5px;">Friends:</b><span class="list-separator-mobile"><br></span>
+                    </td>
+                    <td style="width: 50%;text-align:left;">
+                        <?php if (!isset($member["_metadata"]["friends"]) || count($member["_metadata"]["friends"]) === 0): ?>
+                            <span class="text-muted"><?= $lang["relations"]["no"] ?></span>
+                        <?php else: ?>
+                            <?php foreach ($member["_metadata"]["friends"] as $id): $mfSystem = explode("/", $id)[0]; $marefriend = getSystemMember(explode("/", $id)[0], explode("/", $id)[1]); if (!($mfSystem === $app["other"]["id"] && !$isLoggedIn && !$isLowerLoggedIn)): ?>
+                                <a title="<?= $marefriend["display_name"] ?? $marefriend["name"] ?>" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="/<?= $marefriend["name"] ?>"><img src="<?= getAsset($mfSystem, $marefriend["id"], "heads") ?>" style="width:24px;"></a>
+                            <?php endif; endforeach; ?>
                         <?php endif; ?>
                     </td>
                 </tr></tbody>
             </table>
-            <?php endif; ?>
         </div>
         <?php endforeach; ?>
     </div>
-- 
cgit