From 096e55b26b43d8d66536e41c85a299d9b6bd1288 Mon Sep 17 00:00:00 2001
From: JimboJoe <jimmy@monin.net>
Date: Fri, 10 Mar 2017 22:01:34 +0100
Subject: [PATCH] Update to upstream version 1.0.40 (#41)

---
 README.markdown    | 16 ++++++----------
 conf/config.php    | 10 ++++++++--
 scripts/_common.sh |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.markdown b/README.markdown
index 0d1d9b4..22c3fc4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -33,7 +33,7 @@ From command line:
 
 Infos
 -----
-Kanboard v1.0.36
+Kanboard v1.0.40
 
 Yunohost forum thread:  <https://forum.yunohost.org/t/kanboard-package/78>
 
@@ -42,25 +42,21 @@ Kanboard and SSOwat
 Kanboard use SSOwat for user authentification (it means it use the user that the web server (nginx) sent him throught SSOwat), but can't list all user of the system.
 If you wish to add a user, just log in with that user into Kanboard so the software knows him and displays it.
 
-Developper infos
+Developer infos
 ----------------
 
 Please do your pull request to the dev branch.
 
-Update package:
-```
-wget http://kanboard.net/kanboard-latest.zip
-unzip kanboard-latest.zip
-rm -Rf sources
-mv kanboard sources
-```
-Then do a manual diff between `conf/config.php` and `sources/config.default.php` to see if there are new config options
+Update package version in `scripts/_common.sh`
+
+Then do a manual diff between `conf/config.php` and `config.default.php` [from upstream Kanboard project](https://github.com/kanboard/kanboard/blob/master/config.default.php) to see if there are new config options
 
 Update readme with the new version
 
 Test it
 
 Test or upgrade to dev version:
+
 ```
 su - admin
 git clone -b dev https://github.com/YunoHost-Apps/kanboard_ynh
diff --git a/conf/config.php b/conf/config.php
index d0a427f..ffefc16 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -1,7 +1,7 @@
 <?php
 
-// Data folder (must be writeable by the web server user)
-define('DATA_DIR', 'data');
+// Data folder (must be writeable by the web server user and absolute)
+define('DATA_DIR', __DIR__.DIRECTORY_SEPARATOR.'data');
 
 // Enable/Disable debug
 define('DEBUG', false);
@@ -30,6 +30,9 @@ define('CACHE_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'cache');
 // Folder for uploaded files (must be writeable by the web server user)
 define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files');
 
+// Enable/disable email configuration from the user interface
+define('MAIL_CONFIGURATION', true);
+
 // E-mail address for the "From" header (notifications)
 define('MAIL_FROM', 'yuno_email');
 
@@ -225,5 +228,8 @@ define('HTTP_PROXY_PORT', '3128');
 define('HTTP_PROXY_USERNAME', '');
 define('HTTP_PROXY_PASSWORD', '');
 
+// Set to false to allow self-signed certificates
+define('HTTP_VERIFY_SSL_CERTIFICATE', false);
+
 // TOTP (2FA) issuer name
 define('TOTP_ISSUER', 'Kanboard');
\ No newline at end of file
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3d032e7..3b0b981 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,7 @@
 #
 
 # Application version
-VERSION="1.0.36"
+VERSION="1.0.40"
 
 # Remote URL to fetch application source archive
 APPLICATION_SOURCE_URL="https://kanboard.net/kanboard-${VERSION}.zip"