Changeset 3303

Timestamp:

04/05/14 17:38:53 (9 years ago)

Author:

brol

Message:

0.2.4 ajout combo + content only + class dans le widget + ajout code sécurité + modif locales

Location:

plugins/switchWelcome/trunk

Files:

• _define.php (modified) (1 diff)
• _prepend.php (modified) (1 diff)
• _widgets.php (modified) (3 diffs)
• inc/class.switch.welcome.php (modified) (2 diffs)
• locales/fr/main.po (modified) (2 diffs)

plugins/switchWelcome/trunk/_define.php

@@ -10 +10 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # -- END LICENSE BLOCK ------------------------------------
-
+if (!defined('DC_RC_PATH')) {
+  return null;
+}
 $this->registerModule(
           /* Name */               "switchWelcome",
           /* Description*/         "Welcome your visitors by a personnal message and help them to navigate",
           /* Author */             "Tomtom (http://blog.zenstyle.fr)",
-          /* Version */            '0.2.3',
-          /* Permissions */        'usage'
+          /* Version */            '0.2.4',
+     /* Properties */
+     array(
+          'permissions' => 'usage',
+          'type' => 'plugin',
+          'dc_min' => '2.5',
+          'support' => 'http://lab.dotclear.org/wiki/plugin/switchWelcome',
+          'details' => 'http://plugins.dotaddict.org/dc2/details/switchWelcome'
+          )
 );
-
-?>

plugins/switchWelcome/trunk/_prepend.php

@@ -10 +10 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # -- END LICENSE BLOCK ------------------------------------
+if (!defined('DC_RC_PATH')) { return; }
 
 $__autoload['switchWelcome'] = dirname(__FILE__).'/inc/class.switch.welcome.php';
 
 require dirname(__FILE__).'/_widgets.php';
-
-?>

plugins/switchWelcome/trunk/_widgets.php

@@ -2 +2 @@
 # -- BEGIN LICENSE BLOCK ----------------------------------
 # This file is part of switchWelcome, a plugin for Dotclear.
-# 
+#
 # Copyright (c) 2009 Tomtom
 # http://blog.zenstyle.fr/
-# 
+#
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
@@ -22 +22 @@
           $w->switchWelcome->setting('title',__('Title:'),__('Welcome!'),'text');
           $w->switchWelcome->setting('welcometext',__('Welcome text (use %1$s for visitor\'s name and %2$s for where he comes from):'),__('Hi %1$s from %2$s! Welcome on this blog!'),'textarea');
-          $w->switchWelcome->setting('welcomesearchtext',__('Welcome text if search exists (use %1$s for keywords and %2$s for related posts\'s list):'),__('Do you search anything about %1$s? Check those related posts : %2$s'),'textarea');
-          $w->switchWelcome->setting('homeonly',__('Home page only'),true,'check');
+          $w->switchWelcome->setting('welcomesearchtext',__('Welcome text if search exists (use %1$s for keywords and %2$s for related posts\'s list):'),__('Do you search anything about %1$s? Check those related posts: %2$s'),'textarea');
+          $w->switchWelcome->setting('homeonly',__('Display on:'),0,'combo',
+               array(
+                    __('All pages') => 0,
+                    __('Home page only') => 1,
+                    __('Except on home page') => 2
+                    )
+          );
+          $w->switchWelcome->setting('content_only',__('Content only'),0,'check');
+          $w->switchWelcome->setting('class',__('CSS class:'),'');
      }
-     
+
      public static function widget($w)
      {
           global $core;
 
-          if ($w->homeonly && $core->url->type != 'default') {
+          // Si nous sommes pas en page accueil et que c'est coché page accueil uniquement on fait rien
+
+          if (($w->homeonly == 1 && $core->url->type != 'default') ||
+               ($w->homeonly == 2 && $core->url->type == 'default')) {
                return;
           }
-          
+
           if (switchWelcome::getHostReferer() === switchWelcome::getHostReferer($core->blog->url)) {
                return;
@@ -39 +50 @@
 
           $title = strlen($w->title) > 0 ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '';
-          
+
           $visitor = isset($_COOKIE['comment_info']) ? preg_split('#\n#',$_COOKIE['comment_info']) : array(__('visitor'));
 
-          $res = '<p>'.sprintf($w->welcometext,$visitor[0],switchWelcome::getHostRefererLink()).'</p>';
-          
+          $res = '<li>'.sprintf($w->welcometext,$visitor[0],switchWelcome::getHostRefererLink()).'</li>';
+
           if (count(switchWelcome::getSearchWords()) > 0) {
-               $res .= '<p>'.sprintf($w->welcomesearchtext,switchWelcome::getSearchWordsList(),switchWelcome::getRelatedPosts()).'</p>';
+               $res .= '<li>'.sprintf($w->welcomesearchtext,switchWelcome::getSearchWordsList(),switchWelcome::getRelatedPosts()).'</li>';
           }
 
           return
-               '<div id="switchwelcome">'.
+               ($w->content_only ? '' : '<div class="switchwelcome'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
                $title.
+               '<ul>'.
                $res.
-               '</div>';
+               '</ul>'.
+               ($w->content_only ? '' : '</div>');
      }
 }
-
-?>

plugins/switchWelcome/trunk/inc/class.switch.welcome.php

@@ -10 +10 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # -- END LICENSE BLOCK ------------------------------------
-
+if (!defined('DC_RC_PATH')) {return;}
 class switchWelcome
 {
@@ -83 +83 @@
      }
 }
-
-?>

plugins/switchWelcome/trunk/locales/fr/main.po

@@ -24 +24 @@
 #: _widgets.php:23
 msgid "Welcome text (use %1$s for visitor's name and %2$s for where he comes from):"
-msgstr "Texte d'accueil (utilisez %1$s pour le nom du visiteur et %2$s pour sa provenance) :"
+msgstr "Texte d'accueil (utilisez %1$s pour le nom du visiteur et %2$s pour sa provenance) :"
 
 #: _widgets.php:23
@@ -32 +32 @@
 #: _widgets.php:24
 msgid "Welcome text if search exists (use %1$s for keywords and %2$s for related posts's list):"
-msgstr "Texte d'accueil si une recherche a été faite (utilisez %1$s pour les mots clés et %2$s pour la liste des billets en relation) :"
+msgstr "Texte d'accueil si une recherche a été faite (utilisez %1$s pour les mots clés et %2$s pour la liste des billets en relation) :"
 
 #: _widgets.php:24
-msgid "Do you search anything about %1$s? Check those related posts : %2$s"
-msgstr "Vous recherchez quelque chose en rapport avec %1$s? Regardez parmi les articles en relation : %2$s"
+msgid "Do you search anything about %1$s? Check those related posts: %2$s"
+msgstr "Vous recherchez quelque chose en rapport avec %1$s ? Regardez parmi les articles en relation : %2$s"
 
 #: _widgets.php:38