sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.7.13

Browse Source
This commit is contained in:
Neo committed 2025-12-19 16:14:56 -08:00
1 parent fd22d99e69
commit 7124a02564
954 files changed
+29277 -59308
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/forums/Application.php
+10
View File
@@ -334,4 +334,14 @@ class _Application extends \IPS\Application
}
}
/**
* Returns a list of essential cookies which are set by this app.
* Wildcards (*) can be used at the end of cookie names for PHP set cookies.
*
* @return string[]
*/
public function _getEssentialCookieNames(): array
{
return [ 'forumpass_*' ];
}
}
applications/forums/data/extensions.json
+55 -45
View File
@@ -1,67 +1,77 @@
{
"core": {
"RssImport": {
"RssImport": "IPS\\forums\\extensions\\core\\RssImport\\RssImport"
"AchievementAction": {
"AnswerMarkedBest": "IPS\\forums\\extensions\\core\\AchievementAction\\AnswerMarkedBest"
},
"AdvertisementLocations": {
"ForumListing": "IPS\\forums\\extensions\\core\\AdvertisementLocations\\ForumListing",
"IndexView": "IPS\\forums\\extensions\\core\\AdvertisementLocations\\IndexView",
"TopicView": "IPS\\forums\\extensions\\core\\AdvertisementLocations\\TopicView"
},
"Announcements": {
"Forums": "IPS\\forums\\extensions\\core\\Announcements\\Forums"
},
"BBCode": {
"post": "IPS\\forums\\extensions\\core\\BBCode\\post",
"snapback": "IPS\\forums\\extensions\\core\\BBCode\\snapback",
"topic": "IPS\\forums\\extensions\\core\\BBCode\\topic"
},
"ContentModeratorPermissions": {
"Topics": "IPS\\forums\\extensions\\core\\ContentModeratorPermissions\\Topics"
},
"ContentRouter": {
"Topics": "IPS\\forums\\extensions\\core\\ContentRouter\\Topics"
},
"AchievementAction": {
"AnswerMarkedBest": "IPS\\forums\\extensions\\core\\AchievementAction\\AnswerMarkedBest"
"CreateMenu": {
"Topic": "IPS\\forums\\extensions\\core\\CreateMenu\\Topic"
},
"LiveSearch": {
"Forums": "IPS\\forums\\extensions\\core\\LiveSearch\\Forums"
},
"ContentModeratorPermissions": {
"Topics": "IPS\\forums\\extensions\\core\\ContentModeratorPermissions\\Topics"
"EditorLocations": {
"Forums": "IPS\\forums\\extensions\\core\\EditorLocations\\Forums"
},
"FileStorage": {
"Cards": "IPS\\forums\\extensions\\core\\FileStorage\\Cards",
"Icons": "IPS\\forums\\extensions\\core\\FileStorage\\Icons"
},
"Announcements": {
"Forums": "IPS\\forums\\extensions\\core\\Announcements\\Forums"
},
"EditorLocations": {
"Forums": "IPS\\forums\\extensions\\core\\EditorLocations\\Forums"
},
"Permissions": {
"Permissions": "IPS\\forums\\extensions\\core\\Permissions\\Permissions"
},
"CreateMenu": {
"Topic": "IPS\\forums\\extensions\\core\\CreateMenu\\Topic"
},
"Queue": {
"DeleteLegacyTopics": "IPS\\forums\\extensions\\core\\Queue\\DeleteLegacyTopics",
"RebuildSolvedStats": "IPS\\forums\\extensions\\core\\Queue\\RebuildSolvedStats",
"TopicStarterIds": "IPS\\forums\\extensions\\core\\Queue\\TopicStarterIds",
"DeleteLegacyPosts": "IPS\\forums\\extensions\\core\\Queue\\DeleteLegacyPosts",
"HiddenFirstPost": "IPS\\forums\\extensions\\core\\Queue\\HiddenFirstPost",
"RebuildSolvedIndex": "IPS\\forums\\extensions\\core\\Queue\\RebuildSolvedIndex",
"RebuildNewTopicFlag": "IPS\\forums\\extensions\\core\\Queue\\RebuildNewTopicFlag"
},
"MobileNavigation": {
"Topics": "IPS\\forums\\extensions\\core\\MobileNavigation\\Topics",
"Forums": "IPS\\forums\\extensions\\core\\MobileNavigation\\Forums"
},
"OverviewStatistics": {
"Solved": "IPS\\forums\\extensions\\core\\OverviewStatistics\\Solved"
},
"FrontNavigation": {
"Forums": "IPS\\forums\\extensions\\core\\FrontNavigation\\Forums"
},
"LiveSearch": {
"Forums": "IPS\\forums\\extensions\\core\\LiveSearch\\Forums"
},
"MemberSync": {
"Forums": "IPS\\forums\\extensions\\core\\MemberSync\\Forums"
},
"BBCode": {
"post": "IPS\\forums\\extensions\\core\\BBCode\\post",
"topic": "IPS\\forums\\extensions\\core\\BBCode\\topic",
"snapback": "IPS\\forums\\extensions\\core\\BBCode\\snapback"
"MobileNavigation": {
"Forums": "IPS\\forums\\extensions\\core\\MobileNavigation\\Forums",
"Topics": "IPS\\forums\\extensions\\core\\MobileNavigation\\Topics"
},
"AdvertisementLocations": {
"IndexView": "IPS\\forums\\extensions\\core\\AdvertisementLocations\\IndexView",
"TopicView": "IPS\\forums\\extensions\\core\\AdvertisementLocations\\TopicView",
"ForumListing": "IPS\\forums\\extensions\\core\\AdvertisementLocations\\ForumListing"
"OverviewStatistics": {
"Solved": "IPS\\forums\\extensions\\core\\OverviewStatistics\\Solved"
},
"Permissions": {
"Permissions": "IPS\\forums\\extensions\\core\\Permissions\\Permissions"
},
"Queue": {
"DeleteLegacyPosts": "IPS\\forums\\extensions\\core\\Queue\\DeleteLegacyPosts",
"DeleteLegacyTopics": "IPS\\forums\\extensions\\core\\Queue\\DeleteLegacyTopics",
"HiddenFirstPost": "IPS\\forums\\extensions\\core\\Queue\\HiddenFirstPost",
"RebuildNewTopicFlag": "IPS\\forums\\extensions\\core\\Queue\\RebuildNewTopicFlag",
"RebuildSolvedIndex": "IPS\\forums\\extensions\\core\\Queue\\RebuildSolvedIndex",
"RebuildSolvedStats": "IPS\\forums\\extensions\\core\\Queue\\RebuildSolvedStats",
"TopicStarterIds": "IPS\\forums\\extensions\\core\\Queue\\TopicStarterIds"
},
"RssImport": {
"RssImport": "IPS\\forums\\extensions\\core\\RssImport\\RssImport"
},
"Statistics": {
"PercentageSolved": "IPS\\forums\\extensions\\core\\Statistics\\PercentageSolved",
"Posts": "IPS\\forums\\extensions\\core\\Statistics\\Posts",
"PostsByForum": "IPS\\forums\\extensions\\core\\Statistics\\PostsByForum",
"Questions": "IPS\\forums\\extensions\\core\\Statistics\\Questions",
"SolvedByForum": "IPS\\forums\\extensions\\core\\Statistics\\SolvedByForum",
"TimeSolved": "IPS\\forums\\extensions\\core\\Statistics\\TimeSolved",
"Topics": "IPS\\forums\\extensions\\core\\Statistics\\Topics",
"TopicsByForum": "IPS\\forums\\extensions\\core\\Statistics\\TopicsByForum"
}
}
}
applications/forums/data/javascript.xml
+10 -11
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<javascript app="forums">
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.flow.js" javascript_type="controller" javascript_version="107643" javascript_position="1000050"><![CDATA[/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.flow.js" javascript_type="controller" javascript_version="107712" javascript_position="1000050"><![CDATA[/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -272,7 +272,7 @@
}
});
}(jQuery, _));]]></file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.forumList.js" javascript_type="controller" javascript_version="107643" javascript_position="1000050"><![CDATA[/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.forumList.js" javascript_type="controller" javascript_version="107712" javascript_position="1000050"><![CDATA[/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -351,7 +351,7 @@
}
});
}(jQuery, _));]]></file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.forumPage.js" javascript_type="controller" javascript_version="107643" javascript_position="1000050">/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.forumPage.js" javascript_type="controller" javascript_version="107712" javascript_position="1000050">/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -410,7 +410,7 @@
}
});
}(jQuery, _));</file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.hovercard.js" javascript_type="controller" javascript_version="107643" javascript_position="1000050">/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/forum" javascript_name="ips.forum.hovercard.js" javascript_type="controller" javascript_version="107712" javascript_position="1000050">/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -460,7 +460,7 @@
}
});
}(jQuery, _));</file>
<file javascript_app="forums" javascript_location="admin" javascript_path="controllers/settings" javascript_name="ips.settings.archiveRules.js" javascript_type="controller" javascript_version="107643" javascript_position="1000050"><![CDATA[/**
<file javascript_app="forums" javascript_location="admin" javascript_path="controllers/settings" javascript_name="ips.settings.archiveRules.js" javascript_type="controller" javascript_version="107712" javascript_position="1000050"><![CDATA[/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -525,7 +525,7 @@
});
}(jQuery, _));
]]></file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.activity.js" javascript_type="controller" javascript_version="107643" javascript_position="1000100">/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.activity.js" javascript_type="controller" javascript_version="107712" javascript_position="1000100">/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -557,7 +557,7 @@
}
});
}(jQuery, _));</file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.answers.js" javascript_type="controller" javascript_version="107643" javascript_position="1000100"><![CDATA[/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.answers.js" javascript_type="controller" javascript_version="107712" javascript_position="1000100"><![CDATA[/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -697,7 +697,7 @@
}
});
}(jQuery, _));]]></file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.reply.js" javascript_type="controller" javascript_version="107643" javascript_position="1000100">/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.reply.js" javascript_type="controller" javascript_version="107712" javascript_position="1000100">/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -725,7 +725,7 @@
}
});
}(jQuery, _));</file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.solved.js" javascript_type="controller" javascript_version="107643" javascript_position="1000100"><![CDATA[/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.solved.js" javascript_type="controller" javascript_version="107712" javascript_position="1000100"><![CDATA[/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -763,7 +763,7 @@
}
});
}(jQuery, _));]]></file>
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.view.js" javascript_type="controller" javascript_version="107643" javascript_position="1000100">/**
<file javascript_app="forums" javascript_location="front" javascript_path="controllers/topic" javascript_name="ips.topic.view.js" javascript_type="controller" javascript_version="107712" javascript_position="1000100">/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -834,7 +834,6 @@ controllers</order>
<order app="global" path="/dev/js//library/">underscore
jquery
mustache
IntersectionObserver
Debug.js
app.js</order>
<order app="global" path="/dev/js//library//jquery">jquery.js
applications/forums/data/lang.xml
+3 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<language>
<app key="forums" version="107643">
<app key="forums" version="107712">
<word key="__app_forums" js="0">Forums</word>
<word key="frontnavigation_forums" js="0">Forums</word>
<word key="__indefart_post" js="0">a post in a topic</word>
@@ -534,6 +534,8 @@
<word key="topic_posted_in_groups" js="0">Posts by %s</word>
<word key="filter_hidden_topics" js="0">Hidden Topics</word>
<word key="filter_hidden_posts_in_topics" js="0">Topics With Hidden Posts</word>
<word key="moderation_log" js="0">Moderation History</word>
<word key="cookie_forumpass_*_description" js="0">These cookies are used to track authentication for password protected forums. There may be multiple cookies with similar names where * is replaced with the forum ID.</word>
<word key="saved_actions" js="0">Saved Actions</word>
<word key="saved_actions_sg" js="0">Saved Action</word>
<word key="mm_title" js="0">Name</word>
applications/forums/data/schema.json
+1 -1
View File
@@ -1570,7 +1570,7 @@
"last_post": "<%TIME%>",
"starter_name": "<%ADMIN_NAME%>",
"last_poster_name": "<%ADMIN_NAME%>",
"poll_state": "",
"poll_state": null,
"last_vote": "0",
"views": "0",
"forum_id": "2",
applications/forums/data/theme.xml
+57 -21
View File
@@ -75,7 +75,12 @@
{{if $forum->sub_can_post and !$forum->password}}
<hr class='ipsHr ipsResponsive_hidePhone' />
<div class='ipsClearfix ipsResponsive_hidePhone'>
<div class='ipsPos_right'>{template="follow" app="core" group="global" params="'forums','forum', $forum->_id, $followerCount"}</div>
<div class='ipsPos_right'>
{{if \IPS\Application::appIsEnabled('cloud')}}
{template="analyticsButton" app="cloud" group="analytics" params="$forum, $forum->_id"}
{{endif}}
{template="follow" app="core" group="global" params="'forums','forum', $forum->_id, $followerCount"}
</div>
</div>
{{endif}}
</header>
@@ -774,13 +779,7 @@
if ( IpsDataLayerConfig && !window.IpsDataLayerConfig && IpsDataLayerConfig._events.content_view.enabled ) {
$('body').trigger( 'ipsDataLayer', {
_key: 'content_view',
_properties: {
{{foreach $topic->getDataLayerProperties() as $key => $value}}
'{$key}' : {{if \is_numeric($value)}} {$value} {{else}} "{$value}" {{endif}},
{{endforeach}}
page_number : null,
view_location: 'hovercard',
}
_properties: {expression="json_encode(array_replace($topic->getDataLayerProperties(), ['view_location' => 'hovercard', 'page_number' => null]))" raw="true"}
} );
}
</script>
@@ -835,7 +834,7 @@
</li>
{{endif}}
{{else}}
<li class="ipsDataItem ipsDataItem_responsivePhoto {{if $row->groupsPosted}}ipsDataItem_highlighted{{endif}} {{if $row->unread()}}ipsDataItem_unread{{endif}} {{if method_exists( $row, 'tableClass' ) && $row->tableClass()}}ipsDataItem_{$row->tableClass()}{{endif}} {{if $row->hidden() or $row->isFutureDate()}}ipsModerated{{endif}} {{if $row->isFutureDate()}}ipsModerated_alternate{{endif}}" data-rowID='{$row->$idField}' data-location='{$row->locationHash}' data-controller='forums.front.forum.topicRow'>
<li class="ipsDataItem ipsDataItem_responsivePhoto {{if $row->groupsPosted}}ipsDataItem_highlighted{{endif}} {{if $row->unread()}}ipsDataItem_unread{{endif}} {{if method_exists( $row, 'tableClass' ) && $row->tableClass()}}ipsDataItem_{$row->tableClass()}{{endif}} {{if $row->hidden() or $row->isFutureDate()}}ipsModerated{{endif}} {{if $row->isFutureDate()}}ipsModerated_alternate{{endif}}" data-rowID='{$row->$idField}' data-location='{{if isset($row->locationHash)}}{$row->locationHash}{{endif}}' data-controller='forums.front.forum.topicRow'>
{{if member.member_id}}
<div class='ipsDataItem_icon ipsPos_top'>
{{if $row->unread()}}
@@ -879,7 +878,8 @@
{{if $row->isFutureDate() || $row->mapped('pinned') || $row->mapped('featured') || $row->hidden() === -1 || $row->hidden() === 1}}
{{if $row->isFutureDate()}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span></span>
{{elseif $row->hidden() === -1}}
{{endif}}
{{if $row->hidden() === -1}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span></span>
{{elseif $row->hidden() === 1}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span></span>
@@ -2125,7 +2125,8 @@
{{if $row->isFutureDate() || $row->mapped('pinned') || $row->mapped('featured') || $row->hidden() === -1 || $row->hidden() === 1 || $row->isSolved()}}
{{if $row->isFutureDate()}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span></span>
{{elseif $row->hidden() === -1}}
{{endif}}
{{if $row->hidden() === -1}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span></span>
{{elseif $row->hidden() === 1}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span></span>
@@ -3212,6 +3213,9 @@
{{endif}}
{{if $comment->item()->canSolve() AND ! $comment->item()->isSolved() AND ! $comment->item()->isNotModeratorButCanSolve()}}
<li><a href='{$item->url()->csrf()->setQueryString( array( 'do' => 'solve', 'answer' => $comment->pid ) )}' data-action="solveComment">{lang="solve_content"}</a></li>
{{endif}}
{{if \IPS\Application::appIsEnabled('cloud')}}
<li>{template="spam" app="cloud" group="spam" params="$comment, FALSE"}</li>
{{endif}}
{{endif}}
<li class='ipsHide' data-role='commentLoading'>
@@ -3460,7 +3464,8 @@
{{if $topic->isFutureDate() || $topic->mapped('pinned') || $topic->mapped('featured') || $topic->hidden() === -1 || $topic->hidden() === 1 || $topic->hidden() === -2 || $topic->isSolved() || ( $topic->canToggleItemModeration() and $topic->itemModerationEnabled() )}}
{{if $topic->isFutureDate()}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$topic->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span></span>
{{elseif $topic->hidden() === -1}}
{{endif}}
{{if $topic->hidden() === -1}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$topic->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span></span>
{{elseif $topic->hidden() === -2}}
<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$topic->deletedBlurb()}'><i class='fa fa-trash'></i></span></span>
@@ -3538,6 +3543,10 @@
{{if !$topic->container()->disable_sharelinks}}
{template="shareButton" app="core" group="sharelinks" params="$topic"}
{{endif}}
{{if \IPS\Application::appIsEnabled('cloud')}}
{template="spam" app="cloud" group="spam" params="$topic"}
{{endif}}
{template="analyticsItemLink" app="core" group="system" params="$topic"}
{template="promote" app="core" group="global" params="$topic"}
{template="follow" app="core" group="global" params="'forums', 'topic', $topic->tid, $topic->followersCount()"}
</div>
@@ -3679,8 +3688,8 @@
{{endif}}
{{if \IPS\Member::loggedIn()->modPermission('can_view_moderation_log')}}
<li class='ipsMenu_sep'><hr></li>
<li class="ipsMenu_item"><a href='{$topic->url()->setQueryString( array( 'do' => 'modLog' ) )}' data-ipsDialog data-ipsDialog-title='{lang="moderation_history"}'>{lang="moderation_history"}</a></li>
{{endif}}
<li class="ipsMenu_item"><a data-ipsDialog data-ipsDialogTitle="{lang="moderation_log"}" href='{$topic->url()->setQueryString( array( 'do' => 'modLog' ) )}'>{lang="moderation_log"}</a></li>
{{endif}}
</ul>
</li>
{{endif}}
@@ -3836,7 +3845,7 @@
</div>
{{endif}}
{{if $topic->commentForm() || $topic->locked() || \IPS\Member::loggedIn()->restrict_post || \IPS\Member::loggedIn()->members_bitoptions['unacknowledged_warnings'] || !\IPS\Member::loggedIn()->checkPostsPerDay()}}
{{if ( $topic->commentForm() || $topic->locked() || \IPS\Member::loggedIn()->restrict_post || \IPS\Member::loggedIn()->members_bitoptions['unacknowledged_warnings'] || !\IPS\Member::loggedIn()->checkPostsPerDay()) && !$topic->isArchived()}}
<a id='replyForm'></a>
<div data-role='replyArea' class='cTopicPostArea ipsBox ipsResponsive_pull ipsPadding {{if !$topic->canComment()}}cTopicPostArea_noSize{{endif}} ipsSpacer_top' {{if \IPS\Application::appIsEnabled('cloud') AND \IPS\cloud\Application::featureIsEnabled( 'realtime' )}}data-controller='cloud.front.realtime.forumsReplyArea,cloud.front.realtime.whosTyping'{{endif}}>
{{if $topic->commentForm()}}
@@ -3866,7 +3875,11 @@
{{if !$topic->container()->disable_sharelinks}}
{template="shareButton" app="core" group="sharelinks" params="$topic, 'verySmall', 'light'"}
{{endif}}
{template="follow" app="core" group="global" params="'forums', 'topic', $topic->tid, $topic->followersCount()"}
{{if \IPS\Application::appIsEnabled('cloud')}}
{template="spam" app="cloud" group="spam" params="$topic"}
{{endif}}
{template="analyticsItemLink" app="core" group="system" params="$topic"}
{template="follow" app="core" group="global" params="'forums', 'topic', $topic->tid, $topic->followersCount()"}
{{if $topic->canPromoteToSocialMedia() and ( $topic instanceof \IPS\Content or $topic instanceof \IPS\Node\Model )}}
{template="promote" app="core" group="global" params="$topic"}
{{endif}}
@@ -3936,11 +3949,11 @@
<li class="ipsMenu_item"><a href='{$topic->url()->csrf()->setQueryString( array( 'do' => 'savedAction', 'action' => $action->_id ) )}' data-confirm>{$action->_title}</a></li>
{{endforeach}}
{{endif}}
{{if \IPS\Member::loggedIn()->modPermission('can_view_moderation_log')}}
<li class='ipsMenu_sep'><hr></li>
<li class="ipsMenu_item"><a href='{$topic->url()->setQueryString( array( 'do' => 'modLog' ) )}' data-ipsDialog data-ipsDialog-title='{lang="moderation_history"}'>{lang="moderation_history"}</a></li>
{{endif}}
{{endif}}
{{if \IPS\Member::loggedIn()->modPermission('can_view_moderation_log')}}
<li class='ipsMenu_sep'><hr></li>
<li class="ipsMenu_item"><a data-ipsDialog data-ipsDialogTitle="{lang="moderation_log"}" href='{$topic->url()->setQueryString( array( 'do' => 'modLog' ) )}'>{lang="moderation_log"}</a></li>
{{endif}}
{{endif}}
</ul>
</li>
</ul>
@@ -4869,6 +4882,7 @@
.cTopicList .ipsLiveActivity--small {
margin-inline-end: calc( var(--sp-2) * -1 );
display: inline-block;
}
.cTopicHovercard .cTopicHovercard_container {
@@ -5627,6 +5641,28 @@ html[dir="rtl"] .cForumFluidTable .ipsDataItem_loading > div > span:last-child:a
margin-inline-end: 15px;
}
}
/* Analytics and statistics */
.ipsFluidGrid--analytics-and-statistics{
--FluidGrid--width: 300px;
}
.ipsLayout_sidebarUsed .ipsFluidGrid--analytics-and-statistics{
--FluidGrid--width: 340px;
}
.analytics-and-statistics {
font-weight: normal;
}
.analytics-and-statistics--chart {
padding-bottom: 0px;
}
/* Hide empty page header on analytics page */
.ipsPageHeader:has(.ipsType_pageTitle:empty:only-child){
display: none;
}]]></css>
<css css_location="front" css_app="forums" css_attributes="" css_path="." css_name="posts.css"></css>
<css css_location="front" css_app="forums" css_attributes="" css_path="." css_name="topics.css"><![CDATA[/* Ensure border-radius is followed */
applications/forums/data/versions.json
+31 -1
View File
@@ -509,5 +509,35 @@
"107640": "4.7.8 Beta 1",
"107641": "4.7.8 Beta 2",
"107642": "4.7.8 Beta 3",
"107643": "4.7.8"
"107643": "4.7.8",
"107644": "4.7.8",
"107645": "4.7.8",
"107660": "4.7.9 Beta 1",
"107661": "4.7.9 Beta 2",
"107662": "4.7.9 Beta 3",
"107663": "4.7.9",
"107664": "4.7.9",
"107665": "4.7.9",
"107666": "4.7.9",
"107667": "4.7.9",
"107668": "4.7.9",
"107680": "4.7.10 Beta 1",
"107681": "4.7.10 Beta 2",
"107682": "4.7.10",
"107683": "4.7.10",
"107684": "4.7.10",
"107690": "4.7.11 Beta 1",
"107691": "4.7.11 Beta 2",
"107692": "4.7.11",
"107693": "4.7.11",
"107694": "4.7.11",
"107695": "4.7.11.1",
"107700": "4.7.12 Beta 1",
"107701": "4.7.12 Beta 2",
"107702": "4.7.12 Beta 3",
"107703": "4.7.12 Beta 4",
"107704": "4.7.12",
"107710": "4.7.13 Beta 1",
"107711": "4.7.13 Beta 2",
"107712": "4.7.13"
}
applications/forums/extensions/core/Queue/RebuildSolvedStats.php
+1 -1
View File
@@ -118,7 +118,7 @@ class _RebuildSolvedStats
$total = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', $where )->first();
$solved = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', array_merge( $where, [ [ 'core_solved_index.id IS NOT NULL' ] ] ) )->join( 'core_solved_index', "core_solved_index.app='forums' AND core_solved_index.item_id=forums_topics.tid")->first();
$avg = \IPS\Db::i()->select( 'AVG(core_solved_index.solved_date-forums_topics.start_date)', 'forums_topics', array_merge( $where, [ [ 'core_solved_index.id IS NOT NULL' ] ] ) )->join( 'core_solved_index', "core_solved_index.app='forums' AND core_solved_index.item_id=forums_topics.tid")->first();
$avg = \IPS\Db::i()->select( 'AVG(CAST(core_solved_index.solved_date AS SIGNED)-forums_topics.start_date)', 'forums_topics', array_merge( $where, [ [ 'core_solved_index.id IS NOT NULL' ] ] ) )->join( 'core_solved_index', "core_solved_index.app='forums' AND core_solved_index.item_id=forums_topics.tid")->first();
\IPS\Db::i()->insert( 'core_statistics', [
'type' => 'solved',
applications/forums/extensions/core/Statistics/PercentageSolved.php
+106
View File
@@ -0,0 +1,106 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _PercentageSolved extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = NULL;
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
/* Determine minimum date */
$minimumDate = NULL;
/* We can't retrieve any stats prior to the new tracking being implemented */
try
{
$oldestLog = \IPS\Db::i()->select( 'MIN(time)', 'core_statistics', array( 'type=?', 'solved' ) )->first();
if( !$minimumDate OR $oldestLog < $minimumDate->getTimestamp() )
{
$minimumDate = \IPS\DateTime::ts( $oldestLog );
}
}
catch( \UnderflowException $e )
{
/* We have nothing tracked, set minimum date to today */
$minimumDate = \IPS\DateTime::create();
}
$chart = new \IPS\Helpers\Chart\Database( $url, 'core_statistics', 'time', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array('gridlines' => array('color' => '#f5f5f5')),
'lineWidth' => 1,
'areaOpacity' => 0.4
),
'AreaChart',
'daily',
array('start' => $minimumDate, 'end' => 0),
array(),
);
$chart->setExtension( $this );
$chart->description = \IPS\Member::loggedIn()->language()->addToStack( 'solved_stats_chart_desc' );
$chart->availableTypes = array('AreaChart', 'ColumnChart', 'BarChart');
$chart->enableHourly = FALSE;
$chart->groupBy = 'value_1';
$chart->title = \IPS\Member::loggedIn()->language()->addToStack('forums_solved_stats_percentage');
$chart->where[] = array( "type=?", 'solved' );
foreach( $validForumIds = $this->getValidForumIds() as $forumId => $forum )
{
$chart->addSeries( $forum->_title, 'number', '( SUM(value_3) / SUM(value_2) ) * 100', TRUE, $forumId );
}
return $chart;
}
/**
* Get valid forum IDs to protect against bad data when a forum is removed
*
* @return array
*/
protected function getValidForumIds()
{
$validForumIds = [];
foreach( \IPS\Db::i()->select( 'value_1', 'core_statistics', [ 'type=?', 'solved' ], NULL, NULL, 'value_1' ) as $forumId )
{
try
{
$validForumIds[ $forumId ] = \IPS\forums\Forum::load( $forumId );
}
catch( \Exception $e ) { }
}
return $validForumIds;
}
}
applications/forums/extensions/core/Statistics/Posts.php
+55
View File
@@ -0,0 +1,55 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _Posts extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'forums_stats_posts_total';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
$chart = new \IPS\Helpers\Chart\Database( $url, 'forums_posts', 'post_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'colors' => array( '#10967e' ),
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4
) );
$chart->setExtension( $this );
$chart->where = array( array( \IPS\Db::i()->in( 'queued', array( -2, -3 ), TRUE ) ) );
$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack( 'stats_new_posts' ), 'number', 'COUNT(*)', FALSE );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_posts_title' );
$chart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart' );
return $chart;
}
}
applications/forums/extensions/core/Statistics/PostsByForum.php
+100
View File
@@ -0,0 +1,100 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _PostsByForum extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'forums_stats_posts_byforum';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
$chart = new \IPS\Helpers\Chart\Database( $url, 'forums_posts', 'post_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4,
'chartArea' => array( 'width' => '70%', 'left' => '5%' ),
'height' => 400,
),
'ColumnChart',
'monthly',
array( 'start' => ( new \IPS\DateTime )->sub( new \DateInterval('P90D') ), 'end' => new \IPS\DateTime ),
array(),
'byforum'
);
$chart->setExtension( $this );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_posts_title_byforum' );
$chart->availableTypes = array( 'ColumnChart' );
$chart->where = array( array( \IPS\Db::i()->in( 'queued', array( -2, -3 ), TRUE ) ) );
$chart->groupBy = 'forum_id';
$chart->joins = array( array( 'forums_topics', 'forums_topics.tid=forums_posts.topic_id' ) );
$customValues = ( isset( $chart->savedCustomFilters['chart_forums'] ) ? array_values( explode( ',', $chart->savedCustomFilters['chart_forums'] ) ) : 0 );
$chart->customFiltersForm = array(
'form' => array(
new \IPS\Helpers\Form\Node( 'chart_forums', $customValues, FALSE, array( 'class' => 'IPS\forums\Forum', 'zeroVal' => 'any', 'multiple' => TRUE, 'permissionCheck' => function ( $forum )
{
return $forum->sub_can_post and !$forum->redirect_url;
} ), NULL, NULL, NULL, 'chart_forums' )
),
'where' => function( $values )
{
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
return \IPS\Db::i()->in( 'forums_topics.forum_id', $forumIds );
},
'groupBy' => 'forum_id',
'series' => function( $values )
{
$series = array();
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
foreach( $forumIds as $id )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $id ), 'number', 'COUNT(*)', FALSE, $id );
}
return $series;
},
'defaultSeries' => function()
{
$series = array();
foreach( \IPS\Db::i()->select( '*', 'forums_forums', array( 'posts>?', 0 ), 'last_post desc', array( 0, 50 ) ) as $forum )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $forum['id'] ), 'number', 'COUNT(*)', FALSE, $forum['id'] );
}
return $series;
}
);
return $chart;
}
}
applications/forums/extensions/core/Statistics/Questions.php
+60
View File
@@ -0,0 +1,60 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _Questions extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'forums_stats_questions';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
$chart = new \IPS\Helpers\Chart\Database( $url, 'forums_question_ratings', 'date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4
) );
$chart->setExtension( $this );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack('stats_question_ratings_title');
$chart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart' );
$chart->groupBy = 'rating';
foreach( array( 1, -1 ) as $v )
{
$label = ( $v == -1 ) ? 'negative' : 'positive';
$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack('stats_question_ratings_' . $label ), 'number', 'COUNT(*)', TRUE, $label );
}
return $chart;
}
}
applications/forums/extensions/core/Statistics/SolvedByForum.php
+140
View File
@@ -0,0 +1,140 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _SolvedByForum extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = NULL;
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
/* Determine minimum date */
$minimumDate = NULL;
/* We can't retrieve any stats prior to the new tracking being implemented */
try
{
$oldestLog = \IPS\Db::i()->select( 'MIN(time)', 'core_statistics', array( 'type=?', 'solved' ) )->first();
if( !$minimumDate OR $oldestLog < $minimumDate->getTimestamp() )
{
$minimumDate = \IPS\DateTime::ts( $oldestLog );
}
}
catch( \UnderflowException $e )
{
/* We have nothing tracked, set minimum date to today */
$minimumDate = \IPS\DateTime::create();
}
$chart = new \IPS\Helpers\Chart\Database( $url, 'core_solved_index', 'solved_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4,
'chartArea' => array( 'width' => '70%', 'left' => '5%' ),
'height' => 400,
),
'LineChart',
'monthly',
array( 'start' => ( new \IPS\DateTime )->sub( new \DateInterval('P90D') ), 'end' => new \IPS\DateTime ),
array(),
'solved'
);
$chart->setExtension( $this );
$chart->joins = array( array( 'forums_topics', array( 'comment_class=? and core_solved_index.item_id=forums_topics.tid', 'IPS\forums\Topic\Post' ) ) );
$chart->where = array( array( \IPS\Db::i()->in( 'state', array( 'link', 'merged' ), TRUE ) ), array( \IPS\Db::i()->in( 'approved', array( -2, -3 ), TRUE ) ) );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_topics_title_solved' );
$chart->availableTypes = array( 'LineChart', 'ColumnChart' );
$chart->groupBy = 'forum_id';
$customValues = ( isset( $chart->savedCustomFilters['chart_forums'] ) ? array_values( explode( ',', $chart->savedCustomFilters['chart_forums'] ) ) : 0 );
$chart->customFiltersForm = array(
'form' => array(
new \IPS\Helpers\Form\Node( 'chart_forums', $customValues, FALSE, array( 'class' => 'IPS\forums\Forum', 'zeroVal' => 'any', 'multiple' => TRUE, 'permissionCheck' => function ( $forum )
{
return $forum->sub_can_post and !$forum->redirect_url;
} ), NULL, NULL, NULL, 'chart_forums' )
),
'where' => function( $values )
{
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
return \IPS\Db::i()->in( 'forum_id', $forumIds );
},
'groupBy' => 'forum_id',
'series' => function( $values )
{
$series = array();
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
foreach( $forumIds as $id )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $id ), 'number', 'COUNT(*)', FALSE, $id );
}
return $series;
},
'defaultSeries' => function()
{
$series = array();
foreach( \IPS\Db::i()->select( '*', 'forums_forums', array( 'topics>? and ( forums_bitoptions & ? or forums_bitoptions & ? or forums_bitoptions & ? )', 0, 4, 8, 16 ), 'last_post desc', array( 0, 50 ) ) as $forum )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $forum['id'] ), 'number', 'COUNT(*)', FALSE, $forum['id'] );
}
return $series;
}
);
return $chart;
}
/**
* Get valid forum IDs to protect against bad data when a forum is removed
*
* @return array
*/
protected function getValidForumIds()
{
$validForumIds = [];
foreach( \IPS\Db::i()->select( 'value_1', 'core_statistics', [ 'type=?', 'solved' ], NULL, NULL, 'value_1' ) as $forumId )
{
try
{
$validForumIds[ $forumId ] = \IPS\forums\Forum::load( $forumId );
}
catch( \Exception $e ) { }
}
return $validForumIds;
}
}
applications/forums/extensions/core/Statistics/TimeSolved.php
+106
View File
@@ -0,0 +1,106 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _TimeSolved extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = NULL;
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
/* Determine minimum date */
$minimumDate = NULL;
/* We can't retrieve any stats prior to the new tracking being implemented */
try
{
$oldestLog = \IPS\Db::i()->select( 'MIN(time)', 'core_statistics', array( 'type=?', 'solved' ) )->first();
if( !$minimumDate OR $oldestLog < $minimumDate->getTimestamp() )
{
$minimumDate = \IPS\DateTime::ts( $oldestLog );
}
}
catch( \UnderflowException $e )
{
/* We have nothing tracked, set minimum date to today */
$minimumDate = \IPS\DateTime::create();
}
$chart = new \IPS\Helpers\Chart\Database( $url, 'core_statistics', 'time', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array('gridlines' => array('color' => '#f5f5f5')),
'lineWidth' => 1,
'areaOpacity' => 0.4
),
'AreaChart',
'daily',
array('start' => $minimumDate, 'end' => 0),
array(),
);
$chart->setExtension( $this );
$chart->description = \IPS\Member::loggedIn()->language()->addToStack( 'solved_stats_chart_desc' );
$chart->availableTypes = array('AreaChart', 'ColumnChart', 'BarChart');
$chart->enableHourly = FALSE;
$chart->groupBy = 'value_1';
$chart->title = \IPS\Member::loggedIn()->language()->addToStack('forums_solved_stats_time');
$chart->where[] = array( "type=?", 'solved' );
foreach( $validForumIds = $this->getValidForumIds() as $forumId => $forum )
{
$chart->addSeries( $forum->_title, 'number', 'AVG(value_4) / 3600', TRUE, $forumId );
}
return $chart;
}
/**
* Get valid forum IDs to protect against bad data when a forum is removed
*
* @return array
*/
protected function getValidForumIds()
{
$validForumIds = [];
foreach( \IPS\Db::i()->select( 'value_1', 'core_statistics', [ 'type=?', 'solved' ], NULL, NULL, 'value_1' ) as $forumId )
{
try
{
$validForumIds[ $forumId ] = \IPS\forums\Forum::load( $forumId );
}
catch( \Exception $e ) { }
}
return $validForumIds;
}
}
applications/forums/extensions/core/Statistics/Topics.php
+57
View File
@@ -0,0 +1,57 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _Topics extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'forums_stats_topics_total';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
$chart = new \IPS\Helpers\Chart\Database( $url, 'forums_topics', 'start_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'colors' => array( '#10967e' ),
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4
),
'AreaChart'
);
$chart->setExtension( $this );
$chart->where = array( array( \IPS\Db::i()->in( 'state', array( 'link', 'merged' ), TRUE ) ), array( \IPS\Db::i()->in( 'approved', array( -2, -3 ), TRUE ) ) );
$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack( 'stats_new_topics' ), 'number', 'COUNT(*)', FALSE );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_topics_title' );
$chart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart' );
return $chart;
}
}
applications/forums/extensions/core/Statistics/TopicsByForum.php
+99
View File
@@ -0,0 +1,99 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Forums
* @since 26 Jan 2023
*/
namespace IPS\forums\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _TopicsByForum extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'forums_stats_topics_byforum';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
$chart = new \IPS\Helpers\Chart\Database( $url, 'forums_topics', 'start_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4,
'chartArea' => array( 'width' => '70%', 'left' => '5%' ),
'height' => 400,
),
'ColumnChart',
'monthly',
array( 'start' => ( new \IPS\DateTime )->sub( new \DateInterval('P90D') ), 'end' => new \IPS\DateTime ),
array(),
'byforum'
);
$chart->setExtension( $this );
$chart->where = array( array( \IPS\Db::i()->in( 'state', array( 'link', 'merged' ), TRUE ) ), array( \IPS\Db::i()->in( 'approved', array( -2, -3 ), TRUE ) ) );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_topics_title_byforum' );
$chart->availableTypes = array( 'ColumnChart' );
$chart->groupBy = 'forum_id';
$customValues = ( isset( $chart->savedCustomFilters['chart_forums'] ) ? array_values( explode( ',', $chart->savedCustomFilters['chart_forums'] ) ) : 0 );
$chart->customFiltersForm = array(
'form' => array(
new \IPS\Helpers\Form\Node( 'chart_forums', $customValues, FALSE, array( 'class' => 'IPS\forums\Forum', 'zeroVal' => 'any', 'multiple' => TRUE, 'permissionCheck' => function ( $forum )
{
return $forum->sub_can_post and !$forum->redirect_url;
} ), NULL, NULL, NULL, 'chart_forums' )
),
'where' => function( $values )
{
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
return \IPS\Db::i()->in( 'forum_id', $forumIds );
},
'groupBy' => 'forum_id',
'series' => function( $values )
{
$series = array();
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
foreach( $forumIds as $id )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $id ), 'number', 'COUNT(*)', FALSE, $id );
}
return $series;
},
'defaultSeries' => function()
{
$series = array();
foreach( \IPS\Db::i()->select( '*', 'forums_forums', array( 'topics>?', 0 ), 'last_post desc', array( 0, 50 ) ) as $forum )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $forum['id'] ), 'number', 'COUNT(*)', FALSE, $forum['id'] );
}
return $series;
}
);
return $chart;
}
}
applications/forums/modules/admin/forums/settings.php
+1 -1
View File
@@ -570,7 +570,7 @@ class _settings extends \IPS\Dispatcher\Controller
}
else
{
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core' )->decision( 'uanrchive_settings_change', array(
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->decision( 'uanrchive_settings_change', array(
'restore_unmatched_settings' => \IPS\Http\Url::internal( 'app=forums&module=forums&controller=settings&do=unarchive&confirm=1' )->csrf(),
'leave_archived_topics' => \IPS\Http\Url::internal( 'app=forums&module=forums&controller=settings&tab=archiving' ),
) );
applications/forums/modules/admin/stats/posts.php
+3 -71
View File
@@ -129,6 +129,7 @@ class _posts extends \IPS\Dispatcher\Controller
\IPS\Dispatcher::i()->checkAcpPermission( 'posts_manage' );
$tabs = array( 'total' => 'stats_posts_tab_total', 'bytype' => 'stats_posts_by_type', 'byforum' => 'stats_posts_tab_byforum' );
\IPS\Request::i()->tab ??= 'total';
$activeTab = ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'total';
if ( $activeTab === 'bytype' )
@@ -179,80 +180,11 @@ class _posts extends \IPS\Dispatcher\Controller
}
else if ( $activeTab === 'total' )
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=forums&module=stats&controller=posts" ), 'forums_posts', 'post_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'colors' => array( '#10967e' ),
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4
) );
$chart->where = array( array( \IPS\Db::i()->in( 'queued', array( -2, -3 ), TRUE ) ) );
$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack( 'stats_new_posts' ), 'number', 'COUNT(*)', FALSE );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_posts_title' );
$chart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart' );
$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'forums', 'Posts' )->getChart( \IPS\Http\Url::internal( "app=forums&module=stats&controller=posts&tab={$activeTab}" ) );
}
else
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=forums&module=stats&controller=posts&tab=" . $activeTab ), 'forums_posts', 'post_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4,
'chartArea' => array( 'width' => '70%', 'left' => '5%' ),
'height' => 400,
),
'ColumnChart',
'monthly',
array( 'start' => ( new \IPS\DateTime )->sub( new \DateInterval('P90D') ), 'end' => new \IPS\DateTime ),
array(),
'byforum'
);
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_posts_title_byforum' );
$chart->availableTypes = array( 'ColumnChart' );
$chart->where = array( array( \IPS\Db::i()->in( 'queued', array( -2, -3 ), TRUE ) ) );
$chart->groupBy = 'forum_id';
$chart->joins = array( array( 'forums_topics', 'forums_topics.tid=forums_posts.topic_id' ) );
$customValues = ( isset( $chart->savedCustomFilters['chart_forums'] ) ? array_values( explode( ',', $chart->savedCustomFilters['chart_forums'] ) ) : 0 );
$chart->customFiltersForm = array(
'form' => array(
new \IPS\Helpers\Form\Node( 'chart_forums', $customValues, FALSE, array( 'class' => 'IPS\forums\Forum', 'zeroVal' => 'any', 'multiple' => TRUE, 'permissionCheck' => function ( $forum )
{
return $forum->sub_can_post and !$forum->redirect_url;
} ), NULL, NULL, NULL, 'chart_forums' )
),
'where' => function( $values )
{
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
return \IPS\Db::i()->in( 'forums_topics.forum_id', $forumIds );
},
'groupBy' => 'forum_id',
'series' => function( $values )
{
$series = array();
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
foreach( $forumIds as $id )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $id ), 'number', 'COUNT(*)', FALSE, $id );
}
return $series;
},
'defaultSeries' => function()
{
$series = array();
foreach( \IPS\Db::i()->select( '*', 'forums_forums', array( 'posts>?', 0 ), 'last_post desc', array( 0, 50 ) ) as $forum )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $forum['id'] ), 'number', 'COUNT(*)', FALSE, $forum['id'] );
}
return $series;
}
);
$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'forums', 'PostsByForum' )->getChart( \IPS\Http\Url::internal( "app=forums&module=stats&controller=posts&tab={$activeTab}" ) );
}
if ( \IPS\Request::i()->isAjax() )
applications/forums/modules/admin/stats/questions.php
+1 -19
View File
@@ -41,25 +41,7 @@ class _questions extends \IPS\Dispatcher\Controller
*/
protected function manage()
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( 'app=forums&module=stats&controller=questions' ), 'forums_question_ratings', 'date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4
) );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack('stats_question_ratings_title');
$chart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart' );
$chart->groupBy = 'rating';
foreach( array( 1, -1 ) as $v )
{
$label = ( $v == -1 ) ? 'negative' : 'positive';
$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack('stats_question_ratings_' . $label ), 'number', 'COUNT(*)', TRUE, $label );
}
$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'forums', 'Questions' )->getChart( \IPS\Http\Url::internal( "app=forums&module=stats&controller=questions" ) );
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('menu__forums_stats_questions');
\IPS\Output::i()->output = (string) $chart;
}
applications/forums/modules/admin/stats/solved.php
+7 -134
View File
@@ -73,142 +73,15 @@ class _solved extends \IPS\Dispatcher\Controller
'data' => array( 'confirm' => '' )
);
\IPS\Request::i()->tab ??= 'time';
$activeTab = ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'time';
/* Determine minimum date */
$minimumDate = NULL;
/* We can't retrieve any stats prior to the new tracking being implemented */
try
{
$oldestLog = \IPS\Db::i()->select( 'MIN(time)', 'core_statistics', array( 'type=?', 'solved' ) )->first();
if( !$minimumDate OR $oldestLog < $minimumDate->getTimestamp() )
{
$minimumDate = \IPS\DateTime::ts( $oldestLog );
}
}
catch( \UnderflowException $e )
{
/* We have nothing tracked, set minimum date to today */
$minimumDate = \IPS\DateTime::create();
}
if ( $activeTab === 'time' )
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( 'app=forums&module=stats&controller=solved&tab=' . $activeTab ), 'core_statistics', 'time', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array('gridlines' => array('color' => '#f5f5f5')),
'lineWidth' => 1,
'areaOpacity' => 0.4
),
'AreaChart',
'daily',
array('start' => $minimumDate, 'end' => 0),
array(),
);
$chart->description = \IPS\Member::loggedIn()->language()->addToStack( 'solved_stats_chart_desc' );
$chart->availableTypes = array('AreaChart', 'ColumnChart', 'BarChart');
$chart->enableHourly = FALSE;
$chart->groupBy = 'value_1';
$chart->title = \IPS\Member::loggedIn()->language()->addToStack('forums_solved_stats_time');
$chart->where[] = array( "type=?", 'solved' );
foreach( $validForumIds = $this->getValidForumIds() as $forumId => $forum )
{
$chart->addSeries( $forum->_title, 'number', 'AVG(value_4) / 3600', TRUE, $forumId );
}
}
else if ( $activeTab === 'percentage' )
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( 'app=forums&module=stats&controller=solved&tab=' . $activeTab ), 'core_statistics', 'time', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array('gridlines' => array('color' => '#f5f5f5')),
'lineWidth' => 1,
'areaOpacity' => 0.4
),
'AreaChart',
'daily',
array('start' => $minimumDate, 'end' => 0),
array(),
);
$chart->description = \IPS\Member::loggedIn()->language()->addToStack( 'solved_stats_chart_desc' );
$chart->availableTypes = array('AreaChart', 'ColumnChart', 'BarChart');
$chart->enableHourly = FALSE;
$chart->groupBy = 'value_1';
$chart->title = \IPS\Member::loggedIn()->language()->addToStack('forums_solved_stats_percentage');
$chart->where[] = array( "type=?", 'solved' );
foreach( $validForumIds = $this->getValidForumIds() as $forumId => $forum )
{
$chart->addSeries( $forum->_title, 'number', '( SUM(value_3) / SUM(value_2) ) * 100', TRUE, $forumId );
}
}
else if( $activeTab === 'solved' )
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=forums&module=stats&controller=solved&tab=" . $activeTab ), 'core_solved_index', 'solved_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4,
'chartArea' => array( 'width' => '70%', 'left' => '5%' ),
'height' => 400,
),
'LineChart',
'monthly',
array( 'start' => ( new \IPS\DateTime )->sub( new \DateInterval('P90D') ), 'end' => new \IPS\DateTime ),
array(),
'solved'
);
$chart->joins = array( array( 'forums_topics', array( 'comment_class=? and core_solved_index.item_id=forums_topics.tid', 'IPS\forums\Topic\Post' ) ) );
$chart->where = array( array( \IPS\Db::i()->in( 'state', array( 'link', 'merged' ), TRUE ) ), array( \IPS\Db::i()->in( 'approved', array( -2, -3 ), TRUE ) ) );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_topics_title_solved' );
$chart->availableTypes = array( 'LineChart', 'ColumnChart' );
$chart->groupBy = 'forum_id';
$customValues = ( isset( $chart->savedCustomFilters['chart_forums'] ) ? array_values( explode( ',', $chart->savedCustomFilters['chart_forums'] ) ) : 0 );
$chart->customFiltersForm = array(
'form' => array(
new \IPS\Helpers\Form\Node( 'chart_forums', $customValues, FALSE, array( 'class' => 'IPS\forums\Forum', 'zeroVal' => 'any', 'multiple' => TRUE, 'permissionCheck' => function ( $forum )
{
return $forum->sub_can_post and !$forum->redirect_url;
} ), NULL, NULL, NULL, 'chart_forums' )
),
'where' => function( $values )
{
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
return \IPS\Db::i()->in( 'forum_id', $forumIds );
},
'groupBy' => 'forum_id',
'series' => function( $values )
{
$series = array();
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
foreach( $forumIds as $id )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $id ), 'number', 'COUNT(*)', FALSE, $id );
}
return $series;
},
'defaultSeries' => function()
{
$series = array();
foreach( \IPS\Db::i()->select( '*', 'forums_forums', array( 'topics>? and ( forums_bitoptions & ? or forums_bitoptions & ? or forums_bitoptions & ? )', 0, 4, 8, 16 ), 'last_post desc', array( 0, 50 ) ) as $forum )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $forum['id'] ), 'number', 'COUNT(*)', FALSE, $forum['id'] );
}
return $series;
}
);
}
$url = \IPS\Http\Url::internal( "app=forums&module=stats&controller=solved&tab={$activeTab}" );
$chart = match( $activeTab ) {
'percentage' => \IPS\core\Statistics\Chart::loadFromExtension( 'forums', 'PercentageSolved' )->getChart( $url ),
'solved' => \IPS\core\Statistics\Chart::loadFromExtension( 'forums', 'SolvedByForum' )->getChart( $url ),
default => \IPS\core\Statistics\Chart::loadFromExtension( 'forums', 'TimeSolved' )->getChart( $url )
};
if ( \IPS\Request::i()->isAjax() )
{
applications/forums/modules/admin/stats/topics.php
+3 -79
View File
@@ -49,86 +49,10 @@ class _topics extends \IPS\Dispatcher\Controller
$tabs[ 'byforum'] = 'stats_topics_tab_byforum';
}
$activeTab = ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'total';
\IPS\Request::i()->tab ??= 'total';
$activeTab = ( array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'total';
if ( $activeTab === 'total' )
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=forums&module=stats&controller=topics" ), 'forums_topics', 'start_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'colors' => array( '#10967e' ),
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4
),
'AreaChart'
);
$chart->where = array( array( \IPS\Db::i()->in( 'state', array( 'link', 'merged' ), TRUE ) ), array( \IPS\Db::i()->in( 'approved', array( -2, -3 ), TRUE ) ) );
$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack( 'stats_new_topics' ), 'number', 'COUNT(*)', FALSE );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_topics_title' );
$chart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart' );
}
else
{
$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=forums&module=stats&controller=topics&tab=" . $activeTab ), 'forums_topics', 'start_date', '', array(
'isStacked' => FALSE,
'backgroundColor' => '#ffffff',
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4,
'chartArea' => array( 'width' => '70%', 'left' => '5%' ),
'height' => 400,
),
'ColumnChart',
'monthly',
array( 'start' => ( new \IPS\DateTime )->sub( new \DateInterval('P90D') ), 'end' => new \IPS\DateTime ),
array(),
'byforum'
);
$chart->where = array( array( \IPS\Db::i()->in( 'state', array( 'link', 'merged' ), TRUE ) ), array( \IPS\Db::i()->in( 'approved', array( -2, -3 ), TRUE ) ) );
$chart->title = \IPS\Member::loggedIn()->language()->addToStack( 'stats_topics_title_byforum' );
$chart->availableTypes = array( 'ColumnChart' );
$chart->groupBy = 'forum_id';
$customValues = ( isset( $chart->savedCustomFilters['chart_forums'] ) ? array_values( explode( ',', $chart->savedCustomFilters['chart_forums'] ) ) : 0 );
$chart->customFiltersForm = array(
'form' => array(
new \IPS\Helpers\Form\Node( 'chart_forums', $customValues, FALSE, array( 'class' => 'IPS\forums\Forum', 'zeroVal' => 'any', 'multiple' => TRUE, 'permissionCheck' => function ( $forum )
{
return $forum->sub_can_post and !$forum->redirect_url;
} ), NULL, NULL, NULL, 'chart_forums' )
),
'where' => function( $values )
{
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
return \IPS\Db::i()->in( 'forum_id', $forumIds );
},
'groupBy' => 'forum_id',
'series' => function( $values )
{
$series = array();
$forumIds = \is_array( $values['chart_forums'] ) ? array_keys( $values['chart_forums'] ) : explode( ',', $values['chart_forums'] );
foreach( $forumIds as $id )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $id ), 'number', 'COUNT(*)', FALSE, $id );
}
return $series;
},
'defaultSeries' => function()
{
$series = array();
foreach( \IPS\Db::i()->select( '*', 'forums_forums', array( 'topics>?', 0 ), 'last_post desc', array( 0, 50 ) ) as $forum )
{
$series[] = array( \IPS\Member::loggedIn()->language()->addToStack( 'forums_forum_' . $forum['id'] ), 'number', 'COUNT(*)', FALSE, $forum['id'] );
}
return $series;
}
);
}
$chart = \IPS\core\Statistics\Chart::loadFromExtension( 'forums', ( $activeTab === 'total' ) ? 'Topics' : 'TopicsByForum' )->getChart( \IPS\Http\Url::internal( "app=forums&module=stats&controller=topics&tab={$activeTab}" ) );
if ( \IPS\Request::i()->isAjax() )
{
applications/forums/modules/front/forums/forums.php
+6
View File
@@ -106,6 +106,12 @@ class _forums extends \IPS\Dispatcher\Controller
}
$getReactions = $getFirstComment = $getFollowerCount = (boolean) ( \IPS\forums\Forum::getMemberListView() === 'snippet' );
/* Do view update now - we want to include redirect forums */
if ( !\IPS\Request::i()->isAjax() )
{
$forum->updateViews();
}
/* Redirect? */
if ( $forum->redirect_url )
applications/forums/modules/front/forums/topic.php
+7
View File
@@ -596,6 +596,13 @@ class _topic extends \IPS\Content\Controller
)
), \IPS\Output::i()->jsonLd['topic'] );
/* Add og:image meta tags */
if( count( $file = $topic->imageAttachments(1 ) ) )
{
$object = \IPS\File::get( 'core_Attachment', $file[0]['attach_location'] );
\IPS\Output::i()->metaTags['og:image'] = (string) $object->url->setScheme( ( mb_substr( \IPS\Settings::i()->base_url, 0, 5 ) === 'https' ) ? 'https' : 'http' );
}
/* Set default search to this topic */
\IPS\Output::i()->defaultSearchOption = array( 'forums_topic', 'forums_topic_el' );
applications/forums/setup/upg_100011/upgrade.php
+9 -1
View File
@@ -48,7 +48,15 @@ class _Upgrade
$did++;
$forum = \IPS\forums\Forum::constructFromData( $forum );
$forum->setLastComment();
try
{
$forum->setLastComment();
}
catch( \Throwable )
{
/* This may error if columns are not present, so if it doesn't work, skip it. Later steps take care of it anyway. */
}
$forum->queued_topics = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', array( 'forum_id=? AND approved=0', $forum->id ) )->first();
$forum->queued_posts = \IPS\Db::i()->select( 'COUNT(*)', 'forums_posts', array( 'forums_topics.forum_id=? AND forums_posts.queued=1', $forum->id ) )->join( 'forums_topics', 'forums_topics.tid=forums_posts.topic_id' )->first();
applications/forums/setup/upg_100035/upgrade.php
+9 -1
View File
@@ -49,7 +49,15 @@ class _Upgrade
$childForum->save();
}
$forum->setLastComment();
try
{
$forum->setLastComment();
}
catch( \Throwable )
{
/* This may error if columns are not present, so if it doesn't work, skip it. Later steps take care of it anyway. */
}
$forum->setLastReview();
$forum->save();
}
applications/forums/setup/upg_107644/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107644,
"name": "4.7.8",
"steps": {
"queries": false,
"lang": false,
"theme": true,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107644/theme.json
+19
View File
@@ -0,0 +1,19 @@
{
"html": {
"added": [],
"edited": [],
"removed": []
},
"css": {
"added": [],
"edited": [
"front\/forums.css"
],
"removed": []
},
"resources": {
"added": [],
"edited": [],
"removed": []
}
}
applications/forums/setup/upg_107645/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107645,
"name": "4.7.8",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107660/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107660,
"name": "4.7.9 Beta 1",
"steps": {
"queries": false,
"lang": false,
"theme": true,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107660/theme.json
+19
View File
@@ -0,0 +1,19 @@
{
"html": {
"added": [],
"edited": [
"front\/forums\/topicRow"
],
"removed": []
},
"css": {
"added": [],
"edited": [],
"removed": []
},
"resources": {
"added": [],
"edited": [],
"removed": []
}
}
applications/forums/setup/upg_107661/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107661,
"name": "4.7.9 Beta 2",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107662/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107662,
"name": "4.7.9 Beta 3",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107663/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107663,
"name": "4.7.9",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107664/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107664,
"name": "4.7.9",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107665/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107665,
"name": "4.7.9",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107666/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107666,
"name": "4.7.9",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107667/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107667,
"name": "4.7.9",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107668/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107668,
"name": "4.7.9",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107680/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107680,
"name": "4.7.10 Beta 1",
"steps": {
"queries": false,
"lang": false,
"theme": true,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107680/theme.json
+19
View File
@@ -0,0 +1,19 @@
{
"html": {
"added": [],
"edited": [
"front\/forums\/topicHover"
],
"removed": []
},
"css": {
"added": [],
"edited": [],
"removed": []
},
"resources": {
"added": [],
"edited": [],
"removed": []
}
}
applications/forums/setup/upg_107681/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107681,
"name": "4.7.10 Beta 2",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107682/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107682,
"name": "4.7.10",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107683/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107683,
"name": "4.7.10",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107684/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107684,
"name": "4.7.10",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107690/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107690,
"name": "4.7.11 Beta 1",
"steps": {
"queries": false,
"lang": true,
"theme": true,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107690/lang.json
+14
View File
@@ -0,0 +1,14 @@
{
"normal": {
"added": [
"moderation_log"
],
"edited": [],
"removed": []
},
"js": {
"added": [],
"edited": [],
"removed": []
}
}
applications/forums/setup/upg_107690/theme.json
+24
View File
@@ -0,0 +1,24 @@
{
"html": {
"added": [],
"edited": [
"front\/forums\/forumDisplay",
"front\/forums\/topicRow",
"front\/index\/simplifiedTopicRow",
"front\/topics\/topic"
],
"removed": []
},
"css": {
"added": [],
"edited": [
"front\/forums.css"
],
"removed": []
},
"resources": {
"added": [],
"edited": [],
"removed": []
}
}
applications/forums/setup/upg_107691/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107691,
"name": "4.7.11 Beta 2",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107692/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107692,
"name": "4.7.11",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107693/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107693,
"name": "4.7.11",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107694/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107694,
"name": "4.7.11",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107695/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107695,
"name": "4.7.11.1",
"steps": {
"queries": false,
"lang": true,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107695/lang.json
+14
View File
@@ -0,0 +1,14 @@
{
"normal": {
"added": [
"cookie_forumpass_*_description"
],
"edited": [],
"removed": []
},
"js": {
"added": [],
"edited": [],
"removed": []
}
}
applications/forums/setup/upg_107700/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107700,
"name": "4.7.12 Beta 1",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": true,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": true,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107700/javascript.json
+14
View File
@@ -0,0 +1,14 @@
{
"files": {
"added": [],
"edited": [],
"removed": []
},
"orders": {
"added": [],
"edited": [
"global\/\/dev\/js\/\/library\/"
],
"removed": []
}
}
applications/forums/setup/upg_107701/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107701,
"name": "4.7.12 Beta 2",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107702/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107702,
"name": "4.7.12 Beta 3",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107703/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107703,
"name": "4.7.12 Beta 4",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107704/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107704,
"name": "4.7.12",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107710/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107710,
"name": "4.7.13 Beta 1",
"steps": {
"queries": false,
"lang": false,
"theme": true,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107710/theme.json
+20
View File
@@ -0,0 +1,20 @@
{
"html": {
"added": [],
"edited": [
"front\/topics\/post",
"front\/topics\/topic"
],
"removed": []
},
"css": {
"added": [],
"edited": [],
"removed": []
},
"resources": {
"added": [],
"edited": [],
"removed": []
}
}
applications/forums/setup/upg_107711/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107711,
"name": "4.7.13 Beta 2",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/setup/upg_107712/data.json
+23
View File
@@ -0,0 +1,23 @@
{
"id": 107712,
"name": "4.7.13",
"steps": {
"queries": false,
"lang": false,
"theme": false,
"themeSettings": false,
"javascript": false,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/forums/sources/Forum/Forum.php
+22 -1
View File
@@ -26,6 +26,7 @@ class _Forum extends \IPS\Node\Model implements \IPS\Node\Permissions
use \IPS\Content\ClubContainer;
use \IPS\Node\Colorize;
use \IPS\Node\Statistics;
use \IPS\Content\ViewUpdates;
/**
* @brief [ActiveRecord] Multiton Store
@@ -1100,7 +1101,7 @@ class _Forum extends \IPS\Node\Model implements \IPS\Node\Permissions
$form->addHeader( 'tags' );
$form->add( new \IPS\Helpers\Form\YesNo( 'bw_disable_tagging', !$this->forums_bitoptions['bw_disable_tagging'], FALSE, array( 'togglesOn' => array( 'bw_disable_prefixes', 'forum_tag_predefined' ) ), NULL, NULL, NULL, 'bw_disable_tagging' ) );
$form->add( new \IPS\Helpers\Form\YesNo( 'bw_disable_prefixes', !$this->forums_bitoptions['bw_disable_prefixes'], FALSE, array(), NULL, NULL, NULL, 'bw_disable_prefixes' ) );
$form->add( new \IPS\Helpers\Form\Text( 'forum_tag_predefined', $this->tag_predefined ?: NULL, FALSE, array( 'autocomplete' => array( 'unique' => 'true' ), 'nullLang' => 'forum_tag_predefined_unlimited' ), NULL, NULL, NULL, 'forum_tag_predefined' ) );
$form->add( new \IPS\Helpers\Form\Text( 'forum_tag_predefined', $this->tag_predefined ?: NULL, FALSE, array( 'autocomplete' => array( 'unique' => 'true', 'alphabetical' => \IPS\Settings::i()->tags_alphabetical ), 'nullLang' => 'forum_tag_predefined_unlimited' ), NULL, NULL, NULL, 'forum_tag_predefined' ) );
}
}
@@ -1957,6 +1958,9 @@ class _Forum extends \IPS\Node\Model implements \IPS\Node\Permissions
{
$form->add( new \IPS\Helpers\Form\Radio( 'club_node_public', $this->id ? $this->isPublic() : 0, TRUE, array( 'options' => array( '0' => 'club_node_public_no', '1' => 'club_node_public_view', '2' => 'club_node_public_participate' ) ) ) );
}
$form->add( new \IPS\Helpers\Form\YesNo( 'bw_enable_answers_moderator', $this->id ? $this->forums_bitoptions['bw_enable_answers_moderator'] : FALSE, FALSE, array( 'togglesOn' => array( 'bw_enable_answers__member' ) ), NULL, NULL, NULL, 'forum_best_answer' ) );
$form->add( new \IPS\Helpers\Form\YesNo( 'bw_enable_answers__member', $this->id ? $this->forums_bitoptions['bw_enable_answers_member'] : FALSE, FALSE, array(), NULL, NULL, NULL, 'bw_enable_answers__member' ) );
}
/**
@@ -1983,6 +1987,23 @@ class _Forum extends \IPS\Node\Model implements \IPS\Node\Permissions
}
}
foreach ( array( 'bw_enable_answers_member', 'bw_enable_answers_moderator' ) as $k )
{
if( isset( $values[ $k ] ) )
{
/* If we're disabling bw_enable_answers_moderator for discussion forums, we need to make sure bw_enable_answers_member is also disabled */
if ( $k == 'bw_enable_answers_moderator' AND !$values[ $k ] )
{
$this->forums_bitoptions['bw_enable_answers_moderator'] = FALSE;
$this->forums_bitoptions['bw_enable_answers_member'] = FALSE;
}
else
{
$this->forums_bitoptions[ $k ] = $values[ $k ];
}
}
}
/* Use default priority for sitemaps */
$this->ipseo_priority = -1;
applications/forums/sources/Topic/Topic.php
+18 -3
View File
@@ -28,7 +28,6 @@ class _Topic extends \IPS\Content\Item implements
\IPS\Content\Followable,
\IPS\Content\Shareable,
\IPS\Content\ReadMarkers,
\IPS\Content\Views,
\IPS\Content\Polls, \SplObserver,
\IPS\Content\Ratings,
\IPS\Content\Searchable,
@@ -37,7 +36,7 @@ class _Topic extends \IPS\Content\Item implements
\IPS\Content\Anonymous,
\IPS\Content\FuturePublishing
{
use \IPS\forums\Topic\LiveTopic, \IPS\Content\Reactable, \IPS\Content\Reportable, \IPS\Content\Statistics, \IPS\Content\Solvable { toggleSolveComment as protected _toggleSolveComment; }
use \IPS\forums\Topic\LiveTopic, \IPS\Content\Reactable, \IPS\Content\Reportable, \IPS\Content\Statistics, \IPS\Content\ViewUpdates, \IPS\Content\Solvable { toggleSolveComment as protected _toggleSolveComment; }
/**
* @brief Not archived
@@ -1302,7 +1301,13 @@ class _Topic extends \IPS\Content\Item implements
{
if ( $container and $container->tag_predefined )
{
return explode( ',', $container->tag_predefined );
$return = explode( ',', $container->tag_predefined );
if ( \IPS\Settings::i()->tags_alphabetical )
{
natcasesort( $return );
}
return $return;
}
return parent::definedTags( $container );
@@ -2295,6 +2300,11 @@ class _Topic extends \IPS\Content\Item implements
*/
public function showSummaryOnDesktop()
{
/* Hide the summary for future topics */
if ( $this->isFutureDate() )
{
return FALSE;
}
if ( ! \IPS\Settings::i()->forums_topics_activity_pages_show OR ( (int) \IPS\Settings::i()->forums_topics_activity_pages_show <= (int) $this->commentPageCount() ) )
{
$viewSettings = json_decode( \IPS\Settings::i()->forums_topic_activity, TRUE );
@@ -2314,6 +2324,11 @@ class _Topic extends \IPS\Content\Item implements
*/
public function showSummaryOnMobile()
{
/* Hide the summary for future topics */
if ( $this->isFutureDate() )
{
return FALSE;
}
if ( ! \IPS\Settings::i()->forums_topics_activity_pages_show OR ( (int) \IPS\Settings::i()->forums_topics_activity_pages_show <= (int) $this->commentPageCount() ) )
{
$viewSettings = json_decode( \IPS\Settings::i()->forums_topic_activity, TRUE );
applications/forums/tasks/solvedNotifications.php
+7 -2
View File
@@ -102,8 +102,13 @@ class _solvedNotifications extends \IPS\Task
if ( $topic->canView( $topic->author() ) )
{
$replies = $topic->comments( 4, 0, 'date', 'asc' );
$firstPost = array_shift( $replies );
$firstPost = $topic->comments( 1, 0, 'date', 'asc' );
$replies = $topic->comments( 3, 0, 'date', 'asc', NULL, NULL, NULL, array( 'author_id !=?', $topic->author()->member_id ) );
if( !count( $replies ) )
{
continue;
}
\IPS\Email::buildFromTemplate( 'core', 'solved_reengagement', array($topic, $firstPost, $replies), \IPS\Email::TYPE_TRANSACTIONAL )->send( $topic->author() );
}
applications/forums/tasks/solvedStatsAggregation.php
+1 -1
View File
@@ -58,7 +58,7 @@ class _solvedStatsAggregation extends \IPS\Task
$total = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', $where )->first();
$solved = \IPS\Db::i()->select( 'COUNT(*)', 'forums_topics', array_merge( $where, [ [ 'core_solved_index.id IS NOT NULL' ] ] ) )->join( 'core_solved_index', "core_solved_index.app='forums' AND core_solved_index.item_id=forums_topics.tid")->first();
$avg = \IPS\Db::i()->select( 'AVG(core_solved_index.solved_date-forums_topics.start_date)', 'forums_topics', array_merge( $where, [ [ 'core_solved_index.id IS NOT NULL' ] ] ) )->join( 'core_solved_index', "core_solved_index.app='forums' AND core_solved_index.item_id=forums_topics.tid")->first();
$avg = \IPS\Db::i()->select( 'AVG(CAST(core_solved_index.solved_date AS SIGNED)-forums_topics.start_date)', 'forums_topics', array_merge( $where, [ [ 'core_solved_index.id IS NOT NULL' ] ] ) )->join( 'core_solved_index', "core_solved_index.app='forums' AND core_solved_index.item_id=forums_topics.tid")->first();
\IPS\Db::i()->delete( 'core_statistics', [ 'type=? and time=? and value_1=?', 'solved', $end->getTimestamp(), $forum['id'] ] );
\IPS\Db::i()->insert( 'core_statistics', [