Changeset 2352

Timestamp:

06/11/10 19:29:40 (13 years ago)

Author:

Aeness

Message:

we can have favicon for IE and the others navigators at the same time.
DC2.2beta1 compatibility

Location:

plugins/myfavicon

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (3 diffs)
• blog_pref.js (modified) (3 diffs)
• locales/fr/main.po (modified) (1 diff)

plugins/myfavicon/_admin.php

@@ -27 +27 @@
      }
      
-     public static function adminBlogPreferencesForm(&$core,&$settings=false)
+     public static function adminBlogPreferencesForm($core,$settings=false)
      {
           # Dotclear <=2.0-beta7 compatibility
@@ -34 +34 @@
           }
           
-          $favicon_url = $settings->favicon_url;
-          $favicon_ie6 = $settings->favicon_ie6;
+          if (version_compare(DC_VERSION,'2.2-beta1','<')) {
+               $favicon_url = $settings->favicon_url;
+               $favicon_ie_url = $settings->favicon_ie_url;
+          }
+          else {
+               $favicon_url = $settings->myfavicon->favicon_url;
+               $favicon_ie_url = $settings->myfavicon->favicon_ie_url;
+          }
           
           echo
           '<fieldset><legend>Favicon</legend>'.
           '<p><label class="classic">'.
-               form::checkbox('favicon_enable','1',!empty($favicon_url)).
+               form::checkbox('favicon_enable','1',(!empty($favicon_url) || !empty($favicon_ie_url))).
                __('Enable favicon').'</label></p>'.
           '<div id="favicon_config">'.
-          '<p><label class="classic">'.
-               form::checkbox('favicon_ie6','1',$favicon_ie6).
-               __('Enable Internet Explorer 6 compatibility').'</label></p>'.
+          '<p><label>'.__('Favicon URL for IE:').' '.
+               form::field('favicon_ie_url',40,255,html::escapeHTML($favicon_ie_url)).'</label></p>'.
+          '<p class="form-note warn">'
+               .__('Please note, IE compatibility works only with ".ico" format.').'</p>'.
           '<p><label>'.__('Favicon URL:').' '.
                form::field('favicon_url',40,255,html::escapeHTML($favicon_url)).'</label></p>'.
-          '<p id="favicon_warn" class="form-note warn">'
-               .__('Please note, IE6 compatibility works only with ".ico" format.').'</p>'.
           '</div></fieldset>';
      }
      
-     public static function adminBeforeBlogSettingsUpdate(&$settings)
+     public static function adminBeforeBlogSettingsUpdate($settings)
      {
-          $favicon_url = empty($_POST['favicon_enable']) ? '' : $_POST['favicon_url'];
-          $favicon_ie6 = !empty($_POST['favicon_ie6']);
+          $favicon_url = empty($_POST['favicon_url']) ? '' : $_POST['favicon_url'];
+          $favicon_ie_url = empty($_POST['favicon_ie_url']) ? '' : $_POST['favicon_ie_url'];
           
-          $settings->setNameSpace('myfavicon');
-          $settings->put('favicon_url',$favicon_url);
-          $settings->put('favicon_ie6',$favicon_ie6);
-          $settings->setNameSpace('system');
+          if (version_compare(DC_VERSION,'2.2-beta1','<')) {
+               $settings->setNameSpace('myfavicon');
+               $settings->put('favicon_url',$favicon_url);
+               $settings->put('favicon_ie_url',$favicon_ie_url);
+               $settings->setNameSpace('system');
+          }
+          else {
+               $settings->addNameSpace('myfavicon');
+               $settings->myfavicon->put('favicon_url',$favicon_url);
+               $settings->myfavicon->put('favicon_ie_url',$favicon_ie_url);
+               $settings->addNameSpace('system');
+          }
      }
 }

plugins/myfavicon/_define.php

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

plugins/myfavicon/_install.php

@@ -25 +25 @@
 
 # --INSTALL AND UPDATE PROCEDURES--
-
-$sets = &$core->blog->settings;
-$sets->setNamespace(strtolower($label));
-
-# New install / update
-$sets->put('favicon_url','','string','Favicon URL',false);
-$sets->put('favicon_ie6',false,'boolean','Internet Explorer 6 compatibility',false);
-
+if (version_compare(DC_VERSION,'2.2-beta1','<')) {
+     $sets = &$core->blog->settings;
+     $sets->setNamespace(strtolower($label));
+     
+     # New install / update
+     $sets->put('favicon_url','','string','Favicon URL',false);
+     $sets->put('favicon_ie_url','','string','Favicon URL Internet Explorer',false);
+}
+else {
+     $core->blog->settings->addNamespace(strtolower($label));
+     
+     # New install / update
+     $core->blog->settings->myfavicon->put('favicon_url','','string','Favicon URL',false);
+     $core->blog->settings->myfavicon->put('favicon_ie_url','','string','Favicon URL Internet Explorer',false);
+}
 if (version_compare(DC_VERSION,'2.0-rc1','<')
 && file_exists(DC_TPL_CACHE.'/cbtpl')

plugins/myfavicon/_public.php

@@ -34 +34 @@
      );
      
