From 01dd6009c96a1af70ad96522987ed0b6ce3743f5 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Sat, 16 Dec 2023 16:20:03 +0700 Subject: [PATCH] Revert "Updated" This reverts commit 85b0c68d52cbbf73ff969c5a01095e242ff32ca7. --- library/config.php | 2 -- library/includes/functions_atom.php | 42 +++++++---------------------- 2 files changed, 9 insertions(+), 35 deletions(-) diff --git a/library/config.php b/library/config.php index 4da33e7b..adf16cea 100644 --- a/library/config.php +++ b/library/config.php @@ -573,8 +573,6 @@ $bb_cfg['atom'] = array( // Примечание: Без слэша в конце 'path' => INT_DATA_DIR .'atom', 'url' => './internal_data/atom', - 'direct_down' => true, // Allow direct downloading of torrents from feeds - 'direct_view' => true, // Allow direct viewing of post texts in feeds ); // Nofollow diff --git a/library/includes/functions_atom.php b/library/includes/functions_atom.php index efc3beef..ecdb9a4f 100644 --- a/library/includes/functions_atom.php +++ b/library/includes/functions_atom.php @@ -13,7 +13,7 @@ function update_forum_feed ($forum_id, $forum_data) if ($forum_id == 0) $forum_data['forum_name'] = (isset($lang['ATOM_GLOBAL_FEED']) ? $lang['ATOM_GLOBAL_FEED'] : $bb_cfg['server_name']); if ($forum_id > 0 && $forum_data['allow_reg_tracker']) { - $select_tor_sql = ', tor.size AS tor_size, tor.tor_status, tor.attach_id'; + $select_tor_sql = ', tor.size AS tor_size, tor.tor_status'; $join_tor_sql = "LEFT JOIN ". BB_BT_TORRENTS ." tor ON(t.topic_id = tor.topic_id)"; } if ($forum_id == 0) @@ -24,14 +24,12 @@ function update_forum_feed ($forum_id, $forum_data) u1.username AS first_username, p1.post_time AS topic_first_post_time, p1.post_edit_time AS topic_first_post_edit_time, p2.post_time AS topic_last_post_time, p2.post_edit_time AS topic_last_post_edit_time, - tor.size AS tor_size, tor.tor_status, tor.attach_id, - pt.post_html + tor.size AS tor_size, tor.tor_status FROM ". BB_BT_TORRENTS ." tor LEFT JOIN ". BB_TOPICS ." t ON(tor.topic_id = t.topic_id) LEFT JOIN ". BB_USERS ." u1 ON(t.topic_poster = u1.user_id) LEFT JOIN ". BB_POSTS ." p1 ON(t.topic_first_post_id = p1.post_id) LEFT JOIN ". BB_POSTS ." p2 ON(t.topic_last_post_id = p2.post_id) - LEFT JOIN ". BB_POSTS_HTML ." pt ON(p1.post_id = pt.post_id) ORDER BY t.topic_last_post_time DESC LIMIT 100 "; @@ -43,14 +41,12 @@ function update_forum_feed ($forum_id, $forum_data) t.topic_id, t.topic_title, t.topic_status, u1.username AS first_username, p1.post_time AS topic_first_post_time, p1.post_edit_time AS topic_first_post_edit_time, - p2.post_time AS topic_last_post_time, p2.post_edit_time AS topic_last_post_edit_time, - pt.post_html + p2.post_time AS topic_last_post_time, p2.post_edit_time AS topic_last_post_edit_time $select_tor_sql FROM ". BB_TOPICS ." t LEFT JOIN ". BB_USERS ." u1 ON(t.topic_poster = u1.user_id) LEFT JOIN ". BB_POSTS ." p1 ON(t.topic_first_post_id = p1.post_id) LEFT JOIN ". BB_POSTS ." p2 ON(t.topic_last_post_id = p2.post_id) - LEFT JOIN ". BB_POSTS_HTML ." pt ON(p1.post_id = pt.post_id) $join_tor_sql WHERE t.forum_id = $forum_id ORDER BY t.topic_last_post_time DESC @@ -90,13 +86,11 @@ function update_user_feed ($user_id, $username) u1.username AS first_username, p1.post_time AS topic_first_post_time, p1.post_edit_time AS topic_first_post_edit_time, p2.post_time AS topic_last_post_time, p2.post_edit_time AS topic_last_post_edit_time, - tor.size AS tor_size, tor.tor_status, tor.attach_id, - pt.post_html + tor.size AS tor_size, tor.tor_status FROM ". BB_TOPICS ." t LEFT JOIN ". BB_USERS ." u1 ON(t.topic_poster = u1.user_id) LEFT JOIN ". BB_POSTS ." p1 ON(t.topic_first_post_id = p1.post_id) LEFT JOIN ". BB_POSTS ." p2 ON(t.topic_last_post_id = p2.post_id) - LEFT JOIN ". BB_POSTS_HTML ." pt ON(p1.post_id = pt.post_id) LEFT JOIN ". BB_BT_TORRENTS ." tor ON(t.topic_id = tor.topic_id) WHERE t.topic_poster = $user_id ORDER BY t.topic_last_post_time DESC @@ -127,9 +121,7 @@ function update_user_feed ($user_id, $username) function create_atom ($file_path, $mode, $id, $title, $topics) { - global $bb_cfg, $lang; - $date = null; - $time = null; + global $lang; $dir = dirname($file_path); if (!file_exists($dir)) { @@ -143,7 +135,8 @@ function create_atom ($file_path, $mode, $id, $title, $topics) $time = bb_date($last_time, 'H:i:s', 0); break; } - $atom = "\n"; + $atom = ""; + $atom .= "\n"; $atom .= "\n"; $atom .= "$title\n"; $atom .= "". $date ."T$time+00:00\n"; @@ -157,11 +150,6 @@ function create_atom ($file_path, $mode, $id, $title, $topics) { $tor_size = str_replace(' ', ' ', ' ['. humn_size($topic['tor_size']) .']'); } - $tor_status = ''; - if (isset($topic['tor_status'])) - { - $tor_status = " ({$lang['TOR_STATUS_NAME'][$topic['tor_status']]})"; - } $topic_title = $topic['topic_title']; $orig_word = array(); $replacement_word = array(); @@ -180,25 +168,13 @@ function create_atom ($file_path, $mode, $id, $title, $topics) $checktime = TIMENOW - 604800; // неделя (week) if ($topic['topic_first_post_edit_time'] && $topic['topic_first_post_edit_time'] > $checktime) $updated = '[' . $lang['ATOM_UPDATED'] . '] '; $atom .= "\n"; - $atom .= " <![CDATA[$updated$topic_title$tor_status$tor_size]]>\n"; + $atom .= " <![CDATA[$updated$topic_title$tor_size]]>\n"; $atom .= " \n"; $atom .= " $author_name\n"; $atom .= " \n"; $atom .= " ". $date ."T$time+00:00\n"; $atom .= " tag:rto.feed,". $date .":/t/$topic_id\n"; - if ($bb_cfg['atom']['direct_down'] && isset($topic['attach_id'])) - { - $atom .= " \n"; - } - else - { - $atom .= " \n"; - } - - if ($bb_cfg['atom']['direct_view']) - { - $atom .= " " . $topic['post_html'] . "\n\nNews URL: " . FULL_URL . TOPIC_URL . $topic_id . "\n"; - } + $atom .= " \n"; $atom .= "\n"; } $atom .= "";