From d1ab54bf535c08f78973442e467878e8ba144ccb Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 18 Sep 2018 08:31:32 +0000
Subject: - htaccess wird jetzt von zentraler Funktion angelegt, um die
 einzelnen Aufrufe in den Modulen anzugleichen - Zugriff auf E-Mail Logo über
 das Backend - htaccess für Apache 2.2 / 2.4 optimiert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7147 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/emailconf.phtml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml
index 1df3f64..2f86c8c 100644
--- a/views/admin/emailconf.phtml
+++ b/views/admin/emailconf.phtml
@@ -20,7 +20,7 @@
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf&noheader=1'); ?>">
 
 		<?php echo wpsg_drawForm_AdminboxStart('Allgemeine Einstellungen', 'wpsg'); ?>
-		<?php $logoPath = WPSG_PATH_CONTENT . 'uploads/wpsg/wpsg_mailconf/wpsg_email_logo.jpg'; ?>
+		<?php $logoPath = wpsg_getUploadDir('wpsg_mailconf').'wpsg_email_logo.jpg'; ?>
 
 		<?php echo wpsg_drawForm_Checkbox(
 			'wpsg_htmlmail',
@@ -32,6 +32,7 @@
 		<div class="col-emaillogo">
 
 			<?php if(file_exists($logoPath)) { ?>
+                
 				<?php echo wpsg_drawForm_Checkbox(
 					'wpsg_email_logo_activated',
 					__("E-Maillogo anzeigen"),
@@ -43,6 +44,7 @@
 					__("E-Maillogo als Wasserzeichen anzeigen"),
 					$this->get_option('wpsg_email_logo_watermark')
 				); ?>
+                
 			<?php } ?>
 
 			<br />
@@ -53,7 +55,7 @@
 				</div>
 				<div class="col-sm-6">
 					<?php if(file_exists($logoPath)) { ?>
-						<a href="<?php echo $this->get_option('wpsg_email_logo_url'); ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a><br>
+						<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf&getEmailLogo=1&noheader=1'; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a><br>
 					<?php } ?>
 					<input type="file" name="wpsg_email_logo">
 				</div>
-- 
cgit v1.2.3