fix permissions, table name, icon

_admin.php

@@ -22,9 +22,9 @@ require_once __DIR__ . '/_widgets.php';
 dcCore::app()->menu[dcAdmin::MENU_PLUGINS]->addItem(
     __('Links shortener'),
     dcCore::app()->adminurl->get('admin.plugin.kUtRL'),
-    dcPage::getPF('kUtRL/icon.png'),
+    urldecode(dcPage::getPF('kUtRL/icon.svg')),
     preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.kUtRL')) . '(&.*)?$/', $_SERVER['REQUEST_URI']),
-    dcCore::app()->auth->check(dcAuth::PERMISSION_ADMIN, dcCore::app()->blog->id)
+    dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_ADMIN]), dcCore::app()->blog->id)
 );
 
 # Admin behaviors
@@ -69,7 +69,7 @@ class adminKutrl
                 'url'         => dcCore::app()->adminurl->get('admin.plugin.kUtRL'),
                 'small-icon'  => dcPage::getPF('kUtRL/icon.png'),
                 'large-icon'  => dcPage::getPF('kUtRL/icon-b.png'),
-                'permissions' => 'admin',
+                'permissions' => dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_ADMIN]),
             ]
         );
     }
@@ -263,7 +263,7 @@ class adminKutrl
         $s = dcCore::app()->blog->settings->kUtRL;
 
         if (!$s->kutrl_active
-         || !dcCore::app()->auth->check(dcAuth::PERMISSION_ADMIN, dcCore::app()->blog->id)) {
+         || !dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_ADMIN]), dcCore::app()->blog->id)) {
             return null;
         }
 
@@ -290,7 +290,7 @@ class adminKutrl
         }
 
         # No right
-        if (!dcCore::app()->auth->check(dcAuth::PERMISSION_ADMIN, dcCore::app()->blog->id)) {
+        if (!dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_ADMIN]), dcCore::app()->blog->id)) {
             throw new Exception(__('No enough right'));
         }
 
@@ -313,7 +313,7 @@ class adminKutrl
         }
 
         # No right
-        if (!dcCore::app()->auth->check(dcAuth::PERMISSION_ADMIN, dcCore::app()->blog->id)) {
+        if (!dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_ADMIN]), dcCore::app()->blog->id)) {
             throw new Exception(__('No enough right'));
         }
 
@@ -337,7 +337,7 @@ class backupKutrl
             'kutrl',
             'SELECT kut_id, blog_id, kut_service, kut_type, ' .
             'kut_hash, kut_url, kut_dt, kut_password, kut_counter ' .
-            'FROM ' . dcCore::app()->prefix . 'kutrl ' .
+            'FROM ' . dcCore::app()->prefix . initkUtRL::KURL_TABLE_NAME . ' ' .
             "WHERE blog_id = '" . $blog_id . "' "
         );
     }
@@ -349,7 +349,7 @@ class backupKutrl
 
     public static function importInit($bk)
     {
-        $bk->cur_kutrl = dcCore::app()->con->openCursor(dcCore::app()->prefix . 'kutrl');
+        $bk->cur_kutrl = dcCore::app()->con->openCursor(dcCore::app()->prefix . initkUtRL::KURL_TABLE_NAME);
         $bk->kutrl     = new kutrlLog();
     }
 

_config.php

@@ -15,7 +15,7 @@ if (!defined('DC_CONTEXT_ADMIN')) {
 }
 
 # Check user perms
-dcPage::check(dcAuth::PERMISSION_ADMIN);
+dcPage::check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_ADMIN]));
 
 # Settings
 $s = dcCore::app()->blog->settings->kUtRL;

_init.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * @brief kUtRL, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
+if (!defined('DC_RC_PATH')) {
+    return null;
+}
+
+class initkUtRL
+{
+    public const KURL_TABLE_NAME = 'kutrl';
+}

_install.php

