release 1.0

CHANGELOG.md

@@ -1,51 +1,50 @@
-todo
+1.0 - 2022.12.21
-bug jsToolBar !
-
-1.0 - 2022.12.xx
 * update to dotclear 2.24
+* remove currywurst template
+* add dotty template
 
-v0.9 - 19-07-2015 - Pierre Van Glabek
+0.9 - 2015.07.19 - Pierre Van Glabek
 * héritabe thème mustek
 * dc2.8 requis
 
-v0.8.1 - 22-04-2015 - Pierre Van Glabeke
+0.8.1 - 2015.04.22 - Pierre Van Glabeke
 * modif url support
 * modif tpl (validation html5)
 
-v0.8 - 20-02-2015 - Pierre Van Glabeke
+0.8 - 2015.02.20 - Pierre Van Glabeke
 * ajout barre d'édition dcLegacyEditor
 * correction tpl mustek disclaimer.html
 
-v0.7 - 16-01-2015 - Pierre Van Glabeke
+0.7 - 2015.01.06 - Pierre Van Glabeke
 * compatibilité dc2.7
 * modification tpl pour html5 (currywurst et mustek)
 * modification localisation
 * modification fichier css
 
-v0.6.2 - 2013-11-14
+0.6.2 - 2013.11.14
 * Switch to Dotclear 2.6
 
-v0.6.1 - 2010-11-12
+0.6.1 - 2010.11.12
 * Fixed install on nightly build
 * Fixed some post fields
 
-v0.6 - 2010-06-05
+0.6 - 2010.06.05
 * Switched to DC 2.2
 
-v0.5 - 2009-12-13
+0.5 - 2009.12.13
 * Added LICENSE
 * Added versioning
 * Prepared DC 2.2 break
 
-v0.4.1 - 2009-11-12
+0.4.1 - 2009.11.12
 * Fixed ''header'' errors on public side
 
-v0.4 - 2009-09-23
+0.4 - 2009.09.23
 * Fixed DC 2.1.6 URL handlers ending
 
-v0.3 - 2009-09-15
+0.3 - 2009.09.15
 * Fixed search engine indexing
 * Added support of plugin dcAdvancedCleaner
 
-v0.2 - 2009-08-16
+0.2 - 2009.08.16
 * Fixed php 5.3 compatibility

README.md

