From a5390580259105f14154b0d7ce1eb13631c471b1 Mon Sep 17 00:00:00 2001
From: Miguel Ribeiro <k.d.mitnick@gmail.com>
Date: Thu, 11 Jul 2024 14:04:10 +0200
Subject: [PATCH] fix: use the same font for inputs

---
 admin.php            | 126 +++++++++++++++++++++++--------------------
 includes/version.php |   2 +-
 styles/styles.css    |   9 ++++
 3 files changed, 79 insertions(+), 58 deletions(-)

diff --git a/admin.php b/admin.php
index c5fc31e59..a00d93ee5 100644
--- a/admin.php
+++ b/admin.php
@@ -99,8 +99,8 @@
                 </p>
             </div>
             <div class="buttons">
-                <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>" id="saveAccountRegistrations"
-                    onClick="saveAccountRegistrationsButton()" />
+                <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
+                    id="saveAccountRegistrations" onClick="saveAccountRegistrationsButton()" />
             </div>
         </div>
     </section>
@@ -120,9 +120,16 @@
                     ?>
                     <div class="form-group-inline" data-userid="<?= $user['id'] ?>">
                         <div class="user-list-row">
-                            <div title="<?= translate('username', $i18n) ?>"><i
-                                    class="fa-solid <?= $userIcon ?>"></i><?= $user['username'] ?></div>
-                            <div title="<?= translate('email', $i18n) ?>"><i class="fa-solid fa-envelope"></i>
+                            <div title="<?= translate('username', $i18n) ?>">
+                                <div class="user-list-icon">
+                                    <i class="fa-solid <?= $userIcon ?>"></i>
+                                </div>
+                                <?= $user['username'] ?>
+                            </div>
+                            <div title="<?= translate('email', $i18n) ?>">
+                                <div class="user-list-icon">
+                                    <i class="fa-solid fa-envelope"></i>
+                                </div>
                                 <a href="mailto:<?= $user['email'] ?>"><?= $user['email'] ?></a>
                             </div>
                         </div>
@@ -130,13 +137,15 @@ class="fa-solid <?= $userIcon ?>"></i><?= $user['username'] ?></div>
                             <?php
                             if ($user['id'] != 1) {
                                 ?>
-                                <button class="image-button medium" onClick="removeUser(<?= $user['id'] ?>)" title="<?= translate('delete_user', $i18n) ?>">
+                                <button class="image-button medium" onClick="removeUser(<?= $user['id'] ?>)"
+                                    title="<?= translate('delete_user', $i18n) ?>">
                                     <?php include "images/siteicons/svg/delete.php"; ?>
                                 </button>
                                 <?php
                             } else {
                                 ?>
-                                <button class="image-button medium disabled" disabled  title="<?= translate('delete_user', $i18n) ?>">
+                                <button class="image-button medium disabled" disabled
+                                    title="<?= translate('delete_user', $i18n) ?>">
                                     <?php include "images/siteicons/svg/delete.php"; ?>
                                 </button>
                                 <?php
@@ -159,7 +168,7 @@ class="fa-solid <?= $userIcon ?>"></i><?= $user['username'] ?></div>
             <div class="form-group">
                 <input type="text" id="newUsername" placeholder="<?= translate('username', $i18n) ?>" />
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <input type="email" id="newEmail" placeholder="<?= translate('email', $i18n) ?>" />
             </div>
             <div class="form-group-inline">
@@ -186,11 +195,13 @@ class="one-third" value="<?= $settings['smtp_port'] ?>" />
             </div>
             <div class="form-group-inline">
                 <div>
-                    <input type="radio" name="encryption" id="encryptiontls" value="tls" <?= empty($settings['encryption']) || $settings['encryption'] == "tls" ? "checked" : "" ?> />
+                    <input type="radio" name="encryption" id="encryptiontls" value="tls"
+                        <?= empty($settings['encryption']) || $settings['encryption'] == "tls" ? "checked" : "" ?> />
                     <label for="encryptiontls"><?= translate('tls', $i18n) ?></label>
                 </div>
                 <div>
-                    <input type="radio" name="encryption" id="encryptionssl" value="ssl" <?= $settings['encryption'] == "ssl" ? "checked" : "" ?> />
+                    <input type="radio" name="encryption" id="encryptionssl" value="ssl"
+                        <?= $settings['encryption'] == "ssl" ? "checked" : "" ?> />
                     <label for="encryptionssl"><?= translate('ssl', $i18n) ?></label>
                 </div>
             </div>
@@ -209,8 +220,8 @@ class="one-third" value="<?= $settings['smtp_port'] ?>" />
             <div class="buttons">
                 <input type="button" class="secondary-button thin mobile-grow" value="<?= translate('test', $i18n) ?>"
                     id="testSmtpSettingsButton" onClick="testSmtpSettingsButton()" />
-                <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>" id="saveSmtpSettingsButton"
-                    onClick="saveSmtpSettingsButton()" />
+                <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
+                    id="saveSmtpSettingsButton" onClick="saveSmtpSettingsButton()" />
             </div>
             <div class="settings-notes">
                 <p>
@@ -225,59 +236,59 @@ class="one-third" value="<?= $settings['smtp_port'] ?>" />
     </section>
 
     <?php
-        // find unused upload logos
+    // find unused upload logos
+    
+    // Get all logos in the subscriptions table
+    $query = 'SELECT logo FROM subscriptions';
+    $stmt = $db->prepare($query);
+    $result = $stmt->execute();
 
-        // Get all logos in the subscriptions table
-        $query = 'SELECT logo FROM subscriptions';
-        $stmt = $db->prepare($query);
-        $result = $stmt->execute();
-
-        $logosOnDisk = [];
-        $logosOnDB = [];
-        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
-            $logosOnDB[] = $row['logo'];
-        }
+    $logosOnDisk = [];
+    $logosOnDB = [];
+    while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+        $logosOnDB[] = $row['logo'];
+    }
 
