github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 06:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Admin cron ulock

Browse source 
Разблокировка форума заблокированного крон на аяксе, GMT -> UTC, мелкие фиксы (золото, доступ к статистике, пара переменных).
This commit is contained in:
Exile 2014-08-11 16:07:37 +04:00
commit d1f87716af
12 changed files with 310 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/admin/index.php
View file

@ -59,6 +59,8 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
{
$template->assign_vars(array(
'TPL_ADMIN_MAIN' => true,
'ADMIN_LOCK' => ($bb_cfg['board_disable']) ? true : false,
'ADMIN_LOCK_CRON' => (file_exists(BB_DISABLED)) ? true :false,
));
// Get forum statistics

9
upload/ajax.php
View file

@ -9,7 +9,12 @@ require('./common.php');
$ajax->init();
// Init userdata
$user->session_start();
// Exit if board is disabled via ON/OFF trigger or by admin
if ($ajax->action != 'manage_admin')
{
if ($bb_cfg['board_disable'])
{
$ajax->ajax_die($lang['BOARD_DISABLE']);
@ -18,6 +23,7 @@ else if (file_exists(BB_DISABLED))
{
$ajax->ajax_die($lang['BOARD_DISABLE_CRON']);
}
}
// Load actions required modules
switch ($ajax->action)
@ -65,10 +71,9 @@ switch ($ajax->action)
break;
}
// position in $ajax->valid_actions['xxx']
// Position in $ajax->valid_actions['xxx']
define('AJAX_AUTH', 0); // 'guest', 'user', 'mod', 'admin', 'super_admin'
$user->session_start();
$ajax->exec();
//

10
upload/ajax/manage_admin.php
View file

@ -99,7 +99,15 @@ switch ($mode)
sync('user_posts', 'all');
$this->response['sync_user_posts_html'] = '<span class="seed bold">'. $lang['USER POSTS COUNT SYNCHRONIZED'] .'</span>';
$this->response['sync_user_posts_html'] = '<span class="seed bold">'. $lang['USER_POSTS_COUNT_SYNCHRONIZED'] .'</span>';
break;
case 'unlock_cron':
cron_enable_board();
$this->response['unlock_cron_html'] = '<span class="seed bold">'. $lang['ADMIN_UNLOCKED'] .'</span>';
break;
}

22
upload/attach_mod/displaying.php
View file

