From 1eb2f04f100d82205106f5e51942a8d0d60978f2 Mon Sep 17 00:00:00 2001 From: flashwave Date: Sun, 15 Nov 2015 22:43:39 +0100 Subject: [PATCH] r20151115.1 part 2 as promised Signed-off-by: Flashwave --- _sakura/components/Forums.php | 44 ++++++++++++++ _sakura/components/News.php | 27 +-------- _sakura/components/Urls.php | 30 +--------- .../templates/yuuno/elements/pagination.tpl | 17 +++--- _sakura/templates/yuuno/forum/forum.tpl | 9 ++- _sakura/templates/yuuno/forum/forumBtns.tpl | 24 ++++---- _sakura/templates/yuuno/forum/forumEntry.tpl | 2 +- _sakura/templates/yuuno/forum/viewforum.tpl | 3 + _sakura/templates/yuuno/forum/viewtopic.tpl | 10 +++- _sakura/templates/yuuno/main/index.tpl | 2 +- _sakura/templates/yuuno/main/memberlist.tpl | 33 +++++------ _sakura/templates/yuuno/main/news.tpl | 13 +++-- .../templates/yuuno/main/supporttracker.tpl | 57 ++++++++----------- .../yuuno/settings/friends.listing.tpl | 28 ++++----- .../yuuno/settings/friends.requests.tpl | 28 ++++----- .../yuuno/settings/notifications.history.tpl | 28 ++++----- public/.htaccess | 7 --- public/members.php | 8 +-- public/news.php | 3 +- public/settings.php | 15 +---- public/support.php | 8 +-- public/viewforum.php | 5 -- public/viewtopic.php | 2 - 23 files changed, 187 insertions(+), 216 deletions(-) diff --git a/_sakura/components/Forums.php b/_sakura/components/Forums.php index 45b3bb1..09e0b6c 100755 --- a/_sakura/components/Forums.php +++ b/_sakura/components/Forums.php @@ -82,6 +82,50 @@ class Forums return $forum; } + // Getting all topics from a forum + public static function getTopics($id) + { + + // Get the topics from the database + $topics = Database::fetch('topics', true, [ + 'forum_id' => [$id, '='], + ]); + + // Get the userdata related to last posts + foreach ($topics as $key => $topic) { + // Get the reply count + $topics[$key]['reply_count'] = Database::count('posts', [ + 'topic_id' => [$topic['topic_id'], '='], + ])[0]; + + // Get first post in topics + $firstPost = Database::fetch('posts', false, [ + 'topic_id' => [$topic['topic_id'], '='], + ]); + + $topics[$key]['first_poster'] = new User($firstPost['poster_id']); + + $topics[$key]['first_post'] = array_merge( + empty($firstPost) ? [] : $firstPost, + ['elapsed' => Main::timeElapsed($firstPost['post_time'])] + ); + + // Get last post in topics + $lastPost = Database::fetch('posts', false, [ + 'topic_id' => [$topic['topic_id'], '='], + ], ['post_id', true]); + + $topics[$key]['last_poster'] = new User($lastPost['poster_id']); + + $topics[$key]['last_post'] = array_merge( + empty($lastPost) ? [] : $lastPost, + ['elapsed' => Main::timeElapsed($lastPost['post_time'])] + ); + } + + return $topics; + } + // Get posts of a thread public static function getTopic($id, $ignoreView = false) { diff --git a/_sakura/components/News.php b/_sakura/components/News.php index c4e6e9d..545bf43 100755 --- a/_sakura/components/News.php +++ b/_sakura/components/News.php @@ -11,7 +11,7 @@ namespace Sakura; */ class News { - private $posts = []; // Posts array + public $posts = []; // Posts array private $posters = []; // Posters array (so we don't create a new user object every time) // Initialise the news object @@ -54,29 +54,4 @@ class News { return array_key_exists($pid, $this->posts) ? $pid : 0; } - - // Get a single post - public function getPost($pid) - { - return array_key_exists($pid, $this->posts) ? $this->posts[$pid] : 0; - } - - // Getting posts - public function getPosts($start = null, $end = null) - { - - // Get posts - $posts = $this->posts; - - // Only return requested posts - if ($start !== null && $end !== null) { - // Slice the array - $posts = array_slice($posts, $start, $end, true); - } elseif ($start !== null) { - // Devide the array in parts (pages) - $posts = array_chunk($posts, $start, true); - } - - return $posts; - } } diff --git a/_sakura/components/Urls.php b/_sakura/components/Urls.php index 1fc7ced..fc118e1 100755 --- a/_sakura/components/Urls.php +++ b/_sakura/components/Urls.php @@ -23,10 +23,6 @@ class Urls '/news.php', '/news', ], - 'SITE_NEWS_PAGE' => [ - '/news.php?page=%u', - '/news/p%u', - ], 'SITE_NEWS_POST' => [ '/news.php?id=%u', '/news/%u', @@ -47,10 +43,6 @@ class Urls '/support.php?tracker=true', '/support/tracker', ], - 'SITE_DONATE_TRACK_PAGE' => [ - '/support.php?tracker=true&page=%u', - '/support/tracker/%u', - ], 'SITE_FAQ' => [ '/faq.php', '/faq', @@ -99,23 +91,11 @@ class Urls ], 'MEMBERLIST_PAGE' => [ '/members.php?page=%u', - '/members/p%u', - ], - 'MEMBERLIST_SORT_RANK' => [ - '/members.php?sort=%s&rank=%u', - '/members/%s/%u', - ], - 'MEMBERLIST_RANK_PAGE' => [ - '/members.php?rank=%u&page=%u', - '/members/%u/p%u', - ], - 'MEMBERLIST_SORT_PAGE' => [ - '/members.php?sort=%s&page=%u', - '/members/%s/p%u', + '/members?page=%u', ], 'MEMBERLIST_ALL' => [ - '/members.php?sort=%s&rank=%u&page=%u', - '/members/%s/%u/p%u', + '/members.php?sort=%s&rank=%u', + '/members/%s/%u', ], // Forums @@ -221,10 +201,6 @@ class Urls '/settings.php?cat=%s&mode=%s', '/settings/%s/%s', ], - 'SETTING_PAGE' => [ - '/settings.php?cat=%s&mode=%s&page=%u', - '/settings/%s/%s/p%u', - ], 'REQUEST_NOTIFICATIONS' => [ '/settings.php?request-notifications=true', '/notifications', diff --git a/_sakura/templates/yuuno/elements/pagination.tpl b/_sakura/templates/yuuno/elements/pagination.tpl index fb48169..bc5e63c 100755 --- a/_sakura/templates/yuuno/elements/pagination.tpl +++ b/_sakura/templates/yuuno/elements/pagination.tpl @@ -1,11 +1,14 @@ - {% if not forum.type and forum.id > 0 %} + {% set threads = forum.threads|batch(25) %} + + {% set paginationPages = threads %} + {% set paginationUrl %}{{ urls.format('FORUM_SUB', [forum.id]) }}{% endset %} + {% include 'forum/forumBtns.tpl' %} - {% if board.threads|length %} + {% if forum.threads %} @@ -38,7 +43,7 @@ - {% for thread in board.threads[currentPage] %} + {% for thread in threads[get.page|default(1) - 1] %} {% include 'forum/topicEntry.tpl' %} {% endfor %} diff --git a/_sakura/templates/yuuno/forum/forumBtns.tpl b/_sakura/templates/yuuno/forum/forumBtns.tpl index 103d4a2..631e057 100755 --- a/_sakura/templates/yuuno/forum/forumBtns.tpl +++ b/_sakura/templates/yuuno/forum/forumBtns.tpl @@ -1,21 +1,17 @@ +{% set paginationClass = 'rightSide' %} + diff --git a/_sakura/templates/yuuno/forum/forumEntry.tpl b/_sakura/templates/yuuno/forum/forumEntry.tpl index 9fcea7a..1848c12 100755 --- a/_sakura/templates/yuuno/forum/forumEntry.tpl +++ b/_sakura/templates/yuuno/forum/forumEntry.tpl @@ -22,7 +22,7 @@
{% if forum.lastPost.id %} - {{ forum.lastPost.subject }}
+ {{ forum.lastPost.subject }}
{{ forum.lastPost.timeElapsed }} by {% if forum.lastPost.poster.id %}{{ forum.lastPost.poster.username }}{% else %}[deleted user]{% endif %} {% else %} There are no posts in this forum.
  diff --git a/_sakura/templates/yuuno/forum/viewforum.tpl b/_sakura/templates/yuuno/forum/viewforum.tpl index 3846263..33adaca 100755 --- a/_sakura/templates/yuuno/forum/viewforum.tpl +++ b/_sakura/templates/yuuno/forum/viewforum.tpl @@ -2,6 +2,9 @@ {% set title %}Forums / {{ forum.name }}{% endset %} +{% set forumBackLink %}{{ urls.format('FORUM_INDEX') }}{% endset %} +{% set forumNewLink %}{{ urls.format('FORUM_NEW_THREAD', [forum.id]) }}{% endset %} + {% block title %}{{ title }}{% endblock %} {% block content %} diff --git a/_sakura/templates/yuuno/forum/viewtopic.tpl b/_sakura/templates/yuuno/forum/viewtopic.tpl index 19f8af3..1134895 100755 --- a/_sakura/templates/yuuno/forum/viewtopic.tpl +++ b/_sakura/templates/yuuno/forum/viewtopic.tpl @@ -1,5 +1,13 @@ {% extends 'global/master.tpl' %} +{% set forumBackLink %}{{ urls.format('FORUM_SUB', [forum.id]) }}{% endset %} +{% set forumReplyLink %}{{ urls.format('FORUM_REPLY', [thread.id]) }}{% endset %} + +{% set posts = thread.posts|batch(10) %} + +{% set paginationPages = posts %} +{% set paginationUrl %}{{ urls.format('FORUM_THREAD', [thread.id]) }}{% endset %} + {% block title %}{{ thread.title }}{% endblock %} {% block content %} @@ -8,7 +16,7 @@
{{ forum.name }} / {{ thread.title }}
{% include 'forum/forumBtns.tpl' %}
- {% for post in posts[currentPage] %} + {% for post in posts[get.page|default(1) - 1] %} - {% for count,user in page.users[page.page] %} + {% for count,user in users[currPage] %}
{% if not post.poster.checkPermission('SITE', 'DEACTIVATED') or post.poster.checkPermission('SITE', 'RESTRICTED') %}{{ post.poster.username }} diff --git a/_sakura/templates/yuuno/main/index.tpl b/_sakura/templates/yuuno/main/index.tpl index ec1b405..5821829 100755 --- a/_sakura/templates/yuuno/main/index.tpl +++ b/_sakura/templates/yuuno/main/index.tpl @@ -7,7 +7,7 @@
News
- {% for post in news.getPosts(0, newsCount) %} + {% for post in news.posts|batch(newsCount)[0] %} {% include 'elements/newsPost.tpl' %} {% endfor %}
diff --git a/_sakura/templates/yuuno/main/memberlist.tpl b/_sakura/templates/yuuno/main/memberlist.tpl index 76a7a64..f17ccf5 100755 --- a/_sakura/templates/yuuno/main/memberlist.tpl +++ b/_sakura/templates/yuuno/main/memberlist.tpl @@ -8,6 +8,13 @@ {% if page.notfound %}The requested rank could not be found!{% else %}{% if not page.active %}The entire user list.{% else %}{{ page.ranks[page.active].description }}{% endif %}{% endif %} {% endset %} +{% set users = users|batch(membersPerPage) %} + +{% set currPage = get.page|default(1) - 1 %} + +{% set paginationPages = users %} +{% set paginationUrl %}{% if page.sort and page.active %}{{ urls.format('MEMBERLIST_ALL', [page.sort, page.active]) }}{% elseif page.sort %}{{ urls.format('MEMBERLIST_SORT', [page.sort]) }}{% elseif page.active %}{{ urls.format('MEMBERLIST_RANK', [page.active]) }}{% else %}{{ urls.format('MEMBERLIST_INDEX') }}{% endif %}{% endset %} + {% block title %}{{ rankTitle }}{% endblock %} {% block content %} @@ -19,21 +26,21 @@
Rank: - All members + All members {% for rank in page.ranks %} {% if not rank.hidden or (rank.hidden and page.active == rank.id) %} - {{ rank.name(true) }} + {{ rank.name(true) }} {% endif %} {% endfor %}
View: {% for sort in page.sorts %} - {{ sort|capitalize }} + {{ sort|capitalize }} {% endfor %}
- {% if not page.users|length %} + {% if not users|length %}

