diff --git a/source/aspnetserver/Collection.cs b/source/aspnetserver/Collection.cs index 403efa1..0ed8be8 100644 --- a/source/aspnetserver/Collection.cs +++ b/source/aspnetserver/Collection.cs @@ -216,7 +216,7 @@ public static Collection[] GetAccessible(AjaxBase ajax) if (user != null) { where += " OR `id` IN (SELECT `cid` FROM `collectionuser` WHERE `uid`=" + Database.Quote(user.Id.ToString()) + " AND `access`='1')"; - where = "(" + where + ") AND `cid` NOT IN (SELECT `cid` FROM `collectionuser` WHERE `uid`=" + Database.Quote(user.Id.ToString()) + " AND `access`='0')"; + where = "(" + where + ") AND `id` NOT IN (SELECT `cid` FROM `collectionuser` WHERE `uid`=" + Database.Quote(user.Id.ToString()) + " AND `access`='0')"; } Dictionary[] resultSet = Database.Select("collection", where); diff --git a/source/aspnetserver/Settings.cs b/source/aspnetserver/Settings.cs index ce74757..eccb0f2 100644 --- a/source/aspnetserver/Settings.cs +++ b/source/aspnetserver/Settings.cs @@ -121,8 +121,9 @@ public static bool UsePdf return (_usePdf = true).Value; } - catch (Exception) + catch (Exception ex) { + Utility.TryLogError(ex); return (_usePdf = false).Value; } } @@ -215,8 +216,9 @@ private static bool SevenZipConfigOk _sevenZipConfigOk = true; } - catch (Exception) + catch (Exception ex) { + Utility.TryLogError(ex); _sevenZipConfigOk = false; } } diff --git a/source/haxe/afung/mangaWeb3/server/Collection.hx b/source/haxe/afung/mangaWeb3/server/Collection.hx index 2297b70..bb7cb89 100644 --- a/source/haxe/afung/mangaWeb3/server/Collection.hx +++ b/source/haxe/afung/mangaWeb3/server/Collection.hx @@ -194,7 +194,7 @@ class Collection if (user != null) { where += " OR `id` IN (SELECT `cid` FROM `collectionuser` WHERE `uid`=" + Database.Quote(Std.string(user.Id)) + " AND `access`='1')"; - where = "(" + where + ") AND `cid` NOT IN (SELECT `cid` FROM `collectionuser` WHERE `uid`=" + Database.Quote(Std.string(user.Id)) + " AND `access`='0')"; + where = "(" + where + ") AND `id` NOT IN (SELECT `cid` FROM `collectionuser` WHERE `uid`=" + Database.Quote(Std.string(user.Id)) + " AND `access`='0')"; } var resultSet:Array> = Database.Select("collection", where);