From 51f3014028c7edb1cf5e5f71fb217605810334bb Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 2 Aug 2020 09:07:49 -0400
Subject: [PATCH] Only display domain name in browser access confirm dialog

* Prevents dialog from growing in width if there is a really long url requesting access.
---
 src/browser/BrowserAccessControlDialog.cpp | 6 ++++--
 src/browser/BrowserAccessControlDialog.h   | 2 +-
 src/browser/BrowserService.cpp             | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/browser/BrowserAccessControlDialog.cpp b/src/browser/BrowserAccessControlDialog.cpp
index 3268ef2b..66863105 100644
--- a/src/browser/BrowserAccessControlDialog.cpp
+++ b/src/browser/BrowserAccessControlDialog.cpp
@@ -37,9 +37,11 @@ BrowserAccessControlDialog::~BrowserAccessControlDialog()
 {
 }
 
-void BrowserAccessControlDialog::setItems(const QList<Entry*>& items, const QString& hostname, bool httpAuth)
+void BrowserAccessControlDialog::setItems(const QList<Entry*>& items, const QString& urlString, bool httpAuth)
 {
-    m_ui->siteLabel->setText(m_ui->siteLabel->text().arg(hostname));
+    QUrl url(urlString);
+    m_ui->siteLabel->setText(m_ui->siteLabel->text().arg(
+        url.toDisplayString(QUrl::RemoveUserInfo | QUrl::RemovePath | QUrl::RemoveQuery | QUrl::RemoveFragment)));
 
     m_ui->rememberDecisionCheckBox->setVisible(!httpAuth);
     m_ui->rememberDecisionCheckBox->setChecked(false);
diff --git a/src/browser/BrowserAccessControlDialog.h b/src/browser/BrowserAccessControlDialog.h
index 1d42cf50..6b2fe52b 100644
--- a/src/browser/BrowserAccessControlDialog.h
+++ b/src/browser/BrowserAccessControlDialog.h
@@ -38,7 +38,7 @@ public:
     explicit BrowserAccessControlDialog(QWidget* parent = nullptr);
     ~BrowserAccessControlDialog() override;
 
-    void setItems(const QList<Entry*>& items, const QString& hostname, bool httpAuth);
+    void setItems(const QList<Entry*>& items, const QString& urlString, bool httpAuth);
     bool remember() const;
 
     QList<QTableWidgetItem*> getSelectedEntries() const;
diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index e0b8dacc..01e9a428 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -776,7 +776,7 @@ QList<Entry*> BrowserService::confirmEntries(QList<Entry*>& pwEntriesToConfirm,
         config.save(entry);
     });
 
-    accessControlDialog.setItems(pwEntriesToConfirm, !submitHost.isEmpty() ? submitHost : url, httpAuth);
+    accessControlDialog.setItems(pwEntriesToConfirm, url, httpAuth);
 
     QList<Entry*> allowedEntries;
     if (accessControlDialog.exec() == QDialog::Accepted) {