From 2c5c88e0b9c74250bc4411317173989a8e19f2a4 Mon Sep 17 00:00:00 2001
From: pancho <pancho@15425.no-reply.drupal.org>
Date: Fri, 7 Jun 2019 12:53:07 -0400
Subject: [PATCH] Issue #3040903 by Pancho, Liam Morland: Use
file_default_scheme in fillpdf_default_scheme()
---
fillpdf.module | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/fillpdf.module b/fillpdf.module
index 1642cad..1aacf48 100644
--- a/fillpdf.module
+++ b/fillpdf.module
@@ -2071,10 +2071,18 @@ function fillpdf_scheme_options() {
}
/**
- * Returns the configured default scheme for FillPDF.
+ * Returns the default scheme for PDF files populated by FillPDF.
+ *
+ * For security reasons we're picking the system's file default scheme, unless
+ * it is 'public' while the more secure 'private' is available.
*/
function fillpdf_default_scheme() {
- return variable_get('fillpdf_scheme', 'public');
+ $site_default_scheme = variable_get('file_default_scheme');
+ if ($site_default_scheme == 'public') {
+ $scheme_options = fillpdf_scheme_options();
+ return isset($scheme_options['private']) ? 'private' : $site_default_scheme;
+ }
+ return $site_default_scheme ?: 'public';
}
/**
--
GitLab