From 900c713eb27fe28aebe783b9bc0099dc5116878f Mon Sep 17 00:00:00 2001 From: Carsten Perthel Date: Sat, 10 Oct 2015 15:58:01 +0000 Subject: [PATCH 1/3] Add 'hide_showrev' config option --- conf/default.php | 1 + conf/metadata.php | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/default.php b/conf/default.php index 8d52fae..0e706c8 100644 --- a/conf/default.php +++ b/conf/default.php @@ -6,6 +6,7 @@ $conf['hidereaderbanner'] = 0; $conf['hide drafts'] = 0; $conf['hide_approved_banner'] = 0; +$conf['hide_showrev'] = 0; $conf['author groups'] = ''; $conf['internal note'] = ''; $conf['delete attic on first approve'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index cb9ea4b..58aaf25 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -6,6 +6,7 @@ $meta['hide drafts'] = array('onoff'); $meta['hidereaderbanner'] = array('onoff'); $meta['hide_approved_banner'] = array('onoff'); +$meta['hide_showrev'] = array('onoff'); $meta['author groups'] = array('string'); $meta['internal note'] = array('string'); $meta['delete attic on first approve'] = array('onoff'); From 4b8997ce4c25e34a65759e1c37d2c4685976251f Mon Sep 17 00:00:00 2001 From: Carsten Perthel Date: Sat, 10 Oct 2015 15:58:24 +0000 Subject: [PATCH 2/3] Add translations (en, de) for 'hide_showrev' config option --- lang/de/settings.php | 1 + lang/en/settings.php | 1 + 2 files changed, 2 insertions(+) diff --git a/lang/de/settings.php b/lang/de/settings.php index 00634e1..e0abb4e 100644 --- a/lang/de/settings.php +++ b/lang/de/settings.php @@ -12,6 +12,7 @@ $lang['hidereaderbanner'] = 'Verstecke Banner vor Benutzern, die nur das Leserecht haben'; $lang['hide drafts'] = 'Verstecke unbestätigte Versionen vor Benutzern, die nur das Leserecht haben.'; $lang['hide_approved_banner'] = 'Verstecke Banner auf bestätigten Seiten.'; +$lang['hide_showrev'] = 'Verstecke showrev Warnung'; $lang['author groups'] = 'Gruppen, die Drafts sehen können (mehrere mit Leerzeichen trennen)'; $lang['internal note'] = 'Notiz auf nicht veröffentlichten Seiten'; $lang['delete attic on first approve'] = 'Alte Versionen bei erster Bestätigung löschen'; diff --git a/lang/en/settings.php b/lang/en/settings.php index 9f25083..2c36342 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -6,6 +6,7 @@ $lang['hidereaderbanner'] = 'Hide banner to read only users'; $lang['hide drafts'] = 'Hide drafts to read only users'; $lang['hide_approved_banner'] = 'Hide banner on approved pages'; +$lang['hide_showrev'] = 'Hide showrev warning'; $lang['author groups'] = 'Groups that can see drafts (separate by blank)'; $lang['internal note'] = 'Note on unapproved pages'; $lang['delete attic on first approve'] = 'Delete attic on first approve'; From 3d57703e4022f0f0a0ced74ee94d0c5d2624ddb3 Mon Sep 17 00:00:00 2001 From: Carsten Perthel Date: Sat, 10 Oct 2015 16:03:58 +0000 Subject: [PATCH 3/3] Implement action to display/hide showrev warning. This prevents or allows the HTML_SHOWREV_OUTPUT event to occur based on the config option setting for 'hide_showrev'. --- action/handleshowrev.php | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 action/handleshowrev.php diff --git a/action/handleshowrev.php b/action/handleshowrev.php new file mode 100644 index 0000000..7d685fa --- /dev/null +++ b/action/handleshowrev.php @@ -0,0 +1,35 @@ +hlp = plugin_load('helper','publish'); + } + + function register(Doku_Event_Handler $controller) { + $controller->register_hook('HTML_SHOWREV_OUTPUT', 'BEFORE', $this, 'handle_showrev', array()); + } + + /** + * @param Doku_Event $event + * @param array $param + */ + function handle_showrev(Doku_Event &$event, $param) { + if (!$this->hlp->isActive()) { + return; + } + + if ($this->getConf('hide_showrev')) { + $event->preventDefault(); + } + + return; + } +}