[various] Use __DIR__ constant in all Page registerStylesheet and registerFooterScrip...

diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index bec98184436a016cc006faaae1dc1473c3ec585b..f352997332c0aa1a4e389b2fe114b1b59fe6e5cf 100644 (file)
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -85,11 +85,8 @@ function cookienotice_addon_admin_post(App $a)
  */
 function cookienotice_page_content_top(App $a, &$b)
 {
-       $stylesheetPath = __DIR__ . '/cookienotice.css';
-       $footerscriptPath = __DIR__ . '/cookienotice.js';
-
-       DI::page()->registerStylesheet($stylesheetPath);
-       DI::page()->registerFooterScript($footerscriptPath);
+       DI::page()->registerStylesheet(__DIR__ . '/cookienotice.css');
+       DI::page()->registerFooterScript(__DIR__ . '/cookienotice.js');
 }
 
 /**

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index e47f03b161881e9a349aaf153cb5a67fe191041f..7b747bef640b03b2ee64a0e66954995ca1e365f9 100644 (file)
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -93,7 +93,7 @@ function diaspora_settings(App $a, &$s)
                }
        }
 
-       DI::page()->registerStylesheet('addon/diaspora/diaspora.css');
+       DI::page()->registerStylesheet(__DIR__ . '/diaspora.css');
 
        $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/diaspora/');
        $s .= Renderer::replaceMacros($t, [

diff --git a/geonames/geonames.php b/geonames/geonames.php
index eb12728f0b331ac9c3c4058265aac7f3bb46c70b..5fdf65ef5d2603859d07ea81e08067d4970fd965 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -129,9 +129,7 @@ function geonames_addon_settings(App $a, &$s)
                return;
        }
 
-       /* Add our stylesheet to the page so we can make our settings look nice */
-       $stylesheetPath = __DIR__ . '/geonames.css';
-       DI::page()->registerStylesheet($stylesheetPath);
+       DI::page()->registerStylesheet(__DIR__ . '/geonames.css');
 
        /* Get the current state of our config variable */
        $enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable'));

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index e67d2ff0558060efcd2dc794fb11c8991044f3a5..72653d5573c4b16f75bd9790e4e428f612fb7b01 100644 (file)
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -29,8 +29,8 @@ function js_upload_form(App $a, array &$b)
 {
        $b['default_upload'] = false;
 
-       DI::page()->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css');
-       DI::page()->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js');
+       DI::page()->registerStylesheet(__DIR__ . '/file-uploader/client/fileuploader.css');
+       DI::page()->registerFooterScript(__DIR__ . '/file-uploader/client/fileuploader.js');
 
        $tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload');
        $b['addon_text'] .= Renderer::replaceMacros($tpl, [

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 9f81b29d8333557f669a26dc735a9a23c711616b..1cbcf7c8e19bb55ae091d6f50318fe17edb8bf27 100644 (file)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -54,9 +54,8 @@ function nsfw_addon_settings(&$a, &$s)
                return;
        }
 
-       /* Add our stylesheet to the page so we can make our settings look nice */
+       DI::page()->registerStylesheet(__DIR__ . '/nsfw.css', 'all');
 
-       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
        $enable_checked = (intval(DI::pConfig()->get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
        $words = DI::pConfig()->get(local_user(), 'nsfw', 'words');

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index ce3b26844e4d6e084948ca6a3b408b51e5b0021d..9dfe3c02fde820df12cfa670eabca582c22ce4ee 100644 (file)
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -23,9 +23,7 @@ function pageheader_addon_admin(App &$a, &$s)
                return;
        }
 
-    /* Add our stylesheet to the page so we can make our settings look nice */
-       $stylesheetPath = __DIR__ . '/pageheader.css';
-       DI::page()->registerStylesheet($stylesheetPath);
+       DI::page()->registerStylesheet(__DIR__ . '/pageheader.css');
 
        $words = DI::config()->get('pageheader','text');
        if(! $words)
@@ -62,8 +60,7 @@ function pageheader_fetch(App $a, &$b)
                $s = DI::config()->get('pageheader', 'text');
        }
 
-       $stylesheetPath = __DIR__ .'/pageheader.css';
-       DI::page()->registerStylesheet($stylesheetPath);
+       DI::page()->registerStylesheet(__DIR__ .'/pageheader.css');
     
     if ($s) {
         $b .= '<div class="pageheader">' . $s . '</div>';

diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index ed110f6675740f2f351853816bd743f3f3a10879..f662aeccc1f51bb2418efc39c5897f057ffd6317 100644 (file)
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -30,7 +30,7 @@ function qcomment_install()
 
 function qcomment_footer(\Friendica\App $a, &$b)
 {
-       DI::page()->registerFooterScript(__DIR__ . '/qcomment.js');
+       DI::page()->registerFooterScript('addon/qcomment/qcomment.js');
 }
 
 function qcomment_addon_settings(&$a, &$s)

diff --git a/showmore/showmore.php b/showmore/showmore.php
index dd6d4773a5c13635f10d92fe11de230baf60343c..574be70faf7ebe00e2603468e1874cdb8933b9ff 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -24,9 +24,7 @@ function showmore_addon_settings(&$a, &$s)
                return;
        }
 
-       /* Add our stylesheet to the page so we can make our settings look nice */
-
-       DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
+       DI::page()->registerStylesheet(__DIR__ . '/showmore.css', 'all');
 
        $enable_checked = (intval(DI::pConfig()->get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
        $chars = DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100);

diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index f01a62015a83a294b96acf21d8ffaaff7d32f9c3..1a1f1d6380c1345eb8a4806e6788a448894f4ea4 100644 (file)
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -97,9 +97,9 @@ function smileybutton_jot_tool(Friendica\App $a, &$b)
        $s .= '</tr></table>';
 
        //Add css to header
-       $css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css';
+       $css_file = __DIR__ . '/view/' . $a->getCurrentTheme() . '.css';
        if (!file_exists($css_file)) {
-               $css_file = 'addon/smileybutton/view/default.css';
+               $css_file = __DIR__ . '/view/default.css';
        }
 
        DI::page()->registerStylesheet($css_file);

diff --git a/superblock/superblock.php b/superblock/superblock.php
index 7bf2bc4ce487a3af31716787e1d87d96bb37b7ef..d31860874358d59bdff0b736428e1dfcc5d86655 100644 (file)
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -25,9 +25,8 @@ function superblock_addon_settings(&$a, &$s)
                return;
        }
 
-       /* Add our stylesheet to the page so we can make our settings look nice */
+       DI::page()->registerStylesheet(__DIR__ . '/superblock.css', 'all');
 
-       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
 
        $words = DI::pConfig()->get(local_user(), 'system', 'blocked');
        if (!$words) {