Tracker search forum list simplification.

This commit is contained in:
Yuriy Pikhtarev 2017-06-15 01:12:53 +03:00
commit 175e22e844
No known key found for this signature in database
GPG key ID: 3A9B5A757B48ECC6
2 changed files with 16 additions and 16 deletions

View file

@ -508,18 +508,17 @@ $(function(){
$('#fs-qs-div').show(); $('#fs-qs-div').show();
} }
}); });
function get_fs_link () function get_fs_link() {
{ var fs_url = '{TRACKER_URL}';
var fs_url = '{TRACKER_URL}'; var fs_val = $('#fs-main').val();
var fs_val = $('#fs-main').val();
if (fs_val == null) { if (fs_val != null && $.inArray('-1', fs_val) == -1) {
alert('{L_NOT_SEL_CHAPTERS}'); fs_url += 'f=' + fs_val.sort().join();
} window.prompt('{L_SEL_CHAPTERS}:', fs_url);
else { }
fs_url += 'f[]='+ fs_val.join('&f[]='); else {
window.prompt('{L_SEL_CHAPTERS}:', fs_url); alert('{L_NOT_SEL_CHAPTERS}');
} }
return false; return false;
} }
</script> </script>

View file

@ -375,10 +375,11 @@ if (!$set_default) {
} // Get requested forum_id(s) } // Get requested forum_id(s)
elseif ($req_forums =& $_REQUEST[$forum_key]) { elseif ($req_forums =& $_REQUEST[$forum_key]) {
if ($req_forums != $search_all) { if ($req_forums != $search_all) {
$req_forums = (array)$req_forums; $clean_forums = [];
array_deep($req_forums, 'intval'); foreach (explode(',', $req_forums) as $req_forum) {
$valid_forums = array_intersect($req_forums, $allowed_forums); $clean_forums[] = (int) $req_forum;
$forum_val = implode(',', $valid_forums); }
$forum_val = implode(',', array_intersect($clean_forums, $allowed_forums));
} }
} elseif (isset($previous_settings[$forum_key])) { } elseif (isset($previous_settings[$forum_key])) {
$valid_forums = array_intersect(explode(',', $previous_settings[$forum_key]), $allowed_forums); $valid_forums = array_intersect(explode(',', $previous_settings[$forum_key]), $allowed_forums);