diff --git a/upload/admin/index.php b/upload/admin/index.php index cd5f5d4d2..1334f3d8b 100644 --- a/upload/admin/index.php +++ b/upload/admin/index.php @@ -58,7 +58,9 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') elseif (isset($_GET['pane']) && $_GET['pane'] == 'right') { $template->assign_vars(array( - 'TPL_ADMIN_MAIN' => true, + 'TPL_ADMIN_MAIN' => true, + 'ADMIN_LOCK' => ($bb_cfg['board_disable']) ? true : false, + 'ADMIN_LOCK_CRON' => (file_exists(BB_DISABLED)) ? true :false, )); // Get forum statistics diff --git a/upload/ajax.php b/upload/ajax.php index f32feb163..34845418f 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -9,14 +9,20 @@ require('./common.php'); $ajax->init(); +// Init userdata +$user->session_start(); + // Exit if board is disabled via ON/OFF trigger or by admin -if ($bb_cfg['board_disable']) +if ($ajax->action != 'manage_admin') { - $ajax->ajax_die($lang['BOARD_DISABLE']); -} -else if (file_exists(BB_DISABLED)) -{ - $ajax->ajax_die($lang['BOARD_DISABLE_CRON']); + if ($bb_cfg['board_disable']) + { + $ajax->ajax_die($lang['BOARD_DISABLE']); + } + else if (file_exists(BB_DISABLED)) + { + $ajax->ajax_die($lang['BOARD_DISABLE_CRON']); + } } // Load actions required modules @@ -65,10 +71,9 @@ switch ($ajax->action) break; } -// position in $ajax->valid_actions['xxx'] -define('AJAX_AUTH', 0); // 'guest', 'user', 'mod', 'admin', 'super_admin' +// Position in $ajax->valid_actions['xxx'] +define('AJAX_AUTH', 0); // 'guest', 'user', 'mod', 'admin', 'super_admin' -$user->session_start(); $ajax->exec(); // diff --git a/upload/ajax/manage_admin.php b/upload/ajax/manage_admin.php index 559f4753d..74311b2ac 100644 --- a/upload/ajax/manage_admin.php +++ b/upload/ajax/manage_admin.php @@ -99,7 +99,15 @@ switch ($mode) sync('user_posts', 'all'); - $this->response['sync_user_posts_html'] = ''. $lang['USER POSTS COUNT SYNCHRONIZED'] .''; + $this->response['sync_user_posts_html'] = ''. $lang['USER_POSTS_COUNT_SYNCHRONIZED'] .''; + + break; + + case 'unlock_cron': + + cron_enable_board(); + + $this->response['unlock_cron_html'] = ''. $lang['ADMIN_UNLOCKED'] .''; break; } diff --git a/upload/attach_mod/displaying.php b/upload/attach_mod/displaying.php index dda71b925..d1c6e3e6e 100644 --- a/upload/attach_mod/displaying.php +++ b/upload/attach_mod/displaying.php @@ -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,19 +273,16 @@ 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, + 'DOWNLOAD_NAME' => $display_name, 'S_UPLOAD_IMAGE' => $upload_image, - - 'IMG_SRC' => $img_source, - 'FILESIZE' => $filesize, - 'COMMENT' => $comment, + 'IMG_SRC' => $img_source, + 'FILESIZE' => $filesize, + 'COMMENT' => $comment, )); // Directly Viewed Image ... update the download count @@ -315,29 +302,22 @@ 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, + '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, - 'COMMENT' => $comment, + 'IMG_SRC' => BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'], + 'IMG_THUMB_SRC' => $thumb_source, + 'FILESIZE' => $filesize, + 'COMMENT' => $comment, )); } @@ -352,15 +332,13 @@ function display_attachments($post_id) // display attachment $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']), + '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']), )); } } diff --git a/upload/language/en/main.php b/upload/language/en/main.php index f3a92ba90..11c470b06 100644 --- a/upload/language/en/main.php +++ b/upload/language/en/main.php @@ -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 %s'; // eg. All times are GMT - 12 Hours (times from next block) +$lang['ALL_TIMES'] = 'All times are %s'; // 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'; diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php index 28776416a..1a1828a55 100644 --- a/upload/language/ru/main.php +++ b/upload/language/ru/main.php @@ -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'] = 'Часовой пояс: %s'; // This is followed by GMT and the timezone offset +$lang['ALL_TIMES'] = 'Часовой пояс: %s'; // 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'] = 'Расширенный поиск пользователя'; diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php index 4f0a45782..4a011ed2b 100644 --- a/upload/language/ua/main.php +++ b/upload/language/ua/main.php @@ -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'] = 'Часовий пояс: %s'; // This is followed by GMT and the timezone offset +$lang['ALL_TIMES'] = 'Часовий пояс: %s'; // 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'] = 'Розширений пошук користувача'; diff --git a/upload/posting.php b/upload/posting.php index 922229a2e..1eee18c3e 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -671,7 +671,7 @@ $template->assign_vars(array( 'SUBJECT' => $subject, 'MESSAGE' => $message, - 'U_VIEWTOPIC' => ( $mode == 'reply' ) ? POST_URL ."$topic_id&postorder=desc" : '', + 'U_VIEWTOPIC' => ( $mode == 'reply' ) ? TOPIC_URL . $topic_id . "&postorder=desc" : '', 'S_NOTIFY_CHECKED' => ( $notify_user ) ? 'checked="checked"' : '', 'S_TYPE_TOGGLE' => $topic_type_toggle, diff --git a/upload/stats/tracker.php b/upload/stats/tracker.php index e2018cbea..2c847eb6e 100644 --- a/upload/stats/tracker.php +++ b/upload/stats/tracker.php @@ -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; diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl index bf07ee500..14641d9ae 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/templates/admin/index.tpl @@ -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); } +
+ +
+

