From 6e5db39f525bd18e7dc61afce3c51a6cc1df29d9 Mon Sep 17 00:00:00 2001
From: Ulrich Block <ulblock@gmx.de>
Date: Sat, 20 Jan 2018 11:42:56 +0100
Subject: [PATCH] FIX #1065

---
 .htaccess                                        | 1 +
 template/default/admin/admin_header.tpl          | 2 +-
 template/default/cms/page_header.tpl             | 2 +-
 template/default/standalone/lend.tpl             | 3 +--
 template/default/standalone/lenddata.tpl         | 3 +--
 template/default/standalone/lenddata_ipblock.tpl | 3 +--
 template/default/standalone/login.tpl            | 3 +--
 template/default/standalone/login_mutiple.tpl    | 2 +-
 template/default/standalone/passwordrecovery.tpl | 2 +-
 template/default/standalone/protectioncheck.tpl  | 3 +--
 template/default/user/userpanel_header.tpl       | 2 +-
 11 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.htaccess b/.htaccess
index bf19f30b..628fa050 100644
--- a/.htaccess
+++ b/.htaccess
@@ -6,6 +6,7 @@
 <IfModule mod_rewrite.c>
     RewriteBase /
     RewriteRule ^index\.php$ - [L]
+    RewriteCond %{REQUEST_URI} !\.(png|ico|jpg)$
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]
diff --git a/template/default/admin/admin_header.tpl b/template/default/admin/admin_header.tpl
index 589c3c9a..9b49dee8 100644
--- a/template/default/admin/admin_header.tpl
+++ b/template/default/admin/admin_header.tpl
@@ -11,7 +11,7 @@
     <meta name="description" content="">
     <meta name="author" content="2012 - <?php echo date('Y'); ?> <?php if(isset($ewCfg['title'])) echo $ewCfg['title']; ?>">
 
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- Bootstrap CSS -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/cms/page_header.tpl b/template/default/cms/page_header.tpl
index 7effc6dc..a47b0b2e 100644
--- a/template/default/cms/page_header.tpl
+++ b/template/default/cms/page_header.tpl
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="2012 - <?php echo date('Y'); ?> Ulrich Block">
 
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <link rel="canonical" href="<?php echo $page_data->canurl;?>" />
     <link href="<?php echo $page_data->getDefaultUrl();?>" hreflang="x-default" rel="alternate">
diff --git a/template/default/standalone/lend.tpl b/template/default/standalone/lend.tpl
index 46628c56..a0612909 100644
--- a/template/default/standalone/lend.tpl
+++ b/template/default/standalone/lend.tpl
@@ -8,9 +8,8 @@
 
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 
-    <link rel="shortcut icon" href="images/favicon.png" type="image/png">
     <meta name="robots" content="noindex">
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- bootstrap -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/standalone/lenddata.tpl b/template/default/standalone/lenddata.tpl
index 7a18755f..fe7544d8 100644
--- a/template/default/standalone/lenddata.tpl
+++ b/template/default/standalone/lenddata.tpl
@@ -8,9 +8,8 @@
 
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 
-    <link rel="shortcut icon" href="images/favicon.png" type="image/png">
     <meta name="robots" content="noindex">
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- bootstrap -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/standalone/lenddata_ipblock.tpl b/template/default/standalone/lenddata_ipblock.tpl
index 5d725dca..c3a4b470 100644
--- a/template/default/standalone/lenddata_ipblock.tpl
+++ b/template/default/standalone/lenddata_ipblock.tpl
@@ -8,9 +8,8 @@
 
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 
-    <link rel="shortcut icon" href="images/favicon.png" type="image/png">
     <meta name="robots" content="noindex">
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- bootstrap -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/standalone/login.tpl b/template/default/standalone/login.tpl
index 0d875e65..9a840db4 100644
--- a/template/default/standalone/login.tpl
+++ b/template/default/standalone/login.tpl
@@ -8,9 +8,8 @@
 
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 
-    <link rel="shortcut icon" href="images/favicon.png" type="image/png">
     <meta name="robots" content="noindex">
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- bootstrap -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/standalone/login_mutiple.tpl b/template/default/standalone/login_mutiple.tpl
index 349c2a58..73965350 100644
--- a/template/default/standalone/login_mutiple.tpl
+++ b/template/default/standalone/login_mutiple.tpl
@@ -8,7 +8,7 @@
 
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <meta name="robots" content="noindex">
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- bootstrap -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/standalone/passwordrecovery.tpl b/template/default/standalone/passwordrecovery.tpl
index 52499c5d..e3d5ac3d 100644
--- a/template/default/standalone/passwordrecovery.tpl
+++ b/template/default/standalone/passwordrecovery.tpl
@@ -9,7 +9,7 @@
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 
     <meta name="robots" content="noindex">
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- bootstrap -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/standalone/protectioncheck.tpl b/template/default/standalone/protectioncheck.tpl
index def551cb..e9db9b7e 100644
--- a/template/default/standalone/protectioncheck.tpl
+++ b/template/default/standalone/protectioncheck.tpl
@@ -8,9 +8,8 @@
 
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 
-    <link rel="shortcut icon" href="images/favicon.png" type="image/png">
     <meta name="robots" content="noindex">
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- bootstrap -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">
diff --git a/template/default/user/userpanel_header.tpl b/template/default/user/userpanel_header.tpl
index 537b0476..f980f5ea 100644
--- a/template/default/user/userpanel_header.tpl
+++ b/template/default/user/userpanel_header.tpl
@@ -11,7 +11,7 @@
     <meta name="description" content="">
     <meta name="author" content="2012 - <?php echo date('Y'); ?> <?php if(isset($ewCfg['title'])) echo $ewCfg['title']; ?>">
 
-    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
 
     <!-- Bootstrap CSS -->
     <link href="css/default/bootstrap.min.css" rel="stylesheet">