diff --git a/assets/javascript/nastenka_sync.js b/assets/javascript/nastenka_sync.js index b0ef2ea569a7f3c4e59bf340a463a67deb78344c..89295f01750b55ded85956de4b1dd5dde24e84d3 100644 --- a/assets/javascript/nastenka_sync.js +++ b/assets/javascript/nastenka_sync.js @@ -22,6 +22,7 @@ window.addEventListener( } nextUrl.searchParams.append("token", window.TOKEN); + nextUrl.searchParams.append("allowed-forum-ids", window.ALLOWED_FORUM_IDS); window.location = nextUrl; } diff --git a/ext/eparsons/restapi/controller/forums/Forums.php b/ext/eparsons/restapi/controller/forums/Forums.php index 4ff83c5dfc79ef43199e63707977a25288dceeb2..1190e7722692239a9d6b82e98badc09c597ce2c2 100755 --- a/ext/eparsons/restapi/controller/forums/Forums.php +++ b/ext/eparsons/restapi/controller/forums/Forums.php @@ -110,7 +110,8 @@ class Forums WHERE forum_id = ' . $forum_id . ' AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id) . ' - ORDER BY topic_id DESC' + ORDER BY topic_id DESC + LIMIT 25' ); $topics = array(); @@ -139,6 +140,25 @@ class Forums array_push($topics, $topic); } - return new JsonResponse($topics, 200); + $forum_query = $db->sql_query( + 'SELECT forum_name, forum_desc + FROM ' . FORUMS_TABLE . ' + WHERE forum_id= ' . $forum_id + ); + + $forum = array(); + + while ($row => $db->sql_fetchrow($forum_query)) { + $forum["name"] = $row["forum_name"]; + $forum["desc"] = $row["forum_desc"]; + } + + return new JsonResponse( + array( + "forum" => $forum, + "topics" => $topics + ), + 200 + ); } } diff --git a/nastenka_sync.php b/nastenka_sync.php index f9c95f1b954f8001d8fd961562eef2d2eebcbaa6..e468beaa4bd450b45b4d29dc03b212ed6cb35570 100755 --- a/nastenka_sync.php +++ b/nastenka_sync.php @@ -111,6 +111,7 @@ $template->set_filenames(array( )); $template->assign_vars(array( 'TOKEN' => $token, + 'ALLOWED_FORUM_IDS' => implode(",", $allowed_forum_ids) )); $request->disable_super_globals(); diff --git a/styles/all/template/nastenka_sync.html b/styles/all/template/nastenka_sync.html index 1574f488ac607cfa209735a1ce7011786cb2cbb3..1085f1ca48f836673b2eed237b39d0cf29005d93 100644 --- a/styles/all/template/nastenka_sync.html +++ b/styles/all/template/nastenka_sync.html @@ -25,6 +25,7 @@ <script> window.TOKEN = "{TOKEN}"; + window.ALLOWED_FORUM_IDS = "{ALLOWED_FORUM_IDS}"; </script> <script src="./assets/javascript/nastenka_sync.js?v=1"></script>