-        // Get all logos in the payment_methods table
-        $query = 'SELECT icon FROM payment_methods';
-        $stmt = $db->prepare($query);
-        $result = $stmt->execute();
+    // Get all logos in the payment_methods table
+    $query = 'SELECT icon FROM payment_methods';
+    $stmt = $db->prepare($query);
+    $result = $stmt->execute();
 
-        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
-            if (!strstr($row['icon'], "images/uploads/icons/")) {
-                $logosOnDB[] = $row['icon'];
-            }
+    while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+        if (!strstr($row['icon'], "images/uploads/icons/")) {
+            $logosOnDB[] = $row['icon'];
         }
+    }
 
-        $logosOnDB = array_unique($logosOnDB);
+    $logosOnDB = array_unique($logosOnDB);
 
-        // Get all logos in the uploads folder
-        $uploadDir = 'images/uploads/logos/';
-        $uploadFiles = scandir($uploadDir);
-        
-        foreach ($uploadFiles as $file) {
-            if ($file != '.'&& $file != '..' && $file != 'avatars') {
-                $logosOnDisk[] = ['logo' => $file];
-            }
+    // Get all logos in the uploads folder
+    $uploadDir = 'images/uploads/logos/';
+    $uploadFiles = scandir($uploadDir);
+
+    foreach ($uploadFiles as $file) {
+        if ($file != '.' && $file != '..' && $file != 'avatars') {
+            $logosOnDisk[] = ['logo' => $file];
         }
+    }
 
-        // Find unused logos
-        $unusedLogos = [];
-        foreach ($logosOnDisk as $disk) {
-            $found = false;
-            foreach ($logosOnDB as $dbLogo) {
-                if ($disk['logo'] == $dbLogo) {
-                    $found = true;
-                    break;
-                }
-            }
-            if (!$found) {
-                $unusedLogos[] = $disk;
+    // Find unused logos
+    $unusedLogos = [];
+    foreach ($logosOnDisk as $disk) {
+        $found = false;
+        foreach ($logosOnDB as $dbLogo) {
+            if ($disk['logo'] == $dbLogo) {
+                $found = true;
+                break;
             }
         }
+        if (!$found) {
+            $unusedLogos[] = $disk;
+        }
+    }
+
+    $logosToDelete = count($unusedLogos);
 
-        $logosToDelete = count($unusedLogos);
-        
     ?>
 
     <section class="account-section">
@@ -289,9 +300,10 @@ class="one-third" value="<?= $settings['smtp_port'] ?>" />
         <div class="maintenance-tasks">
             <h3><?= translate('orphaned_logos', $i18n) ?></h3>
             <div class="form-group-inline">
-                <input type="button" class="button thin mobile-grow" value="<?= translate('delete', $i18n) ?>" id="deleteUnusedLogos"
-                    onClick="deleteUnusedLogos()" <?= $logosToDelete == 0 ? 'disabled' : '' ?> />
-                    <span class="number-of-logos bold"><?= $logosToDelete ?></span> <?= translate('orphaned_logos', $i18n) ?>
+                <input type="button" class="button thin mobile-grow" value="<?= translate('delete', $i18n) ?>"
+                    id="deleteUnusedLogos" onClick="deleteUnusedLogos()" <?= $logosToDelete == 0 ? 'disabled' : '' ?> />
+                <span class="number-of-logos bold"><?= $logosToDelete ?></span>
+                <?= translate('orphaned_logos', $i18n) ?>
             </div>
         </div>
     </section>
diff --git a/includes/version.php b/includes/version.php
index 02b8f8eee..e7940d94b 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-$version = "v2.16.1";
+$version = "v2.17.0";
 ?>
\ No newline at end of file
diff --git a/styles/styles.css b/styles/styles.css
index 98fd25de8..89e30dd67 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -10,6 +10,10 @@ body.no-scroll {
   overflow-y: hidden; 
 }
 
+input, button, select, textarea {
+  font-family: Barlow, 'Helvetica Neue', Helvetica, sans-serif;
+}
+
 @media (max-width: 768px) {
   body.no-scroll section.contain {
     display: none;
@@ -2110,6 +2114,11 @@ button.dark-theme-button i {
   color: var(--hover-color);
 }
 
+.user-list .user-list-icon {
+  width: 16px;
+  text-align: center;
+}
+
 .calendar-nav {
   display: flex;
   flex-direction: row;