From d27e1bbfb95992aa50e24f0725c9a914ae94e1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome.lebleu@mailoo.org>
Date: Mon, 13 Jul 2015 22:28:21 +0200
Subject: [PATCH] [fix] Properly set and save upload password, allowing empty
 one

---
 conf/config.local.php |  2 +-
 scripts/install       | 11 +++++++++--
 scripts/upgrade       |  8 +++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/conf/config.local.php b/conf/config.local.php
index 021ffe5..1425129 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -51,7 +51,7 @@ $cfg['link_name_length'] = 8;
  * $cfg['upload_password'] = array('psw1', 'psw2'); // Two passwords
  * ... and so on
  */
-$cfg['upload_password'] = array('YNH_UPLOAD_PASSWORD');
+$cfg['upload_password'] = array(YNH_UPLOAD_PASSWORD);
 /* An empty admin password will disable the classic admin password
  * authentication.
  */
diff --git a/scripts/install b/scripts/install
index 6af35cd..3e35e64 100755
--- a/scripts/install
+++ b/scripts/install
@@ -25,9 +25,17 @@ fi
 
 # Save specific settings
 sudo yunohost app setting jirafeau admin_user -v $admin_user
-sudo yunohost app setting jirafeau upload_password -v $upload_password
 sudo yunohost app setting jirafeau is_public -v $is_public
 
+# Set and save upload password, allowing an empty one
+if [[ -z "$upload_password" ]]; then
+    sed -i "s@YNH_UPLOAD_PASSWORD@@g" ../conf/config.local.php
+    sudo yunohost app setting jirafeau upload_password -v ''
+else
+    sed -i "s@YNH_UPLOAD_PASSWORD@'$upload_password'@g" ../conf/config.local.php
+    sudo yunohost app setting jirafeau upload_password -v $upload_password
+fi
+
 # Copy files to the right place
 final_path=/var/www/jirafeau
 var_root=/home/yunohost.app/jirafeau
@@ -37,7 +45,6 @@ sed -i "s@YNH_DOMAIN@$domain@g" ../conf/config.local.php
 sed -i "s@YNH_WWW_PATH@$path@g" ../conf/config.local.php
 sed -i "s@YNH_VAR_ROOT@$var_root@g" ../conf/config.local.php
 sed -i "s@YNH_ADMIN_USER@$admin_user@g" ../conf/config.local.php
-sed -i "s@YNH_UPLOAD_PASSWORD@$upload_password@g" ../conf/config.local.php
 sudo cp ../conf/config.local.php $final_path/lib
 sudo rm $final_path/install.php
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 39b98c1..07b855c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,6 +9,13 @@ is_public=$(sudo yunohost app setting jirafeau is_public)
 # Remove trailing "/" for next commands
 path=${path%/}
 
+# Set upload password, allowing an empty one
+if [[ -z "$upload_password" ]]; then
+    sed -i "s@YNH_UPLOAD_PASSWORD@@g" ../conf/config.local.php
+else
+    sed -i "s@YNH_UPLOAD_PASSWORD@'$upload_password'@g" ../conf/config.local.php
+fi
+
 # Copy files to the right place
 final_path=/var/www/jirafeau
 var_root=/home/yunohost.app/jirafeau
@@ -19,7 +26,6 @@ sed -i "s@YNH_DOMAIN@$domain@g" ../conf/config.local.php
 sed -i "s@YNH_WWW_PATH@$path@g" ../conf/config.local.php
 sed -i "s@YNH_VAR_ROOT@$var_root@g" ../conf/config.local.php
 sed -i "s@YNH_ADMIN_USER@$admin_user@g" ../conf/config.local.php
-sed -i "s@YNH_UPLOAD_PASSWORD@$upload_password@g" ../conf/config.local.php
 sudo cp ../conf/config.local.php $final_path/lib
 sudo rm $final_path/install.php