Replaced all occurences of '&$renderer' with 'Doku_Renderer $renderer'.
Moved function 'render_preview_image()' to section 'Render functions'.
This commit is contained in:
60
syntax.php
60
syntax.php
@@ -196,7 +196,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
* @param $renderer the renderer to use
|
* @param $renderer the renderer to use
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function _render_link($filename, $filepath, $basedir, $webdir, $params, &$renderer) {
|
function _render_link($filename, $filepath, $basedir, $webdir, $params, Doku_Renderer $renderer) {
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
//prepare for formating
|
//prepare for formating
|
||||||
@@ -243,7 +243,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
* @param $renderer the renderer to use
|
* @param $renderer the renderer to use
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
protected function render_odt_link ($link, &$renderer) {
|
protected function render_odt_link ($link, Doku_Renderer $renderer) {
|
||||||
if ( method_exists ($renderer, 'getODTProperties') === true ) {
|
if ( method_exists ($renderer, 'getODTProperties') === true ) {
|
||||||
$properties = array ();
|
$properties = array ();
|
||||||
|
|
||||||
@@ -270,7 +270,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
* @param $renderer the renderer to use
|
* @param $renderer the renderer to use
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function _render_list($result, $params, &$renderer) {
|
function _render_list($result, $params, Doku_Renderer $renderer) {
|
||||||
$this->_render_list_items($result['files'], $result['basedir'], $result['webdir'], $params, $renderer);
|
$this->_render_list_items($result['files'], $result['basedir'], $result['webdir'], $params, $renderer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -285,7 +285,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
* @param $level the level to render
|
* @param $level the level to render
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function _render_list_items($files, $basedir, $webdir, $params, &$renderer, $level = 1) {
|
function _render_list_items($files, $basedir, $webdir, $params, Doku_Renderer $renderer, $level = 1) {
|
||||||
if ($params['style'] == 'olist') {
|
if ($params['style'] == 'olist') {
|
||||||
$renderer->listo_open();
|
$renderer->listo_open();
|
||||||
} else {
|
} else {
|
||||||
@@ -340,7 +340,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
* @param $renderer the renderer to use
|
* @param $renderer the renderer to use
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function _render_table($result, $params, $pos, &$renderer) {
|
function _render_table($result, $params, $pos, Doku_Renderer $renderer) {
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
$renderer->table_open(NULL, NULL, $pos);
|
$renderer->table_open(NULL, NULL, $pos);
|
||||||
@@ -417,7 +417,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
* @param $renderer the renderer to use
|
* @param $renderer the renderer to use
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function _render_page($result, $params, &$renderer) {
|
function _render_page($result, $params, Doku_Renderer $renderer) {
|
||||||
if ( method_exists ($renderer, 'getLastlevel') === false ) {
|
if ( method_exists ($renderer, 'getLastlevel') === false ) {
|
||||||
$class_vars = get_class_vars (get_class($renderer));
|
$class_vars = get_class_vars (get_class($renderer));
|
||||||
if ($class_vars ['lastlevel'] !== NULL) {
|
if ($class_vars ['lastlevel'] !== NULL) {
|
||||||
@@ -445,7 +445,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
* @param $level the level to render
|
* @param $level the level to render
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function _render_page_section($files, $basedir, $webdir, $params, &$renderer, $level) {
|
function _render_page_section($files, $basedir, $webdir, $params, Doku_Renderer $renderer, $level) {
|
||||||
$trees = array();
|
$trees = array();
|
||||||
$leafs = array();
|
$leafs = array();
|
||||||
|
|
||||||
@@ -473,6 +473,29 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Render a preview item for file $filepath.
|
||||||
|
*
|
||||||
|
* @param $filepath the file for which a preview image shall be rendered
|
||||||
|
* @param $basedir the basedir to use
|
||||||
|
* @param $webdir the webdir to use
|
||||||
|
* @param $params the parameters of the filelist call
|
||||||
|
* @param $renderer the renderer to use
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
protected function _render_preview_image ($filepath, $basedir, $webdir, $params, Doku_Renderer $renderer) {
|
||||||
|
$imagepath = $this->get_preview_image_path($filepath, $params);
|
||||||
|
if (!empty($imagepath)) {
|
||||||
|
$imgLink = $this->_get_link_url ($imagepath, $basedir, $webdir, 0, $params['direct']);
|
||||||
|
|
||||||
|
$previewsize = $params['previewsize'];
|
||||||
|
if ($previewsize == 0) {
|
||||||
|
$previewsize = 32;
|
||||||
|
}
|
||||||
|
$renderer->doc .= '<img style=" max-height: '.$previewsize.'px; max-width: '.$previewsize.'px;" src="'.$imgLink.'">';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//~~ Filelist functions
|
//~~ Filelist functions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -924,29 +947,6 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
|
|||||||
return $imagepath;
|
return $imagepath;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Render a preview item for file $filepath.
|
|
||||||
*
|
|
||||||
* @param $filepath the file for which a preview image shall be rendered
|
|
||||||
* @param $basedir the basedir to use
|
|
||||||
* @param $webdir the webdir to use
|
|
||||||
* @param $params the parameters of the filelist call
|
|
||||||
* @param $renderer the renderer to use
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
protected function _render_preview_image ($filepath, $basedir, $webdir, $params, Doku_Renderer $renderer) {
|
|
||||||
$imagepath = $this->get_preview_image_path($filepath, $params);
|
|
||||||
if (!empty($imagepath)) {
|
|
||||||
$imgLink = $this->_get_link_url ($imagepath, $basedir, $webdir, 0, $params['direct']);
|
|
||||||
|
|
||||||
$previewsize = $params['previewsize'];
|
|
||||||
if ($previewsize == 0) {
|
|
||||||
$previewsize = 32;
|
|
||||||
}
|
|
||||||
$renderer->doc .= '<img style=" max-height: '.$previewsize.'px; max-width: '.$previewsize.'px;" src="'.$imgLink.'">';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create URL for file $filepath.
|
* Create URL for file $filepath.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user