From b9420e697104be6ecab9140fce2edc7cebe2b23b Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Sat, 26 Nov 2022 14:54:16 +0100
Subject: [PATCH] use svg icon and fix admin url

---
 _admin.php   |  31 +++++++------------------------
 icon-big.png | Bin 1823 -> 0 bytes
 icon.png     | Bin 438 -> 0 bytes
 icon.svg     |  32 ++++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 24 deletions(-)
 delete mode 100644 icon-big.png
 delete mode 100644 icon.png
 create mode 100644 icon.svg

diff --git a/_admin.php b/_admin.php
index 64b4915..1b1326c 100644
--- a/_admin.php
+++ b/_admin.php
@@ -45,7 +45,7 @@ if (dcCore::app()->blog->settings->periodical->periodical_active) {
     dcCore::app()->menu[dcAdmin::MENU_PLUGINS]->addItem(
         __('Periodical'),
         dcCore::app()->adminurl->get('admin.plugin.periodical'),
-        dcPage::getPF('periodical/icon.png'),
+        dcPage::getPF('periodical/icon.svg'),
         preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.periodical')) . '(&.*)?$/', $_SERVER['REQUEST_URI']),
         dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([
             dcAuth::PERMISSION_USAGE,
@@ -55,7 +55,7 @@ if (dcCore::app()->blog->settings->periodical->periodical_active) {
 
     dcCore::app()->addBehavior(
         'adminDashboardFavoritesV2',
-        ['adminPeriodical', 'adminDashboardFavorites']
+        ['adminPeriodical', 'adminDashboardFavoritesV2']
     );
     dcCore::app()->addBehavior(
         'adminPostHeaders',
@@ -233,13 +233,13 @@ class adminPeriodical
      *
      * @param   dcFavorites $favs Array of favorites
      */
-    public static function adminDashboardFavorites(dcFavorites $favs)
+    public static function adminDashboardFavoritesV2(dcFavorites $favs)
     {
         $favs->register('periodical', [
             'title'       => __('Periodical'),
-            'url'         => 'plugin.php?p=periodical',
-            'small-icon'  => 'index.php?pf=periodical/icon.png',
-            'large-icon'  => 'index.php?pf=periodical/icon-big.png',
+            'url'         => dcCore::app()->adminurl->get('admin.plugin.periodical'),
+            'small-icon'  => dcPage::getPF('periodical/icon.svg'),
+            'large-icon'  => dcPage::getPF('periodical/icon.svg'),
             'permissions' => dcCore::app()->auth->check(
                 dcCore::app()->auth->makePermissions([
                     dcAuth::PERMISSION_USAGE,
@@ -247,26 +247,9 @@ class adminPeriodical
                 ]),
                 dcCore::app()->blog->id
             ),
-            'active_cb' => [
-                'adminPeriodical',
-                'adminDashboardFavoritesActive',
-            ],
         ]);
     }
 
-    /**
-     * Favorites selection.
-     *
-     * @param   string $request Requested page
-     * @param   array  $params  Requested parameters
-     */
-    public static function adminDashboardFavoritesActive($request, $params)
-    {
-        return $request == 'plugin.php'
-            && isset($params['p'])
-            && $params['p'] == 'periodical';
-    }
-
     /**
      * Add javascript for toggle
      *
@@ -274,7 +257,7 @@ class adminPeriodical
      */
     public static function adminPostHeaders()
     {
-        return dcPage::jsLoad('index.php?pf=periodical/js/toggle.js');
+        return dcPage::jsLoad(dcPage::getPF('periodical/js/toggle.js'));
     }
 
     /**
diff --git a/icon-big.png b/icon-big.png
deleted file mode 100644
index ddb5527e6353e76a3f494a4431cccd8db925a37f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1823
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

diff --git a/icon.png b/icon.png
deleted file mode 100644
index e7476289e621851c04437db9f3f46a28ac18d962..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0003cNkl<ZI8T+*yGq1B6oBDLY9AmV;%&iJ
z&<F5Ri1-kKjjbS}Vxg>HE7}N_f(Rm(Ha>v%*7^z-f{l3j|1rDFX4A}pFFQH6gs>rr
z0;?E{ckN-#9(xDEM2Q<L)%R_dVUNAu$C$wZ=5UJ@Y~r}VoHcvq;f%9kA79wOHGIWq
zd^bG7nmzV9<7_y>56-ZFMZDp+;T6_puQSfZiwz%m#0z|4bAdT)_SkE#zu*(^nVg9W
z4$;L#CTE<Dmn~G7MW?E&X@1k_z}hG=9y9+l0}C#&j&4yDZcpPL)~?F3T#K2O1*bTN
z&AUkB66PP^f5B*dgKeDD=QJEP?*n`jV`xF|8_07Sy>Flq6U5Mh+~_aZ!(E-o;mi)g
gRDEz;4rapSA3G0d5-N^|yZ`_I07*qoM6N<$g5YJff&c&j

diff --git a/icon.svg b/icon.svg
new file mode 100644
index 0000000..d8c86be
--- /dev/null
+++ b/icon.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">  <image id="image0" width="64" height="64" x="0" y="0"
+    href="data:image/png;base64,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
+rkJggg==" />
+</svg>