Added support for favicon.ico/gif/png in base path (very basic support)

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 9c9059d31494a22c23bc8a0004515d484b547917..fa47705d73a9c7b2487456e462da8ed9e86aa233 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -2051,6 +2051,71 @@ function addJavaScriptMenuContent ($menuMode, $mainAction, $action, $what) {
        return $OUT;
 }
 
+// Tries to anonymize some sensitive data (e.g. IP address, user agent, referrer, etc.)
+function anonymizeSensitiveData ($data) {
+       // Trim it
+       $data = trim($data);
+
+       // Is it empty?
+       if (empty($data)) {
+               // Then add three dashes
+               $data = '---';
+       } elseif (isUrlValid($data)) {
+               // Is a referrer, so is it black-listed?
+               if (isAdmin()) {
+                       // Is admin, has always priority
+                       $data = '[<a href="{%pipe,generateFrametesterUrl=' . $data . '%}" target="_blank">{--ADMIN_TEST_URL--}</a>]';
+               } elseif ((isExtensionActive('blacklist')) && (isUrlBlacklisted($data))) {
+                       // Yes, so replace it with text
+                       $data = '<em>{--URL_IS_BLACKLISTED--}</em>';
+               } else {
+                       // A  member is viewing this referral URL
+                       $data = '[<a href="{%pipe,generateDereferrerUrl=' . $data . '%}" target="_blank">{--MEMBER_TEST_URL--}</a>]';
+               }
+       } elseif (isIp4AddressValid($data)) {
+               // Is an IPv4 address
+               $ipArray = explode('.', $data);
+
+               // Only display first 2 octets
+               $data = $ipArray[0] . '.' . $ipArray[1] . '.?.?';
+       } else {
+               // Generic data
+               $data = '<em>{--DATA_IS_HIDDEN--}</em>';
+       }
+
+       // Return it (hopefully) anonymized
+       return $data;
+}
+
+/**
+ * Removes all comments, tabs and new-line characters to compact the content
+ *
+ * @param      $uncompactedContent             The uncompacted content
+ * @return     $compactedContent               The compacted content
+ */
+function compactContent ($uncompactedContent) {
+       // First, remove all tab/new-line/revert characters
+       $compactedContent = str_replace(chr(9), '', str_replace(PHP_EOL, '', str_replace(chr(13), '', $uncompactedContent)));
+
+       // Make a space after >
+       $compactedContent = str_replace(array('>', '  '), array('> ', ' '), $compactedContent);
+
+       // Then regex all comments like <!-- //--> away
+       preg_match_all('/<!--[\w\W]*?(\/\/){0,1}-->/', $compactedContent, $matches);
+
+       // Do we have entries?
+       if (isset($matches[0][0])) {
+               // Remove all
+               foreach ($matches[0] as $match) {
+                       // Remove the match
+                       $compactedContent = str_replace($match, '', $compactedContent);
+               } // END - foreach
+       } // END - if
+
+       // Return compacted content
+       return $compactedContent;
+}
+
 //-----------------------------------------------------------------------------
 //                     Template helper functions for EL code
 //-----------------------------------------------------------------------------
@@ -2278,69 +2343,23 @@ function doTemplateLoadTemplate ($templateName, $clear = FALSE, $theTemplate, $c
        return loadTemplate($theTemplate, TRUE, $content);
 }
 
-// Tries to anonymize some sensitive data (e.g. IP address, user agent, referrer, etc.)
-function anonymizeSensitiveData ($data) {
-       // Trim it
-       $data = trim($data);
+// Output HTML code for favicon.ico, if found
+function doTemplateMetaFavIcon ($templateName, $clear = FALSE) {
+       // Default is not found
+       $out = '';
 
-       // Is it empty?
-       if (empty($data)) {
-               // Then add three dashes
-               $data = '---';
-       } elseif (isUrlValid($data)) {
-               // Is a referrer, so is it black-listed?
-               if (isAdmin()) {
-                       // Is admin, has always priority
-                       $data = '[<a href="{%pipe,generateFrametesterUrl=' . $data . '%}" target="_blank">{--ADMIN_TEST_URL--}</a>]';
-               } elseif ((isExtensionActive('blacklist')) && (isUrlBlacklisted($data))) {
-                       // Yes, so replace it with text
-                       $data = '<em>{--URL_IS_BLACKLISTED--}</em>';
-               } else {
-                       // A  member is viewing this referral URL
-                       $data = '[<a href="{%pipe,generateDereferrerUrl=' . $data . '%}" target="_blank">{--MEMBER_TEST_URL--}</a>]';
-               }
-       } elseif (isIp4AddressValid($data)) {
-               // Is an IPv4 address
-               $ipArray = explode('.', $data);
-
-               // Only display first 2 octets
-               $data = $ipArray[0] . '.' . $ipArray[1] . '.?.?';
-       } else {
-               // Generic data
-               $data = '<em>{--DATA_IS_HIDDEN--}</em>';
-       }
-
-       // Return it (hopefully) anonymized
-       return $data;
-}
-
-/**
- * Removes all comments, tabs and new-line characters to compact the content
- *
- * @param      $uncompactedContent             The uncompacted content
- * @return     $compactedContent               The compacted content
- */
-function compactContent ($uncompactedContent) {
-       // First, remove all tab/new-line/revert characters
-       $compactedContent = str_replace(chr(9), '', str_replace(PHP_EOL, '', str_replace(chr(13), '', $uncompactedContent)));
-
-       // Make a space after >
-       $compactedContent = str_replace(array('>', '  '), array('> ', ' '), $compactedContent);
-
-       // Then regex all comments like <!-- //--> away
-       preg_match_all('/<!--[\w\W]*?(\/\/){0,1}-->/', $compactedContent, $matches);
-
-       // Do we have entries?
-       if (isset($matches[0][0])) {
-               // Remove all
-               foreach ($matches[0] as $match) {
-                       // Remove the match
-                       $compactedContent = str_replace($match, '', $compactedContent);
-               } // END - foreach
-       } // END - if
+       // Check all common extensions
+       foreach (array('ico', 'gif', 'png') as $extension) {
+               // Is the file there?
+               if (isFileReadable(getPath() . 'favicon.' . $extension)) {
+                       // Then use this and abort
+                       $out = '<link rel="shortcut icon" href="http://www.wds66.com/favicon.ico" type="image/' . $extension . '" />';
+                       break;
+               } // END - if
+       } // END - while
 
-       // Return compacted content
-       return $compactedContent;
+       // Return code
+       return $out;
 }
 
 // [EOF]

diff --git a/templates/de/html/page_header.tpl b/templates/de/html/page_header.tpl
index bb99026d635a4ccca1304cfed6ab5435fbd178df..c41cd59239bb923cd40cea17416bddb601c84d45 100644 (file)
--- a/templates/de/html/page_header.tpl
+++ b/templates/de/html/page_header.tpl
@@ -6,6 +6,7 @@
 <meta http-equiv="content-style-type" content="text/css" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="language" content="de" />
+{%template,MetaFavIcon%}
 
 <script src="{%jquery%}{%ext,version=sql_patches%}" type="text/javascript"></script>
 <script src="{%url=js/core-common.js?dummy=1%}{%ext,version=sql_patches%}" type="text/javascript"></script>