From ceb54b9657474649d4853edc712c38d0eba9276c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 20 Nov 2018 20:39:31 +0100
Subject: [PATCH] OpenVPN export, move base filename into own method for easier
 reuse. https://github.com/opnsense/core/issues/2787

---
 .../library/OPNsense/OpenVPN/ArchiveOpenVPN.php    |  2 +-
 .../app/library/OPNsense/OpenVPN/PlainOpenVPN.php  | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
index e8879041b..0a93005c9 100644
--- a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
+++ b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
@@ -66,7 +66,7 @@ class ArchiveOpenVPN extends PlainOpenVPN
     public function getContent()
     {
         $conf = $this->openvpnConfParts();
-        $base_filename = "profile";
+        $base_filename = $this->getBaseFilename();
         $tempdir = tempnam(sys_get_temp_dir(), '_ovpn') ;
         $content_dir = $tempdir . "/" . $base_filename;
         if (file_exists($tempdir)) {
diff --git a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/PlainOpenVPN.php b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/PlainOpenVPN.php
index f354f7eee..5276c9637 100644
--- a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/PlainOpenVPN.php
+++ b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/PlainOpenVPN.php
@@ -52,9 +52,9 @@ class PlainOpenVPN extends BaseExporter implements IExportProvider
     }
 
     /**
-     * @return string filename
+     * @return string base filename without extension
      */
-    public function getFilename()
+    protected function getBaseFilename()
     {
         $result = array();
         if (!empty($this->config['description'])) {
@@ -65,7 +65,15 @@ class PlainOpenVPN extends BaseExporter implements IExportProvider
         if (!empty($this->config['client_cn'])) {
             $result[] = $this->config['client_cn'];
         }
-        return implode("_", $result) . ".". $this->fileExtension;
+        return implode("_", $result);
+    }
+
+    /**
+     * @return string filename
+     */
+    public function getFilename()
+    {
+        return $this->getBaseFilename() . ".". $this->fileExtension;
     }
 
     /**