CHANGELOG.md

@@ -1,21 +1,3 @@
-2023.07.29
-- require Dotclear 2.27
-- require PHP 7.4+
-- update to Dotclear 2.27-dev
-
-2023.04.23
-- require Dotclear 2.26
-- use latest dotclear namespace
-- remove magix
-- fix nullsafe warnings
-
-2023.03.21
-- require Dotclear 2.26
-- use PHP namespace
-- use new plugin structure
-- use new Form class
-- add icon url on blog pref
-
 2022.12.23
 - use anonymlous functions
 - code review (phpstan, php-cs-fixer)

README.md

@@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/JcDenis/simplyFavicon)](https://github.com/JcDenis/simplyFavicon/releases)
 [![Date](https://img.shields.io/github/release-date/JcDenis/simplyFavicon)](https://github.com/JcDenis/simplyFavicon/releases)
 [![Issues](https://img.shields.io/github/issues/JcDenis/simplyFavicon)](https://github.com/JcDenis/simplyFavicon/issues)
-[![Dotclear](https://img.shields.io/badge/dotclear-v2.27-blue.svg)](https://fr.dotclear.org/download)
+[![Dotclear](https://img.shields.io/badge/dotclear-v2.24-blue.svg)](https://fr.dotclear.org/download)
 [![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/simplyFavicon)
 [![License](https://img.shields.io/github/license/JcDenis/simplyFavicon)](https://github.com/JcDenis/simplyFavicon/blob/master/LICENSE)
 
@@ -19,8 +19,7 @@ It adds a favicon to your blog.
 _simplyFavicon_ requires: 
 
  * Administrator permissions
- * Dotclear 2.27
- * PHP 7.4+
+ * Dotclear 2.24
  * A readable public directory.
 
 ## USAGE

_define.php

@@ -18,11 +18,11 @@ $this->registerModule(
     'Simply favicon',
     'Multi-agents favicon',
     'Jean-Christian Denis',
-    '2023.07.29',
+    '2022.12.23',
     [
-        'requires'    => [['core', '2.27']],
+        'requires'    => [['core', '2.24']],
         'permissions' => dcCore::app()->auth->makePermissions([
-            dcCore::app()->auth::PERMISSION_ADMIN,
+            dcAuth::PERMISSION_ADMIN,
         ]),
         'type'        => 'plugin',
         'support'     => 'https://github.com/JcDenis/' . basename(__DIR__),

dcstore.xml

@@ -2,11 +2,11 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="simplyFavicon">
     <name>Simply favicon</name>
-    <version>2023.07.29</version>
+    <version>2022.12.23</version>
     <author>Jean-Christian Denis</author>
     <desc>Multi-agents favicon</desc>
-    <file>https://github.com/JcDenis/simplyFavicon/releases/download/v2023.07.29/plugin-simplyFavicon.zip</file>
-    <da:dcmin>2.27</da:dcmin>
+    <file>https://github.com/JcDenis/simplyFavicon/releases/download/v2022.12.23/plugin-simplyFavicon.zip</file>
+    <da:dcmin>2.24</da:dcmin>
     <da:details>http://plugins.dotaddict.org/dc2/details/simplyFavicon</da:details>
     <da:support>https://github.com/JcDenis/simplyFavicon</da:support>
   </module>

locales/fr/main.lang.php

@@ -9,11 +9,8 @@
 # DOT NOT MODIFY THIS FILE !
 #
 
-use Dotclear\Helper\L10n;
-
-L10n::$locales['Enable favorite icon']                                                                           = 'Activer l\'icône de favori';
-L10n::$locales['You must place an image called favicon.png or .jpg or .ico into your blog\'s public directory.'] = 'Vous devez placer une image nommée favicon.png, .jpg ou .ico dans le répertoire publique du blog.';
-L10n::$locales['There are no favicon in blog public directory']                                                  = 'Il n\'y a pas de Favicon dans le répertoire public du blog.';
-L10n::$locales['Current favicons:']                                                                              = 'Favicons actuels :';
-L10n::$locales['Multi-agents favicon']                                                                           = 'Favicon multi-agents';
-L10n::$locales['Simply favicon']                                                                                 = 'Simple favicon';
+l10n::$locales['Enable "%s" extension']                                                                          = 'Activer l\'extension "%s"';
+l10n::$locales['You must place an image called favicon.png or .jpg or .ico into your blog\'s public directory.'] = 'Vous devez placer une image nommée favicon.png, .jpg ou .ico dans le répertoire publique du blog.';
+l10n::$locales['There are no favicon in blog public directory']                                                  = 'Il n\'y a pas de Favicon dans le répertoire public du blog.';
+l10n::$locales['Current favicons:']                                                                              = 'Favicons actuels :';
+l10n::$locales['Multi-agents favicon']                                                                           = 'Favicon multi-agents';

locales/fr/main.po

@@ -1,17 +1,17 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: simplyFavicon 2023.03.06\n"
+"Project-Id-Version: simplyFavicon 2021.09.02.1\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2023-03-06T22:03:39+00:00\n"
+"PO-Revision-Date: 2021-11-06T09:13:24+00:00\n"
 "Last-Translator: Jean-Christian Denis\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgid "Enable favorite icon"
-msgstr "Activer l'icône de favori"
+msgid "Enable \"%s\" extension"
+msgstr "Activer l'extension \"Simply favicon\""
 
 msgid "You must place an image called favicon.png or .jpg or .ico into your blog's public directory."
 msgstr "Vous devez placer une image nommée favicon.png, .jpg ou .ico dans le répertoire publique du blog."
@@ -24,7 +24,3 @@ msgstr "Favicons actuels :"
 
 msgid "Multi-agents favicon"
 msgstr "Favicon multi-agents"
-
-msgid "Simply favicon"
-msgstr "Simple favicon"
-

src/Backend.php

@@ -10,70 +10,28 @@
  * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-declare(strict_types=1);
-
-namespace Dotclear\Plugin\simplyFavicon;
-
-use dcCore;
-use dcSettings;
-use Dotclear\Core\Process;
-use Dotclear\Helper\File\Path;
-use Dotclear\Helper\Html\Form\{
-    Checkbox,
-    Div,
-    Label,
-    Note,
-    Para
-};
-
-class Backend extends Process
-{
-    public static function init(): bool
-    {
-        return self::status(My::checkContext(My::BACKEND));
-    }
-
-    public static function process(): bool
-    {
-        if (!self::status()) {
-            return false;
-        }
-
-        dcCore::app()->addBehaviors([
-            'adminBlogPreferencesFormV2' => function (dcSettings $blog_settings): void {
-                // nullsafe
-                if (is_null(dcCore::app()->blog)) {
+if (!defined('DC_CONTEXT_ADMIN')) {
     return;
 }
 
+dcCore::app()->addBehaviors([
+    'adminBlogPreferencesFormV2' => function ($blog_settings) {
         $exists = [];
-                $path   = Path::fullFromRoot((string) $blog_settings->get('system')->get('public_path'), DC_ROOT);
+        $path   = path::fullFromRoot((string) $blog_settings->get('system')->get('public_path'), DC_ROOT);
         foreach (['ico', 'png', 'bmp', 'gif', 'jpg', 'mng'] as $ext) {
             if (file_exists($path . '/favicon.' . $ext)) {
-                        $url      = dcCore::app()->blog->url . dcCore::app()->url->getURLFor('simplyFavicon', $ext);
-                        $exists[] = '<li><a href="' . $url . '">' . $url . '</a></li>';
+                $exists[] = sprintf('<li title="%s">%s</li>', $path . '/favicon.' . $ext, 'favicon.' . $ext);
             }
         }
 
         echo
         '<div class="fieldset clear"><h4 id="simply_favicon_params">' . __('Favicon') . '</h4>' .
         '<div class="two-cols"><div class="col">' .
-                (new Div())
-                    ->__call('class', ['box'])
-                    ->__call('items', [[
-                        (new Para())
-                            ->__call('items', [[
-                                (new Checkbox('simply_favicon', (bool) $blog_settings->get('system')->get('simply_favicon')))
-                                    ->__call('value', ['1']),
-                                (new Label(__('Enable favorite icon'), Label::OUTSIDE_LABEL_AFTER))
-                                    ->__call('for', ['simply_favicon'])
-                                    ->__call('class', ['classic']),
-                            ]]),
-                        (new Note())
-                            ->__call('text', [__("You must place an image called favicon.png or .jpg or .ico into your blog's public directory.")])
-                            ->__call('class', ['form-note']),
-                    ]])
-                    ->render() .
+        '<p><label class="classic">' .
+        form::checkbox('simply_favicon', '1', (bool) $blog_settings->get('system')->get('simply_favicon')) .
+        sprintf(__('Enable "%s" extension'), __('Simply favicon')) . '</label></p>' .
+        '<p class="form-note">' .
+        __("You must place an image called favicon.png or .jpg or .ico into your blog's public directory.") .
         '</p></div><div class="col">' .
         (
             empty($exists) ?
@@ -82,11 +40,7 @@ class Backend extends Process
         ) .
         '</div></div><br class="clear" /></div>';
     },
-            'adminBeforeBlogSettingsUpdate' => function (dcSettings $blog_settings): void {
+    'adminBeforeBlogSettingsUpdate' => function ($blog_settings) {
         $blog_settings->get('system')->put('simply_favicon', !empty($_POST['simply_favicon']));
     },
 ]);
-
-        return true;
-    }
-}

src/Frontend.php

@@ -10,33 +10,49 @@
  * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-declare(strict_types=1);
-
-namespace Dotclear\Plugin\simplyFavicon;
-
-use dcCore;
-use Dotclear\Core\Process;
-use Dotclear\Helper\File\Path;
-
-class Frontend extends Process
-{
-    public static function init(): bool
-    {
-        return self::status(My::checkContext(My::FRONTEND));
-    }
-
-    public static function process(): bool
-    {
-        if (!self::status()) {
-            return false;
-        }
-
-        dcCore::app()->addBehavior('publicHeadContent', function (): void {
-            if (is_null(dcCore::app()->blog) || !dcCore::app()->blog->settings->get('system')->get('simply_favicon')) {
+if (!defined('DC_RC_PATH')) {
     return;
 }
 
-            $public_path = Path::fullFromRoot(dcCore::app()->blog->settings->get('system')->get('public_path'), DC_ROOT) . '/favicon.';
+dcCore::app()->addBehavior('publicHeadContent', ['publicSimplyFavicon', 'publicHeadContent']);
+
+class publicSimplyFavicon extends dcUrlHandlers
+{
+    public static $mimetypes = [
+        'ico' => 'image/x-icon',
+        'png' => 'image/png',
+        'bmp' => 'image/bmp',
+        'gif' => 'image/gif',
+        'jpg' => 'image/jpeg',
+        'mng' => 'video/x-mng',
+    ];
+
+    public static function simplyFaviconUrl($arg)
+    {
+        $public_path = path::fullFromRoot(dcCore::app()->blog->settings->get('system')->get('public_path'), DC_ROOT);
+
+        if (dcCore::app()->blog->settings->get('system')->get('simply_favicon')
+            && !empty($arg)
+            && array_key_exists($arg, self::$mimetypes)
+            && file_exists($public_path . '/favicon.' . $arg)
+        ) {
+            header('Content-Type: ' . self::$mimetypes[$arg] . ';');
+            readfile($public_path . '/favicon.' . $arg);
+            exit;
+        }
+
+        self::p404();
+
+        return null;
+    }
+
+    public static function publicHeadContent()
+    {
+        if (!dcCore::app()->blog->settings->get('system')->get('simply_favicon')) {
+            return null;
+        }
+
+        $public_path = path::fullFromRoot(dcCore::app()->blog->settings->get('system')->get('public_path'), DC_ROOT) . '/favicon.';
         $public_url  = dcCore::app()->blog->url . dcCore::app()->url->getBase('simplyFavicon') . '.';
 
         // ico : IE6
@@ -51,7 +67,7 @@ class Frontend extends Process
             '<link rel="icon" type="image/png" href="' . $public_url . 'png" />' . "\n";
         // all others
         } else {
-                foreach (UrlHandler::$mimetypes as $ext => $mime) {
+            foreach (self::$mimetypes as $ext => $mime) {
                 if (in_array($ext, ['ico', 'png'])) {
                     continue;
                 }
@@ -63,8 +79,5 @@ class Frontend extends Process
                 }
             }
         }
-        });
-
-        return true;
     }
 }

src/My.php

@@ -1,21 +0,0 @@
-<?php
-/**
- * @brief simplyFavicon, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis
- *
- * @copyright Jean-Christian Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
-declare(strict_types=1);
-
-namespace Dotclear\Plugin\simplyFavicon;
-
-use Dotclear\Module\MyPlugin;
-
-class My extends MyPlugin
-{
-}

src/Prepend.php

@@ -10,33 +10,10 @@
  * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-declare(strict_types=1);
-
-namespace Dotclear\Plugin\simplyFavicon;
-
-use dcCore;
-use Dotclear\Core\Process;
-
-class Prepend extends Process
-{
-    public static function init(): bool
-    {
-        return self::status(My::checkContext(My::PREPEND));
+if (!defined('DC_RC_PATH')) {
+    return;
 }
 
-    public static function process(): bool
-    {
-        if (!self::status()) {
-            return false;
-        }
+Clearbricks::lib()->autoload(['publicSimplyFavicon' => __DIR__ . '/_public.php']);
 
-        dcCore::app()->url->register(
-            'simplyFavicon',
-            'favicon',
-            '^favicon.(.*?)$',
-            [UrlHandler::class, 'simplyFaviconUrl']
-        );
-
-        return true;
-    }
-}
+dcCore::app()->url->register('simplyFavicon', 'favicon', '^favicon.(.*?)$', ['publicSimplyFavicon', 'simplyFaviconUrl']);

src/UrlHandler.php

@@ -1,53 +0,0 @@
-<?php
-/**
- * @brief simplyFavicon, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis
- *
- * @copyright Jean-Christian Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
-declare(strict_types=1);
-
-namespace Dotclear\Plugin\simplyFavicon;
-
-use dcCore;
-use dcUrlHandlers;
-use Dotclear\Helper\File\Path;
-
-class UrlHandler extends dcUrlHandlers
-{
-    public static array $mimetypes = [
-        'ico' => 'image/x-icon',
-        'png' => 'image/png',
-        'bmp' => 'image/bmp',
-        'gif' => 'image/gif',
-        'jpg' => 'image/jpeg',
-        'mng' => 'video/x-mng',
-    ];
-
-    public static function simplyFaviconUrl(string $arg): void
-    {
-        // nullsafe
-        if (is_null(dcCore::app()->blog)) {
-            return;
-        }
-
-        $public_path = Path::fullFromRoot(dcCore::app()->blog->settings->get('system')->get('public_path'), DC_ROOT);
-
-        if (dcCore::app()->blog->settings->get('system')->get('simply_favicon')
-            && !empty($arg)
-            && array_key_exists($arg, self::$mimetypes)
-            && file_exists($public_path . '/favicon.' . $arg)
-        ) {
-            header('Content-Type: ' . self::$mimetypes[$arg] . ';');
-            readfile($public_path . '/favicon.' . $arg);
-            exit;
-        }
-
-        self::p404();
-    }
-}