viewmode is turn off by default

action/editmode.php → action/viewmode.php

@@ -14,7 +14,7 @@
  * @author     Anika Henke <anika@selfthinker.org>
  */
 
-class action_plugin_approve_editmode extends DokuWiki_Action_Plugin
+class action_plugin_approve_viewmode extends DokuWiki_Action_Plugin
 {
     /** @inheritdoc */
     function register(Doku_Event_Handler $controller)
@@ -26,6 +26,7 @@ function register(Doku_Event_Handler $controller)
 
     public function handleAct(Doku_Event $event)
     {
+        if (!$this->getConf('viewmode')) return;
         if ($event->data != 'viewmodesitetools' && $event->data != 'viewmodeedit') return;
         $viewmode = get_doku_pref('approve_viewmode', false);
         set_doku_pref('approve_viewmode', !$viewmode);  // toggle status
@@ -41,7 +42,7 @@ public function handleAct(Doku_Event $event)
     public function addSiteTools(Doku_Event $event)
     {
         global $INPUT;
-
+        if (!$this->getConf('viewmode')) return false;
         if (!$INPUT->server->str('REMOTE_USER')) return false;
         if ($event->data['view'] != 'user') return false;
 
@@ -53,7 +54,7 @@ public function addSiteTools(Doku_Event $event)
     public function addPageTools(Doku_Event $event)
     {
         global $INPUT;
-
+        if (!$this->getConf('viewmode')) return false;
         if (!$INPUT->server->str('REMOTE_USER')) return false;
         if ($event->data['view'] != 'page') return false;
 

conf/default.php

@@ -12,3 +12,4 @@
 
 $conf['display_banner_for_readonly'] = 1;
 $conf['banner_long'] = 1;
+$conf['viewmode'] = 0;

conf/metadata.php

@@ -6,3 +6,4 @@
 $meta['banner_long'] = array('onoff');
 $meta['strict_approver'] = array('onoff', '_caution' => 'security');
 $meta['hide_drafts_for_viewers'] = array('onoff', '_caution' => 'security');
+$meta['viewmode'] = array('onoff');

helper.php

@@ -249,6 +249,9 @@ public function client_can_mark_ready_for_approval($id) {
      * @return bool
      */
     public function client_can_see_drafts($id, $pageApprover) {
+        // in view mode no one can see drafts
+        if ($this->getConf('viewmode') && get_doku_pref('approve_viewmode', false)) return false;
+
         if (!$this->getConf('hide_drafts_for_viewers')) return true;
 
         if (auth_quickaclcheck($id) >= AUTH_EDIT) return true;

lang/en/settings.php

@@ -5,4 +5,5 @@
 $lang['strict_approver'] = 'Only approvers can approve their pages.';
 $lang['hide_drafts_for_viewers'] = 'Hide draft from users without edit permission and show the latest approved revision instead.';
 $lang['display_banner_for_readonly'] = 'Display banner for users with AUTH_READ only.';
-$lang['banner_long'] = 'Long banner including version number and approver';
+$lang['banner_long'] = 'Long banner including version number and approver.';
+$lang['viewmode'] = 'Enables View/Edit mode toggle button. In view mode no one can see drafts.';

meta/ViewModeEdit.php

@@ -13,6 +13,6 @@ public function __construct() {
 
         $this->svg = DOKU_INC . 'lib/plugins/approve/circle-edit-outline.svg';
         $this->label = $helper->getLang('btn_edit_mode');
-        $this->accesskey = 'z';
+        $this->accesskey = 'e'; // it replaces the edit button, so the same access key.
     }
 }

meta/ViewModeSiteTools.php

@@ -14,10 +14,10 @@ public function __construct() {
         $viewmode = get_doku_pref('approve_viewmode', false);
         if ($viewmode) {
             $this->svg = DOKU_INC . 'lib/plugins/approve/toggle-on-solid.svg';
-            $this->label = $helper->getLang('btn_edit_mode');
+            $this->label = $helper->getLang('btn_view_mode');
         } else {
             $this->svg = DOKU_INC . 'lib/plugins/approve/toggle-off-solid.svg';
-            $this->label = $helper->getLang('btn_view_mode');
+            $this->label = $helper->getLang('btn_edit_mode');
         }
     }
 }