From 5d20a56542266fdb900058334eb63f84905c19d5 Mon Sep 17 00:00:00 2001
From: John Bintz <27256+johnbintz@users.noreply.github.com>
Date: Tue, 23 Jun 2020 17:38:48 -0400
Subject: [PATCH] 2017-02-19g~2020-06-23, fix link targets, lock down Sandstorm
 settings

---
 .sandstorm/app-marketing-version  |  2 +-
 .sandstorm/launcher.sh            |  2 ++
 .sandstorm/sandstorm-files.list   |  1 +
 .sandstorm/sandstorm-pkgdef.capnp |  2 +-
 local.php                         | 11 +----------
 local.protected.php               | 20 ++++++++++++++++++++
 6 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 local.protected.php

diff --git a/.sandstorm/app-marketing-version b/.sandstorm/app-marketing-version
index 393efcb..bdc5094 100644
--- a/.sandstorm/app-marketing-version
+++ b/.sandstorm/app-marketing-version
@@ -1 +1 @@
-2017-02-19g~2020-06-20
+2017-02-19g~2020-06-23
diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh
index 7d7a249..6065016 100755
--- a/.sandstorm/launcher.sh
+++ b/.sandstorm/launcher.sh
@@ -27,6 +27,8 @@ if [ ! -e /var/lib/dokuwiki/conf/local.php ]; then
   cp /opt/app/local.php /var/lib/dokuwiki/conf
 fi
 rm -f /var/lib/dokuwiki/conf/conf
+# sandstorm-specific things go here
+cp /opt/app/local.protected.php /var/lib/dokuwiki/conf
 
 if [ ! -e /var/lib/dokuwiki/data ]; then
   echo Adding data.
diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index c38d2cb..11ef031 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -3017,6 +3017,7 @@ opt/app/dokuwiki/vendor/splitbrain/php-archive/src/FileInfo.php
 opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Tar.php
 opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Zip.php
 opt/app/local.php
+opt/app/local.protected.php
 opt/app/plugin
 opt/app/plugin/README
 opt/app/plugin/auth.php
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index ca6216a..19a804a 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = (
 
     appTitle = (defaultText = "DokuWiki"),
 
-    appVersion = 6,  # Increment this for every release.
+    appVersion = 7,  # Increment this for every release.
 
     appMarketingVersion = (defaultText = (embed "app-marketing-version")),
     # Human-readable representation of appVersion. Should match the way you
diff --git a/local.php b/local.php
index 9871e89..31a7bcf 100644
--- a/local.php
+++ b/local.php
@@ -9,13 +9,4 @@
  */
 
 $conf['showuseras']  = 'username';
-$conf['useacl']      = 1;                //Use Access Control Lists to restrict access?
-$conf['autopasswd']  = 0;                //autogenerate passwords and email them to user
-$conf['authtype']    = 'sandstorm';      //which authentication backend should be used
-$conf['superuser']   = '@admin';    //The admin can be user or @group or comma separated list user1,@group1,user2
-$conf['manager']     = '@manager';    //The manager can be user or @group or comma separated list user1,@group1,user2
-$conf['profileconfirm'] = 0;             //Require current password to confirm changes to user profile
-$conf['disableactions']='login';
-$conf['userewrite']  = 1;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
-$conf['useslash']    = 1;                //use slash instead of colon? only when rewrite is on
-$conf['savedir']     = '/var/lib/dokuwiki/data';          //where to store all the files
+$conf['target']['extern'] = '_blank'; // always open external links in a new window
diff --git a/local.protected.php b/local.protected.php
new file mode 100644
index 0000000..fbc32a3
--- /dev/null
+++ b/local.protected.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * This is an example of how a local.php could look like.
+ * Simply copy the options you want to change from dokuwiki.php
+ * to this file and change them.
+ *
+ * When using the installer, a correct local.php file be generated for
+ * you automatically.
+ */
+
+$conf['autopasswd']  = 0;                //autogenerate passwords and email them to user
+$conf['authtype']    = 'sandstorm';      //which authentication backend should be used
+$conf['superuser']   = '@admin';    //The admin can be user or @group or comma separated list user1,@group1,user2
+$conf['manager']     = '@manager';    //The manager can be user or @group or comma separated list user1,@group1,user2
+$conf['profileconfirm'] = 0;             //Require current password to confirm changes to user profile
+$conf['disableactions']='login';
+$conf['userewrite']  = 1;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
+$conf['useslash']    = 1;                //use slash instead of colon? only when rewrite is on
+$conf['useacl']      = 1;                //Use Access Control Lists to restrict access?
+$conf['savedir']     = '/var/lib/dokuwiki/data';          //where to store all the files