This rank has no members!

{% elseif not page.notfound %}
@@ -59,7 +66,7 @@
Country
@@ -85,7 +92,7 @@ {% endfor %}
{% else %} - {% for user in page.users[page.page] %} + {% for user in users[currPage] %} {# These comment tags are here to prevent the link extending too far #}
{# #}{{ user.username }}{# @@ -98,18 +105,8 @@ {% endif %}
{% endif %} - {% if page.users|length > 1 %} - + {% if users|length > 1 %} + {% include 'elements/pagination.tpl' %} {% endif %} {% endblock %} diff --git a/_sakura/templates/yuuno/main/news.tpl b/_sakura/templates/yuuno/main/news.tpl index f31f587..77b07dc 100755 --- a/_sakura/templates/yuuno/main/news.tpl +++ b/_sakura/templates/yuuno/main/news.tpl @@ -1,12 +1,13 @@ {% extends 'global/master.tpl' %} -{% set newsPosts = viewPost and postExists ? [news.getPost(postExists)] : news.getPosts(postsPerPage)[currentPage] %} - -{% set pagination = {'page': currentPage, 'pages': news.getPosts(postsPerPage), 'urlPattern': 'SITE_NEWS_PAGE'} %} +{% set newsPosts = viewPost and postExists ? [news.posts[postExists]] : news.posts|batch(postsPerPage)[get.page|default(1) - 1] %} {% if viewPost and postExists %} -{% set commentsCategory = 'news-' ~ newsPosts[0].news_category ~ '-' ~ newsPosts[0].news_id %} -{% set comments = newsPosts[0].news_comments.comments %} + {% set commentsCategory = 'news-' ~ newsPosts[0].news_category ~ '-' ~ newsPosts[0].news_id %} + {% set comments = newsPosts[0].news_comments.comments %} +{% else %} + {% set paginationPages = news.posts|batch(postsPerPage) %} + {% set paginationUrl %}{{ urls.format('SITE_NEWS') }}{% endset %} {% endif %} {% set title %} @@ -34,7 +35,7 @@ {% include 'elements/comments.tpl' %} {% endif %} {% endfor %} - {% if not (viewPost and postExists) and news.getPosts(postsPerPage)|length > 1 %} + {% if not (viewPost and postExists) and news.posts|batch(postsPerPage)|length > 1 %}
{% include 'elements/pagination.tpl' %}
diff --git a/_sakura/templates/yuuno/main/supporttracker.tpl b/_sakura/templates/yuuno/main/supporttracker.tpl index 55a44b5..a99cabf 100755 --- a/_sakura/templates/yuuno/main/supporttracker.tpl +++ b/_sakura/templates/yuuno/main/supporttracker.tpl @@ -2,45 +2,44 @@ {% block title %}Donation Tracker{% endblock %} +{% set paginationPages = tracker.table|batch(20) %} +{% set paginationUrl %}{{ urls.format('SITE_DONATE_TRACK') }}{% endset %} + +{% block css %} + +{% endblock %} + {% block content %}
Donation Tracker
-

Our current overall balance is €{{ page.premiumData.balance|number_format(2) }}

+

Our current overall balance is €{{ tracker.balance|number_format(2) }}

Donation Log
- - - + + + - - - + + + - {% for supporter in page.premiumTable[page.currentPage] %} + {% for supporter in tracker.table|batch(20)[get.page|default(1) - 1] %}
- Supporter - - Amount - - Action - SupporterAmountAction
- Supporter - - Amount - - Action - SupporterAmountAction
- {{ page.premiumData.users[supporter.user_id].username }} + {{ tracker.users[supporter.user_id].username }} €{{ supporter.transaction_amount|number_format(2) }} @@ -52,19 +51,11 @@ {% endfor %}
- {% if page.premiumTable|length > 1 %} - {% endblock %} diff --git a/_sakura/templates/yuuno/settings/friends.listing.tpl b/_sakura/templates/yuuno/settings/friends.listing.tpl index eb9fe34..3ae09ab 100755 --- a/_sakura/templates/yuuno/settings/friends.listing.tpl +++ b/_sakura/templates/yuuno/settings/friends.listing.tpl @@ -1,3 +1,8 @@ +{% set friends = user.friends(1)|batch(12) %} + +{% set paginationPages = friends %} +{% set paginationUrl %}{{ urls.format('SETTING_MODE', ['friends', 'listing']) }}{% endset %} + {% block js %} {% endblock %} +{% block css %} + +{% endblock %} + {% if friends|length %}
- {% for friend in friends[page.currentPage] %} + {% for friend in friends[get.page|default(1) - 1] %} {% if friends|length > 1 %}
- -
+ {% include 'elements/pagination.tpl' %}
{% endif %} {% else %} diff --git a/_sakura/templates/yuuno/settings/friends.requests.tpl b/_sakura/templates/yuuno/settings/friends.requests.tpl index 032ea84..2d0a470 100755 --- a/_sakura/templates/yuuno/settings/friends.requests.tpl +++ b/_sakura/templates/yuuno/settings/friends.requests.tpl @@ -1,3 +1,8 @@ +{% set friends = user.friends(-1)|batch(12) %} + +{% set paginationPages = friends %} +{% set paginationUrl %}{{ urls.format('SETTING_MODE', ['friends', 'requests']) }}{% endset %} + {% block js %} {% endblock %} +{% block css %} + +{% endblock %} + {% if friends|length %}
- {% for friend in friends[page.currentPage] %} + {% for friend in friends[get.page|default(1) - 1] %} {% if friends|length > 1 %}
- -
+ {% include 'elements/pagination.tpl' %}
{% endif %} {% else %} diff --git a/_sakura/templates/yuuno/settings/notifications.history.tpl b/_sakura/templates/yuuno/settings/notifications.history.tpl index 2582a1f..946ba8d 100755 --- a/_sakura/templates/yuuno/settings/notifications.history.tpl +++ b/_sakura/templates/yuuno/settings/notifications.history.tpl @@ -1,6 +1,19 @@ +{% set alerts = alerts|batch(10) %} + +{% set paginationPages = alerts %} +{% set paginationUrl %}{{ urls.format('SETTING_MODE', ['notifications', 'history']) }}{% endset %} + +{% block css %} + +{% endblock %} + {% if alerts %}
- {% for alert in alerts[page.currentPage] %} + {% for alert in alerts[get.page|default(1) - 1] %}
{% if 'FONT:' in alert.alert_img %} @@ -28,18 +41,7 @@
{% if alerts|length > 1 %}
- -
+ {% include 'elements/pagination.tpl' %}
{% endif %} {% else %} diff --git a/public/.htaccess b/public/.htaccess index 52fb97f..d76b89f 100755 --- a/public/.htaccess +++ b/public/.htaccess @@ -12,7 +12,6 @@ Options +FollowSymLinks -Indexes RewriteRule ^login/?$|^logout/?$|^activate/?$|^register/?$|^forgotpassword/?|^authenticate/?$ authenticate.php [L,QSA] RewriteRule ^support/?$ support.php [L,QSA] RewriteRule ^support/tracker/?$ support.php?tracker=true [L,QSA] -RewriteRule ^support/tracker/([0-9]+)/?$ support.php?tracker=true&page=$1 [L,QSA] RewriteRule ^faq/?$ faq.php [L,QSA] RewriteRule ^search/?$ search.php [L,QSA] @@ -21,10 +20,8 @@ RewriteRule ^p/([a-z]+)/?$ index.php?p=$1 [L,QSA] # News RewriteRule ^news/?$ news.php [L,QSA] -RewriteRule ^news/p([0-9]+)/?$ news.php?page=$1 [L,QSA] RewriteRule ^news/([0-9]+)/?$ news.php?id=$1 [L,QSA] RewriteRule ^news/([a-z\-]+)/?$ news.php?cat=$1 [L,QSA] -RewriteRule ^news/([a-z\-]+)/p([0-9]+)/?$ news.php?cat=$1&page=$2 [L,QSA] RewriteRule ^news/([a-z\-]+)/([0-9]+)/?$ news.php?cat=$1&id=$2 [L,QSA] RewriteRule ^news.xml$ news.php?xml [L,QSA] @@ -32,7 +29,6 @@ RewriteRule ^news.xml$ news.php?xml [L,QSA] RewriteRule ^settings/?$ settings.php [L,QSA] RewriteRule ^settings/([a-z]+)/?$ settings.php?cat=$1 [L,QSA] RewriteRule ^settings/([a-z]+)/([a-z]+)/?$ settings.php?cat=$1&mode=$2 [L,QSA] -RewriteRule ^settings/([a-z]+)/([a-z]+)/p([0-9]+)/?$ settings.php?cat=$1&mode=$2&page=$3 [L,QSA] RewriteRule ^friends/?$ settings.php?friend-action=true [L,QSA] RewriteRule ^notifications/?$ settings.php?request-notifications=true [L,QSA] RewriteRule ^comments/?$ settings.php?comment-action=true [L,QSA] @@ -41,11 +37,8 @@ RewriteRule ^comments/?$ settings.php?comment-action=true [L,QSA] RewriteRule ^members/?$ members.php [L,QSA] RewriteRule ^members/([a-z]+)/?$ members.php?sort=$1 [L,QSA] RewriteRule ^members/([0-9]+)/?$ members.php?rank=$1 [L,QSA] -RewriteRule ^members/p([0-9]+)/?$ members.php?page=$1 [L,QSA] RewriteRule ^members/([a-z]+)/([0-9]+)/?$ members.php?sort=$1&rank=$2 [L,QSA] RewriteRule ^members/([0-9]+)/p([0-9]+)/?$ members.php?rank=$1&page=$2 [L,QSA] -RewriteRule ^members/([a-z]+)/p([0-9]+)/?$ members.php?sort=$1&page=$2 [L,QSA] -RewriteRule ^members/([a-z]+)/([0-9]+)/p([0-9]+)/?$ members.php?sort=$1&rank=$2&page=$3 [L,QSA] # Profiles RewriteRule ^u/?$ profile.php [L,QSA] diff --git a/public/members.php b/public/members.php index 569d6f8..3d0bcbd 100755 --- a/public/members.php +++ b/public/members.php @@ -34,13 +34,13 @@ if (Users::checkLogin()) { 'sort' => isset($_GET['sort']) && $_GET['sort'] && in_array($_GET['sort'], $_MEMBERLIST_SORTS) ? $_GET['sort'] : $_MEMBERLIST_SORTS[0], - 'page' => isset($_GET['page']) && ($_GET['page'] - 1) >= 0 ? $_GET['page'] - 1 : 0, - 'users' => array_chunk($_MEMBERLIST_ACTIVE && !$_MEMBERLIST_NFOUND ? - Users::getUsersInRank($_MEMBERLIST_ACTIVE, null, true) : - Users::getAllUsers(), Config::getConfig('members_per_page'), true), ]; + $renderData['users'] = ($_MEMBERLIST_ACTIVE && !$_MEMBERLIST_NFOUND ? Users::getUsersInRank($_MEMBERLIST_ACTIVE) : Users::getAllUsers()); + + $renderData['membersPerPage'] = Config::getConfig('members_per_page'); + // Set parse variables $template->setVariables($renderData); diff --git a/public/news.php b/public/news.php index 5ebbfee..0586b3c 100755 --- a/public/news.php +++ b/public/news.php @@ -18,7 +18,7 @@ $news = new News(isset($_GET['cat']) ? $_GET['cat'] : Config::getConfig('site_ne // News XML feed if (isset($_GET['xml'])) { // Get the news posts - $posts = $news->getPosts(); + $posts = $news->posts; // Meta data attributes $metaData = [ @@ -123,7 +123,6 @@ $renderData = array_merge($renderData, [ 'postsPerPage' => Config::getConfig('news_posts_per_page'), 'viewPost' => isset($_GET['id']), 'postExists' => $news->postExists(isset($_GET['id']) ? $_GET['id'] : 0), - 'currentPage' => isset($_GET['page']) && ($_GET['page'] - 1) >= 0 ? $_GET['page'] - 1 : 0, ]); // Initialise templating engine diff --git a/public/settings.php b/public/settings.php index 8e00cb6..a73b930 100755 --- a/public/settings.php +++ b/public/settings.php @@ -1456,12 +1456,9 @@ if (Users::checkLogin()) { // Page data $renderData['page'] = [ - 'category' => $pages[$category]['title'], 'mode' => $pages[$category]['modes'][$mode]['title'], - 'currentPage' => isset($_GET['page']) && ($_GET['page'] - 1) >= 0 ? $_GET['page'] - 1 : 0, 'description' => $pages[$category]['modes'][$mode]['description'], - ]; // Section specific @@ -1494,16 +1491,6 @@ if (Users::checkLogin()) { ]; break; - // Friends - case 'friends.listing': - $renderData['friends'] = array_chunk(array_reverse($currentUser->friends(1)), 12, true); - break; - - // Pending Friend Requests - case 'friends.requests': - $renderData['friends'] = array_chunk(array_reverse($currentUser->friends(-1)), 12, true); - break; - // PM inbox case 'messages.inbox': $renderData['messages'] = []; @@ -1511,7 +1498,7 @@ if (Users::checkLogin()) { // Notification history case 'notifications.history': - $renderData['alerts'] = array_chunk(array_reverse(Users::getNotifications(null, 0, false, true)), 10, true); + $renderData['alerts'] = array_reverse(Users::getNotifications(null, 0, false, true)); break; // Avatar and background sizes diff --git a/public/support.php b/public/support.php index 095d5fd..aeee41e 100755 --- a/public/support.php +++ b/public/support.php @@ -142,13 +142,7 @@ if (isset($_REQUEST['mode']) // Premium tracker if (isset($_GET['tracker'])) { - $renderData['page'] = [ - - 'currentPage' => isset($_GET['page']) && ($_GET['page'] - 1) >= 0 ? $_GET['page'] - 1 : 0, - 'premiumData' => ($_PREMIUM = Main::getPremiumTrackerData()), - 'premiumTable' => array_chunk($_PREMIUM['table'], 20, true), - - ]; + $renderData['tracker'] = Main::getPremiumTrackerData(); // Set parse variables $template->setVariables($renderData); diff --git a/public/viewforum.php b/public/viewforum.php index 82ed3af..0812860 100755 --- a/public/viewforum.php +++ b/public/viewforum.php @@ -53,11 +53,6 @@ if ($forum->type === 2) { $renderData['forum'] = $forum; -$renderData['board'] = [ - 'threads' => array_chunk($forum->threads, 25, true), -]; -$renderData['currentPage'] = isset($_GET['page']) && ($_GET['page'] - 1) >= 0 ? $_GET['page'] - 1 : 0; - // Set parse variables $template->setVariables($renderData); diff --git a/public/viewtopic.php b/public/viewtopic.php index 855d70e..7df7288 100755 --- a/public/viewtopic.php +++ b/public/viewtopic.php @@ -44,8 +44,6 @@ if (!$thread) { $renderData = array_merge($renderData, [ 'thread' => $thread, 'forum' => $forum, - 'posts' => array_chunk($thread->posts, 10, true), - 'currentPage' => isset($_GET['page']) && ($_GET['page'] - 1) >= 0 ? $_GET['page'] - 1 : 0, ]); // Set parse variables