fix PSR12 CS

master
Jean-Christian Paul Denis 2021-11-06 02:23:40 +01:00
parent 254562e384
commit f26464ca9f
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
4 changed files with 47 additions and 52 deletions

View File

@ -1,16 +1,15 @@
<?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
*/
if (!defined('DC_CONTEXT_ADMIN')) {
return;
}
@ -25,7 +24,7 @@ class adminSimplyFavicon
echo
'<div class="fieldset"><h4 id="simply_favicon_params">Favicon</h4>' .
'<p><label class="classic">' .
form::checkbox('simply_favicon', '1', (boolean) $blog_settings->system->simply_favicon) .
form::checkbox('simply_favicon', '1', (bool) $blog_settings->system->simply_favicon) .
__('Enable "Simply favicon" extension') . '</label></p>' .
'<p class="form-note">' .
__("You must place an image called favicon.png or .jpg or .ico into your blog's public directory.") .
@ -37,4 +36,4 @@ class adminSimplyFavicon
{
$blog_settings->system->put('simply_favicon', !empty($_POST['simply_favicon']));
}
}
}

View File

@ -1,34 +1,33 @@
<?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
*/
if (!defined('DC_RC_PATH')){
if (!defined('DC_RC_PATH')) {
return;
}
$this->registerModule(
"Simply favicon",
"Multi-agents favicon",
"Jean-Christian Denis",
'Simply favicon',
'Multi-agents favicon',
'Jean-Christian Denis',
'2021.09.02.1',
[
'requires' => [['core', '2.19']],
'requires' => [['core', '2.19']],
'permissions' => 'admin',
'type' => 'plugin',
'support' => 'https://github.com/JcDenis/simplyFavicon',
'details' => 'http://plugins.dotaddict.org/dc2/details/simplyFavicon',
'repository' => 'https://raw.githubusercontent.com/JcDenis/simplyFavicon/master/dcstore.xml',
'settings' => [
'type' => 'plugin',
'support' => 'https://github.com/JcDenis/simplyFavicon',
'details' => 'http://plugins.dotaddict.org/dc2/details/simplyFavicon',
'repository' => 'https://raw.githubusercontent.com/JcDenis/simplyFavicon/master/dcstore.xml',
'settings' => [
'blog' => '#params.simply_favicon_params'
]
]
);
);

View File

@ -1,20 +1,19 @@
<?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
*/
if (!defined('DC_RC_PATH')){
if (!defined('DC_RC_PATH')) {
return;
}
$__autoload['publicSimplyFavicon'] = dirname(__FILE__) . '/_public.php';
$core->url->register('simplyFavicon', 'favicon', '^favicon.(.*?)$', ['publicSimplyFavicon', 'simplyFaviconUrl']);
$core->url->register('simplyFavicon', 'favicon', '^favicon.(.*?)$', ['publicSimplyFavicon', 'simplyFaviconUrl']);

View File

@ -1,17 +1,16 @@
<?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
*/
if (!defined('DC_RC_PATH')){
if (!defined('DC_RC_PATH')) {
return;
}
@ -19,67 +18,66 @@ $core->addBehavior('publicHeadContent', ['publicSimplyFavicon', 'publicHeadConte
class publicSimplyFavicon extends dcUrlHandlers
{
public static $mimetypes = array(
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)
{
global $core;
$mimetypes = self::$mimetypes;
$mimetypes = self::$mimetypes;
$public_path = path::real(path::fullFromRoot($core->blog->settings->system->public_path, DC_ROOT)) . '/favicon.';
if (!$core->blog->settings->system->simply_favicon
|| empty($arg)
|| !array_key_exists($arg, $mimetypes)
if (!$core->blog->settings->system->simply_favicon
|| empty($arg)
|| !array_key_exists($arg, $mimetypes)
|| file_exists($public_path . 'favicon' . $arg)
) {
throw new Exception ("Page not found", 404);
}
else {
header('Content-Type: ' . $mimetypes[$arg] . ';');
readfile($public_path . $arg);
exit;
throw new Exception('Page not found', 404);
}
header('Content-Type: ' . $mimetypes[$arg] . ';');
readfile($public_path . $arg);
exit;
}
public static function publicHeadContent($core)
{
if (!$core->blog->settings->system->simply_favicon){
if (!$core->blog->settings->system->simply_favicon) {
return;
}
$mimetypes = self::$mimetypes;
$mimetypes = self::$mimetypes;
$public_path = path::real(path::fullFromRoot($core->blog->settings->system->public_path, DC_ROOT)) . '/favicon.';
$public_url = $core->blog->url.$core->url->getBase('simplyFavicon') . '.';
$public_url = $core->blog->url . $core->url->getBase('simplyFavicon') . '.';
// ico : IE6
if (file_exists($public_path . 'ico') && '?' != substr($core->blog->url, -1)) {
echo
echo
'<link rel="SHORTCUT ICON" type="image/x-icon" href="' . $public_url . 'ico" />' . "\n";
}
// png: apple and others
if (file_exists($public_path . 'png')) {
echo
echo
'<link rel="apple-touch-icon" href="' . $public_url . 'png" />' . "\n" .
'<link rel="icon" type="image/png" href="' . $public_url . 'png" />' . "\n";
}
// all others
else {
foreach($mimetypes as $ext => $mime)
{
foreach ($mimetypes as $ext => $mime) {
if (file_exists($public_path . $ext)) {
echo
'<link rel="icon" type="' . $mime . '" href="' . $public_url . $ext . '" />' . "\n";
break;
}
}
}
}
}
}