From: Niki <david.roulet@uclouvain.be>
Date: Tue, 4 Jun 2019 12:58:16 +0000 (+0200)
Subject: include 2.0.3 patch
X-Git-Tag: fanfix-swing-0.0.1~12^2~45
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=27f3b37ff1bb4b7eed69b44e0ccd7b23380dcf44;p=fanfix-swing.git

include 2.0.3 patch
---

diff --git a/changelog-fr.md b/changelog-fr.md
index 0a80ab9e..5ea8c329 100644
--- a/changelog-fr.md
+++ b/changelog-fr.md
@@ -21,6 +21,10 @@
 - remote: le log inclus maintenant la date des évènements
 - remote: le mot de passe se configure maintenant dans le fichier de configuration
 
+# Version 2.0.3
+
+SoFurry: correction pour les histoires disponibles uniquement aux utilisateurs inscrits sur le site
+
 # Version 2.0.2
 
 - i18n: changer la langue dans les options fonctionne aussi quand $LANG existe
diff --git a/changelog.md b/changelog.md
index 99380f71..c4c0aa00 100644
--- a/changelog.md
+++ b/changelog.md
@@ -21,6 +21,10 @@
 - remote: worse perfs but much better memory usage
 - remote: log now includes the time of events
 
+# Version 2.0.3
+
+SoFurry: fix for stories only available to registrated users
+
 # Version 2.0.2
 
 - i18n: setting the language in the option panel now works even with $LANG set
diff --git a/src/be/nikiroo/fanfix/supported/YiffStar.java b/src/be/nikiroo/fanfix/supported/YiffStar.java
index a17253a5..aad01a68 100644
--- a/src/be/nikiroo/fanfix/supported/YiffStar.java
+++ b/src/be/nikiroo/fanfix/supported/YiffStar.java
@@ -74,10 +74,13 @@ class YiffStar extends BasicSupport_Deprecated {
 
 		if (login != null && !login.isEmpty() && password != null
 				&& !password.isEmpty()) {
+
 			Map<String, String> post = new HashMap<String, String>();
-			post.put("sfLoginUsername", login);
-			post.put("sfLoginPassword", password);
+			post.put("LoginForm[sfLoginUsername]", login);
+			post.put("LoginForm[sfLoginPassword]", password);
 			post.put("YII_CSRF_TOKEN", "");
+			post.put("yt1", "Login");
+			post.put("returnUrl", "/");
 
 			// Cookies will actually be retained by the cache manager once
 			// logged in
@@ -91,8 +94,10 @@ class YiffStar extends BasicSupport_Deprecated {
 	public URL getCanonicalUrl(URL source) {
 		try {
 			if (source.getPath().startsWith("/view")) {
-				source = new URL(source.toString() + "/guest");
-				InputStream in = Instance.getCache().open(source, this, false);
+				source = guest(source.toString());
+				// NO CACHE because we don't want the NotLoggedIn message later
+				InputStream in = Instance.getCache().openNoCache(source, this,
+						null, null, null);
 				String line = getLine(in, "/browse/folder/", 0);
 				if (line != null) {
 					String[] tab = line.split("\"");