JcDenis/simplyFavicon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix PSR12 CS

Browse source
This commit is contained in:
Jean-Christian 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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
_admin.php
View file

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis * @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/ */
if (!defined('DC_CONTEXT_ADMIN')) { if (!defined('DC_CONTEXT_ADMIN')) {
return; return;
} }
@ -25,7 +24,7 @@ class adminSimplyFavicon
echo echo
'<div class="fieldset"><h4 id="simply_favicon_params">Favicon</h4>' . '<div class="fieldset"><h4 id="simply_favicon_params">Favicon</h4>' .
'<p><label class="classic">' . '<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>' . __('Enable "Simply favicon" extension') . '</label></p>' .
'<p class="form-note">' . '<p class="form-note">' .
__("You must place an image called favicon.png or .jpg or .ico into your blog's public directory.") . __("You must place an image called favicon.png or .jpg or .ico into your blog's public directory.") .

21
_define.php
View file

@ -10,24 +10,23 @@
* @copyright Jean-Christian Denis * @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/ */
if (!defined('DC_RC_PATH')) {
if (!defined('DC_RC_PATH')){
return; return;
} }
$this->registerModule( $this->registerModule(
"Simply favicon", 'Simply favicon',
"Multi-agents favicon", 'Multi-agents favicon',
"Jean-Christian Denis", 'Jean-Christian Denis',
'2021.09.02.1', '2021.09.02.1',
[ [
'requires' => [['core', '2.19']], 'requires' => [['core', '2.19']],
'permissions' => 'admin', 'permissions' => 'admin',
'type' => 'plugin', 'type' => 'plugin',
'support' => 'https://github.com/JcDenis/simplyFavicon', 'support' => 'https://github.com/JcDenis/simplyFavicon',
'details' => 'http://plugins.dotaddict.org/dc2/details/simplyFavicon', 'details' => 'http://plugins.dotaddict.org/dc2/details/simplyFavicon',
'repository' => 'https://raw.githubusercontent.com/JcDenis/simplyFavicon/master/dcstore.xml', 'repository' => 'https://raw.githubusercontent.com/JcDenis/simplyFavicon/master/dcstore.xml',
'settings' => [ 'settings' => [
'blog' => '#params.simply_favicon_params' 'blog' => '#params.simply_favicon_params'
] ]
] ]

3
_prepend.php
View file

@ -10,8 +10,7 @@
* @copyright Jean-Christian Denis * @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/ */
if (!defined('DC_RC_PATH')) {
if (!defined('DC_RC_PATH')){
return; return;
} }

30
_public.php
View file

@ -10,8 +10,7 @@
* @copyright Jean-Christian Denis * @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/ */
if (!defined('DC_RC_PATH')) {
if (!defined('DC_RC_PATH')){
return; return;
} }
@ -19,20 +18,20 @@ $core->addBehavior('publicHeadContent', ['publicSimplyFavicon', 'publicHeadConte
class publicSimplyFavicon extends dcUrlHandlers class publicSimplyFavicon extends dcUrlHandlers
{ {
public static $mimetypes = array( public static $mimetypes = [
'ico' => 'image/x-icon', 'ico' => 'image/x-icon',
'png' => 'image/png', 'png' => 'image/png',
'bmp' => 'image/bmp', 'bmp' => 'image/bmp',
'gif' => 'image/gif', 'gif' => 'image/gif',
'jpg' => 'image/jpeg', 'jpg' => 'image/jpeg',
'mng' => 'video/x-mng' 'mng' => 'video/x-mng'
); ];
public static function simplyFaviconUrl($arg) public static function simplyFaviconUrl($arg)
{ {
global $core; global $core;
$mimetypes = self::$mimetypes; $mimetypes = self::$mimetypes;
$public_path = path::real(path::fullFromRoot($core->blog->settings->system->public_path, DC_ROOT)) . '/favicon.'; $public_path = path::real(path::fullFromRoot($core->blog->settings->system->public_path, DC_ROOT)) . '/favicon.';
if (!$core->blog->settings->system->simply_favicon if (!$core->blog->settings->system->simply_favicon
@ -40,24 +39,23 @@ class publicSimplyFavicon extends dcUrlHandlers
|| !array_key_exists($arg, $mimetypes) || !array_key_exists($arg, $mimetypes)
|| file_exists($public_path . 'favicon' . $arg) || file_exists($public_path . 'favicon' . $arg)
) { ) {
throw new Exception ("Page not found", 404); throw new Exception('Page not found', 404);
}
else {
header('Content-Type: ' . $mimetypes[$arg] . ';');
readfile($public_path . $arg);
exit;
} }
header('Content-Type: ' . $mimetypes[$arg] . ';');
readfile($public_path . $arg);
exit;
} }
public static function publicHeadContent($core) public static function publicHeadContent($core)
{ {
if (!$core->blog->settings->system->simply_favicon){ if (!$core->blog->settings->system->simply_favicon) {
return; return;
} }
$mimetypes = self::$mimetypes; $mimetypes = self::$mimetypes;
$public_path = path::real(path::fullFromRoot($core->blog->settings->system->public_path, DC_ROOT)) . '/favicon.'; $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 // ico : IE6
if (file_exists($public_path . 'ico') && '?' != substr($core->blog->url, -1)) { if (file_exists($public_path . 'ico') && '?' != substr($core->blog->url, -1)) {
@ -72,11 +70,11 @@ class publicSimplyFavicon extends dcUrlHandlers
} }
// all others // all others
else { else {
foreach($mimetypes as $ext => $mime) foreach ($mimetypes as $ext => $mime) {
{
if (file_exists($public_path . $ext)) { if (file_exists($public_path . $ext)) {
echo echo
'<link rel="icon" type="' . $mime . '" href="' . $public_url . $ext . '" />' . "\n"; '<link rel="icon" type="' . $mime . '" href="' . $public_url . $ext . '" />' . "\n";
break; break;
} }
} }