12 changed files with 54 additions and 114 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,15 +1,3 @@
-FrontendSession 0.3 - 2025.01.11
-==========================================================
-* Require Dotclear 2.33-dev
-* Require PHP 8.3
-* Add pending user status
-
-FrontendSession 0.2 - 2024.12.31
-===========================================================
-* Require Dotclear 2.33-dev
-* Require PHP 8.3
-* Fix widget options
-
 FrontendSession 0.1 - 2024.12.30
 ===========================================================
 * Require Dotclear 2.33-dev
--- a/README.md
+++ b/README.md
@ -1,45 +1,51 @@
 # README

-[![Release](https://img.shields.io/github/v/release/jcdenis/FrontendSession?color=lightblue)](https://git.dotclear.watch/JcDenis/FrontendSession/releases)
-![Date](https://img.shields.io/github/release-date/jcdenis/FrontendSession?color=red)
-[![Dotclear](https://img.shields.io/badge/dotclear-v2.33-137bbb.svg)](https://fr.dotclear.org/download)
-[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/FrontendSession)
-[![License](https://img.shields.io/github/license/jcdenis/FrontendSession?color=white)](https://git.dotclear.watch/JcDenis/FrontendSession/src/branch/master/LICENSE)
+[![Release](https://img.shields.io/badge/release-2.3.1-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/cinecturlink2/releases)
+![Date](https://img.shields.io/badge/date-2023.11.04-c44d58.svg)]
+[![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download)
+[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/cinecturlink2)
+[![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/cinecturlink2/src/branch/master/LICENSE)

 ## ABOUT

-_FrontendSession_ is a plugin for the open-source web publishing software called [Dotclear](https://www.dotclear.org).
+_cinecturlink2_ is a plugin for the open-source web publishing software called [Dotclear](https://www.dotclear.org).

-> Allow session on frontend.
+> Widgets and pages about books, musics, films, blogs you are interested in
+
+It is hightly based on cinecturlink for Dotclear 1 by Tigroux and maintain by brol.

 ## REQUIREMENTS

-* Dotclear 2.33
+* Dotclear 2.28
 * PHP 8.1+
 * Dotclear admin permission for configuration
+* Dotclear contentadmin permission for management
+* System writable directory on public path to store picture
+* Note: it also creates dedicated database tables

 ## USAGE

-First install _FrontendSession_, manualy from a zip package or from 
+First install _cinecturlink2_, manualy from a zip package or from 
 Dotaddict repository. (See Dotclear's documentation to know how do this)

-Once it's done you can manage FrontendSession option from blog preferences.
+Go to ''plugins manager'', expand _cinecturlink2_ information then 
+go to ''configure plugin'', fill in form.
+
+Once it's done you can manage your cinecturlink from menu 
+''My cinecturlink'' on sidebar or you can add dashboard icon.

 There are templates for public page. These template is adapted to 
 default Dotclear's theme. If you want to create your own template 
-for your theme, copy files from FrontendSession/default-templates 
+for your theme, copy files from cinecturlink2/default-templates 
 to your theme tpl path and adapt them.

-This plugin only manage sign in and session on public pages, nothing more.
-Users must exist on Dotclear's database and have rights permissions.
-Features enabled by session must be done by others plugins.
-
 ## LINKS

-* [License](https://git.dotclear.watch/JcDenis/FrontendSession/src/branch/master/LICENSE)
-* [Packages & details](https://git.dotclear.watch/JcDenis/FrontendSession/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/FrontendSession))
-* [Sources & contributions](https://git.dotclear.watch/JcDenis/FrontendSession) (or on [GitHub](https://github.com/JcDenis/FrontendSession))
-* [Issues & security](https://git.dotclear.watch/JcDenis/FrontendSession/issues) (or on [GitHub](https://github.com/JcDenis/FrontendSession/issues))
+* [License](https://git.dotclear.watch/JcDenis/cinecturlink2/src/branch/master/LICENSE)
+* [Packages & details](https://git.dotclear.watch/JcDenis/cinecturlink2/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/cinecturlink2))
+* [Sources & contributions](https://git.dotclear.watch/JcDenis/cinecturlink2) (or on [GitHub](https://github.com/JcDenis/cinecturlink2))
+* [Issues & security](https://git.dotclear.watch/JcDenis/cinecturlink2/issues) (or on [GitHub](https://github.com/JcDenis/cinecturlink2/issues))
+* [Discuss and help](https://forum.dotclear.org/viewtopic.php?id=40893)

 ## CONTRIBUTORS

--- a/_define.php
+++ b/_define.php
@ -17,14 +17,14 @@ $this->registerModule(
    'Frontend sessions',
    'Allow session on frontend.',
    'Jean-Christian Paul Denis and Contributors',
-    '0.3',
+    '0.1',
    [
        'requires'    => [['core', '2.33']],
-        'settings'    => ['blog' => '#params.' . $this->id . '_params'],
+        'settings'    => ['blog' => '#params.' . basename(__DIR__) . '_params'],
        'permissions' => 'My',
        'type'        => 'plugin',
-        'support'     => 'https://git.dotclear.watch/JcDenis/' . $this->id . '/issues',
-        'details'     => 'https://git.dotclear.watch/JcDenis/' . $this->id . '/src/branch/master/README.md',
-        'repository'  => 'https://git.dotclear.watch/JcDenis/' . $this->id . '/raw/branch/master/dcstore.xml',
+        'support'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
+        'details'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',
+        'repository'  => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
    ]
 );
--- a/dcstore.xml
+++ b/dcstore.xml
@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
  <module id="FrontendSession">
    <name>Frontend Session</name>
-    <version>0.3</version>
+    <version>0.1</version>
    <author>Jean-Christian Paul Denis and contributors</author>
    <desc>Allow session on frontend.</desc>
-    <file>https://github.com/JcDenis/FrontendSession/releases/download/v0.3/plugin-FrontendSession.zip</file>
+    <file>https://github.com/JcDenis/FrontendSession/releases/download/v0.1/plugin-FrontendSession.zip</file>
    <da:dcmin>2.33</da:dcmin>
    <da:details>https://git.dotclear.watch/JcDenis/FrontendSession/src/branch/master/README.md</da:details>
    <da:support>https://git.dotclear.watch/JcDenis/FrontendSession/issues</da:support>
--- a/default-templates/dotty/FrontendSession.html
+++ b/default-templates/dotty/FrontendSession.html
@ -47,7 +47,7 @@
 				<input type="password" id="{{tpl:FrontendSessionID}}_page_password" name="{{tpl:FrontendSessionID}}_password" value="" />
 			</p>
 			<p>
-				<input class="submit" type="submit" id="{{tpl:FrontendSessionID}}_page_submit" name="{{tpl:FrontendSessionID}}_submit" value="{{tpl:lang Connect}}" />
+				<input class="submit" type="submit" id="{{tpl:FrontendSessionID}}_page_submit" name="{{tpl:FrontendSessionID}}_submit" value="{{tpl:lang Start to share}}" />
 			</p>
 			</form>
 		</div>
--- a/icon.svg
+++ b/icon.svg
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="64px" height="64px" viewBox="0 0 24 24" id="_24x24_On_Light_Session-Join" data-name="24x24/On Light/Session-Join" xmlns="http://www.w3.org/2000/svg">
-  <rect id="view-box" width="24" height="24" fill="none"/>
-  <path id="Shape" d="M5.75,17.5a.75.75,0,0,1,0-1.5h8.8A1.363,1.363,0,0,0,16,14.75v-12A1.363,1.363,0,0,0,14.55,1.5H5.75a.75.75,0,0,1,0-1.5h8.8A2.853,2.853,0,0,1,17.5,2.75v12A2.853,2.853,0,0,1,14.55,17.5ZM7.22,13.28a.75.75,0,0,1,0-1.061L9.939,9.5H.75A.75.75,0,0,1,.75,8H9.94L7.22,5.28A.75.75,0,0,1,8.28,4.22l4,4,.013.013.005.006.007.008.007.008,0,.005.008.009,0,0,.008.01,0,0,.008.011,0,0,.008.011,0,0,.008.011,0,0,.007.011,0,.005.006.01,0,.007,0,.008,0,.009,0,.006.006.011,0,0,.008.015h0a.751.751,0,0,1-.157.878L8.28,13.28a.75.75,0,0,1-1.06,0Z" transform="translate(3.25 3.25)" fill="#b2b2b2"/>
-</svg>
--- a/src/Backend.php
+++ b/src/Backend.php
@ -7,7 +7,6 @@ namespace Dotclear\Plugin\FrontendSession;
 use ArrayObject;
 use Dotclear\App;
 use Dotclear\Core\Process;
-use Dotclear\Core\Backend\Notices;
 use Dotclear\Helper\Html\Form\{
    Checkbox,
    Div,
@ -17,7 +16,6 @@ use Dotclear\Helper\Html\Form\{
    Textarea
 };
 use Dotclear\Helper\Html\Html;
-use Dotclear\Helper\Network\Http;
 use Dotclear\Interface\Core\BlogSettingsInterface;

 /**
@ -95,23 +93,6 @@ class Backend extends Process
                    $attr[2] = App::blog()->url() . App::url()->getURLFor(My::id());
                }
            },
-            'adminUsersActions' => function (array $users, array $blogs, string $action, string $redir): void {
-                if ($action == My::id()) {
-                    foreach ($users as $u) {
-                        try {
-                            $cur              = App::auth()->openUserCursor();
-                            $cur->user_status = My::USER_PENDING;
-                            App::users()->updUser($u, $cur);
-                        } catch (Exception $e) {
-                            App::error()->add($e->getMessage());
-                        }
-                    }
-                    if (!App::error()->flag()) {
-                        Notices::addSuccessNotice(__('User has been successfully marked as pending.'));
-                        Http::redirect($redir);
-                    }
-                }
-            },
        ]);

        return true;
--- a/src/Frontend.php
+++ b/src/Frontend.php
@ -93,47 +93,30 @@ class Frontend extends Process
            // we check the user and its perm
            if (App::auth()->checkUser($user_id, $user_pwd, $user_key, false) === true
             && App::auth()->check(My::id(), App::blog()->id()) === true
-             //&& !App::status()->user()->isRestricted((int) App::auth()->getInfo('user_status'))
            ) {
-                // check if user is pending activation
-                if ((int) App::auth()->getInfo('user_status') == My::USER_PENDING) {
-                    self::resetCookie();
-                    Http::redirect(App::blog()->url() . App::url()->getURLFor(My::id()) . '/pending');
-                // check if user is not enabled
-                } elseif (App::status()->user()->isRestricted((int) App::auth()->getInfo('user_status'))) {
-                     self::resetCookie();
-                    Http::redirect(Http::getSelfURI());
+                if ($user_key === null) {
+                    $cookie_console = Http::browserUID(
+                        App::config()->masterKey() .
+                        $user_id .
+                        App::auth()->cryptLegacy($user_id)
+                    ) . bin2hex(pack('a32', $user_id));
                } else {
-                    if ($user_key === null) {
-                        $cookie_console = Http::browserUID(
-                            App::config()->masterKey() .
-                            $user_id .
-                            App::auth()->cryptLegacy($user_id)
-                        ) . bin2hex(pack('a32', $user_id));
-                    } else {
-                        $cookie_console = $_COOKIE[My::id()];
-                    }
-                    setcookie(My::id(), $cookie_console, strtotime('+20 hours'), '/', '', self::useSSL());
+                    $cookie_console = $_COOKIE[My::id()];
                }
+                setcookie(My::id(), $cookie_console, strtotime('+20 hours'), '/', '', self::useSSL());
            } else {
-                self::resetCookie();
+                //App::frontend()->context()->form_error = __("Error: your password may be wrong or you haven't an account or you haven't ask for its activation.");
+
+                if (isset($_COOKIE[My::id()])) {
+                    unset($_COOKIE[My::id()]);
+                    setcookie(My::id(), '', time() - 3600, '/', '', self::useSSL());
+                }
                // need to replay doAuthControl() to remove user information from Auth if it exists but have no permissions
                Http::redirect(Http::getSelfURI());
            }
        }
    }

-    /**
-     * Remove cookie
-     */
-    public static function resetCookie(): void
-    {
-        if (isset($_COOKIE[My::id()])) {
-            unset($_COOKIE[My::id()]);
-            setcookie(My::id(), '', time() - 3600, '/', '', self::useSSL());
-        }
-    }
-
    /**
     * Check SSL.
     */
--- a/src/My.php
+++ b/src/My.php
@ -18,5 +18,5 @@ use Dotclear\Module\MyPlugin;
 */
 class My extends MyPlugin
 {
-    public const USER_PENDING = -201;
+    // nothing special
 }
--- a/src/Prepend.php
+++ b/src/Prepend.php
@ -5,8 +5,9 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\FrontendSession;

 use Dotclear\App;
+use Dotclear\Core\PostType;
 use Dotclear\Core\Process;
-use Dotclear\Helper\Stack\Status;
+use Dotclear\Database\MetaRecord;

 /**
 * @brief       FrontendSession module prepend.
@ -28,13 +29,13 @@ class Prepend extends Process
            return false;
        }

-        // Add frontend permission (required to login in frontend)
+        // contributor permission
        App::auth()->setPermissionType(
            My::id(),
-            My::name()
+            My::name() . ':' . __('Frontend')
        );

-        // Add session login URL
+        // add session login URL
        App::url()->register(
            My::id(),
            'session/login',
@ -42,15 +43,6 @@ class Prepend extends Process
            [UrlHandler::class, 'sessionLogin']
        );

-        // Add user status
-        App::status()->user()->set((new Status(
-            My::USER_PENDING , 
-            My::id(), 
-            'Pending registration', 
-            'pending registration (>1)', 
-            My::fileURL('icon.svg'))
-        ));
-
        return true;
    }
 }
--- a/src/UrlHandler.php
+++ b/src/UrlHandler.php
@ -49,10 +49,6 @@ class UrlHandler extends Url
            App::blog()->triggerBlog();

            Http::redirect(App::blog()->url());
-        // user pending activation
-        } elseif (is_array($args) && $args[0] == 'pending' && App::auth()->userID() == '') {
-            App::frontend()->context()->form_error = __("Error: your account is not yet activated.");
-            self::serveTemplate(My::id() . '.html');
        // no loggin session, go to login page
        } elseif (App::auth()->userID() == '') {
            self::serveTemplate(My::id() . '.html');
--- a/src/Widgets.php
+++ b/src/Widgets.php
@ -35,7 +35,6 @@ class Widgets
                'Public login form'
            )
            ->addTitle(__('Login'))
-            ->addHomeOnly()
            ->addContentOnly()
            ->addClass()
            ->addOffline();
@ -59,7 +58,7 @@ class Widgets
        } else {
            $res .= '<form method="post" name="' . My::id() . '_form" id="' . My::id() . '_widget_form" action="">';
            if (App::frontend()->context()->form_error !== null) {
-                //$res .= '<p class="erreur">' . Html::escapeHTML(App::frontend()->context()->form_error) . '</p>';
+                $res .= '<p class="erreur">' . Html::escapeHTML(App::frontend()->context()->form_error) . '</p>';
            }
            $res .= '<p>' .
                    '<label for="' . My::id() . '_login" class="required">' . __('Login:') . '</label><br />' .