@@ -27,7 +27,7 @@ if (version_compare($old_version, $new_version, '>=')) {
 try {
     # Table
     $t = new dbStruct(dcCore::app()->con, dcCore::app()->prefix);
-    $t->kutrl
+    $t->{initkUtRL::KURL_TABLE_NAME}
         ->kut_id('bigint', 0, false)
         ->blog_id('varchar', 32, false)
         ->kut_service('varchar', 32, false, "'kUtRL'")

_prepend.php

@@ -33,10 +33,12 @@ if (!defined('SHORTEN_SERVICE_ENCODE')) {
 
 # Main class
 $d = __DIR__ . '/inc/';
-Clearbricks::lib()->autoload(['kUtRL' => $d . 'class.kutrl.php']);
+Clearbricks::lib()->autoload([
-Clearbricks::lib()->autoload(['kutrlService' => $d . 'lib.kutrl.srv.php']);
+    'kUtRL'          => $d . 'class.kutrl.php',
-Clearbricks::lib()->autoload(['kutrlLog' => $d . 'lib.kutrl.log.php']);
+    'kutrlService'   => $d . 'lib.kutrl.srv.php',
-Clearbricks::lib()->autoload(['kutrlLinkslist' => $d . 'lib.kutrl.lst.php']);
+    'kutrlLog'       => $d . 'lib.kutrl.log.php',
+    'kutrlLinkslist' => $d . 'lib.kutrl.lst.php',
+]);
 
 # Services
 Clearbricks::lib()->autoload(['defaultKutrlService' => $d . 'services/class.default.service.php']);

_uninstall.php

@@ -31,7 +31,7 @@ $this->addUserAction(
     /* action */
     'delete',
     /* ns */
-    'kutrl',
+    initkUtRL::KURL_TABLE_NAME,
     /* description */
     __('delete table')
 );

_widgets.php

@@ -178,7 +178,7 @@ class widgetKutrl
 
         $rs = dcCore::app()->con->select(
             'SELECT kut_counter, kut_hash ' .
-            'FROM ' . dcCore::app()->prefix . 'kutrl ' .
+            'FROM ' . dcCore::app()->prefix . initkUtRL::KURL_TABLE_NAME . ' ' .
             "WHERE blog_id='" . dcCore::app()->con->escape(dcCore::app()->blog->id) . "' " .
             "AND kut_service = 'local' " .
             $type . $hide . $more . 'ORDER BY ' . $order . $limit

icon.svg

@@ -0,0 +1,43 @@
+<?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="96px" height="96px" viewBox="0 0 96 96" enable-background="new 0 0 96 96" xml:space="preserve">  <image id="image0" width="96" height="96" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAC/VBMVEUAAAAXe7sYe7oYerkZ
+erkZeroYerkZe7oZe7oZebkZerkZe7oYerkZe7sYe7oYe7oYergYe7kYerkYeroZerkYeroZeroZ
+fLsZerkZeroZe7gZe7kYerkZe7kZerkYe7kYe7oYerkYe7gZe7p+fncZerl9fHd+fXYZerl/fHl+
+e3cZe7kYerp/f3d9fHd9fXYZe7oYe7l9fXZ+fnZ9fHYYe7l/fHZ9fXZ+fnZ9fHcZe7l/e3d8fHd+
+fXcYe7oZe7p9fHYYe70Ye7oZe7p+fXcZebcZeroZe7YZe7p9fXX//wB9fXd9fHZ+e3cae7h8fHZ+
+fXd+fHcaeLcZe7l9fHd+fHYXfbkYe7l9fXd9e3YafLsYerl9fXYYebYYe7p9fXd9fXcWf7t/f3J+
+fnh+fHl9fHd9fXl9fXccerwYergYe7p/e3h/fHd8fHV9fXYeeMMZe7p+fHYccaoZe7oYerkZe7p/
+fHaAfnYYerkZe7kYe7p8fHZ9fHYYe7oAf78Ye7l9fXgYe7kXfLcYe7p/f3gYerkae7gYe7kZerl+
+fHcZe7kYerkYe7oafbt9fXZ+fnV9fXZ9fXcXerkZe7kZerkAZpl9fXV8fHd+fXcXc7kYe7gYe7sY
+e7p/e3d+fnh/fHd9fXZ9fXcZe7oZerkZebgXe7kYebl/e3d8fHd9fHZ/f3iqqlUZe7sZe7kZfLoY
+e7sYe7oZe7l9fXV+fXd+fHYYe7kYebl8fHZ+fXd/f398fHcVf799fXh9fHZ/f3N8fHV+fHZ+fXd/
+fXcYerwYerkZebh7e3J9fHd9fXZ9fHZ8fHcWeroYe7l+fXZxcXF9fHcafLcYe7kXe7l8fHd/f3l9
+fHd+fHd9fXYaersYe7l9fXZ9fXZ+fXd/enV/f3ETdbAYe7kYe7oZe7l/eXl+fHZ+fXZ+e3YYeroY
+e7kYeroYe7oZerkYe7oZerl+e3Z9fXZ9fXZ8fHfi7/a3z1u60Vu40lnM5Wa60Fy50Vu50Vy60FwZ
+e7p+fXe60Vz///9Cl2AEAAAA+3RSTlMAQNeH0tSF5uiE54LlgOTjf+F94uB73nnf3Hjd23bc2XTa
+dNVr1Ovo1lBt1dAeye7TzpBn8c1Y6GPzy0Bi9s/J+T7NyPw9zDzKQwHJ/Ws6UrF1OceafzfGgoox
+xZQqxFOeIhRfi5w7qxt7xkZcJbkRvsgJleG2VGOl8K5U77oEm4rsK4YiqFd8braEsds5RV3iUWCA
++wVBWuIWaWmnPlVev36fv1BCVDxkzyQDPLRvj6/yaNKqk3Gm1gIxDDPRFieF2nhJ9kUd7d7dYDjk
+4AnhJ7ghjyjluo5iX91H5jISDXLCrSiw7F9opbuyopGBZ4hyLQFL0ygK8c7l4110jEsAAAABYktH
+RP7SAMJTAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAB3RJTUUH5gsZFyUXJEGb7gAAA21JREFUaN7t
+lnVUFFEUh5dlMRBFBVvEQCxULGxQ7AADscVADMTELuzCFgsVuzGwFRUTu7vF7i7c4Rx3d+a+fTvv
+7VsG5xjnzO8f5t3v3vsxG2dHpVKiRImSfz5Waog1CTXAbH5DoIWkImFqYGnkEKRlCGzlEKRjCOzk
+EKQnYQZg9nIIMpLQHlgmOQSZSegAzFEOQRYSOgLLKocgGwmzA8shhyAnCXMByy2HwImEeYA5yyHI
+S8J8wNRyCPKT0BlYAUtrXPhIFaiBFbQkcOX0KSRVUBiYxrRepChd4CpVUAyYG14tXoJzoQtKShW4
+AyuFFUvrNpWhC8pKFWiAlUMlj/L6TRXogopSBW7AKkGlsmERV4UuqCpV4AnMK3mCahRBdZbAG1iN
+5AlqUgS1WILaEgUcRVCHJahLCOolR1C/QUP+6KM7+LIEXqaCRpxJzAoaCw1N9IemLIFfigTNBO5v
+ODVnCVqkRNBSwK140polaJMCgY9A2wqkHUsQIF3QXoAdgHSUIOgUGNiZHw8K1IUm6CLs74pINyTo
+zniTg6HSg58PMfMx7Sns72UkvZGA8nRtA6yPSOBhRiCkL0b6IUEoKegPbIBIMJAtGIQjJBhMCoYA
+GyoSDGMLhuMIPeCOIPaPRPIwaQJuFIaCYcloQjAGCcZKFHDjjGg82jJBPDURoUlSBZONaAraEi6e
+morQNChNtySYMZP/Owuh2WiL+AF+DgIRc6E2z4JgPtzjAoQWGgXaSHxmkbG+GBWX8ONRZgRLdZfL
++MvliK3ADCtXQXV1OFZeg5rX8tPr6IL1+ssNws1sBBatxeO+KdRp85atnngtRiUWbKMLthuug/ie
+HQju1FrILkKwmy7YY7jeK9zCPoCxduz9Xtii/fzsgYOquEOk4DB/OMJhOn2OHmPtjziOLYqHj+MJ
+2u/BSeF0iu85jfCZs+b3O/iavBbnjF+m84TggnCKIn6SLl4yt9/vsumLfcUouEoIrsHxOt9xA+u4
+aUtbr74lfjfjbyPBHUJwF473hJb7WMuDhwmi7TGPIlVkHj8Rhp8+U0lNbPRz6xcvA7w1Ca9ev3lr
+Za4t7p3/+w8hHyWvV6Lkf8inv/0PKFGihJ3Posje8yXJNF8pw6KWJErLN1HLd0WgCGQU/Eg0DU0g
+akmkCUQtP1VKlCj5M/kFEhn+vsdr4I4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMTEtMjVUMjI6
+Mzc6MjMrMDE6MDAPUS+mAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIyLTExLTI1VDIyOjM3OjIzKzAx
+OjAwfgyXGgAAAABJRU5ErkJggg==" />
+</svg>

inc/lib.kutrl.log.php

@@ -20,7 +20,7 @@ class kutrlLog
 
     public function __construct()
     {
-        $this->table = dcCore::app()->prefix . 'kutrl';
+        $this->table = dcCore::app()->prefix . initkUtRL::KURL_TABLE_NAME;
         $this->blog  = dcCore::app()->con->escape(dcCore::app()->blog->id);
         $this->con   = dcCore::app()->con;
     }

inc/patch.dcminiurl.php

@@ -35,7 +35,7 @@ class dcMiniUrl2kUtRL
     public function __construct()
     {
         $this->con  = dcCore::app()->con;
-        $this->k_tb = dcCore::app()->prefix . 'kutrl';
+        $this->k_tb = dcCore::app()->prefix . initkUtRL::KURL_TABLE_NAME;
         $this->m_tb = dcCore::app()->prefix . 'miniurl';
     }
 

index.php

@@ -15,7 +15,9 @@ if (!defined('DC_CONTEXT_ADMIN')) {
 }
 
 # Check user perms
-dcPage::check(dcAuth::PERMISSION_ADMIN);
+dcPage::check(dcCore::app()->auth->makePermissions([
+    dcAuth::PERMISSION_ADMIN,
+]));
 
 $header = '';
 $part   = $_REQUEST['part'] ?? 'links';