Changeset 389

Timestamp:

04/05/08 21:21:00 (16 years ago)

Author:

sacha

Message:

My Favicon : Mimetypes auto-detection

Location:

plugins/myfavicon

Files:

• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (2 diffs)

plugins/myfavicon/_define.php

@@ -19 +19 @@
      /* Description*/    "Add a customized favicon to your blog",
      /* Author */        "Oleksandr Syenchuk",
-     /* Version */       '0.1',
+     /* Version */       '0.2',
      /* Permissions */   'contentadmin'
 );

plugins/myfavicon/_install.php

@@ -30 +30 @@
 # New install / update
 $sets->put('favicon_url','','string','Favicon URL',false);
-$sets->put('favicon_mimetype','image/png','string','Favicon MIME type',false);
 
 # --SETTING NEW VERSION--

plugins/myfavicon/_public.php

@@ -24 +24 @@
 class myFavicon
 {
+     #FIXME Mimetypes in common/lib.files.php (Clearbricks) are not enough
      public static $allowed_mimetypes = array(
-          'image/x-icon',
-          'image/png',
-          'image/bmp',
-          'image/gif',
-          'image/jpeg',
-          'video/x-mng'
+          'ico' => 'image/x-icon',
+          'png' => 'image/png',
+          'bmp' => 'image/bmp',
+          'gif' => 'image/gif',
+          'jpg' => 'image/jpeg',
+          'mng' => 'video/x-mng'
      );
      
@@ -50 +51 @@
      }
 
-     private static function faviconHTML(&$sets)
+     private static function faviconHTML(&$settings)
      {
-          $favicon_url = $sets->favicon_url;
-          $favicon_mimetype = $sets->favicon_mimetype;
+          $favicon_url = $settings->favicon_url;
           
-          if (empty($favicon_url) || empty($favicon_mimetype)
-          || !in_array($favicon_mimetype,self::$allowed_mimetypes)) {
+          if (empty($favicon_url)) {
                return;
           }
           
-          return '<link rel="icon" type="'.$favicon_mimetype.
+          $extension = files::getExtension($favicon_url);
+          
+          if (!isset(self::$allowed_mimetypes[$extension])) {
+               $mimetype = files::getMimeType($favicon_url);
+               if (!in_array($mimetype,self::$allowed_mimetypes)) {
+                    return;
+               }
+          }
+          else {
+               $mimetype = self::$allowed_mimetypes[$extension];
+          }
+          
+          return '<link rel="icon" type="'.$mimetype.
                '" href="'.html::escapeHTML($favicon_url).'" />';
      }