Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Remove News link from site#389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 4 commits into from
Sep 1, 2023
Merged

Remove News link from site #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ecd1
Remove News link from site
lonnieezell Aug 16, 2023
b803b07
Remove news from routing
lonnieezell Aug 16, 2023
080ff46
feat: Convert Recent News section on home page to pull from the forum…
lonnieezell Aug 25, 2023
b160382
Fixing style issues
lonnieezell Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/MyBB.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class MyBB extends BaseConfig
* An array of user names to restrict our search for news articles to.
* This simply helps limit the work to do.
*/
public $newsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
public $newsUsernames = ['ciadmin', 'kilishan', 'kenjis', 'MGatner'];

/**
* --------------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions app/Config/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,6 @@
$routes->get('the-fine-print', 'FinePrint::index');
$routes->get('security-disclosures', 'Disclosures::index');

// Blog
$routes->get('news', 'Blog::index');
$routes->get('news/c/(:segment)', 'Blog::category/$1');
$routes->get('news/(:segment)', 'Blog::post/$1');

/**
* --------------------------------------------------------------------
* Additional Routing
Expand Down
1 change: 1 addition & 0 deletions app/Database/Migrations/2020-10-29-035422_CreateForumsTable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ public function up()
{
// fx_threads
$this->forge->addField([
'fid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
Comment thread
kenjis marked this conversation as resolved.
'tid' => ['type' => 'int', 'constraint' => 11, 'unsigned' => true, 'autoincrement' => true],
'subject' => ['type' => 'varchar', 'constraint' => 255],
'username' => ['type' => 'varchar', 'constraint' => 255],
Expand Down
15 changes: 10 additions & 5 deletions app/Database/Seeds/ForumSeeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,16 @@
class ForumSeeder extends Seeder
{
protected $threads = [
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407'],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '413'],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '403'],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '4'],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '414'],
['subject' => 'Multi Table Select (Active Records)', 'username' => 'Han Solo', 'lastpost' => '1414737566', 'tid' => '407', 'fid' => 1],
['subject' => 'unexpected end of file', 'username' => 'Yoda', 'lastpost' => '1414567370', 'tid' => '408', 'fid' => 1],
['subject' => 'Status Enable & Disable Not Working', 'username' => 'Luke Skywalker', 'lastpost' => '1414567370', 'tid' => '409', 'fid' => 1],
['subject' => 'waiting for CI3.0 version', 'username' => 'Princess Leia', 'lastpost' => '1414567370', 'tid' => '410', 'fid' => 1],
['subject' => 'How i can select most common value with codeigniter', 'username' => 'Obi Wan Kenobi', 'lastpost' => '1414567370', 'tid' => '411', 'fid' => 1],
['subject' => 'CodeIgniter 4.3.7 released', 'username' => 'ciadmin', 'lastpost' => '1414737566', 'tid' => '412', 'fid' => 2],
['subject' => 'CodeIgniter 4.3.6 released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '413', 'fid' => 2],
['subject' => 'Shield Authentication Library', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '414', 'fid' => 2],
['subject' => 'Settings Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '415', 'fid' => 2],
['subject' => 'Tasks Library released', 'username' => 'ciadmin', 'lastpost' => '1414567370', 'tid' => '416', 'fid' => 2],
];

public function run()
Expand Down
25 changes: 25 additions & 0 deletions app/Libraries/Forums.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,4 +61,29 @@ public function posts($params = [])

return view('forum/_drats');
}

public function news($params = [])
{
$limit = $params['limit'] ?? $this->limit;

// get the forum posts
if (! $items = cache('bb_news')) {
$items = $this->mybb->getRecentNews($limit);
$ttl = 60 * 60 * 4; // time to live s/b 4 hours
cache()->save('bb_news', $items, $ttl);
}

if (! empty($items) && is_array($items)) {
// massage the date formats
foreach ($items as &$item) {
$item['lastpost'] = date('Y.m.d', $item['lastpost']);
$item['mybb_forum_url'] = $this->forumUrl;
$item['subject'] = strip_tags($item['subject']); // fix #79
}

return view('forum/_posts', ['posts' => $items]);
}

return view('forum/_drats');
}
}
36 changes: 31 additions & 5 deletions app/Models/MyBBModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,19 +18,18 @@ class MyBBModel extends Model
protected $useAutoIncrement = true;
protected $returnType = 'array';
protected $allowedFields = [
'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
'fid', 'tid', 'subject', 'username', 'lastpost', 'lastposter', 'visible', 'deletetime',
];

/**
* Grabs the most recently active threads from the forums.
*
* @param int $limit
* @param string $order
*
* @return array|null
*/
public function getRecentPosts($limit = 5, $order = 'desc')
public function getRecentPosts(int $limit = 5, string $order = 'desc')
{
$forumId = config('MyBB')->newsForumId;

$where = [
'visible' => 1,
'deletetime' => 0,
Expand All@@ -39,10 +38,37 @@ public function getRecentPosts($limit = 5, $order = 'desc')
$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->where('fid != ' . $forumId)
->limit($limit, 0)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}

/**
* Grabs the most recent announcements from the forums.
*
* @return array
*/
public function getRecentNews(int $limit = 5, string $order = 'desc')
{
$admins = config('MyBB')->newsUsernames;
$forumId = config('MyBB')->newsForumId;

$where = [
'fid' => $forumId,
'visible' => 1,
'deletetime' => 0,
];

$builder = $this->db->table('fx_threads');
$query = $builder->select('tid, subject, username, lastpost, lastposter')
->where($where)
->whereIn('username', $admins)
->orderBy('lastpost', $order)
->get();

return $query->getResultArray();
}
}
3 changes: 2 additions & 1 deletion app/Views/forum/_posts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,8 @@
<div class="rnapf-row">
<div class="rnapf-date"><?= esc($post['lastpost']) ?></div>
<div class="rnapf-title">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link">
<a href="<?= esc($post['mybb_forum_url'], 'attr') ?>/thread-<?= esc($post['tid'], 'attr') ?>-lastpost.html" class="rnapf-title-link"
target="_blank">
<?= esc($post['subject']) ?>
</a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Views/home.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,7 +218,7 @@
<div class="rnafp-name">Recent News</div>
<div class="clr"></div>

