0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add enable per board feature and only include new threads feature for RSS theme / extension

This commit is contained in:
Benjamin Southall 2016-10-08 00:48:55 +09:00
parent c0d1f60752
commit 379fe63fba
3 changed files with 84 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/themes/rss/info.php
View File

@ -48,6 +48,20 @@
'comment' => '(eg. "http://test.com")' 'comment' => '(eg. "http://test.com")'
); );
$theme['config'][] = Array(
'title' => 'Show Threads Only',
'name' => 'show_threads_only',
'type' => 'text',
'default' => 'false',
);
$theme['config'][] = Array(
'title' => 'Enable Per Board',
'name' => 'enable_per_board',
'type' => 'text',
'default' => 'false',
);
// Unique function name for building everything // Unique function name for building everything
$theme['build_function'] = 'rss_recentposts_build'; $theme['build_function'] = 'rss_recentposts_build';
$theme['install_callback'] = 'rss_recentposts_install'; $theme['install_callback'] = 'rss_recentposts_install';

2
templates/themes/rss/rss.xml
View File

@ -11,7 +11,7 @@
<link>{{ settings.base_url }}{{ config.root }}{{ settings.html }}</link> <link>{{ settings.base_url }}{{ config.root }}{{ settings.html }}</link>
{% for post in recent_posts %} {% for post in recent_posts %}
<item> <item>
<title>{{ post.board_name }}</title> <title><![CDATA[ {{ post.board_name }} ]]></title>
<description> <description>
<![CDATA[ <![CDATA[
<a href="{{ settings.base_url }}{{ post.link }}"> <a href="{{ settings.base_url }}{{ post.link }}">

134
templates/themes/rss/theme.php
View File

@ -16,52 +16,91 @@
// Wrap functions in a class so they don't interfere with normal Tinyboard operations // Wrap functions in a class so they don't interfere with normal Tinyboard operations
class RSSRecentPosts { class RSSRecentPosts {
public function build($action, $settings) { public function build($action, $settings) {
global $config, $_theme; global $config, $_theme,$board;
/*if ($action == 'all') {
copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
}*/
$this->excluded = explode(' ', $settings['exclude']); $this->excluded = explode(' ', $settings['exclude']);
if ($settings['show_threads_only'] == 'true'){
if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete') if ($action == 'all' || $action == 'post-thread' || $action == 'post-delete')
file_write($config['dir']['home'] . $settings['xml'], $this->homepage($settings)); file_write($config['dir']['home'] . $settings['xml'], $this->site_rsspage($settings));
}
else {
if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
file_write($config['dir']['home'] . $settings['xml'], $this->site_rsspage($settings));
}
if ($settings['enable_per_board'] == 'true'){
$boards = listBoards();
foreach ($boards as &$_board) {
if (in_array($_board['uri'], $this->excluded))
continue;
openBoard($_board['uri']);
if ($settings['show_threads_only'] == 'true'){
if ($action == 'all' || $action == 'post-thread' || $action == 'post-delete')
file_write($config['dir']['home'] . 'debug.xml', $board['dir']);
file_write($config['dir']['home'] . $board['dir'] . $settings['xml'], $this->board_rsspage($settings,$_board));
}
else {
if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
file_write($config['dir']['home'] . $board['dir'] . $settings['xml'], $this->board_rsspage($settings,$_board));
}
}
}
} }
// Build news page // Build news page
public function homepage($settings) { public function site_rsspage($settings) {
global $config, $board; global $config, $board;
//$recent_images = Array();
$recent_posts = Array(); $recent_posts = Array();
//$stats = Array();
$boards = listBoards(); $boards = listBoards();
/*$query = '';
foreach ($boards as &$_board) {
if (in_array($_board['uri'], $this->excluded))
continue;
$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
}
$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
$query = query($query) or error(db_error());
while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
openBoard($post['board']);
// board settings won't be available in the template file, so generate links now
$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
$post['src'] = $config['uri_thumb'] . $post['thumb'];
//$recent_images[] = $post;
}*/
$query = ''; $query = '';
foreach ($boards as &$_board) { foreach ($boards as &$_board) {
if (in_array($_board['uri'], $this->excluded)) if (in_array($_board['uri'], $this->excluded))
continue; continue;
if ($settings['show_threads_only'] == 'true'){
$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` is null UNION ALL ", $_board['uri'], $_board['uri']);
}
else {
$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
}
}
$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
$query = query($query) or error(db_error());
while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
openBoard($post['board']);
$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
$post['snippet'] = pm_snippet($post['body'], 30);
$post['board_name'] = $board['name'];
$recent_posts[] = $post;
}
return Element('themes/rss/rss.xml', Array(
'settings' => $settings,
'config' => $config,
'recent_posts' => $recent_posts,
));
}
// Build news page
public function board_rsspage($settings,$_board) {
global $config, $board;
$recent_posts = Array();
$query = '';
if ($settings['show_threads_only'] == 'true'){
$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` is null UNION ALL ", $_board['uri'], $_board['uri']);
}
else {
$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']); $query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
} }
$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query); $query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
@ -77,46 +116,11 @@
$recent_posts[] = $post; $recent_posts[] = $post;
} }
// Total posts
/*$query = 'SELECT SUM(`top`) FROM (';
foreach ($boards as &$_board) {
if (in_array($_board['uri'], $this->excluded))
continue;
$query .= sprintf("SELECT MAX(`id`) AS `top` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
}
$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
$query = query($query) or error(db_error());*/
//$stats['total_posts'] = number_format($query->fetchColumn());
// Unique IPs
/*$query = 'SELECT COUNT(DISTINCT(`ip`)) FROM (';
foreach ($boards as &$_board) {
if (in_array($_board['uri'], $this->excluded))
continue;
$query .= sprintf("SELECT `ip` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
}
$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
$query = query($query) or error(db_error());
//$stats['unique_posters'] = number_format($query->fetchColumn());*/
// Active content
/*$query = 'SELECT SUM(`filesize`) FROM (';
foreach ($boards as &$_board) {
if (in_array($_board['uri'], $this->excluded))
continue;
$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
}
$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
$query = query($query) or error(db_error());
//$stats['active_content'] = $query->fetchColumn();*/
return Element('themes/rss/rss.xml', Array( return Element('themes/rss/rss.xml', Array(
'settings' => $settings, 'settings' => $settings,
'config' => $config, 'config' => $config,
//'boardlist' => createBoardlist(),
//'recent_images' => $recent_images,
'recent_posts' => $recent_posts, 'recent_posts' => $recent_posts,
//'stats' => $stats
)); ));
} }
}; };