Updated 23 files, added assets/uploads/pt-princesscelestia.png and renamed assets/uploads/pt-luna.png (automated)

2 files changed, 24 insertions, 25 deletions

diff --git a/includes/system/history.inc b/includes/system/history.inc
index b66b8c4..ee7f762 100644
--- a/includes/system/history.inc
+++ b/includes/system/history.inc
@@ -56,10 +56,9 @@ function getMember(string $id) {
                 $original = str_replace("Sat", "Sam.", $original);
                 $original = str_replace("Sun", "Dim.", $original);
 
-                return $original;
-            } else {
-                return $original;
             }
+            
+            return $original;
         }
 
         function getSwitchesForDay(int $day) {
@@ -145,8 +144,8 @@ function getMember(string $id) {
                             <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                         </a>
                         <?php if (count($switch["members"]) > 1): ?>
-                            (<?= $lang["system"]["with"] ?>
-                            <?php if (isset($switch["members"][1])): $member2 = getMember($switch["members"][1]); ?><a class="member-link" href="/<?= $member2["name"] ?>"><img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a><?php endif; ?><?php if (isset($switch["members"][2])): $member2 = getMember($switch["members"][2]); ?>, <a class="member-link" href="/<?= $member2["name"] ?>"><img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a><?php endif; ?><?php if (isset($switch["members"][3])): $member2 = getMember($switch["members"][3]); ?>, <a class="member-link" href="/<?= $member2["name"] ?>"><img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a><?php endif; ?>)
+                            and
+                            <?php if (isset($switch["members"][1])): $member2 = getMember($switch["members"][1]); ?><a class="member-link" href="/<?= $member2["name"] ?>"><img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a><?php endif; ?><?php if (isset($switch["members"][2])): $member2 = getMember($switch["members"][2]); ?>, <a class="member-link" href="/<?= $member2["name"] ?>"><img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a><?php endif; ?><?php if (isset($switch["members"][3])): $member2 = getMember($switch["members"][3]); ?>, <a class="member-link" href="/<?= $member2["name"] ?>"><img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a><?php endif; ?>
                         <?php endif; ?>
                     </span>
                 </div>
diff --git a/includes/system/history.old.inc b/includes/system/history.old.inc
index ee687d7..060ba97 100644
--- a/includes/system/history.old.inc
+++ b/includes/system/history.old.inc
@@ -123,8 +123,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                 <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                 <?php endif; ?>
             </span>
         </div>
@@ -166,8 +166,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                 <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                    (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                    and <a class="member-link" href="/<?= $member2["name"] ?>">
+                <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                 <?php endif; ?>
             </span>
             </div>
@@ -209,8 +209,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                        and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>
@@ -252,8 +252,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                        and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>
@@ -295,8 +295,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                        and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>
@@ -338,8 +338,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                        and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>
@@ -381,8 +381,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                        and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member2["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>
@@ -424,8 +424,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                        and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>
@@ -467,8 +467,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                        and <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>
@@ -504,8 +504,8 @@ function getMember(string $id) {
                     <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?>
                 </a>
                     <?php if (isset($fronter["member2"])): $member2 = getMember($fronter["member2"]); ?>
-                        (with <a class="member-link" href="/<?= $member2["name"] ?>">
-                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>)
+                         <a class="member-link" href="/<?= $member2["name"] ?>">
+                    <img src="<?= getAsset($systemID, $member["id"], "heads") ?>" style="width:24px;"> <?= $member2["display_name"] ?? $member2["name"] ?></a>
                     <?php endif; ?>
             </span>
             </div>