<?= view_cell('\App\Libraries\Blog::recentPostsWidget', 'limit=5, view=blog/_home_widget') ?>
<?= view_cell('\App\Libraries\Forums::news', 'limit=5') ?>
</div><!--recent-news-and-forum-posts here-->

<div class="recent-news-and-forum-posts">
Expand All@@ -236,4 +236,3 @@
<div class="clr"></div>

<?= $this->endSection() ?>

5 changes: 2 additions & 3 deletions app/Views/layouts/_footer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
<a href="/policies" class="footer-menu-item" >Policies</a>
<a href="/the-fine-print" class="footer-menu-item" >The Fine Print</a>
<a href="/security-disclosures" class="footer-menu-item" >Security Disclosures</a>
<a href="/news" class="footer-menu-item">News</a>
<a href="/discuss" class="footer-menu-item" >Discuss</a>
<a href="/contribute" class="footer-menu-item" >Contribute</a>
<a href="/download" class="footer-menu-item" >Download</a>
Expand DownExpand Up@@ -83,11 +82,11 @@
$('#menu-toggle button').click(function(){
$("#top-menu").slideToggle("slow");
});

$('#scroll-to-top').click(function(){
$("html").animate({ scrollTop: 0 }, "slow");
});

$("a[href$='https://github.com/apps/dependabot']").parent().css("display", "none");
$('#mode').click(function(){
if($('html').hasClass('dark-theme')){
Expand Down
2 changes: 0 additions & 2 deletions app/Views/layouts/_top_nav.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,6 @@
</div>

<div id="top-menu">
<!--<a href="discover.html" class="top-menu-item hidden" title="CodeIgniter.com">Discover</a>-->
<a href="/news" class="top-menu-item hidden <?php if (url_is('/news*')) : ?>top-menu-item-active<?php endif ?>">News</a>
<a href="/discuss" class="top-menu-item hidden <?php if (url_is('/discuss')) : ?>top-menu-item-active<?php endif ?>">Discuss</a>
<a href="/contribute" class="top-menu-item hidden <?php if (url_is('/contribute')) : ?>top-menu-item-active<?php endif ?>">Contribute</a>
<a href="/user_guide/index.html" class="top-menu-item hidden">Learn</a>
Expand Down
Loading