github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 13:24:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Simplified jumpbox 📜 (#815)

Browse source 
* Simplified jumpbox 📜

* Updated

* Update README.md

* Updated

* Update page_header.tpl

* Update functions.php
This commit is contained in:
Roman Kelesidis 2023-11-12 01:05:14 +07:00 • committed by GitHub
commit f098041713
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,7 +8,6 @@ composer.phar
configs/local.php configs/local.php
data/avatars data/avatars
data/torrent_files data/torrent_files
internal_data/ajax_html
internal_data/atom internal_data/atom
internal_data/cache internal_data/cache
internal_data/log internal_data/log

1
README.md
View file

@ -60,7 +60,6 @@ You must provide write permissions to the specified folders:
* `data/avatars` * `data/avatars`
* `data/torrent_files` * `data/torrent_files`
* `data/torrent_files/thumbs` * `data/torrent_files/thumbs`
* `internal_data/ajax_html`
* `internal_data/atom` * `internal_data/atom`
* `internal_data/cache` * `internal_data/cache`
* `internal_data/log` * `internal_data/log`

0
internal_data/ajax_html/.keep
View file

1
library/defines.php
View file

@ -36,7 +36,6 @@ define('CHECK_REQIREMENTS', [
define('ADMIN_DIR', BB_PATH . '/admin'); define('ADMIN_DIR', BB_PATH . '/admin');
define('DATA_DIR', BB_PATH . '/data'); define('DATA_DIR', BB_PATH . '/data');
define('INT_DATA_DIR', BB_PATH . '/internal_data'); define('INT_DATA_DIR', BB_PATH . '/internal_data');
define('AJAX_HTML_DIR', BB_PATH . '/internal_data/ajax_html');
define('CACHE_DIR', BB_PATH . '/internal_data/cache'); define('CACHE_DIR', BB_PATH . '/internal_data/cache');
define('LOG_DIR', BB_PATH . '/internal_data/log'); define('LOG_DIR', BB_PATH . '/internal_data/log');
define('TRIGGERS_DIR', BB_PATH . '/internal_data/triggers'); define('TRIGGERS_DIR', BB_PATH . '/internal_data/triggers');

11
library/includes/datastore/build_cat_forums.php
View file

@ -106,15 +106,14 @@ $this->store('cat_forums', $data);
// //
// jumpbox // jumpbox
// //
$data = [ if ($bb_cfg['show_jumpbox']) {
$data = [
'guest' => get_forum_select('guest', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'' . FORUM_URL . '\'+this.value;"'), 'guest' => get_forum_select('guest', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'' . FORUM_URL . '\'+this.value;"'),
'user' => get_forum_select('user', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'' . FORUM_URL . '\'+this.value;"'), 'user' => get_forum_select('user', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'' . FORUM_URL . '\'+this.value;"'),
]; ];
$this->store('jumpbox', $data); $this->store('jumpbox', $data);
}
file_write($data['guest'], AJAX_HTML_DIR . '/jumpbox_guest.html', false, true, true);
file_write($data['user'], AJAX_HTML_DIR . '/jumpbox_user.html', false, true, true);
// //
// viewtopic_forum_select // viewtopic_forum_select

10
library/includes/functions.php
View file

@ -1012,16 +1012,20 @@ function get_userdata($u, bool $is_name = false, bool $allow_guest = false)
return $u_data; return $u_data;
} }
function make_jumpbox($selected = 0) function make_jumpbox()
{ {
global $datastore, $template; global $datastore, $template, $bb_cfg;
if (!$bb_cfg['show_jumpbox']) {
return;
}
if (!$jumpbox = $datastore->get('jumpbox')) { if (!$jumpbox = $datastore->get('jumpbox')) {
$datastore->update('jumpbox'); $datastore->update('jumpbox');
$jumpbox = $datastore->get('jumpbox'); $jumpbox = $datastore->get('jumpbox');
} }
$template->assign_vars(['JUMPBOX' => (IS_GUEST) ? $jumpbox['guest'] : $jumpbox['user']]); $template->assign_vars(['JUMPBOX' => (IS_GUEST) ? DB()->escape($jumpbox['guest']) : DB()->escape($jumpbox['user'])]);
} }
// $mode: array(not_auth_forum1,not_auth_forum2,..) or (string) 'mode' // $mode: array(not_auth_forum1,not_auth_forum2,..) or (string) 'mode'

5
library/includes/page_header.php
View file

@ -56,6 +56,9 @@ if (defined('SHOW_ONLINE') && SHOW_ONLINE) {
]); ]);
} }
// Make jumpbox
make_jumpbox();
// Info about new private messages // Info about new private messages
$icon_pm = $images['pm_no_new_msg']; $icon_pm = $images['pm_no_new_msg'];
$pm_info = $lang['NO_NEW_PM']; $pm_info = $lang['NO_NEW_PM'];
@ -192,8 +195,6 @@ $template->assign_vars([
'BONUS_URL' => BB_ROOT . BONUS_URL, 'BONUS_URL' => BB_ROOT . BONUS_URL,
'TOPIC_URL' => BB_ROOT . TOPIC_URL, 'TOPIC_URL' => BB_ROOT . TOPIC_URL,
'AJAX_HTML_DIR' => AJAX_HTML_DIR,
// Misc // Misc
'BOT_UID' => BOT_UID, 'BOT_UID' => BOT_UID,
'SID' => $userdata['session_id'], 'SID' => $userdata['session_id'],

13
styles/templates/default/page_header.tpl
View file

@ -68,8 +68,8 @@ var user = {
} }
}; };
<!-- IF $bb_cfg['show_jumpbox'] --> <!-- IF JUMPBOX -->
$(document).ready(function(){ $(document).ready(function () {
$("div.jumpbox").html('\ $("div.jumpbox").html('\
<span id="jumpbox-container"> \ <span id="jumpbox-container"> \
<select id="jumpbox"> \ <select id="jumpbox"> \
@ -78,11 +78,12 @@ $(document).ready(function(){
</span> \ </span> \
<input id="jumpbox-submit" type="button" class="lite" value="{L_GO}" /> \ <input id="jumpbox-submit" type="button" class="lite" value="{L_GO}" /> \
'); ');
$('#jumpbox-container').one('click', function(){ $('#jumpbox-container').one('click', function () {
$('#jumpbox-title').html('&nbsp;&nbsp; {L_LOADING} ... &nbsp;'); $('#jumpbox-title').html('&nbsp;&nbsp; {L_LOADING} ... &nbsp;');
var jumpbox_src = '/internal_data/ajax_html' + ({LOGGED_IN} ? '/jumpbox_user.html' : '/jumpbox_guest.html'); $(this).html('{JUMPBOX}');
$(this).load(jumpbox_src); $('#jumpbox-submit').click(function () {
$('#jumpbox-submit').click(function(){ window.location.href='{FORUM_URL}'+$('#jumpbox').val(); }); window.location.href = '{FORUM_URL}' + $('#jumpbox').val();
});
}); });
}); });
<!-- ENDIF --> <!-- ENDIF -->