From cc3bca98c4f0b3400cec7353dbe911c7c1251ce2 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Fri, 6 Jan 2023 00:48:09 +0100
Subject: [PATCH] release 0.3

---
 CHANGELOG.md             |  8 ++++++--
 _admin.php               | 25 ++++++++++++++++++-------
 _define.php              | 15 ++++++++++-----
 _prepend.php             | 11 +++++++++++
 dcstore.xml              |  4 ++--
 inc/Admin.php            | 17 +++++++++++++----
 inc/Manage.php           | 26 +++++++++++++++++---------
 inc/Prepend.php          | 13 ++++++++++++-
 index.php                | 27 +++++++++++++++++++--------
 locales/fr/main.lang.php | 18 ++++++++++++++++++
 locales/fr/main.po       | 15 +++++++++------
 11 files changed, 135 insertions(+), 44 deletions(-)
 create mode 100644 locales/fr/main.lang.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fdb897..261f115 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+0.3 - 2023.01.06
+* use namespace
+* use abstract plugin id
+
 0.2 - 2022.11.27
-- update to Dotclear 2.24
-- add fr translation
\ No newline at end of file
+* update to Dotclear 2.24
+* add fr translation
\ No newline at end of file
diff --git a/_admin.php b/_admin.php
index 9f13439..4cbd1de 100644
--- a/_admin.php
+++ b/_admin.php
@@ -1,7 +1,18 @@
-<?php
-declare(strict_types=1);
-
-$admin = implode('\\', ['Dotclear', 'Plugin', basename(__DIR__), 'Admin']);
-if ($admin::init()) {
-    $admin::process();
-}
\ No newline at end of file
+<?php
+/**
+ * @brief testMail, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Osku and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
+declare(strict_types=1);
+
+$admin = implode('\\', ['Dotclear', 'Plugin', basename(__DIR__), 'Admin']);
+if ($admin::init()) {
+    $admin::process();
+}
diff --git a/_define.php b/_define.php
index 987ce48..1622e4a 100644
--- a/_define.php
+++ b/_define.php
@@ -7,9 +7,14 @@
  *
  * @author Osku and contributors
  *
- * @copyright Jean-Crhistian Denis
+ * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
+declare(strict_types=1);
+
+// can not use namespace as it is included inside a class method,
+// and also can be included in third party plugins class methods.
+
 if (!defined('DC_RC_PATH')) {
     return null;
 }
@@ -18,13 +23,13 @@ $this->registerModule(
     'Mail test',
     'Send a simple mail from admin',
     'Osku and contributors',
-    '0.2',
+    '0.3',
     [
         'requires'    => [['core', '2.24']],
         'permissions' => null,
         'type'        => 'plugin',
-        'support'     => 'https://github.com/JcDenis/testMail',
-        'details'     => 'https://plugins.dotaddict.org/dc2/details/testMail',
-        'repository'  => 'https://raw.githubusercontent.com/JcDenis/testMail/master/dcstore.xml',
+        'support'     => 'https://github.com/JcDenis/' . basename(__DIR__),
+        'details'     => 'https://plugins.dotaddict.org/dc2/details/' . basename(__DIR__),
+        'repository'  => 'https://raw.githubusercontent.com/JcDenis/' . basename(__DIR__) . '/master/dcstore.xml',
     ]
 );
diff --git a/_prepend.php b/_prepend.php
index 3296660..f500181 100644
--- a/_prepend.php
+++ b/_prepend.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * @brief testMail, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Osku and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 $prepend = implode('\\', ['Dotclear', 'Plugin', basename(__DIR__), 'Prepend']);
diff --git a/dcstore.xml b/dcstore.xml
index 4b10a97..6f295da 100644
--- a/dcstore.xml
+++ b/dcstore.xml
@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="testMail">
     <name>Mail test</name>
-    <version>0.2</version>
+    <version>0.3</version>
     <author>Osku and contributors</author>
     <desc>Send a simple mail from admin</desc>
-    <file>https://github.com/JcDenis/testMail/releases/download/v0.2/plugin-testMail.zip</file>
+    <file>https://github.com/JcDenis/testMail/releases/download/v0.3/plugin-testMail.zip</file>
     <da:dcmin>2.24</da:dcmin>
     <da:details>https://plugins.dotaddict.org/dc2/details/testMail</da:details>
     <da:support>https://github.com/JcDenis/testMail</da:support>
diff --git a/inc/Admin.php b/inc/Admin.php
index 1a1b6ad..b676178 100644
--- a/inc/Admin.php
+++ b/inc/Admin.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * @brief testMail, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Osku and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\testMail;
@@ -10,13 +21,11 @@ use dcPage;
 
 class Admin
 {
-    private static $name = '';
     protected static $init = false;
 
     public static function init(): bool
     {
         if (defined('DC_CONTEXT_ADMIN')) {
-            self::$name = __('Mail test');
             self::$init = true;
         }
 
@@ -29,8 +38,8 @@ class Admin
             return false;
         }
 
-        dcCore::app()->menu[dcAdmin::MENU_SYSTEM]->addItem(
-            self::$name,
+        dcCore::app()->menu[dcAdmin::MENU_PLUGINS]->addItem(
+            dcCore::app()->plugins->moduleInfo(basename(__NAMESPACE__), 'name'),
             dcCore::app()->adminurl->get('admin.plugin.' . basename(__NAMESPACE__)),
             dcPage::getPF(basename(__NAMESPACE__) . '/icon.svg'),
             preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.' . basename(__NAMESPACE__))) . '(&.*)?$/', $_SERVER['REQUEST_URI']),
diff --git a/inc/Manage.php b/inc/Manage.php
index c3980f5..863b8a0 100644
--- a/inc/Manage.php
+++ b/inc/Manage.php
@@ -7,7 +7,7 @@
  *
  * @author Osku and contributors
  *
- * @copyright Jean-Crhistian Denis
+ * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 declare(strict_types=1);
@@ -29,10 +29,10 @@ use text;
 class Manage
 {
     private static $active_headers = false;
-    private static $mail_to  = '';
-    private static $mail_subject  = '';
-    private static $mail_content  = '';
-    protected static $init = false;
+    private static $mail_to        = '';
+    private static $mail_subject   = '';
+    private static $mail_content   = '';
+    protected static $init         = false;
 
     public static function init(): bool
     {
@@ -91,13 +91,21 @@ class Manage
                 dcCore::app()->error->add($e->getMessage());
             }
         }
+
         return null;
     }
 
     public static function render(): void
     {
-        echo '<html><head><title>' . __('Mail test') . '</title></head><body>' .
-        dcPage::breadcrumb([__('System') => '', __('Mail test') => '']) .
+        echo
+        '<html><head><title>' .
+        dcCore::app()->plugins->moduleInfo(basename(__NAMESPACE__), 'name') .
+        '</title></head><body>' .
+
+        dcPage::breadcrumb([
+            __('System')                                                        => '',
+            dcCore::app()->plugins->moduleInfo(basename(__NAMESPACE__), 'name') => '',
+        ]) .
         dcPage::notices() . '
 
         <div id="mail_testor">
@@ -127,7 +135,7 @@ class Manage
         dcCore::app()->formNonce() . '</p>' .
         '</form>
         </div>
-        </body>
-        </html>';
+
+        </body></html>';
     }
 }
diff --git a/inc/Prepend.php b/inc/Prepend.php
index 317e1e0..0679652 100644
--- a/inc/Prepend.php
+++ b/inc/Prepend.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * @brief testMail, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Osku and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\testMail;
@@ -29,7 +40,7 @@ class Prepend
 
         foreach (self::LIBS as $lib) {
             Clearbricks::lib()->autoload([
-                implode('\\', ['Dotclear','Plugin', basename(__NAMESAPCE__), $lib]) => __DIR__ . DIRECTORY_SEPARATOR . $lib . '.php'
+                implode('\\', ['Dotclear','Plugin', basename(__NAMESPACE__), $lib]) => __DIR__ . DIRECTORY_SEPARATOR . $lib . '.php',
             ]);
         }
 
diff --git a/index.php b/index.php
index 045048a..8ccdc0e 100644
--- a/index.php
+++ b/index.php
@@ -1,8 +1,19 @@
-<?php
-declare(strict_types=1);
-
-$manage = implode('\\', ['Dotclear', 'Plugin', basename(__DIR__), 'Manage']);
-if ($manage::init()) {
-    $manage::process();
-    $manage::render();
-}
\ No newline at end of file
+<?php
+/**
+ * @brief testMail, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Osku and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
+declare(strict_types=1);
+
+$manage = implode('\\', ['Dotclear', 'Plugin', basename(__DIR__), 'Manage']);
+if ($manage::init()) {
+    $manage::process();
+    $manage::render();
+}
diff --git a/locales/fr/main.lang.php b/locales/fr/main.lang.php
new file mode 100644
index 0000000..380387a
--- /dev/null
+++ b/locales/fr/main.lang.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package Dotclear
+ *
+ * @copyright Olivier Meunier & Association Dotclear
+ * @copyright GPL-2.0-only
+ */
+#
+# DOT NOT MODIFY THIS FILE !
+#
+
+l10n::$locales['You must provide a content.']   = 'Vous devez fournir un contenu.';
+l10n::$locales['Mail successuffly sent.']       = 'Mail envoyer avec succès.';
+l10n::$locales['Mailto:']                       = 'Envoyer à :';
+l10n::$locales['Subject:']                      = 'Sujet :';
+l10n::$locales['Active mail headers']           = 'Activer les entêtes de mail';
+l10n::$locales['Mail test']                     = 'Mail test';
+l10n::$locales['Send a simple mail from admin'] = 'Envoyer un simple mail depuis l\'admin';
diff --git a/locales/fr/main.po b/locales/fr/main.po
index e0218ef..eb06195 100644
--- a/locales/fr/main.po
+++ b/locales/fr/main.po
@@ -1,18 +1,15 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: testMail 0.2\n"
+"Project-Id-Version: testMail 0.2.1\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-11-27T22:19:31+00:00\n"
-"Last-Translator: Jean-Crhistian Denis\n"
+"PO-Revision-Date: 2023-01-05T23:44:36+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 "Mail test"
-msgstr "Mail test"
-
 msgid "You must provide a content."
 msgstr "Vous devez fournir un contenu."
 
@@ -28,3 +25,9 @@ msgstr "Sujet :"
 msgid "Active mail headers"
 msgstr "Activer les entêtes de mail"
 
+msgid "Mail test"
+msgstr "Mail test"
+
+msgid "Send a simple mail from admin"
+msgstr "Envoyer un simple mail depuis l'admin"
+