-     public static function publicHeadContent(&$core)
+     public static function publicHeadContent($core)
      {
           $res = self::faviconHTML($core->blog->settings);
@@ -42 +42 @@
      }
      
-     public static function templateBeforeValue(&$core,$id,$attr)
+     public static function templateBeforeValue($core,$id,$attr)
      {
           if ($id == 'include' && isset($attr['src']) && $attr['src'] == '_head.html') {
@@ -53 +53 @@
      private static function faviconHTML(&$settings)
      {
-          $favicon_url = $settings->favicon_url;
-          $favicon_ie6 = $settings->favicon_ie6;
-          
-          if (empty($favicon_url)) {
+          if (version_compare(DC_VERSION,'2.2-beta1','<')) {
+               $favicon_url = $settings->favicon_url;
+               $favicon_ie_url = $settings->favicon_ie_url;
+          }
+          else {
+               $favicon_url = $settings->myfavicon->favicon_url;
+               $favicon_ie_url = $settings->myfavicon->favicon_ie_url;
+          }
+          if (empty($favicon_url) && empty($favicon_ie_url)) {
                return;
           }
-          
-          $extension = files::getExtension($favicon_url);
-          
-          if (!isset(self::$allowed_mimetypes[$extension])) {
-               $mimetype = files::getMimeType($favicon_url);
-               if (!in_array($mimetype,self::$allowed_mimetypes)) {
-                    return '<!-- Bad favicon MIME type. -->'."\n";
-               }
-          }
-          else {
-               $mimetype = self::$allowed_mimetypes[$extension];
+
+          $ie_link = '';
+          if ($favicon_ie_url != null) {
+               $ie_link = '
+<!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="'.html::escapeHTML($favicon_ie_url).'" /><![endif]-->';
+               
           }
           
-          $rel = ($favicon_ie6 ? 'shortcut ' : '').'icon';
-          return '<link rel="'.$rel.'" type="'.$mimetype.
+          $other_link = '';
+          if (!empty($favicon_url)) {
+               $extension = files::getExtension($favicon_url);
+               
+               if (!isset(self::$allowed_mimetypes[$extension])) {
+                    $mimetype = files::getMimeType($favicon_url);
+                    if (!in_array($mimetype,self::$allowed_mimetypes)) {
+                         return '<!-- Bad favicon MIME type. -->'."\n";
+                    }
+               }
+               else {
+                    $mimetype = self::$allowed_mimetypes[$extension];
+               }
+               
+               $other_link = '<link rel="icon" type="'.$mimetype.
                '" href="'.html::escapeHTML($favicon_url).'" />';
+               
+          }
+               
+          return $other_link.$ie_link;
      }
 }

plugins/myfavicon/blog_pref.js

@@ -1 +1 @@
 $(function() {
      var favicon_url = '';
+     var favicon_ie_url = '';
      
      // favicon_enable checkbox
@@ -8 +9 @@
                $("#favicon_config").show();
                $("#favicon_url").val(favicon_url);
+               $("#favicon_ie_url").val(favicon_ie_url);
           }
           else {
                favicon_url = $("#favicon_url").val();
+               favicon_ie_url = $("#favicon_url").val();
                $("#favicon_url").val('');
+               $("#favicon_ie_url").val('');
                $("#favicon_config").hide();
           }
@@ -19 +23 @@
           $("#favicon_config").hide();
      }
-     
-     // favicon_ie6 checkbox
-     $("#favicon_ie6").change(function()
-     {
-          if (this.checked) {
-               $("#favicon_warn").show();
-          }
-          else {
-               $("#favicon_warn").hide();
-          }
-     });
-     
-     if (!document.getElementById('favicon_ie6').checked) {
-          $("#favicon_warn").hide();
-     }
 });
 

plugins/myfavicon/locales/fr/main.po

@@ -12 +12 @@
 msgstr "Activer le favicon"
 
-msgid "Enable Internet Explorer 6 compatibility"
-msgstr "Activer la compatibilité avec Internet Explorer 6"
-
 msgid "Favicon URL:"
 msgstr "URL du favicon :"
 
-msgid "Please note, IE6 compatibility works only with \".ico\" format."
-msgstr "Veuillez noter que la compatibilité IE6 fonctionne uniquement avec le format \".ico\"."
+msgid "Favicon URL for IE:"
+msgstr "URL du favicon pour IE :"
+
+msgid "Please note, IE compatibility works only with \".ico\" format."
+msgstr "Veuillez noter que la compatibilité IE fonctionne uniquement avec le format \".ico\"."