From 90bf55f3ba94f5b639f00522d089b7a2c3083040 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 16 Jun 2021 00:09:21 +0200
Subject: [PATCH] Upgrade to 11.5 and fix install

---
 README.md             |  2 +-
 conf/app.src          |  4 ++--
 conf/database.inc.php |  2 +-
 manifest.json         |  2 +-
 scripts/install       | 12 +++++-------
 scripts/upgrade       | 17 +++++------------
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 288724b..a347871 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 [Piwigo](http://piwigo.org) is a photo gallery software for the web, built by an active community of users and developers. Extensions make Piwigo easily customizable.
 
-**Shipped version:** 11.3.0
+**Shipped version:** 11.5.0
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index e0244d4..6d61b68 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=11.3.0
-SOURCE_SUM=07b0a364484c85acecf9abd6ac2b87e9c8793795b760134b4fab96be99228943
+SOURCE_URL=https://piwigo.org/download/dlcounter.php?code=11.5.0
+SOURCE_SUM=bfecdd743c62cdb4e1936662178d019af264ea763d26c8c832da836fbe09652d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/database.inc.php b/conf/database.inc.php
index 9001a57..7e3a2cb 100644
--- a/conf/database.inc.php
+++ b/conf/database.inc.php
@@ -1,7 +1,7 @@
 <?php
 $conf['dblayer'] = 'mysqli';
 $conf['db_base'] = '__DB_NAME__';
-$conf['db_user'] = '__DB_NAME__';
+$conf['db_user'] = '__DB_USER__';
 $conf['db_password'] = '__DB_PWD__';
 $conf['db_host'] = 'localhost';
 
diff --git a/manifest.json b/manifest.json
index 9cf0d1f..dec3688 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open source photo gallery for the web",
         "fr": "Galerie de photos open source pour le web"
     },
-    "version": "11.3.0~ynh2",
+    "version": "11.5.0~ynh1",
     "url": "http://piwigo.org",
     "license": "GPL-2.0",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index de850b8..74b3d40 100644
--- a/scripts/install
+++ b/scripts/install
@@ -170,7 +170,7 @@ fi
 mail="$(ynh_user_get_info --username=$admin --key=mail)"
 
 # Installation with cURL
-ynh_local_curl "/install.php?language=$applanguage" "install=true" "dbuser=$db_name" "dbpasswd=$db_pwd" "dbname=$db_name" "admin_name=$admin" "admin_pass1=$adm_pwd" "admin_pass2=$adm_pwd" "admin_mail=$mail"
+ynh_local_curl "/install.php?language=$applanguage" "install=true" "dbhost=127.0.0.1" "dbuser=$db_user" "dbpasswd=$db_pwd" "dbname=$db_name" "prefix=" "admin_name=$admin" "admin_pass1=$adm_pwd" "admin_pass2=$adm_pwd" "admin_mail=$mail"
 
 #=================================================
 # CONFIGURE PIWIGO
@@ -178,16 +178,14 @@ ynh_local_curl "/install.php?language=$applanguage" "install=true" "dbuser=$db_n
 ynh_script_progression --message="Configuring Piwigo..."
 
 # Change local config
-cp ../conf/config.inc.php $final_path/local/config/
-
-# Calculate and store the config file checksum
-ynh_store_file_checksum --file="$final_path/local/config/config.inc.php"
+ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/local/config/config.inc.php"
 
 # Setup database in local/config/database.inc.php
 ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php"
 
-# Calculate and store the database config file checksum
-ynh_store_file_checksum --file="$final_path/local/config/database.inc.php"
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # ADD LDAP PLUGIN
diff --git a/scripts/upgrade b/scripts/upgrade
index 7d4c180..f266533 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -210,22 +210,15 @@ ynh_local_curl "/upgrade.php?language=$applanguage&now=true" "language=$applangu
 #=================================================
 ynh_script_progression --message="Configuring Piwigo..."
 
-# Make a backup of the original config file if modified
-ynh_backup_if_checksum_is_different --file="$final_path/local/config/config.inc.php"
-
 # Change local config
-cp ../conf/config.inc.php $final_path/local/config/
-
-# Calculate and store the config file checksum
-ynh_store_file_checksum --file="$final_path/local/config/config.inc.php"
-
-# Make a backup of the original database config file if modified
-ynh_backup_if_checksum_is_different --file="$final_path/local/config/database.inc.php"
+ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/local/config/config.inc.php"
 
+# Setup database in local/config/database.inc.php
 ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php"
 
-# Calculate and store the database config file checksum
-ynh_store_file_checksum --file="$final_path/local/config/database.inc.php"
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # CONFIGURE LDAP PLUGIN