diff --git a/README b/README index c9a0242..5d48f0d 100644 --- a/README +++ b/README @@ -24,16 +24,8 @@ See the monobook template website for update instructions [2]. - NOTE: If everything will be displayed unformatted, your PHP environment is - probably affected by PHP bug #49692 [3]. You may find errors like - "syntax error, unexpected '/' in ../../lib/tpl/monobook/style.ini on - line XX" in your PHP logs when this is the case. monobook provides a - workaround for this, simply delete monobook's "style.ini" to trigger - the template to use it. - [1] [2] - [3] diff --git a/bug49642.php b/bug49642.php deleted file mode 100644 index db26670..0000000 --- a/bug49642.php +++ /dev/null @@ -1,120 +0,0 @@ -). - * Therefore, DokuWiki is not able to parse monobook's style.ini and users don't - * get the needed CSS (but errors like "syntax error, unexpected '/' in - * ../../lib/tpl/monobook/style.ini on line XX" instead). To get things work in - * such environments, simply delete the "style.ini". Then the template uses - * this helper to get the CSS. - * - * Known disadvantages: A little bit more traffic compared to an environment - * without this bug and DokuWiki's "compress" feature enabled (cause this - * feature does not have any effect on monobook's CSS files when using this - * workaround, and therefore non-minimized and uncompressed CSS will be - * delivered). - * - * - * LICENSE: This file is open source software (OSS) and may be copied under - * certain conditions. See COPYING file for details or try to contact - * the author(s) of this file in doubt. - * - * @license GPLv2 (http://www.gnu.org/licenses/gpl2.html) - * @author ARSAVA - * @link http://bugs.php.net/bug.php?id=49692 - * @link https://forum.dokuwiki.org/thread/4827 - * @link https://www.dokuwiki.org/template:monobook - * @link https://www.dokuwiki.org/devel:style.ini - */ - - -//workaround for PHP Bug #49692 -//If you are affected, simply delete monobook's style.ini to trigger the -//template to use this workaround. - -//we are rebuilding a CSS file, send needed headers (otherwise, the browser -//would interpret this as text/plain or XHTML) -header("Content-Type: text/css"); - -//define placeholders as they are known out of the style.ini -$placeholder_names = array(//main text and background colors - "__text__", - "__background__", - //alternative text and background colors - "__text_alt__", - "__background_alt__", - //neutral text and background colors - "__text_neu__", - "__background_neu__", - //border color - "__border__", - //these are used for links - "__existing__", - "__missing__", - //highlighting search snippets - "__highlight__"); -$placeholder_values = array(//main text and background colors - "#000", - "#fff", - //alternative text and background colors - "#000", - "#dee7ec", - //neutral text and background colors - "#000", - "#fff", - //border color - "#8cacbb", - //these are used for links - "#002bb8", - "#ba0000", - //highlighting search snippets - "#ff9"); - -//get needed file contents: screen media CSS -$interim = trim(file_get_contents("./static/3rd/dokuwiki/_imgdetail.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_media_popup.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_media_fullscreen.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_fileuploader.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_tabs.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_links.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_toc.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_footnotes.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_search.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_recent.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_diff.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_edit.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_modal.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_forms.css"))."\n" - .trim(file_get_contents("./static/3rd/dokuwiki/_admin.css"))."\n" - .trim(file_get_contents("./static/3rd/monobook/main.css"))."\n" - .trim(file_get_contents("./static/css/screen.css"))."\n" - .trim(file_get_contents("./user/screen.css"))."\n"; -if (!empty($_GET["langdir"]) && - $_GET["langdir"] === "rtl"){ - $interim .= trim(file_get_contents("./static/3rd/monobook/rtl.css"))."\n" - .trim(file_get_contents("./user/rtl.css"))."\n"; -} -//replace the placeholders with the corresponding values and send the needed CSS -echo "@media screen {\n".str_replace(//search - $placeholder_names, - //replace - $placeholder_values, - //haystack - $interim)."\n}\n\n"; - -//get needed file contents: print media CSS -$interim = trim(file_get_contents("./static/3rd/dokuwiki/print.css"))."\n" - .trim(file_get_contents("./static/3rd/wikipedia/commonPrint.css"))."\n" - .trim(file_get_contents("./static/css/print.css"))."\n" - .trim(file_get_contents("./user/print.css"))."\n"; -//replace the placeholders with the corresponding values and send the needed CSS -echo "@media print {\n".str_replace(//search - $placeholder_names, - //replace - $placeholder_values, - //haystack - $interim)."\n}\n\n"; - diff --git a/main.php b/main.php index 5e71939..8205d0b 100644 --- a/main.php +++ b/main.php @@ -140,8 +140,8 @@ * NOTE: This function is heavily inspired by "writeMBPortlet(), context.php" of * the "Monobook for Dokuwiki" template by Terence J. Grant. * - * @param array The tab data to render within the snippet. Each element - * is represented through a subarray: + * @param array The tab data to render within the snippet. Each element is + * represented by a subarray: * $array = array("tab1" => array("text" => "hello world!", * "href" => "http://www.example.com" * "nofollow" => true), @@ -281,7 +281,7 @@ function _monobook_renderTabs($arr) * the "Monobook for Dokuwiki" template by Terence J. Grant. * * @param array The box data to render within the snippet. Each box is - * represented through a subarray: + * represented by a subarray: * $array = array("box-id1" => array("headline" => "hello world!", * "xhtml" => "I am here.")); * Available keys within the subarrays: @@ -361,8 +361,8 @@ function _monobook_renderBoxes($arr) /** * Helper to render the footer buttons (like a dynamic XHTML snippet) * - * @param array The button data to render within the snippet. Each element - * is represented through a subarray: + * @param array The button data to render within the snippet. Each element is + * represented by a subarray: * $array = array("btn1" => array("img" => DOKU_TPL."static/img/button-monobook.png", * "href" => "https://andreashaerter.com/", * "width" => 80, @@ -473,15 +473,6 @@ function _monobook_renderButtons($arr) tpl_metaheaders(); echo ""; -//manually load needed CSS? this is a workaround for PHP Bug #49642. In some -//version/os combinations PHP is not able to parse INI-file entries if there -//are slashes "/" used for the keynames (see bugreport for more information: -//). to trigger this workaround, simply -//delete/rename monobook's style.ini. -if (!file_exists(DOKU_TPLINC."style.ini")){ - echo "\n"; //var comes from DokuWiki core -} - //include default or userdefined favicon // //note: since 2011-04-22 "Rincewind RC1", there is a core function named diff --git a/mediamanager.php b/mediamanager.php index d0322e7..4d8a2b4 100644 --- a/mediamanager.php +++ b/mediamanager.php @@ -33,15 +33,6 @@ tpl_metaheaders(); echo ""; -//manually load needed CSS? this is a workaround for PHP Bug #49642. In some -//version/os combinations PHP is not able to parse INI-file entries if there -//are slashes "/" used for the keynames (see bugreport for more information: -//). to trigger this workaround, simply -//delete/rename monobook's style.ini. -if (!file_exists(DOKU_TPLINC."style.ini")){ - echo "\n"; //var comes from DokuWiki core -} - //include default or userdefined favicon // //note: since 2011-04-22 "Rincewind RC1", there is a core function named diff --git a/style.ini b/style.ini index 24d7bca..0f86972 100644 --- a/style.ini +++ b/style.ini @@ -27,8 +27,6 @@ [stylesheets] ; screen -; note to myself: don't forget to respect the workaround within "bug49642.php" -; when adding new screen styles. ; load the DokuWiki styles. See why I am doing this. static/3rd/dokuwiki/_imgdetail.css = screen static/3rd/dokuwiki/_media_popup.css = screen @@ -60,8 +58,6 @@ user/screen.css = screen ; I think this function is silly (cause therefore we got ; different "media" but some people *always* searching for such ; print version links). Good text about this: -; note to myself: don't forget to respect the workaround within "bug49642.php" -; when adding new print styles. ; load the DokuWiki styles. See why I am doing this. static/3rd/dokuwiki/print.css = print @@ -74,9 +70,6 @@ user/print.css = print ; right-to-left -; note to myself: don't forget to respect the workaround within "bug49642.php" -; when adding new rtl styles. - ; load the most important MediaWiki monobook styles static/3rd/monobook/rtl.css = rtl @@ -95,9 +88,6 @@ user/rtl.css = rtl ;-------------------------------------------------------------------------- ;------ guaranteed dokuwiki color placeholders that every plugin can use ; main text and background colors -; -;note to myself: don't forget to respect the workaround within "bug49642.php" -; when changing values in here. __text__ = "#000" __background__ = "#fff" ; alternative text and background colors