@ -99,11 +99,6 @@ function display_post_attachments($post_id, $switch_attachment)
{
display_attachments($post_id);
}
else
{
// Display Notice (attachment there but not having permissions to view it)
// Not included because this would mean template and language file changes (at this stage this is not a wise step. ;))
}
}
/**
@ -271,11 +266,6 @@ function display_attachments($post_id)
if ($image)
{
// Images
// NOTE: If you want to use the dl.php everytime an image is displayed inlined, replace the
// Section between BEGIN and END with (Without the // of course):
// $img_source = BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'];
// $download_link = TRUE;
// Check if we can reach the file or if it is stored outside of the webroot
if ($attach_config['upload_dir'][0] == '/' || ( $attach_config['upload_dir'][0] != '/' && $attach_config['upload_dir'][1] == ':'))
{
$img_source = BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'];
@ -283,16 +273,13 @@ function display_attachments($post_id)
}
else
{
// BEGIN
$img_source = $filename;
$download_link = FALSE;
// END
}
$template->assign_block_vars('postrow.attach.cat_images', array(
'DOWNLOAD_NAME' => $display_name,
'S_UPLOAD_IMAGE' => $upload_image,
'IMG_SRC' => $img_source,
'FILESIZE' => $filesize,
'COMMENT' => $comment,
@ -315,25 +302,18 @@ function display_attachments($post_id)
if ($thumbnail)
{
// Images, but display Thumbnail
// NOTE: If you want to use the dl.php everytime an thumnmail is displayed inlined, replace the
// Section between BEGIN and END with (Without the // of course):
// $thumb_source = BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1';
// Check if we can reach the file or if it is stored outside of the webroot
if ($attach_config['upload_dir'][0] == '/' || ( $attach_config['upload_dir'][0] != '/' && $attach_config['upload_dir'][1] == ':'))
{
$thumb_source = BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1';
}
else
{
// BEGIN
$thumb_source = $thumbnail_filename;
// END
}
$template->assign_block_vars('postrow.attach.cat_thumb_images', array(
'DOWNLOAD_NAME' => $display_name,
'S_UPLOAD_IMAGE' => $upload_image,
'IMG_SRC' => BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'],
'IMG_THUMB_SRC' => $thumb_source,
'FILESIZE' => $filesize,
@ -354,12 +334,10 @@ function display_attachments($post_id)
$template->assign_block_vars('postrow.attach.attachrow', array(
'U_DOWNLOAD_LINK' => BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'],
'S_UPLOAD_IMAGE' => $upload_image,
'DOWNLOAD_NAME' => $display_name,
'FILESIZE' => $filesize,
'COMMENT' => $comment,
'TARGET_BLANK' => $target_blank,
'DOWNLOAD_COUNT' => sprintf($lang['DOWNLOAD_NUMBER'], $attachments['_' . $post_id][$i]['download_count']),
));
}

141
upload/language/en/main.php
View file

@ -103,6 +103,13 @@ $lang['DATASTORE'] = 'Datastore';
$lang['DATASTORE_CLEARED'] = 'Datastore has been cleared';
$lang['BOARD_DISABLE'] = 'Sorry, this forum is disabled. Try to come back later';
$lang['BOARD_DISABLE_CRON'] = 'Forum is down for maintenance. Try to come back later';
$lang['ADMIN_DISABLE'] = 'the forum is disabled by administrator, you can enable it at any time';
$lang['ADMIN_DISABLE_CRON'] = 'forum locked by the trigger cron job, you can remove a lock at any time';
$lang['ADMIN_DISABLE_TITLE'] = 'The forum is disabled';
$lang['ADMIN_DISABLE_CRON_TITLE'] = 'Forum is down for maintenance';
$lang['ADMIN_UNLOCK'] = 'Enable forum';
$lang['ADMIN_UNLOCKED'] = 'Unlocked';
$lang['ADMIN_UNLOCK_CRON'] = 'Remove lock';
$lang['LOADING'] = 'Loading...';
$lang['JUMPBOX_TITLE'] = 'Select forum';
@ -895,74 +902,74 @@ $lang['LOOKUP_IP'] = 'Look up IP address';
//
// Timezones ... for display on each page
//
$lang['ALL_TIMES'] = 'All times are <span class="tz_time">%s</span>'; // eg. All times are GMT - 12 Hours (times from next block)
$lang['ALL_TIMES'] = 'All times are <span class="tz_time">%s</span>'; // eg. All times are UTC - 12 Hours (times from next block)
$lang['-12'] = 'GMT - 12 Hours';
$lang['-11'] = 'GMT - 11 Hours';
$lang['-10'] = 'GMT - 10 Hours';
$lang['-9'] = 'GMT - 9 Hours';
$lang['-8'] = 'GMT - 8 Hours';
$lang['-7'] = 'GMT - 7 Hours';
$lang['-6'] = 'GMT - 6 Hours';
$lang['-5'] = 'GMT - 5 Hours';
$lang['-4'] = 'GMT - 4 Hours';
$lang['-3.5'] = 'GMT - 3.5 Hours';
$lang['-3'] = 'GMT - 3 Hours';
$lang['-2'] = 'GMT - 2 Hours';
$lang['-1'] = 'GMT - 1 Hours';
$lang['0'] = 'GMT';
$lang['1'] = 'GMT + 1 Hour';
$lang['2'] = 'GMT + 2 Hours';
$lang['3'] = 'GMT + 3 Hours';
$lang['3.5'] = 'GMT + 3.5 Hours';
$lang['4'] = 'GMT + 4 Hours';
$lang['4.5'] = 'GMT + 4.5 Hours';
$lang['5'] = 'GMT + 5 Hours';
$lang['5.5'] = 'GMT + 5.5 Hours';
$lang['6'] = 'GMT + 6 Hours';
$lang['6.5'] = 'GMT + 6.5 Hours';
$lang['7'] = 'GMT + 7 Hours';
$lang['8'] = 'GMT + 8 Hours';
$lang['9'] = 'GMT + 9 Hours';
$lang['9.5'] = 'GMT + 9.5 Hours';
$lang['10'] = 'GMT + 10 Hours';
$lang['11'] = 'GMT + 11 Hours';
$lang['12'] = 'GMT + 12 Hours';
$lang['13'] = 'GMT + 13 Hours';
$lang['-12'] = 'UTC - 12';
$lang['-11'] = 'UTC - 11';
$lang['-10'] = 'UTC - 10';
$lang['-9'] = 'UTC - 9';
$lang['-8'] = 'UTC - 8';
$lang['-7'] = 'UTC - 7';
$lang['-6'] = 'UTC - 6';
$lang['-5'] = 'UTC - 5';
$lang['-4'] = 'UTC - 4';
$lang['-3.5'] = 'UTC - 3.5';
$lang['-3'] = 'UTC - 3';
$lang['-2'] = 'UTC - 2';
$lang['-1'] = 'UTC - 1';
$lang['0'] = 'UTC ± 0';
$lang['1'] = 'UTC + 1';
$lang['2'] = 'UTC + 2';
$lang['3'] = 'UTC + 3';
$lang['3.5'] = 'UTC + 3.5';
$lang['4'] = 'UTC + 4';
$lang['4.5'] = 'UTC + 4.5';
$lang['5'] = 'UTC + 5';
$lang['5.5'] = 'UTC + 5.5';
$lang['6'] = 'UTC + 6';
$lang['6.5'] = 'UTC + 6.5';
$lang['7'] = 'UTC + 7';
$lang['8'] = 'UTC + 8';
$lang['9'] = 'UTC + 9';
$lang['9.5'] = 'UTC + 9.5';
$lang['10'] = 'UTC + 10';
$lang['11'] = 'UTC + 11';
$lang['12'] = 'UTC + 12';
$lang['13'] = 'UTC + 13';
// These are displayed in the timezone select box
$lang['TZ']['-12'] = 'GMT - 12 Hours';
$lang['TZ']['-11'] = 'GMT - 11 Hours';
$lang['TZ']['-10'] = 'GMT - 10 Hours';
$lang['TZ']['-9'] = 'GMT - 9 Hours';
$lang['TZ']['-8'] = 'GMT - 8 Hours';
$lang['TZ']['-7'] = 'GMT - 7 Hours';
$lang['TZ']['-6'] = 'GMT - 6 Hours';
$lang['TZ']['-5'] = 'GMT - 5 Hours';
$lang['TZ']['-4'] = 'GMT - 4 Hours';
$lang['TZ']['-3.5'] = 'GMT - 3.5 Hours';
$lang['TZ']['-3'] = 'GMT - 3 Hours';
$lang['TZ']['-2'] = 'GMT - 2 Hours';
$lang['TZ']['-1'] = 'GMT - 1 Hours';
$lang['TZ']['0'] = 'GMT';
$lang['TZ']['1'] = 'GMT + 1 Hour';
$lang['TZ']['2'] = 'GMT + 2 Hours';
$lang['TZ']['3'] = 'GMT + 3 Hours';
$lang['TZ']['3.5'] = 'GMT + 3.5 Hours';
$lang['TZ']['4'] = 'GMT + 4 Hours';
$lang['TZ']['4.5'] = 'GMT + 4.5 Hours';
$lang['TZ']['5'] = 'GMT + 5 Hours';
$lang['TZ']['5.5'] = 'GMT + 5.5 Hours';
$lang['TZ']['6'] = 'GMT + 6 Hours';
$lang['TZ']['6.5'] = 'GMT + 6.5 Hours';
$lang['TZ']['7'] = 'GMT + 7 Hours';
$lang['TZ']['8'] = 'GMT + 8 Hours';
$lang['TZ']['9'] = 'GMT + 9 Hours';
$lang['TZ']['9.5'] = 'GMT + 9.5 Hours';
$lang['TZ']['10'] = 'GMT + 10 Hours';
$lang['TZ']['11'] = 'GMT + 11 Hours';
$lang['TZ']['12'] = 'GMT + 12 Hours';
$lang['TZ']['13'] = 'GMT + 13 Hours';
$lang['TZ']['-12'] = 'UTC - 12';
$lang['TZ']['-11'] = 'UTC - 11';
$lang['TZ']['-10'] = 'UTC - 10';
$lang['TZ']['-9'] = 'UTC - 9';
$lang['TZ']['-8'] = 'UTC - 8';
$lang['TZ']['-7'] = 'UTC - 7';
$lang['TZ']['-6'] = 'UTC - 6';
$lang['TZ']['-5'] = 'UTC - 5';
$lang['TZ']['-4'] = 'UTC - 4';
$lang['TZ']['-3.5'] = 'UTC - 3.5';
$lang['TZ']['-3'] = 'UTC - 3';
$lang['TZ']['-2'] = 'UTC - 2';
$lang['TZ']['-1'] = 'UTC - 1';
$lang['TZ']['0'] = 'UTC ± 0';
$lang['TZ']['1'] = 'UTC + 1';
$lang['TZ']['2'] = 'UTC + 2';
$lang['TZ']['3'] = 'UTC + 3';
$lang['TZ']['3.5'] = 'UTC + 3.5';
$lang['TZ']['4'] = 'UTC + 4';
$lang['TZ']['4.5'] = 'UTC + 4.5';
$lang['TZ']['5'] = 'UTC + 5';
$lang['TZ']['5.5'] = 'UTC + 5.5';
$lang['TZ']['6'] = 'UTC + 6';
$lang['TZ']['6.5'] = 'UTC + 6.5';
$lang['TZ']['7'] = 'UTC + 7';
$lang['TZ']['8'] = 'UTC + 8';
$lang['TZ']['9'] = 'UTC + 9';
$lang['TZ']['9.5'] = 'UTC + 9.5';
$lang['TZ']['10'] = 'UTC + 10';
$lang['TZ']['11'] = 'UTC + 11';
$lang['TZ']['12'] = 'UTC + 12';
$lang['TZ']['13'] = 'UTC + 13';
$lang['DATETIME']['TODAY'] = 'Today';
$lang['DATETIME']['YESTERDAY'] = 'Yesterday';
@ -1784,7 +1791,7 @@ $lang['USER_LEVELS_UPDATED'] = 'User levels have been updated';
$lang['SYNCHRONIZE'] = 'Synchronize';
$lang['TOPICS_DATA_SYNCHRONIZED'] = 'Topics data have been synchronized';
$lang['USER_POSTS_COUNT'] = 'User posts count';
$lang['USER POSTS COUNT SYNCHRONIZED'] = 'User posts count has been synchronized';
$lang['USER_POSTS_COUNT_SYNCHRONIZED'] = 'User posts count has been synchronized';
// Online Userlist
$lang['SHOW_ONLINE_USERLIST'] = 'Show the list of online users';
@ -2893,7 +2900,7 @@ $lang['SEARCH_FOR_USERFIELD_OCCUPATION'] = 'Searching for users with their Occup
$lang['SEARCH_FOR_LASTVISITED_INTHELAST'] = 'Searching for users who have visited in the last %s %s';
$lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'] = 'Searching for users who have visited after the last %s %s';
$lang['SEARCH_FOR_LANGUAGE'] = 'Searching for users who have set %s as their language';
$lang['SEARCH_FOR_TIMEZONE'] = 'Searching for users who have set GMT %s as their timezone';
$lang['SEARCH_FOR_TIMEZONE'] = 'Searching for users who have set UTC %s as their timezone';
$lang['SEARCH_FOR_STYLE'] = 'Searching for users who have set %s as their style';
$lang['SEARCH_FOR_MODERATORS'] = 'Search for moderators of the Forum -> %s';
$lang['SEARCH_USERS_ADVANCED'] = 'Advanced User Search';

141
upload/language/ru/main.php
View file

@ -103,6 +103,13 @@ $lang['DATASTORE'] = 'Datastore';
$lang['DATASTORE_CLEARED'] = 'Datastore очищен';
$lang['BOARD_DISABLE'] = 'Извините, этот форум отключен. Попробуйте зайти позднее';
$lang['BOARD_DISABLE_CRON'] = 'Форум отключен на техническое обслуживание. Попробуйте зайти позднее';
$lang['ADMIN_DISABLE'] = 'форум отключен администратором, вы можете включить его в любое время';
$lang['ADMIN_DISABLE_CRON'] = 'форум заблокирован триггером cron-заданий, вы можете снять блокировку в любое время';
$lang['ADMIN_DISABLE_TITLE'] = 'Форум отключен';
$lang['ADMIN_DISABLE_CRON_TITLE'] = 'Форум отключен на техническое обслуживание';
$lang['ADMIN_UNLOCK'] = 'Включить форум';
$lang['ADMIN_UNLOCKED'] = 'Разблокировано';
$lang['ADMIN_UNLOCK_CRON'] = 'Снять блокировку';
$lang['LOADING'] = 'Загружается…';
$lang['JUMPBOX_TITLE'] = 'Выберите форум для перехода';
@ -895,74 +902,74 @@ $lang['LOOKUP_IP'] = 'Посмотреть хост для IP';
//
// Timezones ... for display on each page
//
$lang['ALL_TIMES'] = 'Часовой пояс: <span class="tz_time">%s</span>'; // This is followed by GMT and the timezone offset
$lang['ALL_TIMES'] = 'Часовой пояс: <span class="tz_time">%s</span>'; // This is followed by UTC and the timezone offset
$lang['-12'] = 'GMT - 12';
$lang['-11'] = 'GMT - 11';
$lang['-10'] = 'GMT - 10';
$lang['-9'] = 'GMT - 9';
$lang['-8'] = 'GMT - 8';
$lang['-7'] = 'GMT - 7';
$lang['-6'] = 'GMT - 6';
$lang['-5'] = 'GMT - 5';
$lang['-4'] = 'GMT - 4';
$lang['-3.5'] = 'GMT - 3:30';
$lang['-3'] = 'GMT - 3';
$lang['-2'] = 'GMT - 2';
$lang['-1'] = 'GMT - 1';
$lang['0'] = 'GMT';
$lang['1'] = 'GMT + 1';
$lang['2'] = 'GMT + 2';
$lang['3'] = 'GMT + 3';
$lang['3.5'] = 'GMT + 3:30';
$lang['4'] = 'GMT + 4';
$lang['4.5'] = 'GMT + 4:30';
$lang['5'] = 'GMT + 5';
$lang['5.5'] = 'GMT + 5:30';
$lang['6'] = 'GMT + 6';
$lang['6.5'] = 'GMT + 6:30';
$lang['7'] = 'GMT + 7';
$lang['8'] = 'GMT + 8';
$lang['9'] = 'GMT + 9';
$lang['9.5'] = 'GMT + 9:30';
$lang['10'] = 'GMT + 10';
$lang['11'] = 'GMT + 11';
$lang['12'] = 'GMT + 12';
$lang['13'] = 'GMT + 13';
$lang['-12'] = 'UTC - 12';
$lang['-11'] = 'UTC - 11';
$lang['-10'] = 'UTC - 10';
$lang['-9'] = 'UTC - 9';
$lang['-8'] = 'UTC - 8';
$lang['-7'] = 'UTC - 7';
$lang['-6'] = 'UTC - 6';
$lang['-5'] = 'UTC - 5';
$lang['-4'] = 'UTC - 4';
$lang['-3.5'] = 'UTC - 3:30';
$lang['-3'] = 'UTC - 3';
$lang['-2'] = 'UTC - 2';
$lang['-1'] = 'UTC - 1';
$lang['0'] = 'UTC ± 0';
$lang['1'] = 'UTC + 1';
$lang['2'] = 'UTC + 2';
$lang['3'] = 'UTC + 3';
$lang['3.5'] = 'UTC + 3:30';
$lang['4'] = 'UTC + 4';
$lang['4.5'] = 'UTC + 4:30';
$lang['5'] = 'UTC + 5';
$lang['5.5'] = 'UTC + 5:30';
$lang['6'] = 'UTC + 6';
$lang['6.5'] = 'UTC + 6:30';
$lang['7'] = 'UTC + 7';
$lang['8'] = 'UTC + 8';
$lang['9'] = 'UTC + 9';
$lang['9.5'] = 'UTC + 9:30';
$lang['10'] = 'UTC + 10';
$lang['11'] = 'UTC + 11';
$lang['12'] = 'UTC + 12';
$lang['13'] = 'UTC + 13';
// это для выпадающего меню, раньше тут еще были города
$lang['TZ']['-12'] = 'GMT - 12';
$lang['TZ']['-11'] = 'GMT - 11';
$lang['TZ']['-10'] = 'GMT - 10';
$lang['TZ']['-9'] = 'GMT - 9';
$lang['TZ']['-8'] = 'GMT - 8';
$lang['TZ']['-7'] = 'GMT - 7';
$lang['TZ']['-6'] = 'GMT - 6';
$lang['TZ']['-5'] = 'GMT - 5';
$lang['TZ']['-4'] = 'GMT - 4';
$lang['TZ']['-3.5'] = 'GMT - 3:30';
$lang['TZ']['-3'] = 'GMT - 3';
$lang['TZ']['-2'] = 'GMT - 2';
$lang['TZ']['-1'] = 'GMT - 1';
$lang['TZ']['0'] = 'GMT (время по Гринвичу)';
$lang['TZ']['1'] = 'GMT + 1';
$lang['TZ']['2'] = 'GMT + 2';
$lang['TZ']['3'] = 'GMT + 3';
$lang['TZ']['3.5'] = 'GMT + 3:30';
$lang['TZ']['4'] = 'GMT + 4 (Московское время)';
$lang['TZ']['4.5'] = 'GMT + 4:30';
$lang['TZ']['5'] = 'GMT + 5';
$lang['TZ']['5.5'] = 'GMT + 5:30';
$lang['TZ']['6'] = 'GMT + 6';
$lang['TZ']['6.5'] = 'GMT + 6:30';
$lang['TZ']['7'] = 'GMT + 7';
$lang['TZ']['8'] = 'GMT + 8';
$lang['TZ']['9'] = 'GMT + 9';
$lang['TZ']['9.5'] = 'GMT + 9:30';
$lang['TZ']['10'] = 'GMT + 10';
$lang['TZ']['11'] = 'GMT + 11';
$lang['TZ']['12'] = 'GMT + 12';
$lang['TZ']['13'] = 'GMT + 13';
$lang['TZ']['-12'] = 'UTC - 12';
$lang['TZ']['-11'] = 'UTC - 11';
$lang['TZ']['-10'] = 'UTC - 10';
$lang['TZ']['-9'] = 'UTC - 9';
$lang['TZ']['-8'] = 'UTC - 8';
$lang['TZ']['-7'] = 'UTC - 7';
$lang['TZ']['-6'] = 'UTC - 6';
$lang['TZ']['-5'] = 'UTC - 5';
$lang['TZ']['-4'] = 'UTC - 4';
$lang['TZ']['-3.5'] = 'UTC - 3:30';
$lang['TZ']['-3'] = 'UTC - 3';
$lang['TZ']['-2'] = 'UTC - 2';
$lang['TZ']['-1'] = 'UTC - 1';
$lang['TZ']['0'] = 'UTC ± 0';
$lang['TZ']['1'] = 'UTC + 1';
$lang['TZ']['2'] = 'UTC + 2';
$lang['TZ']['3'] = 'UTC + 3';
$lang['TZ']['3.5'] = 'UTC + 3:30';
$lang['TZ']['4'] = 'UTC + 4 (Московское время)';
$lang['TZ']['4.5'] = 'UTC + 4:30';
$lang['TZ']['5'] = 'UTC + 5';
$lang['TZ']['5.5'] = 'UTC + 5:30';
$lang['TZ']['6'] = 'UTC + 6';
$lang['TZ']['6.5'] = 'UTC + 6:30';
$lang['TZ']['7'] = 'UTC + 7';
$lang['TZ']['8'] = 'UTC + 8';
$lang['TZ']['9'] = 'UTC + 9';
$lang['TZ']['9.5'] = 'UTC + 9:30';
$lang['TZ']['10'] = 'UTC + 10';
$lang['TZ']['11'] = 'UTC + 11';
$lang['TZ']['12'] = 'UTC + 12';
$lang['TZ']['13'] = 'UTC + 13';
$lang['DATETIME']['TODAY'] = 'Сегодня, в';
$lang['DATETIME']['YESTERDAY'] = 'Вчера, в';
@ -1784,7 +1791,7 @@ $lang['USER_LEVELS_UPDATED'] = 'Уровни и права пользовате
$lang['SYNCHRONIZE'] = 'Синхронизировать';
$lang['TOPICS_DATA_SYNCHRONIZED'] = 'Темы синхронизированы';
$lang['USER_POSTS_COUNT'] = 'Количество сообщений пользователей';
$lang['USER POSTS COUNT SYNCHRONIZED'] = 'Количество сообщений пользователей синхронизированы';
$lang['USER_POSTS_COUNT_SYNCHRONIZED'] = 'Количество сообщений пользователей синхронизировано';
// Online Userlist
$lang['SHOW_ONLINE_USERLIST'] = 'Показать список пользователей онлайн';
@ -2893,7 +2900,7 @@ $lang['SEARCH_FOR_USERFIELD_OCCUPATION'] = 'Поиск пользователе
$lang['SEARCH_FOR_LASTVISITED_INTHELAST'] = 'Поиск пользователей, посетивших трекер в последние %s %s';
$lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'] = 'Поиск пользователей, посетивших трекер после %s %s';
$lang['SEARCH_FOR_LANGUAGE'] = 'Поиск пользователей, у которых выбран %s язык';
$lang['SEARCH_FOR_TIMEZONE'] = 'Поиск пользователей с часовым поясом GMT %s';
$lang['SEARCH_FOR_TIMEZONE'] = 'Поиск пользователей с часовым поясом UTC %s';
$lang['SEARCH_FOR_STYLE'] = 'Поиск пользователей, использующих стиль %s';
$lang['SEARCH_FOR_MODERATORS'] = 'Поиск модареторов форума -> %s';
$lang['SEARCH_USERS_ADVANCED'] = 'Расширенный поиск пользователя';

141
upload/language/ua/main.php
View file

@ -103,6 +103,13 @@ $lang['DATASTORE'] = 'Datastore';
$lang['DATASTORE_CLEARED'] = 'Datastore очищено';
$lang['BOARD_DISABLE'] = 'Вибачте, цей форум відключений. Спробуйте зайти пізніше';
$lang['BOARD_DISABLE_CRON'] = 'Форум відключений на технічне обслуговування. Спробуйте зайти пізніше';
$lang['ADMIN_DISABLE'] = 'форум відключений адміністратором, ви можете включити його в будь-який час';
$lang['ADMIN_DISABLE_CRON'] = 'форум заблокований тригером cron-завдань, ви можете зняти блокування в будь-який час';
$lang['ADMIN_DISABLE_TITLE'] = 'Форум відключений';
$lang['ADMIN_DISABLE_CRON_TITLE'] = 'Форум відключений на технічне обслуговування';
$lang['ADMIN_UNLOCK'] = 'Включити форум';
$lang['ADMIN_UNLOCKED'] = 'Розблоковано';
$lang['ADMIN_UNLOCK_CRON'] = 'Зняти блокування';
$lang['LOADING'] = 'Завантаження...';
$lang['JUMPBOX_TITLE'] = 'Оберіть форум для переходу';
@ -895,74 +902,74 @@ $lang['LOOKUP_IP'] = 'Показати хост для IP';
//
// Timezones ... for display on each page
//
$lang['ALL_TIMES'] = 'Часовий пояс: <span class="tz_time">%s</span>'; // This is followed by GMT and the timezone offset
$lang['ALL_TIMES'] = 'Часовий пояс: <span class="tz_time">%s</span>'; // This is followed by UTC and the timezone offset
$lang['-12'] = 'GMT - 12';
$lang['-11'] = 'GMT - 11';
$lang['-10'] = 'GMT - 10';
$lang['-9'] = 'GMT - 9';
$lang['-8'] = 'GMT - 8';
$lang['-7'] = 'GMT - 7';
$lang['-6'] = 'GMT - 6';
$lang['-5'] = 'GMT - 5';
$lang['-4'] = 'GMT - 4';
$lang['-3.5'] = 'GMT - 3:30';
$lang['-3'] = 'GMT - 3';
$lang['-2'] = 'GMT - 2';
$lang['-1'] = 'GMT - 1';
$lang['0'] = 'GMT';
$lang['1'] = 'GMT + 1';
$lang['2'] = 'GMT + 2';
$lang['3'] = 'GMT + 3';
$lang['3.5'] = 'GMT + 3:30';
$lang['4'] = 'GMT + 4';
$lang['4.5'] = 'GMT + 4:30';
$lang['5'] = 'GMT + 5';
$lang['5.5'] = 'GMT + 5:30';
$lang['6'] = 'GMT + 6';
$lang['6.5'] = 'GMT + 6:30';
$lang['7'] = 'GMT + 7';
$lang['8'] = 'GMT + 8';
$lang['9'] = 'GMT + 9';
$lang['9.5'] = 'GMT + 9:30';
$lang['10'] = 'GMT + 10';
$lang['11'] = 'GMT + 11';
$lang['12'] = 'GMT + 12';
$lang['13'] = 'GMT + 13';
$lang['-12'] = 'UTC - 12';
$lang['-11'] = 'UTC - 11';
$lang['-10'] = 'UTC - 10';
$lang['-9'] = 'UTC - 9';
$lang['-8'] = 'UTC - 8';
$lang['-7'] = 'UTC - 7';
$lang['-6'] = 'UTC - 6';
$lang['-5'] = 'UTC - 5';
$lang['-4'] = 'UTC - 4';
$lang['-3.5'] = 'UTC - 3:30';
$lang['-3'] = 'UTC - 3';
$lang['-2'] = 'UTC - 2';
$lang['-1'] = 'UTC - 1';
$lang['0'] = 'UTC ± 0';
$lang['1'] = 'UTC + 1';
$lang['2'] = 'UTC + 2';
$lang['3'] = 'UTC + 3';
$lang['3.5'] = 'UTC + 3:30';
$lang['4'] = 'UTC + 4';
$lang['4.5'] = 'UTC + 4:30';
$lang['5'] = 'UTC + 5';
$lang['5.5'] = 'UTC + 5:30';
$lang['6'] = 'UTC + 6';
$lang['6.5'] = 'UTC + 6:30';
$lang['7'] = 'UTC + 7';
$lang['8'] = 'UTC + 8';
$lang['9'] = 'UTC + 9';
$lang['9.5'] = 'UTC + 9:30';
$lang['10'] = 'UTC + 10';
$lang['11'] = 'UTC + 11';
$lang['12'] = 'UTC + 12';
$lang['13'] = 'UTC + 13';
// це для випадного меню, раніше тут ще були міста
$lang['TZ']['-12'] = 'GMT - 12';
$lang['TZ']['-11'] = 'GMT - 11';
$lang['TZ']['-10'] = 'GMT - 10';
$lang['TZ']['-9'] = 'GMT - 9';
$lang['TZ']['-8'] = 'GMT - 8';
$lang['TZ']['-7'] = 'GMT - 7';
$lang['TZ']['-6'] = 'GMT - 6';
$lang['TZ']['-5'] = 'GMT - 5';
$lang['TZ']['-4'] = 'GMT - 4';
$lang['TZ']['-3.5'] = 'GMT - 3:30';
$lang['TZ']['-3'] = 'GMT - 3';
$lang['TZ']['-2'] = 'GMT - 2';
$lang['TZ']['-1'] = 'GMT - 1';
$lang['TZ']['0'] = 'GMT (час по Грінвічу)';
$lang['TZ']['1'] = 'GMT + 1';
$lang['TZ']['2'] = 'GMT + 2';
$lang['TZ']['3'] = 'GMT + 3 (Київський час)';
$lang['TZ']['3.5'] = 'GMT + 3:30';
$lang['TZ']['4'] = 'GMT + 4';
$lang['TZ']['4.5'] = 'GMT + 4:30';
$lang['TZ']['5'] = 'GMT + 5';
$lang['TZ']['5.5'] = 'GMT + 5:30';
$lang['TZ']['6'] = 'GMT + 6';
$lang['TZ']['6.5'] = 'GMT + 6:30';
$lang['TZ']['7'] = 'GMT + 7';
$lang['TZ']['8'] = 'GMT + 8';
$lang['TZ']['9'] = 'GMT + 9';
$lang['TZ']['9.5'] = 'GMT + 9:30';
$lang['TZ']['10'] = 'GMT + 10';
$lang['TZ']['11'] = 'GMT + 11';
$lang['TZ']['12'] = 'GMT + 12';
$lang['TZ']['13'] = 'GMT + 13';
$lang['TZ']['-12'] = 'UTC - 12';
$lang['TZ']['-11'] = 'UTC - 11';
$lang['TZ']['-10'] = 'UTC - 10';
$lang['TZ']['-9'] = 'UTC - 9';
$lang['TZ']['-8'] = 'UTC - 8';
$lang['TZ']['-7'] = 'UTC - 7';
$lang['TZ']['-6'] = 'UTC - 6';
$lang['TZ']['-5'] = 'UTC - 5';
$lang['TZ']['-4'] = 'UTC - 4';
$lang['TZ']['-3.5'] = 'UTC - 3:30';
$lang['TZ']['-3'] = 'UTC - 3';
$lang['TZ']['-2'] = 'UTC - 2';
$lang['TZ']['-1'] = 'UTC - 1';
$lang['TZ']['0'] = 'UTC ± 0';
$lang['TZ']['1'] = 'UTC + 1';
$lang['TZ']['2'] = 'UTC + 2';
$lang['TZ']['3'] = 'UTC + 3 (Київський час)';
$lang['TZ']['3.5'] = 'UTC + 3:30';
$lang['TZ']['4'] = 'UTC + 4';
$lang['TZ']['4.5'] = 'UTC + 4:30';
$lang['TZ']['5'] = 'UTC + 5';
$lang['TZ']['5.5'] = 'UTC + 5:30';
$lang['TZ']['6'] = 'UTC + 6';
$lang['TZ']['6.5'] = 'UTC + 6:30';
$lang['TZ']['7'] = 'UTC + 7';
$lang['TZ']['8'] = 'UTC + 8';
$lang['TZ']['9'] = 'UTC + 9';
$lang['TZ']['9.5'] = 'UTC + 9:30';
$lang['TZ']['10'] = 'UTC + 10';
$lang['TZ']['11'] = 'UTC + 11';
$lang['TZ']['12'] = 'UTC + 12';
$lang['TZ']['13'] = 'UTC + 13';
$lang['DATETIME']['TODAY'] = 'Сьогодні, в';
$lang['DATETIME']['YESTERDAY'] = 'Вчора, в';
@ -1784,7 +1791,7 @@ $lang['USER_LEVELS_UPDATED'] = 'Рівні та права користувач
$lang['SYNCHRONIZE'] = 'Синхронізувати';
$lang['TOPICS_DATA_SYNCHRONIZED'] = 'Теми синхронізовані';
$lang['USER_POSTS_COUNT'] = 'Кількість повідомлень користувачів';
$lang['USER POSTS COUNT SYNCHRONIZED'] = 'Кількість повідомлень користувачів синхронізовані';
$lang['USER_POSTS_COUNT_SYNCHRONIZED'] = 'Кількість повідомлень користувачів синхронізовано';
// Online Userlist
$lang['SHOW_ONLINE_USERLIST'] = 'Показувати список користувачів онлайн';
@ -2893,7 +2900,7 @@ $lang['SEARCH_FOR_USERFIELD_OCCUPATION'] = 'Пошук користувачів
$lang['SEARCH_FOR_LASTVISITED_INTHELAST'] = 'Пошук користувачів, що відвідали трекер в останні %s %s';
$lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'] = 'Пошук користувачів, що відвідали трекер після %s %s';
$lang['SEARCH_FOR_LANGUAGE'] = 'Пошук користувачів, у яких обрана %s мова';
$lang['SEARCH_FOR_TIMEZONE'] = 'Пошук користувачів з годинним поясом GMT %s';
$lang['SEARCH_FOR_TIMEZONE'] = 'Пошук користувачів з годинним поясом UTC %s';
$lang['SEARCH_FOR_STYLE'] = 'Пошук користувачів, які використовують стиль %s';
$lang['SEARCH_FOR_MODERATORS'] = 'Пошук модераторів форуму -> %s';
$lang['SEARCH_USERS_ADVANCED'] = 'Розширений пошук користувача';

2
upload/posting.php
View file

@ -671,7 +671,7 @@ $template->assign_vars(array(
'SUBJECT' => $subject,
'MESSAGE' => $message,
'U_VIEWTOPIC' => ( $mode == 'reply' ) ? POST_URL ."$topic_id&amp;postorder=desc" : '',
'U_VIEWTOPIC' => ( $mode == 'reply' ) ? TOPIC_URL . $topic_id . "&amp;postorder=desc" : '',
'S_NOTIFY_CHECKED' => ( $notify_user ) ? 'checked="checked"' : '',
'S_TYPE_TOGGLE' => $topic_type_toggle,

4
upload/stats/tracker.php
View file

@ -4,6 +4,10 @@ define('IN_ADMIN', true);
define('BB_ROOT', './../');
require(BB_ROOT .'common.php');
$user->session_start();
if (!IS_ADMIN) die('Unauthorized');
$peers_in_last_minutes = array(30, 15, 5, 1);
$peers_in_last_sec_limit = 300;

18
upload/templates/admin/index.tpl
View file

@ -70,10 +70,28 @@ ajax.callback.manage_admin = function(data) {
$('#update_user_level').html(data.update_user_level_html);
$('#sync_topics').html(data.sync_topics_html);
$('#sync_user_posts').html(data.sync_user_posts_html);
$('#unlock_cron').html(data.unlock_cron_html);
}
</script>
<br />
<!-- IF ADMIN_LOCK_CRON -->
<div class="alert alert-danger" style="width: 95%;">
<h4 class="alert-heading">{L_ADMIN_DISABLE_CRON_TITLE}</h4><hr>
<a href="#" id="unlock_cron" onclick="ajax.manage_admin('unlock_cron'); return false;">{L_ADMIN_UNLOCK_CRON}</a>
({L_ADMIN_DISABLE_CRON})
</div>
<!-- ENDIF -->
<!-- IF ADMIN_LOCK -->
<div class="alert alert-danger" style="width: 95%;">
<h4 class="alert-heading">{L_ADMIN_DISABLE_TITLE}</h4><hr>
<a href="admin_board.php?mode=config">{L_ADMIN_UNLOCK}</a>
({L_ADMIN_DISABLE})
</div>
<!-- ENDIF -->
<table>
<tr>
<td><b>{L_CLEAR_CACHE}:</b></td>

4
upload/viewforum.php
View file

@ -69,7 +69,7 @@ if (!$is_auth['auth_view'])
if (IS_GUEST)
{
$redirect = ($start) ? "&start=$start" : '';
redirect(LOGIN_URL . "?redirect=". FORUM_URL . $forum_id ."&$redirect");
redirect(LOGIN_URL . "?redirect=". FORUM_URL . $forum_id . $redirect);
}
// The user is not authed to read this forum ...
$message = sprintf($lang['SORRY_AUTH_VIEW'], $is_auth['auth_view_type']);
@ -492,7 +492,7 @@ foreach ($topic_rowset as $topic)
'VIEWS' => $topic['topic_views'],
'TOR_STALED' => ($forum_data['allow_reg_tracker'] && !($t_type == POST_ANNOUNCE || $t_type == POST_STICKY || $topic['tor_size'])),
'TOR_FROZEN' => isset($topic['tor_status']) ? ((!IS_AM) ? isset($bb_cfg['tor_frozen'][$topic['tor_status']]) : '') : '',
'TOR_TYPE' => is_gold($topic['tor_type']),
'TOR_TYPE' => isset($topic['tor_type']) ? is_gold($topic['tor_type']) : '',
'TOR_STATUS_ICON' => isset($topic['tor_status']) ? $bb_cfg['tor_icons'][$topic['tor_status']] : '',
'TOR_STATUS_TEXT' => isset($topic['tor_status']) ? $lang['TOR_STATUS_NAME'][$topic['tor_status']] : '',

14
upload/viewtopic.php
View file

@ -432,11 +432,11 @@ if ( count($orig_word) )
// Post, reply and other URL generation for
// templating vars
//
$new_topic_url = POSTING_URL . "?mode=newtopic&amp;f=$forum_id";
$reply_topic_url = POSTING_URL . "?mode=reply&amp;t=$topic_id";
$new_topic_url = POSTING_URL . "?mode=newtopic&amp;f=" . $forum_id;
$reply_topic_url = POSTING_URL . "?mode=reply&amp;t=" . $topic_id;
$view_forum_url = FORUM_URL . $forum_id;
$view_prev_topic_url = TOPIC_URL ."$topic_id&amp;view=previous#newest";
$view_next_topic_url = TOPIC_URL ."$topic_id&amp;view=next#newest";
$view_prev_topic_url = TOPIC_URL . $topic_id . "&amp;view=previous#newest";
$view_next_topic_url = TOPIC_URL . $topic_id . "&amp;view=next#newest";
$reply_img = ( $t_data['forum_status'] == FORUM_LOCKED || $t_data['topic_status'] == TOPIC_LOCKED) ? $images['reply_locked'] : $images['reply_new'];
$reply_alt = ( $t_data['forum_status'] == FORUM_LOCKED || $t_data['topic_status'] == TOPIC_LOCKED) ? $lang['TOPIC_LOCKED_SHORT'] : $lang['REPLY_TO_TOPIC'];
@ -518,12 +518,12 @@ if ( $can_watch_topic )
{
if ($is_watching_topic)
{
$s_watching_topic = "<a href=\"". TOPIC_URL ."$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . $lang['STOP_WATCHING_TOPIC'] . '</a>';
$s_watching_topic = "<a href=\"". TOPIC_URL . $topic_id ."&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . $lang['STOP_WATCHING_TOPIC'] . '</a>';
$s_watching_topic_img = (isset($images['topic_un_watch'])) ? "<a href=\"" . TOPIC_URL . "$topic_id&amp;unwatch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['topic_un_watch'] . '" alt="' . $lang['STOP_WATCHING_TOPIC'] . '" title="' . $lang['STOP_WATCHING_TOPIC'] . '" border="0"></a>' : '';
}
else
{
$s_watching_topic = "<a href=\"". TOPIC_URL ."$topic_id&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . $lang['START_WATCHING_TOPIC'] . '</a>';
$s_watching_topic = "<a href=\"". TOPIC_URL . $topic_id ."&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '">' . $lang['START_WATCHING_TOPIC'] . '</a>';
$s_watching_topic_img = (isset($images['Topic_watch'])) ? "<a href=\"". TOPIC_URL ."$topic_id&amp;watch=topic&amp;start=$start&amp;sid=" . $userdata['session_id'] . '"><img src="' . $images['Topic_watch'] . '" alt="' . $lang['START_WATCHING_TOPIC'] . '" title="' . $lang['START_WATCHING_TOPIC'] . '" border="0"></a>' : '';
}
}
@ -601,7 +601,7 @@ $template->assign_vars(array(
'S_SELECT_POST_DAYS' => build_select('postdays', array_flip($sel_previous_days), $post_days),
'S_SELECT_POST_ORDER' => build_select('postorder', $sel_post_order_ary, $post_order),
'S_POST_DAYS_ACTION' => TOPIC_URL ."$topic_id&amp;start=$start",
'S_POST_DAYS_ACTION' => TOPIC_URL . $topic_id . "&amp;start=$start",
'S_AUTH_LIST' => $s_auth_can,
'S_TOPIC_ADMIN' => $topic_mod,
'S_WATCH_TOPIC' => $s_watching_topic,