{L_ADMIN_DISABLE_CRON_TITLE}

+ {L_ADMIN_UNLOCK_CRON} + ({L_ADMIN_DISABLE_CRON}) +
+ + + +
+

{L_ADMIN_DISABLE_TITLE}

+ {L_ADMIN_UNLOCK} + ({L_ADMIN_DISABLE}) +
+ + diff --git a/upload/viewforum.php b/upload/viewforum.php index 87f012a21..3cbee8594 100644 --- a/upload/viewforum.php +++ b/upload/viewforum.php @@ -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']); @@ -268,7 +268,7 @@ if (!empty($_REQUEST['topicdays'])) SELECT COUNT(*) AS forum_topics FROM ". BB_TOPICS ." WHERE forum_id = $forum_id - AND topic_last_post_time > ". (TIMENOW - 86400*$req_topic_days) ." + AND topic_last_post_time > ". (TIMENOW - 86400 * $req_topic_days) ." "; if ($row = DB()->fetch_row($sql)) @@ -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']] : '', diff --git a/upload/viewtopic.php b/upload/viewtopic.php index 3e85082ef..7f884761d 100644 --- a/upload/viewtopic.php +++ b/upload/viewtopic.php @@ -313,7 +313,7 @@ if ($bb_cfg['topic_notify_enabled']) { if ($_GET['unwatch'] == 'topic') { - redirect(LOGIN_URL . "?redirect=". TOPIC_URL . "$topic_id&unwatch=topic"); + redirect(LOGIN_URL . "?redirect=" . TOPIC_URL . "$topic_id&unwatch=topic"); } } } @@ -432,11 +432,11 @@ if ( count($orig_word) ) // Post, reply and other URL generation for // templating vars // -$new_topic_url = POSTING_URL . "?mode=newtopic&f=$forum_id"; -$reply_topic_url = POSTING_URL . "?mode=reply&t=$topic_id"; +$new_topic_url = POSTING_URL . "?mode=newtopic&f=" . $forum_id; +$reply_topic_url = POSTING_URL . "?mode=reply&t=" . $topic_id; $view_forum_url = FORUM_URL . $forum_id; -$view_prev_topic_url = TOPIC_URL ."$topic_id&view=previous#newest"; -$view_next_topic_url = TOPIC_URL ."$topic_id&view=next#newest"; +$view_prev_topic_url = TOPIC_URL . $topic_id . "&view=previous#newest"; +$view_next_topic_url = TOPIC_URL . $topic_id . "&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']; @@ -447,17 +447,17 @@ $template->set_filenames(array('body' => 'viewtopic.tpl')); // // User authorisation levels output // -$s_auth_can = ( ( $is_auth['auth_post'] ) ? $lang['RULES_POST_CAN'] : $lang['RULES_POST_CANNOT'] ) . '
'; -$s_auth_can .= ( ( $is_auth['auth_reply'] ) ? $lang['RULES_REPLY_CAN'] : $lang['RULES_REPLY_CANNOT'] ) . '
'; -$s_auth_can .= ( ( $is_auth['auth_edit'] ) ? $lang['RULES_EDIT_CAN'] : $lang['RULES_EDIT_CANNOT'] ) . '
'; -$s_auth_can .= ( ( $is_auth['auth_delete'] ) ? $lang['RULES_DELETE_CAN'] : $lang['RULES_DELETE_CANNOT'] ) . '
'; -$s_auth_can .= ( ( $is_auth['auth_vote'] ) ? $lang['RULES_VOTE_CAN'] : $lang['RULES_VOTE_CANNOT'] ) . '
'; -$s_auth_can .= ( ($is_auth['auth_attachments'] ) ? $lang['RULES_ATTACH_CAN'] : $lang['RULES_ATTACH_CANNOT'] ) . '
'; -$s_auth_can .= ( ($is_auth['auth_download'] ) ? $lang['RULES_DOWNLOAD_CAN'] : $lang['RULES_DOWNLOAD_CANNOT'] ) . '
'; +$s_auth_can = (($is_auth['auth_post']) ? $lang['RULES_POST_CAN'] : $lang['RULES_POST_CANNOT']) . '
'; +$s_auth_can .= (($is_auth['auth_reply']) ? $lang['RULES_REPLY_CAN'] : $lang['RULES_REPLY_CANNOT']) . '
'; +$s_auth_can .= (($is_auth['auth_edit']) ? $lang['RULES_EDIT_CAN'] : $lang['RULES_EDIT_CANNOT']) . '
'; +$s_auth_can .= (($is_auth['auth_delete']) ? $lang['RULES_DELETE_CAN'] : $lang['RULES_DELETE_CANNOT']) . '
'; +$s_auth_can .= (($is_auth['auth_vote']) ? $lang['RULES_VOTE_CAN'] : $lang['RULES_VOTE_CANNOT']) . '
'; +$s_auth_can .= (($is_auth['auth_attachments']) ? $lang['RULES_ATTACH_CAN'] : $lang['RULES_ATTACH_CANNOT']) . '
'; +$s_auth_can .= (($is_auth['auth_download']) ? $lang['RULES_DOWNLOAD_CAN'] : $lang['RULES_DOWNLOAD_CANNOT']) . '
'; $topic_mod = ''; -if ( $is_auth['auth_mod'] ) +if ($is_auth['auth_mod']) { $s_auth_can .= $lang['RULES_MODERATE']; $topic_mod .= "' . $lang['DELETE_TOPIC'] . ' '; @@ -514,17 +514,17 @@ if ($report_topic && $report_topic->auth_check('auth_write')) // Topic watch information // $s_watching_topic = $s_watching_topic_img = ''; -if ( $can_watch_topic ) +if ($can_watch_topic) { - if ( $is_watching_topic ) + if ($is_watching_topic) { - $s_watching_topic = "' . $lang['STOP_WATCHING_TOPIC'] . ''; - $s_watching_topic_img = ( isset($images['topic_un_watch']) ) ? "' . $lang['STOP_WATCHING_TOPIC'] . '' : ''; + $s_watching_topic = "' . $lang['STOP_WATCHING_TOPIC'] . ''; + $s_watching_topic_img = (isset($images['topic_un_watch'])) ? "' . $lang['STOP_WATCHING_TOPIC'] . '' : ''; } else { - $s_watching_topic = "' . $lang['START_WATCHING_TOPIC'] . ''; - $s_watching_topic_img = ( isset($images['Topic_watch']) ) ? "' . $lang['START_WATCHING_TOPIC'] . '' : ''; + $s_watching_topic = "' . $lang['START_WATCHING_TOPIC'] . ''; + $s_watching_topic_img = (isset($images['Topic_watch'])) ? "' . $lang['START_WATCHING_TOPIC'] . '' : ''; } } @@ -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&start=$start", + 'S_POST_DAYS_ACTION' => TOPIC_URL . $topic_id . "&start=$start", 'S_AUTH_LIST' => $s_auth_can, 'S_TOPIC_ADMIN' => $topic_mod, 'S_WATCH_TOPIC' => $s_watching_topic,
{L_CLEAR_CACHE}: