Changeset 93540 in spip-zone

Timestamp:

Dec 11, 2015, 3:31:27 PM (5 years ago)

Author:

kent1@…

Message:

Indentation / PHPdoc

Petit incrément de version

Location:

_plugins_/cookiebar/trunk

Files:

• cookiebar_pipelines.php (modified) (2 diffs)
• paquet.xml (modified) (2 diffs)

_plugins_/cookiebar/trunk/cookiebar_pipelines.php

@@ -1 +1 @@
 <?php
+/**
+ * Plugin Cookie bar pour Spip 3.0.
+ * 
+ * @licence    GNU/GPL
+ * @package    SPIP\Cookiebar\Pipelines
+ */
+if (!defined('_ECRIRE_INC_VERSION'))
+        return;
 
 /**
- * Plugin Cookie bar pour Spip 3.0.
+ * Inserer la CSS de cookie bar dans le head public.
+ *
+ * @pipeline insert_head_css
+ * 
+ * @param string $flux
+ *      Le contenu de la balise #INSERT_HEAD_CSS
+ * @return string
  */
-if (!defined('_ECRIRE_INC_VERSION')) {
-    return;
-}
+function cookiebar_insert_head_css($flux){
+        if(defined('_COOKIEBAR_CSS_NON'))
+                return $flux;
 
-/**
- * Inserer la CSS de cookie bar.
- *
- * @param $flux
- *
- * @return mixed
- */
-function cookiebar_insert_head_css($flux)
-{
-    if (defined('_COOKIEBAR_CSS_NON')) {
-        return $flux;
-    }
+        $flux .= '<link rel="stylesheet" type="text/css" href="'.find_in_path('css/jquery.cookiebar.css').'" />';
 
-    $flux .= '<link rel="stylesheet" type="text/css" href="'.find_in_path('css/jquery.cookiebar.css').'" />';
-
-    return $flux;
+        return $flux;
 }
 
@@ -29 +30 @@
  * Inserer le javascript de cookiebar.
  *
- * @param $flux
- *
+ * @pipeline insert_head
+ * 
+ * @param string $flux
+ *      Le contenu de la balise #INSERT_HEAD
  * @return mixed
  */
-function cookiebar_insert_head($flux)
-{
-    //$js_cookiebar = parametre_url(generer_url_public('jquery.cookiebar.js'), 'lang', $lang);
-    include_spip('inc/filtres');
-    if (!$lang) {
-        $lang = (isset($GLOBALS['spip_lang']) ? $GLOBALS['spip_lang'] : 'fr');
-    }
-    $js_cookiebar = produire_fond_statique('jquery.cookiebar.js', array('lang' => $lang));
+function cookiebar_insert_head($flux){
+        include_spip('inc/filtres');
+        
+        $lang = (isset($GLOBALS['spip_lang']) ? $GLOBALS['spip_lang'] : 'fr');
+        $js_cookiebar = produire_fond_statique('jquery.cookiebar.js', array('lang' => $lang));
 
-    $flux .= "<script type='text/javascript' src='$js_cookiebar'></script>\n"
-    ."<script type='text/javascript' src='".find_in_path('js/jquery.cookiebar.call.js')."'></script>";
+        $flux .= "<script type='text/javascript' src='$js_cookiebar'></script>\n";
+        $flux .= "<script type='text/javascript' src='".find_in_path('js/jquery.cookiebar.call.js')."'></script>";
 
-    return $flux;
+        return $flux;
 }

_plugins_/cookiebar/trunk/paquet.xml

@@ -2 +2 @@
         prefix="cookiebar"
         categorie="communication"
-        version="1.1.5"
+        version="1.1.6"
         etat="test"
         compatibilite="[3.0.17;3.1.*]"
@@ -8 +8 @@
         documentation="http://contrib.spip.net/4554"
 >
-  <nom>cookiebar</nom>
-  <auteur lien='http://www.primebox.co.uk/projects/cookie-bar/'>primebox</auteur>
-  <auteur lien="http://www.erational.org">erational (mise en plugin)</auteur>
-  <licence lien="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</licence>
-  
-  <pipeline nom="insert_head_css" inclure="cookiebar_pipelines.php" />
-  <pipeline nom="insert_head" inclure="cookiebar_pipelines.php" />
+        <nom>cookiebar</nom>
+        <auteur lien='http://www.primebox.co.uk/projects/cookie-bar/'>primebox</auteur>
+        <auteur lien="http://www.erational.org">erational (mise en plugin)</auteur>
+        <licence lien="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</licence>
+        
+        <pipeline nom="insert_head_css" inclure="cookiebar_pipelines.php" />
+        <pipeline nom="insert_head" inclure="cookiebar_pipelines.php" />
 </paquet>