From aaa8a3a30b5e549487a25ad715c6bef1801c2f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement@selfhost.fr>
Date: Mon, 13 Feb 2017 22:52:07 +0100
Subject: [PATCH] update hooks

---
 hooks/post_app_addaccess | 37 ++-----------------------------------
 hooks/post_user_create   | 13 ++-----------
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/hooks/post_app_addaccess b/hooks/post_app_addaccess
index 958b6ba..460cc0f 100755
--- a/hooks/post_app_addaccess
+++ b/hooks/post_app_addaccess
@@ -11,43 +11,10 @@ then
     db_name=freshrss
     db_pwd=$(sudo yunohost app setting freshrss mysqlpwd)
 
-    #check wallabag
-    if [[ $(sudo yunohost app list --installed -f wallabag2) -eq 0 ]]; then
-        echo "Detected wallabag V2"
-        wallabagPath=$(sudo yunohost app setting wallabag2 path)
-        wallabagUrl=$domain$wallabagPath
-        sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabag',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t),"
-        sharingEnable=1
-    elif [[ $(sudo yunohost app list --installed -f wallabag) -eq 0 ]]; then
-        echo "Detected wallabag"
-        wallabagPath=$(sudo yunohost app setting wallabag path)
-        wallabagUrl=$domain$wallabagPath
-        sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabag',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t),"
-        sharingEnable=1
-    fi
-
     for myuser in $(echo "$new_users" | sed "s/,/ /g")
     do
-        #copy sql
-        sudo cp $app_path/app/SQL/install_ynh.sql /tmp/$myuser-install.sql
-        #  $app_path/cli/create-user.php --user  --email
-
-
-        #change username in sql
-        sudo sed -i "s/YnoUser/$myuser/g" /tmp/$myuser-install.sql
-        #create tables
-        ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" \
-        < "/tmp/$myuser-install.sql"
-        #remove temp sql
-        sudo rm /tmp/$myuser-install.sql
-
-        #copy default conf
-        sudo cp -r $app_path/data/users/_ $app_path/data/users/$myuser/
-        sudo mv $app_path/data/users/$myuser/config.default.php $app_path/data/users/$myuser/config.php
-        #add wallabag sharing
-        if [[ $sharingEnable -eq 1 ]]; then
-            sudo sed -i "s@'sharing'\ =>\ array\ (@$sharingWallabag@g" $app_path/data/users/$myuser/config.php
-        fi
+        user_token=$(ynh_string_random)
+        $app_path/cli/create-user.php --user $myuser --language en --token $user_token --no-default-feeds
         sudo chown -R www-data: $app_path/data/users/$myuser/
     done
 fi
diff --git a/hooks/post_user_create b/hooks/post_user_create
index b2523f3..3241fa5 100755
--- a/hooks/post_user_create
+++ b/hooks/post_user_create
@@ -7,15 +7,6 @@ app_path=/var/www/freshrss
 
 myuser=$1
 
-#copy sql
-sudo cp $app_path/app/SQL/install_ynh.sql /tmp/$myuser-install.sql
-#change username in sql
-sudo sed -i "s/YnoUser/$myuser/g" /tmp/$myuser-install.sql
-#create tables
-mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql
-#remove temp sql
-sudo rm /tmp/$myuser-install.sql
-#copy default conf
-sudo cp -r $app_path/data/users/_ $app_path/data/users/$myuser/
-sudo mv $app_path/data/users/$myuser/config.default.php $app_path/data/users/$myuser/config.php
+user_token=$(ynh_string_random)
+$app_path/cli/create-user.php --user $myuser --language en --token $user_token --no-default-feeds
 sudo chown -R www-data: $app_path/data/users/$myuser/