From fa6160d9f0bf59cb0b7c71c79ab8d961ef602481 Mon Sep 17 00:00:00 2001
From: scith <scith@hotmail.fr>
Date: Sun, 21 Aug 2016 23:56:32 +0200
Subject: [PATCH] Improvements

---
 README.md       | 22 +++++++++++++++++++++-
 conf/common.php |  4 ----
 manifest.json   | 27 ---------------------------
 scripts/install |  9 ---------
 scripts/restore |  1 -
 scripts/upgrade |  9 ---------
 6 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index c3a6b37..d77899a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,27 @@
 # HumHub for YunoHost
 
+- HumHub has to be postinstalled manually
+- LDAP has to be setup manually (see below)
+- LDAP auth does not work with users having multiple email addresses
+- Users cannot be logged in automatically
+
+
+LDAP settings:
+* hostname : localhost
+* port : 389
+* baseDn : ou=users,dc=yunohost,dc=org
+* loginFilter : (uid=%s)
+* userFilter : objectClass=mailAccount
+* usernameAttribute : uid
+* emailAttribute : mail
+
 ## HumHub
-- TBD
+HumHub is a feature rich and highly flexible OpenSource Social Network Kit written in PHP.
+
+It's perfect for individual:
+- Social Intranets
+- Enterprise Social Networks
+- Private Social Networks
 
 **More information:**    
 https://yunohost.org/
diff --git a/conf/common.php b/conf/common.php
index 66c65bb..e8bd415 100644
--- a/conf/common.php
+++ b/conf/common.php
@@ -2,10 +2,6 @@
 
 return [
     'components' => [
-        'urlManager' => [
-            'urlFormat' => 'path',
-            'showScriptName' => false,
-        ],
 		'db' => [
             'dsn' => 'mysql:host=localhost;dbname=DBNAME_TO_CHANGE',
             'username' => 'DBUSER_TO_CHANGE',
diff --git a/manifest.json b/manifest.json
index d5bf959..3201c6f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -41,33 +41,6 @@
                 },
                 "example": "/humhub",
                 "default": "/humhub"
-            },
-            {
-                "name": "admin",
-				"type": "user",
-                "ask": {
-                    "en": "Choose an admin user",
-                    "fr": "Choisissez l’administrateur"
-                },
-                "example": "johndoe"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "ask": {
-                    "en": "Is it a public application?",
-                    "fr": "Est-ce une application publique ?"
-                },
-                "default": true
-            },
-            {
-                "name": "language",
-                "ask": {
-                    "en": "Choose the application language",
-                    "fr": "Choisissez la langue de l'application"
-                },
-                "choices": ["fr", "en"],
-                "default": "fr"
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index d028a0f..1ec1814 100644
--- a/scripts/install
+++ b/scripts/install
@@ -9,9 +9,6 @@ version='1.1.0'
 # Retrieve arguments
 	domain=$YNH_APP_ARG_DOMAIN
 	path=$YNH_APP_ARG_PATH
-	admin=$YNH_APP_ARG_ADMIN
-	is_public=$YNH_APP_ARG_IS_PUBLIC
-	language=$YNH_APP_ARG_LANGUAGE
 
 # Source YunoHost helpers
 	source /usr/share/yunohost/helpers
@@ -47,7 +44,6 @@ version='1.1.0'
 
 # Set permissions to app files
 	sudo chown -R root: $src_path
-	sudo chown -R www-data: $src_path/public_html
 	
 # Cron
 	echo "30 * * * * $src_path/public_html/yiic cron hourly >/dev/null 2>&1" > cron
@@ -61,10 +57,5 @@ version='1.1.0'
 	sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf
 	sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf
 
-# If app is public, add url to SSOWat conf as skipped_uris
-	if [[ $is_public -eq 1 ]]; then
-	  ynh_app_setting_set "$app" unprotected_uris "/"
-	fi
-
 # Reload services
 	sudo service nginx reload
diff --git a/scripts/restore b/scripts/restore
index 54b9995..35ac392 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -26,7 +26,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 # Restore permissions to app files
 	sudo chown -R root: $src_path
-	sudo chown -R www-data: $src_path/public_html
 
 # MySQL
 	dbname=$app
diff --git a/scripts/upgrade b/scripts/upgrade
index 3f76f17..8385cec 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,9 +12,6 @@ version='1.1.0'
 # Retrieve app settings
 	domain=$(ynh_app_setting_get "$app" domain)
 	path=$(ynh_app_setting_get "$app" path)
-	admin=$(ynh_app_setting_get "$app" admin)
-	is_public=$(ynh_app_setting_get "$app" is_public)
-	language=$(ynh_app_setting_get "$app" language)
 
 # Remove trailing "/" for next commands
 	path=${path%/}
@@ -27,7 +24,6 @@ version='1.1.0'
 
 # Set permissions to app files
 	sudo chown -R root: $src_path
-	sudo chown -R www-data: $src_path/public_html
 	
 # Cron
 	echo "30 * * * * $src_path/public_html/yiic cron hourly >/dev/null 2>&1" > cron
@@ -41,10 +37,5 @@ version='1.1.0'
 	sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf
 	sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf
 
-# If app is public, add url to SSOWat conf as skipped_uris
-	if [[ $is_public -eq 1 ]]; then
-	  ynh_app_setting_set "$app" unprotected_uris "/"
-	fi
-
 # Reload nginx service
 	sudo service nginx reload