@@ -7,41 +7,45 @@
 [![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/disclaimer)
 [![License](https://img.shields.io/github/license/JcDenis/disclaimer)](https://github.com/JcDenis/disclaimer/blob/master/LICENSE)
 
-## QU'EST CE QUE DISCLAIMER ?
+## WHAT IS  DISCLAIMER ?
 
-"disclaimer" est un plugin pour l'outil open source de 
+_disclaimer_  is a plugin for the open-source 
-publication web nommé Dotclear.
+web publishing software called Dotclear.
 
-Ce plugin permet d'ajouter un texte d'avertissement 
+It add a disclaimer to your blog entrance.
-pour le visiteur avant son entrée sur le blog.
 
-Le code de ce plugin est largement inspiré du plugin
+This plugin is inspired from plugin "Private mode"  by Osku.
-"Private mode" d'Osku.
 
-## LICENCE
+## REQUIREMENTS
 
-This file is part of disclaimer, a plugin for Dotclear 2.
+ _disclaimer_ requires: 
-Copyright (c) 2009 JC Denis and contributors
-jcdenis@gdwd.com
-Licensed under the GPL version 2.0 license.
-A copy of this license is available at
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
-Some icons from Silk icon set 1.3 by Mark James at:
+  * admin permissions on blog
-http://www.famfamfam.com/lab/icons/silk/
+  * Dotclear 2.24
-under a Creative Commons Attribution 2.5 License at
-http://creativecommons.org/licenses/by/2.5/
-
-## SUPPORT
-
-http://forum.dotclear.net
-
-### Note
-
-Certains thèmes ne sont pas compatibles avec ce plugin.
 
 ## USAGE
 
+First install _disclaimer_, manualy from a zip package or from 
+Dotaddict repository. (See Dotclear's documentation to know how do this)
+
+You can activate and setup _disclaimer_ from blog preferences page.
+
+## LINKS
+
+ * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
+ * Source & contribution : [GitHub Page](https://github.com/JcDenis/disclaimer)
+ * Packages & details : [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/disclaimer)
+ * Help & discuss : [Dotclear forum](http://forum.dotclear.org/viewtopic.php?id=40000)
+
+## CONTRIBUTORS
+
+ * Jean-Christian Denis (author)
+ * Pierre Van Glabeke
+
+ You are welcome to contribute to this code.
+
+## HELP (in french)
+
 ### Paramètres
 
 La configuration du plugin est situé dans
@@ -84,10 +88,9 @@ tous les user-agent vers le disclaimer.
 
 Le fichier de template par default pour la page d'avertissement 
 se situe dans le repertoire "/default-template/mustek/disclaimer.html" ou
-"/default-template/currywurst/disclaimer.html" du plugin.
+"/default-template/dotty/disclaimer.html" du plugin.
-
+Il sera utilisé par défaut, sinon il faut le copier 
-Il faut le copier dans le repertoire /tpl du thème pour le modifier.
+dans le repertoire /tpl de votre thème pour le modifier.
-
 
 ### Balises
 
@@ -106,8 +109,3 @@ Texte de l'avertissement.
 A mettre dans l'attribut "action" de la balise "form".
 
 Ces balises supportent les attributs communs.
-
-
----
-Cordialement et en français dans le texte,
-Jean-Christian Denis

_admin.php

@@ -36,7 +36,7 @@ dcCore::app()->addBehavior('adminBlogPreferencesHeaders', function () {
 
     return
         dcCore::app()->callBehavior('adminPostEditor', $editor['xhtml'], 'disclaimer', ['#disclaimer_text'], 'xhtml') .
-    	dcPage::jsModuleLoad(basename(__DIR__) . '/js/admin.js');
+        dcPage::jsModuleLoad(basename(__DIR__) . '/js/admin.js');
 });
 
 dcCore::app()->addBehavior('adminBlogPreferencesFormV2', function (dcSettings $blog_settings) {
@@ -50,7 +50,7 @@ dcCore::app()->addBehavior('adminBlogPreferencesFormV2', function (dcSettings $b
 
     echo
     '<div class="fieldset">' .
-    '<h4>' . __('Disclaimer') . '</h4>' .
+    '<h4 id="disclaimerParam">' . __('Disclaimer') . '</h4>' .
     '<div class="two-boxes">' .
 
     '<p><label class="classic" for="disclaimer_active">' .

_define.php

@@ -18,7 +18,7 @@ $this->registerModule(
     'disclaimer',
     'Add a disclaimer to your blog entrance',
     'Jean-Christian Denis, Pierre Van Glabeke',
-    '0.10',
+    '1.0',
     [
         'requires'    => [['core', '2.24']],
         'permissions' => dcCore::app()->auth->makePermissions([
@@ -28,5 +28,8 @@ $this->registerModule(
         'support'     => 'http://forum.dotclear.org/viewtopic.php?id=40000',
         'details'     => 'https://github.com/JcDenis/' . basename(__DIR__),
         'repository'  => 'https://raw.githubusercontent.com/JcDenis/' . basename(__DIR__) . '/master/dcstore.xml',
+        'settings'    => [
+            'blog' => '#params.disclaimerParam',
+        ],
     ]
 );

_public.php

@@ -60,7 +60,8 @@ dcCore::app()->addBehavior(
  */
 class urlDisclaimer extends dcUrlHandlers
 {
-	private const COOKIE_PREFIX = 'dc_disclaimer_cookie_';
+    private const COOKIE_PREFIX  = 'dc_disclaimer_cookie_';
+    private const SESSION_PREFIX = 'dc_disclaimer_sess_';
 
     public static $default_bots_agents = [
         'bot','Scooter','Slurp','Voila','WiseNut','Fast','Index','Teoma',
@@ -126,7 +127,7 @@ class urlDisclaimer extends dcUrlHandlers
         $session = new sessionDB(
             dcCore::app()->con,
             dcCore::app()->prefix . 'session',
-            'dc_disclaimer_sess_' . dcCore::app()->blog->id,
+            self::SESSION_PREFIX . dcCore::app()->blog->id,
             '/'
         );
         $session->start();

dcstore.xml

@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="disclaimer">
     <name>disclaimer</name>
-    <version>0.10</version>
+    <version>1.0</version>
     <author>Jean-Christian Denis, Pierre Van Glabeke</author>
     <desc>Add a disclaimer to your blog entrance</desc>
-    <file>https://github.com/JcDenis/disclaimer/releases/download/v0.10/plugin-disclaimer.zip</file>
+    <file>https://github.com/JcDenis/disclaimer/releases/download/v1.0/plugin-disclaimer.zip</file>
     <da:dcmin>2.24</da:dcmin>
     <da:details>https://github.com/JcDenis/disclaimer</da:details>
     <da:support>http://forum.dotclear.org/viewtopic.php?id=40000</da:support>