From 582870d33284cf8a64b0888a523f56b6fdeec84a Mon Sep 17 00:00:00 2001 From: Ruud Habing Date: Sun, 8 Oct 2017 12:06:44 +0200 Subject: [PATCH 1/9] added 'wanted_revision' variable to '_get_instructions' function to be able to retrieve a specific revision --- helper.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/helper.php b/helper.php index f693e9a..a3ed875 100644 --- a/helper.php +++ b/helper.php @@ -238,7 +238,7 @@ function get_flags($setflags) { * @author Michael Klier * @author Michael Hamann */ - function _get_instructions($page, $sect, $mode, $lvl, $flags, $root_id = null, $included_pages = array()) { + function _get_instructions($page, $sect, $mode, $lvl, $flags, $root_id = null, $included_pages = array(), $wanted_revision = null) { $key = ($sect) ? $page . '#' . $sect : $page; $this->includes[$key] = true; // legacy code for keeping compatibility with other plugins @@ -270,7 +270,13 @@ function _get_instructions($page, $sect, $mode, $lvl, $flags, $root_id = null, $ global $ID; $backupID = $ID; $ID = $page; // Change the global $ID as otherwise plugins like the discussion plugin will save data for the wrong page - $ins = p_cached_instructions(wikiFN($page), false, $page); + + + if (!is_null($wanted_revision)) { + $ins = p_cached_instructions(wikiFN($page, $wanted_revision), false, $page); + } else { + $ins = p_cached_instructions(wikiFN($page), false, $page); + } $ID = $backupID; } else { $ins = array(); From de49edd0218d308239ad72bf703331480458bf0a Mon Sep 17 00:00:00 2001 From: Ruud Habing Date: Sun, 8 Oct 2017 12:11:18 +0200 Subject: [PATCH 2/9] added 'wanted_revision' variable --- syntax/include.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/syntax/include.php b/syntax/include.php index 1fd68c8..2f67d3c 100644 --- a/syntax/include.php +++ b/syntax/include.php @@ -151,7 +151,12 @@ function render($format, Doku_Renderer $renderer, $data) { unset($flags['include_secid']); } - $instructions = $this->helper->_get_instructions($id, $sect, $mode, $level, $flags, $root_id, $secids); + // add configuration option to honour top page revision or not + // if (not configuration_option_honour_revision) { + // $wanted_revision = null; + // } + $wanted_revision = null; + $instructions = $this->helper->_get_instructions($id, $sect, $mode, $level, $flags, $root_id, $secids, $wanted_revision); if (!$flags['editbtn']) { global $conf; From 8580e0d719d6fb364465ed126d258bdbe8bb609a Mon Sep 17 00:00:00 2001 From: Ruud Habing Date: Sun, 8 Oct 2017 12:14:47 +0200 Subject: [PATCH 3/9] added 'honourmainrevision' option to . If this option is selected, the revision of the included page revision should equal to or older than the main page revision --- conf/default.php | 1 + conf/metadata.php | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/default.php b/conf/default.php index c619005..1d77479 100644 --- a/conf/default.php +++ b/conf/default.php @@ -27,4 +27,5 @@ $conf['depth'] = 1; // maximum depth of namespace includes, 0 for unlimited depth $conf['readmore'] = 1; // Show readmore link in case of firstsection only $conf['debugoutput'] = 0; // print debug information to debuglog if global allowdebug is enabled +$conf['honourmainrevision'] = 0; //Setup VIM: ex: et ts=2 : diff --git a/conf/metadata.php b/conf/metadata.php index a0fa7b1..a967f98 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -30,4 +30,5 @@ $meta['depth'] = array('numeric', '_min' => 0); $meta['readmore'] = array('onoff'); $meta['debugoutput'] = array('onoff'); +$meta['honourmainrevision'] = array('onoff'); //Setup VIM: ex: et ts=2 : From a927595a2743ee58e47de8a21f02553966dcfae7 Mon Sep 17 00:00:00 2001 From: Ruud Habing Date: Sun, 8 Oct 2017 12:32:50 +0200 Subject: [PATCH 4/9] added code to select revision of included page(s) based upon revision date of main page. This is only done when a revision of the main page is shown. In case the main page is the latest, all included pages will also be the latest version. --- syntax/include.php | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/syntax/include.php b/syntax/include.php index 2f67d3c..879ce0f 100644 --- a/syntax/include.php +++ b/syntax/include.php @@ -89,6 +89,7 @@ function handle($match, $state, $pos, Doku_Handler $handler) { */ function render($format, Doku_Renderer $renderer, $data) { global $ID; + global $conf; // static stack that records all ancestors of the child pages static $page_stack = array(); @@ -128,6 +129,8 @@ function render($format, Doku_Renderer $renderer, $data) { $secids = p_get_metadata($ID, 'plugin_include secids'); } + + foreach ($pages as $page) { extract($page); $id = $page['id']; @@ -136,6 +139,55 @@ function render($format, Doku_Renderer $renderer, $data) { if (in_array($id, $page_stack)) continue; array_push($page_stack, $id); + // check if the include plugin should honour the main page revision + if ($conf['honourmainrevision']) { + + // initialize variables with empty string + $wanted_revision = ''; + $revision_before_main_revision = ''; + $first_revision = ''; + + $m = p_get_metadata($id); // get metadata for current page + $sum = $m['last_change']['sum']; // get last change summary + global $REV; // load global $REV variable + + $changelog = new PageChangeLog($id); // initiate changelog + $chs = $changelog->getRevisions(0, 10000); // load changes list + + + if (intval($REV) > 0) { // check if a revision is shown for the main page, otherwise simply get last revision of all included pages + + foreach ($chs as $rev) { + $ch = $changelog->getRevisionInfo($rev); + if (intval($rev) <= intval($REV)) { + // a revision lower than the main page revision is found + if ($revision_before_main_revision == '') { + $revision_before_main_revision = $rev; + } + + // check for approved in summary (works only if approval plugin is enabled) + if ($ch['sum'] == APPROVED) { + // revision found before the $REV date with APPROVAL in summary + $wanted_revision = $rev; + break; + } + } + $first_revision = $rev; + } + + if ($wanted_revision == '') { // no suitable revision found with approval + if ($revision_before_main_revision != '') { // a revision is found before $REV, use this revision + $wanted_revision = $revision_before_main_revision; + } else { // simply use the oldest revision, despite the revision date is newer than the main page revision date + $wanted_revision = $first_revision; + } + } + } + } else { + $wanted_revision = null; + } + + // add references for backlink if ($format == 'metadata') { $renderer->meta['relation']['references'][$id] = $exists; @@ -155,7 +207,6 @@ function render($format, Doku_Renderer $renderer, $data) { // if (not configuration_option_honour_revision) { // $wanted_revision = null; // } - $wanted_revision = null; $instructions = $this->helper->_get_instructions($id, $sect, $mode, $level, $flags, $root_id, $secids, $wanted_revision); if (!$flags['editbtn']) { From 0b3d433938a6b7da7b4475264a56cad54279f741 Mon Sep 17 00:00:00 2001 From: Ruud Habing Date: Sun, 8 Oct 2017 12:36:54 +0200 Subject: [PATCH 5/9] added description in [en] language file --- lang/en/settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/en/settings.php b/lang/en/settings.php index 8aec307..f308fd4 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -38,4 +38,5 @@ $lang['depth'] = 'Maximum depth of namespace includes, 0 for unlimited depth'; $lang['readmore'] = 'Show or not the \'Read More\' link in case of firstsection only'; $lang['debugoutput'] = 'Print verbose debug information to the dokuwiki debuglog if the global "allowdebug" option is enabled'; +$lang['honourmainrevision'] = 'Honour the main page revision. If a revision of the main page is shown, pass this revision date to include pages and get the appropiate revision of those pages as well'; //Setup VIM: ex: et ts=2 : From 0697c2d0f0f068d6d588b4aad706fa10244efe9f Mon Sep 17 00:00:00 2001 From: Ruud Habing Date: Sun, 8 Oct 2017 13:01:09 +0200 Subject: [PATCH 6/9] added language spelling error and fixed getting configuration setting --- lang/en/settings.php | 2 +- syntax/include.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/en/settings.php b/lang/en/settings.php index f308fd4..c5a19b1 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -38,5 +38,5 @@ $lang['depth'] = 'Maximum depth of namespace includes, 0 for unlimited depth'; $lang['readmore'] = 'Show or not the \'Read More\' link in case of firstsection only'; $lang['debugoutput'] = 'Print verbose debug information to the dokuwiki debuglog if the global "allowdebug" option is enabled'; -$lang['honourmainrevision'] = 'Honour the main page revision. If a revision of the main page is shown, pass this revision date to include pages and get the appropiate revision of those pages as well'; +$lang['honourmainrevision'] = 'Honour the main page revision. If a revision of the main page is shown, pass this revision date to include pages and get the appropriate revision of those pages as well'; //Setup VIM: ex: et ts=2 : diff --git a/syntax/include.php b/syntax/include.php index 879ce0f..bc9aa46 100644 --- a/syntax/include.php +++ b/syntax/include.php @@ -89,7 +89,6 @@ function handle($match, $state, $pos, Doku_Handler $handler) { */ function render($format, Doku_Renderer $renderer, $data) { global $ID; - global $conf; // static stack that records all ancestors of the child pages static $page_stack = array(); @@ -129,7 +128,7 @@ function render($format, Doku_Renderer $renderer, $data) { $secids = p_get_metadata($ID, 'plugin_include secids'); } - + foreach ($pages as $page) { extract($page); @@ -140,7 +139,7 @@ function render($format, Doku_Renderer $renderer, $data) { array_push($page_stack, $id); // check if the include plugin should honour the main page revision - if ($conf['honourmainrevision']) { + if ($this->getConf('honourmainrevision')) { // initialize variables with empty string $wanted_revision = ''; @@ -185,6 +184,7 @@ function render($format, Doku_Renderer $renderer, $data) { } } else { $wanted_revision = null; + msg('nope'); } From d3694ac70405cf3a334947cbe310b15ceae47c20 Mon Sep 17 00:00:00 2001 From: Ruud Habing Date: Sun, 8 Oct 2017 13:04:42 +0200 Subject: [PATCH 7/9] cleanup and removal of msg for debug purposes --- syntax/.include.php.swp | Bin 0 -> 24576 bytes syntax/include.php | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 syntax/.include.php.swp diff --git a/syntax/.include.php.swp b/syntax/.include.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..d934ce9df3f133efaab593c0f3fef308c44e1d2e GIT binary patch literal 24576 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 Date: Mon, 15 Jul 2019 15:44:09 +0000 Subject: [PATCH 8/9] removed swap file --- syntax/.include.php.swp | Bin 24576 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 syntax/.include.php.swp diff --git a/syntax/.include.php.swp b/syntax/.include.php.swp deleted file mode 100644 index d934ce9df3f133efaab593c0f3fef308c44e1d2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 Date: Fri, 24 Jan 2020 08:59:10 +0000 Subject: [PATCH 9/9] bugfix in approved variable --- syntax/include.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/include.php b/syntax/include.php index 5b1a486..88051cd 100644 --- a/syntax/include.php +++ b/syntax/include.php @@ -165,7 +165,7 @@ function render($format, Doku_Renderer $renderer, $data) { } // check for approved in summary (works only if approval plugin is enabled) - if ($ch['sum'] == APPROVED) { + if ($ch['sum'] == "APPROVED") { // revision found before the $REV date with APPROVAL in summary $wanted_revision = $rev; break;