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

Version 4.6.0

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:55:31 -08:00
1 parent f79dcf067a
commit 517a5e1f70
2036 files changed
+110041 -26162
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/blog/data/application.json
+2 -1
View File
@@ -4,5 +4,6 @@
"app_directory": "blog",
"app_protected": 0,
"app_website": null,
"app_update_check": null
"app_update_check": null,
"app_hide_tab": 0
}
applications/blog/data/javascript.xml
+14 -7
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<javascript app="blog">
<file javascript_app="blog" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.grid.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150"><![CDATA[/**
<file javascript_app="blog" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.grid.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150"><![CDATA[/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -37,7 +37,7 @@
}
});
}(jQuery, _));]]></file>
<file javascript_app="blog" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.list.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
<file javascript_app="blog" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.list.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -66,7 +66,7 @@
}
});
}(jQuery, _));</file>
<file javascript_app="blog" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.manageCategories.js" javascript_type="controller" javascript_version="105100" javascript_position="1000100"><![CDATA[/**
<file javascript_app="blog" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.manageCategories.js" javascript_type="controller" javascript_version="106107" javascript_position="1000100"><![CDATA[/**
* Invision Community
* (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
*
@@ -135,6 +135,11 @@
Debug.log( "Sortable categories initialized" );
});
if( !$('#form_tab_blog_entry_categories').length ) {
$('button[type="submit"]').addClass('ipsHide');
$('button[data-action="addNew"]').removeClass('ipsHide');
}
},
/**
@@ -191,8 +196,10 @@
} ) );
$('[data-action="addNew"]').attr('disabled', true );
$('[data-action="delete"][data-category-id="new"],[data-action="edit"][data-category-id="new"]').hide();
$('[data-action="delete"][data-category-id="new"],[data-action="edit"][data-category-id="new"],[data-role="sortHandle"]').hide();
$('body').find('[data-action="edit"][data-category-id="new"]').click();
this.scope.find('[data-role="tableRows"]').sortable( "disable" );
},
/**
@@ -201,7 +208,7 @@
*/
renderList: function() {
var _this = this;
ips.getAjax()( '?app=blog&module=blogs&controller=view&do=categoriesJson&id=' + this.scope.attr('data-blog-id') )
.done( function (response) {
if( response.categories.length ){
@@ -228,7 +235,6 @@
* @returns {void}
*/
tabChange: function (e) {
if ( ! $('#form_tab_blog_entry_categories').hasClass('ipsTabs_activeItem') ) { // This looks back to front but the tab status is changed after this has fired
$('button[type="submit"]').addClass('ipsHide');
$('button[data-action="addNew"]').removeClass('ipsHide');
@@ -291,6 +297,7 @@
} )
.done( function (response) {
_this.renderList();
_this.scope.find('[data-role="tableRows"]').sortable( "enable" );
} )
.fail( function (response) {
a.html( langBit ).removeClass('ipsField_loading');
@@ -336,7 +343,7 @@
}
});
}(jQuery, _));]]></file>
<file javascript_app="blog" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.view.js" javascript_type="template" javascript_version="105100" javascript_position="1000050"><![CDATA[/* CLASS LIST TEMPLATES */
<file javascript_app="blog" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.view.js" javascript_type="template" javascript_version="106107" javascript_position="1000050"><![CDATA[/* CLASS LIST TEMPLATES */
ips.templates.set('blog.view.addButton', "\
<button type=\"button\" class=\"ipsButton ipsButton_primary ipsHide\" data-action=\"addNew\">{{#lang}}manage_cats_new_row{{/lang}}</button>\
");
applications/blog/data/lang.xml
+5 -1
View File
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<language>
<app key="blog" version="105100">
<app key="blog" version="106107">
<word key="__app_blog" js="0">Blogs</word>
<word key="frontnavigation_blogs" js="0">Blogs</word>
<word key="__indefart_blog_entry_comment" js="0">a comment on a blog entry</word>
<word key="__indefart_blog_entry" js="0">a blog entry</word>
<word key="__defart_blog_entry_comment" js="0">comment on a blog entry</word>
<word key="__defart_blog_entry_comment_plural" js="0">{!#[1:comment][?:comments]} on a blog entry</word>
<word key="__defart_blog_entry" js="0">blog entry</word>
<word key="__defart_blog_entry_plural" js="0">{!#[1:blog entry][?:blog entries]}</word>
<word key="blog_entry_container" js="0">blog</word>
<word key="blog_entry_pl_lc" js="0">blog entries</word>
<word key="module__blog_blogs" js="0">Blogs</word>
@@ -45,6 +47,7 @@
<word key="blog_word_custom" js="0">Blog Name</word>
<word key="blog_blog_member_id" js="0">Blog Author</word>
<word key="blogs_sg" js="0">Blog</word>
<word key="blogs_sg_lc" js="0">blog</word>
<word key="create_blog" js="0">Create a blog</word>
<word key="create_new_blog" js="0">Create a new blog</word>
<word key="add_entry_to" js="0">Add entry to a blog</word>
@@ -307,6 +310,7 @@
<word key="blog_categories_all" js="0">Show All</word>
<word key="no_entries_in_cat" js="0">There are no entries in this category</word>
<word key="__api_blog_entrycategories" js="0">Entry Categories</word>
<word key="blog_subcategories" js="0">Subcategories</word>
<word key="blog_category_confirm_delete" js="1">Are you sure you want to delete this category?</word>
<word key="blog_category_confirm_delete_desc" js="1">Existing entries in this category will be updated so that they are no longer in a category.</word>
<word key="manage_cats_new_row" js="1">Add New Category</word>
applications/blog/data/schema.json
+60
View File
@@ -393,6 +393,30 @@
"zerofill": false,
"auto_increment": false,
"binary": false
},
"blog_allow_anonymous": {
"name": "blog_allow_anonymous",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
},
"blog_last_poster_anon": {
"name": "blog_last_poster_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
},
"indexes": {
@@ -953,6 +977,30 @@
"zerofill": false,
"auto_increment": false,
"binary": false
},
"entry_is_anon": {
"name": "entry_is_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
},
"entry_last_poster_anon": {
"name": "entry_last_poster_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
},
"indexes": {
@@ -1218,6 +1266,18 @@
"unsigned": true,
"values": [],
"zerofill": false
},
"comment_is_anon": {
"name": "comment_is_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
},
"indexes": {
applications/blog/data/theme.xml
+31 -33
View File
@@ -3,9 +3,9 @@
<template template_group="browse" template_name="categories" template_data="$currentCategory=NULL" template_location="front" template_app="blog"><![CDATA[ {{$categories = $currentCategory ? $currentCategory->children( 'view', NULL, FALSE ) : \IPS\blog\Category::roots();}}
{{if !\IPS\blog\Category::theOnlyNode( array(), TRUE, FALSE ) and \count( $categories )}}
<div id='elBlogCategoriesBlock' class='ipsWidget ipsWidget_vertical ipsBox'>
<h3 class='ipsType_sectionTitle ipsType_reset'>{{if $currentCategory}}{lang="subcategories"}{{else}}{lang="categories"}{{endif}}</h3>
<h3 class='ipsType_sectionTitle ipsType_reset'>{{if $currentCategory}}{lang="blog_subcategories"}{{else}}{lang="categories"}{{endif}}</h3>
<div class='ipsPad_half'>
<div class='ipsSideMenu'>
<div class='ipsSideMenu ipsCategoriesMenu'>
<ul class='ipsSideMenu_list'>
{{foreach $categories as $category}}
<li>
@@ -63,7 +63,7 @@
</div>
</div>
</div>]]></template>
<template template_group="browse" template_name="index" template_data="$table, $featured, $blogs=array(), $viewMode, $category=NULL" template_location="front" template_app="blog"><![CDATA[<div class="ipsPageHeader ipsClearfix ipsMargin_bottom ipsHeaderButtons ipsFlex ipsFlex-ai:center ipsFlex-jc:between">
<template template_group="browse" template_name="index" template_data="$table, $featured, $blogs=array(), $viewMode=NULL, $category=NULL" template_location="front" template_app="blog"><![CDATA[<div class="ipsPageHeader ipsClearfix ipsMargin_bottom ipsHeaderButtons ipsFlex ipsFlex-ai:center ipsFlex-jc:between">
<h1 class="ipsType_pageTitle ipsFlex-flex:11 ipsType_break">{lang="blogs"}</h1>
{{if \count( $blogs ) || \IPS\blog\Blog::canCreate() || \IPS\Settings::i()->blog_allow_grid}}
<ul class='ipsToolList ipsToolList_horizontal ipsClearfix ipsPos_right '>
@@ -84,7 +84,7 @@
<div class='ipsBox'>
{$table|raw}
</div>]]></template>
<template template_group="browse" template_name="indexButtons" template_data="$blogs=array(), $viewMode, $forMobile=FALSE, $category=NULL" template_location="front" template_app="blog"><![CDATA[{{if \count( $blogs ) || \IPS\blog\Blog::canCreate() || \IPS\Settings::i()->blog_allow_grid}}
<template template_group="browse" template_name="indexButtons" template_data="$blogs=array(), $viewMode=NULL, $forMobile=FALSE, $category=NULL" template_location="front" template_app="blog"><![CDATA[{{if \count( $blogs ) || \IPS\blog\Blog::canCreate() || \IPS\Settings::i()->blog_allow_grid}}
{{if \count( $blogs ) AND \IPS\blog\Blog::canOnAny( 'add' )}}
<li class='ipsToolList_primaryAction {{if !$forMobile}}ipsResponsive_hidePhone{{endif}}'>
{{if \count( $blogs ) > 1}}
@@ -112,7 +112,7 @@
{{endif}}
</li>
{{endif}}
{{if \IPS\Settings::i()->blog_allow_grid AND !$forMobile}}
{{if \IPS\Settings::i()->blog_allow_grid AND !$forMobile AND member.member_id}}
<li class='ipsType_center ipsMargin_bottom:none'>
<ul class='ipsButton_split'>
<li class='ipsType_center'>
@@ -259,7 +259,7 @@
<span class='ipsType_break ipsContained'>
{{if $entry->unread()}}
<a href='{$entry->url('getNewComment')}'><span class='ipsItemStatus' data-ipsTooltip title="{lang="cms_unread_record"}"><i class="fa fa-circle"></i></span></a>&nbsp;
<a href='{$entry->url('getNewComment')}'><span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span></a>&nbsp;
{{endif}}
<a href="{$entry->url()}" title="{lang="read_more_about" sprintf="$entry->name"}" data-role="newsTitle">{wordbreak="$entry->name"}</a>
</span>
@@ -647,7 +647,7 @@
</li>
{{endforeach}}]]></template>
<template template_group="livesearch" template_name="blog" template_data="$blog" template_location="admin" template_app="blog"><![CDATA[<li class='ipsPad_half ipsClearfix' data-role='result'>
<a href='{url="app=blog&module=blogs&controller=blogs&do=form&id="}{$blog->id}' class='ipsPos_left'>{$blog->_title}</a>
<a href='{url="app=blog&module=blogs&controller=blogs&subnode=1&do=form&id="}{$blog->id}' class='ipsPos_left'>{$blog->_title}</a>
</li>
]]></template>
@@ -843,11 +843,9 @@
{{endif}}
</ul>
{{if $table->pages > 1}}
<div data-role="tablePagination">
{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
</div>
{{endif}}
<div data-role="tablePagination" {{if $table->pages <= 1}}class='ipsHide'{{endif}}>
{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
</div>
</div>
{{endif}}
@@ -931,13 +929,9 @@
{template="$table->rowsTemplate[1]" params="$table, $headers, $rows" object="$table->rowsTemplate[0]"}
</div>
{{endif}}
{{if $table->pages > 1}}
<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear">
<div data-role="tablePagination">
{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
</div>
</div>
{{endif}}
<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear {{if $table->pages <= 1}}ipsHide{{endif}}" data-role="tablePagination">
{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
</div>
</div>]]></template>
<template template_group="view" template_name="blogViewLarge" template_data="$entry, $table, $first = FALSE" template_location="front" template_app="blog"><![CDATA[
<article class='cBlogView_entry ipsContained ipsType_break {{if $entry->hidden()}}ipsModerated{{endif}}' data-controller="core.front.core.lightboxedImages">
@@ -1074,14 +1068,14 @@
<li class='ipsType_light'>{lang="num_views_with_number" pluralize="$entry->views"}</li>
</ul>
</article>]]></template>
<template template_group="view" template_name="categories" template_data="$currentCategory=NULL, $categories=array(), $blog" template_location="front" template_app="blog"><![CDATA[ {{if \count( $categories )}}
<template template_group="view" template_name="categories" template_data="$currentCategory=NULL, $categories=array(), $blog=NULL" template_location="front" template_app="blog"><![CDATA[ {{if \count( $categories )}}
<div id='elBlogCategoriesBlock' class='ipsWidget ipsWidget_vertical ipsBox'>
{{if $blog->canEdit()}}
<span class='ipsPos_right ipsPad_half ipsType_light'><a href="{$blog->url()->setQueryString( array( 'do' => "manageCategories" ) )}" data-ipsDialog data-ipsDialog-size='narrow'><i class='fa fa-pencil'></i></a></span>
{{endif}}
<h3 class='ipsType_sectionTitle ipsType_reset'>{lang="categories"}</h3>
<div class='ipsPad_half'>
<div class='ipsSideMenu'>
<div class='ipsSideMenu ipsCategoriesMenu'>
<ul class='ipsSideMenu_list'>
{{foreach $categories as $category}}
<li{{if $currentCategory and $currentCategory->id == $category->id}} class="ipsAreaBackground_light"{{endif}}>
@@ -1308,13 +1302,13 @@
{$entry->editLine()|raw}
{{endif}}
</section>
{{if ( $entry->isFutureDate() and $entry::canFuturePublish( NULL, $entry->container() ) ) or ( $entry->status === 'draft' or $entry->canEdit() or $entry->canPin() or $entry->canUnpin() or $entry->canFeature() or $entry->canUnfeature() or $entry->canHide() or $entry->canUnhide() or $entry->canMove() or $entry->canLock() or $entry->canUnlock() or $entry->canDelete() ) or ( $entry->hidden() == -2 AND \IPS\Member::loggedIn()->modPermission('can_manage_deleted_content') ) || ( \IPS\IPS::classUsesTrait( $entry, 'IPS\Content\Reactable' ) AND settings.reputation_enabled )}}
{{if ( $entry->isFutureDate() and $entry::canFuturePublish( NULL, $entry->container() ) ) or ( $entry->status === 'draft' or $entry->canEdit() or $entry->canPin() or $entry->canUnpin() or $entry->canFeature() or $entry->canUnfeature() or $entry->canHide() or $entry->canUnhide() or $entry->canMove() or $entry->canLock() or $entry->canUnlock() or $entry->canDelete() ) or ( $entry->hidden() == -2 AND \IPS\Member::loggedIn()->modPermission('can_manage_deleted_content') ) || ( \IPS\IPS::classUsesTrait( $entry, 'IPS\Content\Reactable' ) AND settings.reputation_enabled ) OR ( ! $entry->container()->social_group and \IPS\Member::loggedIn()->group['g_can_report'] )}}
<div class='ipsItemControls'>
{{if \IPS\IPS::classUsesTrait( $entry, 'IPS\Content\Reactable' ) AND settings.reputation_enabled}}
{template="reputation" app="core" group="global" params="$entry"}
{{endif}}
{{if ( $entry->isFutureDate() and $entry::canFuturePublish( NULL, $entry->container() ) ) or ( $entry->status === 'draft' or $entry->canEdit() or $entry->canPin() or $entry->canUnpin() or $entry->canFeature() or $entry->canUnfeature() or $entry->canHide() or $entry->canUnhide() or $entry->canMove() or $entry->canLock() or $entry->canUnlock() or $entry->canDelete() ) or ( $entry->hidden() == -2 AND \IPS\Member::loggedIn()->modPermission('can_manage_deleted_content') ) || ( ! $entry->container()->social_group and \IPS\Member::loggedIn()->group['g_can_report'] )}}
{{if ( $entry->isFutureDate() and $entry::canFuturePublish( NULL, $entry->container() ) ) or ( $entry->status === 'draft' or $entry->canEdit() or $entry->canPin() or $entry->canUnpin() or $entry->canFeature() or $entry->canUnfeature() or $entry->canHide() or $entry->canUnhide() or $entry->canMove() or $entry->canLock() or $entry->canUnlock() or $entry->canDelete() ) or ( $entry->hidden() == -2 AND \IPS\Member::loggedIn()->modPermission('can_manage_deleted_content') ) OR ( ! $entry->container()->social_group and \IPS\Member::loggedIn()->group['g_can_report'] )}}
<ul class='ipsComment_controls ipsClearfix ipsItemControls_left'>
{{if ( $entry->isFutureDate() and $entry::canFuturePublish( NULL, $entry->container() ) ) or ( $entry->status === 'draft' or $entry->canEdit() or $entry->canPin() or $entry->canUnpin() or $entry->canFeature() or $entry->canUnfeature() or $entry->canHide() or $entry->canUnhide() or $entry->canMove() or $entry->canLock() or $entry->canUnlock() or $entry->canDelete() ) or ( $entry->hidden() == -2 AND \IPS\Member::loggedIn()->modPermission('can_manage_deleted_content') )}}
<li>
@@ -1322,7 +1316,7 @@
<ul id='elentryActions_menu' class='ipsMenu ipsMenu_auto ipsHide'>
{{if ! $entry->container()->social_group and $entry->canReportOrRevoke() === TRUE }}
<li class='ipsMenu_item'>
<a href='{$entry->url('report')}' data-ipsDialog data-ipsDialog-size='medium' data-ipsDialog-title="{lang="report_entry"}" data-ipsDialog-remoteSubmit data-ipsDialog-flashMessage="{lang="report_submit_success"}" title="{lang="report_entry"}">{lang="report_entry"}</a>
<a href='{$entry->url('report')}' {{if member.member_id or \IPS\Helpers\Form\Captcha::supportsModal()}}data-ipsDialog data-ipsDialog-size='medium' data-ipsDialog-title="{lang="report_entry"}" data-ipsDialog-remoteSubmit data-ipsDialog-flashMessage="{lang="report_submit_success"}"{{endif}} title="{lang="report_entry"}">{lang="report_entry"}</a>
</li>
<li class='ipsMenu_sep'><hr></li>
{{endif}}
@@ -1350,7 +1344,7 @@
<li class='ipsMenu_item'><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'moderate', 'action' => 'unpin' ) )}' title='{lang="unpin_title_blog"}'>{lang="unpin"}</a></li>
{{endif}}
{{if $entry->canHide()}}
<li class='ipsMenu_item'><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'moderate', 'action' => 'hide' ) )}' title='{lang="hide_title_blog"}' data-ipsDialog data-ipsDialog-title="{lang="hide"}">{lang="hide"}</a></li>
<li class='ipsMenu_item'><a href='{$entry->url()->setQueryString( array( 'do' => 'moderate', 'action' => 'hide' ) )}' title='{lang="hide_title_blog"}' data-ipsDialog data-ipsDialog-title="{lang="hide"}">{lang="hide"}</a></li>
{{endif}}
{{if $entry->canUnhide()}}
<li class='ipsMenu_item'><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'moderate', 'action' => 'unhide' ) )}' title='{{if $entry->hidden() === 1}}{lang="approve_title_blog"}{{else}}{lang="unhide_title_blog"}{{endif}}'>{{if $entry->hidden() === 1}}{lang="approve"}{{else}}{lang="unhide"}{{endif}}</a></li>
@@ -1362,24 +1356,24 @@
<li class='ipsMenu_item'><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'moderate', 'action' => 'unlock' ) )}' title='{lang="blog_unlock_title"}'>{lang="unlock"}</a></li>
{{endif}}
{{if $entry->canMove()}}
<li class='ipsMenu_item'><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'move' ) )}' data-ipsDialog data-ipsDialog-size='narrow' data-ipsDialog-title="{lang="move"}" title='{lang="blog_move_title"}'>{lang="move"}</a></li>
<li class='ipsMenu_item'><a href='{$entry->url()->setQueryString( array( 'do' => 'move' ) )}' data-ipsDialog data-ipsDialog-size='narrow' data-ipsDialog-title="{lang="move"}" title='{lang="blog_move_title"}'>{lang="move"}</a></li>
{{endif}}
{{if $entry->canDelete()}}
<li class='ipsMenu_item'><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'moderate', 'action' => 'delete' ) )}' data-confirm title='{lang="blog_delete_title"}'>{lang="delete"}</a></li>
{{endif}}
{{if $entry->canOnMessage( 'add' )}}
<li class='ipsMenu_item'><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'messageForm' ) )}' data-ipsDialog data-ipsDialod-title='{lang="add_message"}'>{lang="add_message"}</a></li>
<li class='ipsMenu_item'><a href='{$entry->url()->setQueryString( array( 'do' => 'messageForm' ) )}' data-ipsDialog data-ipsDialod-title='{lang="add_message"}'>{lang="add_message"}</a></li>
{{endif}}
{{if \IPS\Member::loggedIn()->modPermission('can_view_moderation_log')}}
<li class='ipsMenu_sep'><hr></li>
<li class="ipsMenu_item"><a href='{$entry->url()->csrf()->setQueryString( array( 'do' => 'modLog' ) )}' data-ipsDialog data-ipsDialog-title='{lang="moderation_history"}'>{lang="moderation_history"}</a></li>
<li class="ipsMenu_item"><a href='{$entry->url()->setQueryString( array( 'do' => 'modLog' ) )}' data-ipsDialog data-ipsDialog-title='{lang="moderation_history"}'>{lang="moderation_history"}</a></li>
{{endif}}
{{endif}}
</ul>
</li>
{{elseif ( ! $entry->container()->social_group and $entry->canReportOrRevoke() === TRUE )}}
<li>
<a href='{$entry->url('report')}' class='ipsButton ipsButton_link ipsButton_verySmall ipsButton_fullWidth' data-ipsDialog data-ipsDialog-size='medium' data-ipsDialog-title="{lang="report_entry"}" data-ipsDialog-remoteSubmit data-ipsDialog-flashMessage="{lang="report_submit_success"}" title="{lang="report_entry"}">{lang="report_entry"}</a>
<a href='{$entry->url('report')}' class='ipsButton ipsButton_link ipsButton_verySmall ipsButton_fullWidth' {{if member.member_id or \IPS\Helpers\Form\Captcha::supportsModal()}}data-ipsDialog data-ipsDialog-size='medium' data-ipsDialog-title="{lang="report_entry"}" data-ipsDialog-remoteSubmit data-ipsDialog-flashMessage="{lang="report_submit_success"}"{{endif}} title="{lang="report_entry"}">{lang="report_entry"}</a>
</li>
<li class='ipsMenu_sep'><hr></li>
{{endif}}
@@ -1540,19 +1534,23 @@
</li>
{{endif}}
{{if !$blog->club_id and ( $blog->canDelete() or ( $blog->canEdit() AND !$blog->groupblog_ids ) or ( $blog->pinned and \IPS\Member::loggedIn()->modPermission('can_unpin_content') ) || ( !$blog->pinned and \IPS\Member::loggedIn()->modPermission('can_pin_content') ) )}}
{{if !$blog->club_id and ( $blog->canDelete() or $blog->canEdit() or ( $blog->pinned and \IPS\Member::loggedIn()->modPermission('can_unpin_content') ) || ( !$blog->pinned and \IPS\Member::loggedIn()->modPermission('can_pin_content') ) )}}
<li>
<a href='#elBlogManage_menu' id='elBlogManage' data-ipsMenu class='ipsButton ipsButton_link ipsButton_medium ipsButton_fullWidth'>{lang="manage_blog"} <i class='fa fa-caret-down'></i></a>
<ul id='elBlogManage_menu' class='ipsMenu ipsMenu_normal ipsHide'>
{{if $blog->canEdit() AND !$blog->groupblog_ids}}
<li class='ipsMenu_item'>
<a href='{$blog->url()->setQueryString( array( 'do' => 'editBlog', 'csrfKey' => \IPS\Session::i()->csrfKey ) )}' title="{lang="edit_blog"}" data-ipsDialog data-ipsDialog-title="{lang="edit_blog"}">{lang="edit_blog"}</a>
<a href='{$blog->url()->setQueryString( array( 'do' => 'editBlog' ) )}' title="{lang="edit_blog"}" data-ipsDialog data-ipsDialog-title="{lang="edit_blog"}">{lang="edit_blog"}</a>
</li>
{{elseif $blog->canEdit() AND $blog->groupblog_ids}}
<li class='ipsMenu_item'>
<a href='{$blog->url()->setQueryString( array( 'do' => 'manageCategories' ) )}' title="{lang="blog_manage_entry_categories"}" data-ipsDialog data-ipsDialog-title="{lang="blog_manage_entry_categories"}">{lang="blog_manage_entry_categories"}</a>
</li>
{{endif}}
{{if $blog->canEdit() AND \IPS\Settings::i()->blog_allow_rssimport }}
<li class='ipsMenu_item'>
<a href='{$blog->url()->setQueryString( array( 'do' => 'rssImport', 'csrfKey' => \IPS\Session::i()->csrfKey ) )}' title="{lang="blog_rss_import"}" data-ipsDialog data-ipsDialog-title="{lang="blog_rss_import"}">{lang="blog_rss_import"}</a>
<a href='{$blog->url()->setQueryString( array( 'do' => 'rssImport' ) )}' title="{lang="blog_rss_import"}" data-ipsDialog data-ipsDialog-title="{lang="blog_rss_import"}">{lang="blog_rss_import"}</a>
</li>
{{endif}}
@@ -1666,7 +1664,7 @@
<div class='ipsItemControls'>
<ul class='ipsComment_controls ipsClearfix ipsItemControls_left' data-role="commentControls">
{{if $comment->canReportOrRevoke() === TRUE}}
<li><a href='{$comment->url('report')}' data-ipsDialog data-ipsDialog-remoteSubmit data-ipsDialog-size='medium' data-ipsDialog-flashMessage='{lang="report_submit_success"}' data-ipsDialog-title="{lang="report"}" data-action='reportComment' title='{lang="report_content"}'>{lang="report"}</a></li>
<li><a href='{$comment->url('report')}' {{if member.member_id or \IPS\Helpers\Form\Captcha::supportsModal()}}data-ipsDialog data-ipsDialog-remoteSubmit data-ipsDialog-size='medium' data-ipsDialog-flashMessage='{lang="report_submit_success"}' data-ipsDialog-title="{lang="report"}"{{endif}} data-action='reportComment' title='{lang="report_content"}'>{lang="report"}</a></li>
{{endif}}
</ul>
{{if $comment->hidden() !== 1 && \IPS\IPS::classUsesTrait( $comment, 'IPS\Content\Reactable' ) and settings.reputation_enabled}}
applications/blog/data/versions.json
+39 -1
View File
@@ -355,6 +355,7 @@
"104067": "4.4.10",
"104068": "4.4.10",
"104069": "4.4.10",
"104070": "4.4.11",
"105013": "4.5.0 Beta 1",
"105014": "4.5.0 Beta 1",
"105015": "4.5.0 Beta 2",
@@ -375,5 +376,42 @@
"105030": "4.5.0 Beta 11",
"105031": "4.5.0 Beta 11",
"105032": "4.5.0 Beta 12",
"105100": "4.5.0"
"105100": "4.5.0",
"105101": "4.5.0",
"105102": "4.5.1 Beta 1",
"105103": "4.5.1 Beta 1",
"105104": "4.5.1 Beta 2",
"105105": "4.5.1 Beta 3",
"105106": "4.5.1",
"105107": "4.5.2",
"105108": "4.5.2",
"105109": "4.5.2",
"105110": "4.5.2",
"105111": "4.5.2",
"105112": "4.5.3",
"105113": "4.5.3",
"105114": "4.5.3",
"105115": "4.5.3",
"105116": "4.5.4",
"105117": "4.5.4",
"105118": "4.5.4",
"105119": "4.5.4",
"105120": "4.5.4",
"105121": "4.5.4",
"105122": "4.5.4",
"105123": "4.5.4",
"105124": "4.5.4.1",
"105125": "4.5.4.2",
"105126": "4.5.4.2",
"105127": "4.5.4.2",
"105128": "4.5.4.2",
"105129": "4.5.4.2",
"105130": "4.5.4.2",
"106100": "4.6.0 Beta 1",
"106101": "4.6.0 Beta 1.1",
"106103": "4.6.0 Beta 2",
"106104": "4.6.0 Beta 3",
"106105": "4.6.0 Beta 3.1",
"106106": "4.6.0 Beta 4",
"106107": "4.6.0"
}
applications/blog/extensions/core/MemberSync/Blog.php
+8 -5
View File
@@ -75,12 +75,15 @@ class _Blog
{
foreach( \IPS\blog\Blog::loadByOwner( $member ) as $blog )
{
$blog->disabled = TRUE;
$blog->save();
if( \in_array( 'delete', $actions ) )
if( !$blog->groupblog_ids )
{
\IPS\Task::queue( 'core', 'DeleteOrMoveContent', array( 'class' => 'IPS\blog\Blog', 'id' => $blog->id, 'deleteWhenDone' => TRUE ), 3 );
$blog->disabled = TRUE;
$blog->save();
if( \in_array( 'delete', $actions ) )
{
\IPS\Task::queue( 'core', 'DeleteOrMoveContent', array( 'class' => 'IPS\blog\Blog', 'id' => $blog->id, 'deleteWhenDone' => TRUE ), 3 );
}
}
}
}
applications/blog/modules/front/blogs/browse.php
+2
View File
@@ -57,6 +57,8 @@ class _browse extends \IPS\Dispatcher\Controller
{
\IPS\Session::i()->csrfCheck();
\IPS\Request::i()->setCookie( 'blog_view', \IPS\Request::i()->view, ( new \IPS\DateTime )->add( new \DateInterval( 'P1Y' ) ) );
\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=blog', 'front', 'blogs' ) );
}
/* Grid view */
applications/blog/modules/front/blogs/entry.php
+4 -13
View File
@@ -159,7 +159,7 @@ class _entry extends \IPS\Content\Controller
'@type' => 'Person',
'name' => \IPS\Member::load( $this->entry->mapped('author') )->name,
'url' => (string) \IPS\Member::load( $this->entry->mapped('author') )->url(),
'image' => \IPS\Member::load( $this->entry->mapped('author') )->get_photo()
'image' => \IPS\Member::load( $this->entry->mapped('author') )->get_photo( TRUE, TRUE )
),
'publisher' => array(
'@id' => \IPS\Settings::i()->base_url . '#organization',
@@ -167,7 +167,7 @@ class _entry extends \IPS\Content\Controller
'@type' => 'Person',
'name' => \IPS\Member::load( $this->entry->mapped('author') )->name,
'url' => (string) \IPS\Member::load( $this->entry->mapped('author') )->url(),
'image' => \IPS\Member::load( $this->entry->mapped('author') )->get_photo()
'image' => \IPS\Member::load( $this->entry->mapped('author') )->get_photo( TRUE, TRUE )
)
),
'interactionStatistic' => array(
@@ -190,15 +190,6 @@ class _entry extends \IPS\Content\Controller
)
);
if( $this->entry->averageRating() )
{
\IPS\Output::i()->jsonLd['blog']['blogPost']['aggregateRating'] = array(
'@type' => 'AggregateRating',
'ratingValue' => $this->entry->averageRating(),
'ratingCount' => $this->entry->numberOfRatings(),
);
}
if( $this->entry->container()->coverPhoto()->file )
{
\IPS\Output::i()->jsonLd['blog']['image'] = (string) $this->entry->container()->coverPhoto()->file->url;
@@ -210,7 +201,7 @@ class _entry extends \IPS\Content\Controller
'@type' => 'Person',
'name' => \IPS\Member::load( $this->entry->container()->member_id )->name,
'url' => (string) \IPS\Member::load( $this->entry->container()->member_id )->url(),
'image' => \IPS\Member::load( $this->entry->container()->member_id )->get_photo()
'image' => \IPS\Member::load( $this->entry->container()->member_id )->get_photo( TRUE, TRUE )
);
}
@@ -264,7 +255,7 @@ class _entry extends \IPS\Content\Controller
/* Breadcrumb */
\IPS\Output::i()->breadcrumb = array();
\IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) );
\IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front', 'blogs' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) );
try
{
applications/blog/modules/front/blogs/view.php
+17 -4
View File
@@ -64,6 +64,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
$this->blog->clubCheckRules();
/* Build table */
$tableUrl = $this->blog->url();
$where = array();
if ( !\in_array( $this->blog->id, array_keys( \IPS\blog\Blog::loadByOwner( \IPS\Member::loggedIn() ) ) ) AND !\IPS\blog\Entry::canViewHiddenItems( \IPS\Member::loggedIn(), $this->blog ) )
{
@@ -77,6 +78,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
try
{
$category = \IPS\blog\Entry\Category::load( \IPS\Request::i()->cat );
$tableUrl = $tableUrl->setQueryString( [ 'cat' => $category->id ] );
}
catch( \OutOfRangeException $e )
{
@@ -88,7 +90,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
$where[] = array( "entry_category_id=?", $category->id );
}
$table = new \IPS\Helpers\Table\Content( 'IPS\blog\Entry', $this->blog->url(), $where, $this->blog );
$table = new \IPS\Helpers\Table\Content( 'IPS\blog\Entry', $tableUrl, $where, $this->blog );
$table->tableTemplate = array( \IPS\Theme::i()->getTemplate( 'view' ), 'blogTable' );
if ( \IPS\Settings::i()->blog_allow_grid )
@@ -175,7 +177,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
'@type' => 'Person',
'name' => \IPS\Member::load( $this->blog->member_id )->name,
'url' => (string) \IPS\Member::load( $this->blog->member_id )->url(),
'image' => \IPS\Member::load( $this->blog->member_id )->get_photo()
'image' => \IPS\Member::load( $this->blog->member_id )->get_photo( TRUE, TRUE )
);
}
@@ -185,7 +187,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
}
\IPS\Output::i()->breadcrumb = array();
\IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) );
\IPS\Output::i()->breadcrumb['module'] = array( \IPS\Http\Url::internal( 'app=blog', 'front', 'blogs' ), \IPS\Member::loggedIn()->language()->addToStack( '__app_blog' ) );
try
{
@@ -539,14 +541,25 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
*/
protected function manageCategories()
{
\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'front_view.js', 'blog', 'front' ) );
if( !$this->blog->canEdit() )
{
\IPS\Output::i()->error( 'no_module_permission', '2B201/A', 403, '' );
}
$form = new \IPS\Helpers\Form;
$form->addHtml( \IPS\Theme::i()->getTemplate( 'view', 'blog', 'front' )->manageCategories( $this->blog ) );
$form->hiddenValues['submitted'] = 1;
if( $values = $form->values() )
{
\IPS\Output::i()->redirect( $this->blog->url() );
}
/* Display */
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('blog_manage_entry_categories');
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'view', 'blog', 'front' )->manageCategories( \IPS\blog\Entry\Category::roots( NULL, NULL, array( 'entry_category_blog_id=?', $this->blog->id ) ), $this->blog );
\IPS\Output::i()->output = $form->error ? $form : \IPS\Theme::i()->getTemplate( 'view', 'blog', 'front' )->rssImport( $form->customTemplate( array( \IPS\Theme::i()->getTemplate( 'forms', 'core' ), 'popupTemplate' ) ) );
}
/**
applications/blog/setup/upg_105013/queries.json
+19 -12
View File
@@ -1,5 +1,12 @@
{
"1": {
"method": "dropTable",
"params": [
"blog_categories",
true
]
},
"2": {
"method": "createTable",
"params": [
{
@@ -97,7 +104,7 @@
}
]
},
"2": {
"3": {
"method": "createTable",
"params": [
{
@@ -213,7 +220,7 @@
}
]
},
"3": {
"4": {
"method": "addColumn",
"params": [
"blog_blogs",
@@ -233,7 +240,7 @@
}
]
},
"4": {
"5": {
"method": "update",
"params": [
"blog_blogs",
@@ -242,7 +249,7 @@
}
]
},
"5": {
"6": {
"method": "addColumn",
"params": [
"blog_entries",
@@ -262,7 +269,7 @@
}
]
},
"6": {
"7": {
"method": "addIndex",
"params": [
"blog_blogs",
@@ -278,7 +285,7 @@
}
]
},
"7": {
"8": {
"method": "addColumn",
"params": [
"blog_entries",
@@ -298,7 +305,7 @@
}
]
},
"8": {
"9": {
"method": "addColumn",
"params": [
"blog_entries",
@@ -318,14 +325,14 @@
}
]
},
"9": {
"10": {
"method": "dropColumn",
"params": [
"blog_entries",
"entry_edit_show"
]
},
"10": {
"11": {
"method": "addColumn",
"params": [
"blog_entries",
@@ -345,7 +352,7 @@
}
]
},
"11": {
"12": {
"method": "delete",
"params": [
"core_sys_lang_words",
@@ -355,7 +362,7 @@
]
]
},
"12": {
"13": {
"method": "changeColumn",
"params": [
"blog_comments",
@@ -374,7 +381,7 @@
}
]
},
"13": {
"14": {
"method": "changeColumn",
"params": [
"blog_entries",
applications/blog/setup/upg_105013/upgrade.php
+11 -2
View File
@@ -46,6 +46,12 @@ class _Upgrade
*/
public function step2()
{
/* Make sure we have the table first */
if( !\IPS\Db::i()->checkForTable('blog_rss_import') )
{
return TRUE;
}
/* Move over blog_rss_import to core_rss_import */
foreach( \IPS\Db::i()->select( '*', 'blog_rss_import' ) as $rss )
{
@@ -69,7 +75,7 @@ class _Upgrade
'rss_import_member' => $rss['rss_member'],
'rss_import_time' => 0,
'rss_import_last_import' => $rss['rss_last_import'],
'rss_import_showlink' => $rss['rss_import_show_link'],
'rss_import_showlink' => $rss['rss_import_show_link'] ?? '',
'rss_import_topic_pre' => '',
'rss_import_auto_follow' => 0,
'rss_import_settings' => json_encode( array(
@@ -103,7 +109,10 @@ class _Upgrade
\IPS\Db::i()->delete( 'core_tasks', array( '`key`=?', 'blogrssimport' ) );
/* Delete old RSS Table */
\IPS\Db::i()->dropTable( array( 'blog_rss_import', 'blog_rss_imported' ) );
if( \IPS\Db::i()->checkForTable('blog_rss_import') )
{
\IPS\Db::i()->dropTable( array( 'blog_rss_import', 'blog_rss_imported' ) );
}
return TRUE;
}
applications/blog/setup/upg_105101/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105101,
"name": "4.5.0",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105102/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105102,
"name": "4.5.1 Beta 1",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105103/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105103,
"name": "4.5.1 Beta 1",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105104/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105104,
"name": "4.5.1 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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105105/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105105,
"name": "4.5.1 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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105106/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105106,
"name": "4.5.1",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105107/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105107,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105108/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105108,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105109/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105109,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105110/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105110,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105111/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105111,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105112/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105112,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105113/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105113,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105114/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105114,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105115/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105115,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105116/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105116,
"name": "4.5.4",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105116/lang.json
+14
View File
@@ -0,0 +1,14 @@
{
"normal": {
"added": [
"blog_subcategories"
],
"edited": [],
"removed": []
},
"js": {
"added": [],
"edited": [],
"removed": []
}
}
applications/blog/setup/upg_105116/theme.json
+19
View File
@@ -0,0 +1,19 @@
{
"html": {
"added": [],
"edited": [
"front\/browse\/categories"
],
"removed": []
},
"css": {
"added": [],
"edited": [],
"removed": []
},
"resources": {
"added": [],
"edited": [],
"removed": []
}
}
applications/blog/setup/upg_105117/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105117,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105118/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105118,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105119/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105119,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105120/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105120,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105121/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105121,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105122/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105122,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105123/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105123,
"name": "4.5.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105124/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105124,
"name": "4.5.4.1",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105125/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105125,
"name": "4.5.4.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105126/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105126,
"name": "4.5.4.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105127/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105127,
"name": "4.5.4.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105128/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105128,
"name": "4.5.4.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105129/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105129,
"name": "4.5.4.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_105130/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 105130,
"name": "4.5.4.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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_106100/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 106100,
"name": "4.6.0 Beta 1",
"steps": {
"queries": true,
"lang": true,
"theme": true,
"themeSettings": false,
"javascript": true,
"emailTemplates": false,
"hooks": false,
"acpSearchKeywords": false,
"settings": false,
"tasks": false,
"modules": false,
"widgets": false,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_106100/javascript.json
+14
View File
@@ -0,0 +1,14 @@
{
"files": {
"added": [],
"edited": [
"blog\/front\/controllers\/view\/ips.view.manageCategories.js"
],
"removed": []
},
"orders": {
"added": [],
"edited": [],
"removed": []
}
}
applications/blog/setup/upg_106100/lang.json
+15
View File
@@ -0,0 +1,15 @@
{
"normal": {
"added": [
"__defart_blog_entry_comment_plural",
"__defart_blog_entry_plural"
],
"edited": [],
"removed": []
},
"js": {
"added": [],
"edited": [],
"removed": []
}
}
applications/blog/setup/upg_106100/queries.json
+92
View File
@@ -0,0 +1,92 @@
{
"1": {
"method": "addColumn",
"params": [
"blog_blogs",
{
"name": "blog_allow_anonymous",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
]
},
"2": {
"method": "addColumn",
"params": [
"blog_blogs",
{
"name": "blog_last_poster_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
]
},
"3": {
"method": "addColumn",
"params": [
"blog_entries",
{
"name": "entry_is_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
]
},
"4": {
"method": "addColumn",
"params": [
"blog_entries",
{
"name": "entry_last_poster_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
]
},
"5": {
"method": "addColumn",
"params": [
"blog_comments",
{
"name": "comment_is_anon",
"type": "TINYINT",
"length": null,
"decimals": null,
"values": null,
"allow_null": false,
"default": "0",
"comment": "",
"unsigned": true,
"auto_increment": false
}
]
}
}
applications/blog/setup/upg_106100/theme.json
+28
View File
@@ -0,0 +1,28 @@
{
"html": {
"added": [],
"edited": [
"front\/browse\/categories",
"front\/browse\/index",
"front\/browse\/indexButtons",
"front\/browse\/indexGridEntry",
"admin\/livesearch\/blog",
"front\/view\/blogTable",
"front\/view\/categories",
"front\/view\/entry",
"front\/view\/view",
"front\/widgets\/blogCommentFeed"
],
"removed": []
},
"css": {
"added": [],
"edited": [],
"removed": []
},
"resources": {
"added": [],
"edited": [],
"removed": []
}
}
applications/blog/setup/upg_106101/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 106101,
"name": "4.6.0 Beta 1.1",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_106103/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 106103,
"name": "4.6.0 Beta 2",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_106103/lang.json
+14
View File
@@ -0,0 +1,14 @@
{
"normal": {
"added": [
"blogs_sg_lc"
],
"edited": [],
"removed": []
},
"js": {
"added": [],
"edited": [],
"removed": []
}
}
applications/blog/setup/upg_106104/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 106104,
"name": "4.6.0 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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_106105/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 106105,
"name": "4.6.0 Beta 3.1",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_106106/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 106106,
"name": "4.6.0 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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/setup/upg_106107/data.json
+24
View File
@@ -0,0 +1,24 @@
{
"id": 106107,
"name": "4.6.0",
"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,
"whatsnew": false,
"customOptions": false,
"customRoutines": false
},
"forceMainUpgrader": false,
"forceManualDownloadNoCiC": false,
"forceManualDownloadCiC": false
}
applications/blog/sources/Blog/Blog.php
+47 -13
View File
@@ -247,7 +247,6 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
default:
return $club->canRead( $member );
}
}
if ( $this->social_group )
@@ -312,7 +311,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
{
if ( $club->type == $club::TYPE_PUBLIC or $club->type == $club::TYPE_READONLY or $club->type == $club::TYPE_OPEN)
{
return 'ca';
return '*';
}
else
{
@@ -429,6 +428,10 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
'subnodes' => FALSE,
), NULL, NULL, NULL, 'blog_category_id' ) );
}
else
{
$form->hiddenValues['blog_category_id'] = \IPS\Request::i()->parent;
}
$groups = array();
foreach ( \IPS\Member\Group::groups() as $k => $v )
@@ -461,7 +464,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
},
NULL, NULL, 'blog_member_id' ) );
$form->add( new \IPS\Helpers\Form\Select( 'blog_groupblog_ids', $this->id ? explode( ',', $this->groupblog_ids ) : array(), FALSE, array( 'options' => $groups, 'multiple' => TRUE ), NULL, NULL, NULL, 'blog_groupblog_ids' ) );
$form->add( new \IPS\Helpers\Form\CheckboxSet( 'blog_groupblog_ids', $this->id ? explode( ',', $this->groupblog_ids ) : array(), FALSE, array( 'options' => $groups, 'multiple' => TRUE ), NULL, NULL, NULL, 'blog_groupblog_ids' ) );
$form->add( new \IPS\Helpers\Form\Translatable( 'blog_groupblog_name', NULL, FALSE, array( 'app' => 'blog', 'key' => ( $this->id ? "blogs_groupblog_name_{$this->id}" : NULL ) ), function( $value ) {
if ( \IPS\Request::i()->blog_type === 'group' )
{
@@ -542,6 +545,8 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
$form->add( new \IPS\Helpers\Form\YesNo( 'blog_enable_rss', $this->id ? $this->settings['allowrss'] : TRUE ) );
}
$form->add( new \IPS\Helpers\Form\YesNo( 'allow_anonymous_comments', $this->id ? $this->allow_anonymous : FALSE, FALSE, array() ) );
/* Categories */
if ( $public and $this->id )
{
@@ -558,8 +563,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
*/
public function formatFormValues( $values )
{
if ( isset( $values['blog_category_id'] ) and $values[ 'blog_category_id' ] )
if ( isset( $values['blog_category_id'] ) and \is_object( $values[ 'blog_category_id' ] ) )
{
$values[ 'blog_category_id' ] = \intval( $values[ 'blog_category_id' ]->id );
}
@@ -589,6 +593,12 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
unset( $values['blog_type'] );
}
if( isset( $values['allow_anonymous_comments'] ) )
{
$values['allow_anonymous'] = ( $values['allow_anonymous_comments'] ? 2 : 0 );
unset( $values['allow_anonymous_comments'] );
}
$this->massUpdateIndex = FALSE;
if ( isset( $values['blog_privacy'] ) and $values['blog_privacy'] === 'private' )
{
@@ -622,7 +632,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
if( $values['blog_member_id'] )
{
\IPS\File::claimAttachments( 'blogs-new-blog', $this->id, NULL, 'description', TRUE );
\IPS\File::claimAttachments( 'blogs-new-blog', $this->id, NULL, 'description' );
}
else
{
@@ -766,6 +776,12 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
{
\IPS\Content\Search\Index::i()->massUpdate( 'IPS\blog\Entry', $this->id, NULL, $this->searchIndexPermissions() );
}
/* If this was a new blog, fire the webhook */
if ( $this->newBlog )
{
\IPS\Api\Webhook::fire( 'blogBlog_create', $this, $this->webhookFilters() );
}
}
/**
@@ -1096,6 +1112,11 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
{
return array( \IPS\Theme::i()->getTemplate( 'browse', 'blog' ), 'rows' );
}
/**
* @brief Remember if this is a new blog so we can fire the webhook if so
*/
protected $newBlog = NULL;
/**
* Save Changed Columns
@@ -1104,14 +1125,12 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
*/
public function save()
{
$new = $this->_new;
if( $this->newBlog === NULL )
{
$this->newBlog = $this->_new;
}
parent::save();
if ( $new )
{
\IPS\Api\Webhook::fire( 'blogBlog_create', $this, $this->webhookFilters() );
}
}
/**
@@ -1150,6 +1169,9 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
/* Delete Follows */
\IPS\Db::i()->delete( 'core_follow', array( "follow_app=? AND follow_area=? AND follow_rel_id=?", 'blog', 'blog', $this->_id ) );
/* Delete Entry categories */
\IPS\Db::i()->delete( 'blog_entry_categories', array( "entry_category_blog_id = ?", $this->_id ) );
return parent::delete();
}
@@ -1285,6 +1307,9 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
*/
public function clubForm( \IPS\Helpers\Form $form )
{
\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'front_view.js', 'blog', 'front' ) );
$form->addTab( 'blog_settings' );
$itemClass = static::$contentItemClass;
$form->add( new \IPS\Helpers\Form\Text( 'club_node_name', $this->_id ? $this->_title : \IPS\Member::loggedIn()->language()->addToStack( 'blogs_sg' ), TRUE, array( 'maxLength' => 255 ) ) );
$form->add( new \IPS\Helpers\Form\Editor( 'club_node_description', $this->_id ? \IPS\Member::loggedIn()->language()->get( static::$titleLangPrefix . $this->_id . '_desc' ) : NULL, FALSE, array( 'app' => 'blog', 'key' => 'Blogs', 'autoSaveKey' => ( $this->id ? "blogs-blog-{$this->id}" : "blogs-new-blog" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'blog_desc_placeholder' ) ) );
@@ -1292,6 +1317,14 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
{
$form->add( new \IPS\Helpers\Form\YesNo( 'blog_enable_rss', $this->id ? $this->settings['allowrss'] : TRUE ) );
}
/* Categories */
if ( $this->id )
{
$form->addTab( 'blog_entry_categories' );
$form->addHtml( \IPS\Theme::i()->getTemplate( 'view', 'blog', 'front' )->manageCategories( $this ) );
}
}
/**
@@ -1392,9 +1425,10 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
* Get last comment time
*
* @note This should return the last comment time for this node only, not for children nodes
* @param \IPS\Member|NULL $member MemberObject
* @return \IPS\DateTime|NULL
*/
public function getLastCommentTime()
public function getLastCommentTime( \IPS\Member $member = NULL )
{
return $this->last_edate ? \IPS\DateTime::ts( $this->last_edate ) : NULL;
}
applications/blog/sources/Category/Category.php
+71
View File
@@ -252,4 +252,75 @@ class _Category extends \IPS\Node\Model
return $return;
}
/**
* Retrieve the content item count
*
* @param null|array $data Data array for mass move/delete
* @return null|int
*/
public function getContentItemCount( $data=NULL )
{
if ( !isset( static::$contentItemClass ) )
{
return false;
}
$contentItemClass = static::$contentItemClass;
$idColumn = static::$databaseColumnId;
$where = array( array( 'blog_blogs.blog_category_id=?', $this->$idColumn ) );
if( $data )
{
$where = array_merge_recursive( $where, $this->massMoveorDeleteWhere( $data ) );
}
$select = \IPS\Db::i()->select( 'COUNT(*)', $contentItemClass::$databaseTable, $where )->join( 'blog_blogs', "blog_entries.entry_blog_id=blog_blogs.blog_id" );
return (int) $select->first();
}
/**
* Retrieve content items (if applicable) for a node.
*
* @param int $limit The limit
* @param int $offset The offset
* @param array $additional Where Additional where clauses
* @param int $countOnly If TRUE, will get the number of results
* @return \IPS\Patterns\ActiveRecordIterator|int
* @throws \BadMethodCallException
*/
public function getContentItems( $limit, $offset, $additionalWhere = array(), $countOnly=FALSE )
{
if ( !isset( static::$contentItemClass ) )
{
throw new \BadMethodCallException;
}
$contentItemClass = static::$contentItemClass;
$where = array();
$where[] = array( 'blog_blogs.blog_category_id=?', $this->_id );
if ( \count( $additionalWhere ) )
{
foreach( $additionalWhere AS $clause )
{
$where[] = $clause;
}
}
if ( $countOnly )
{
return \IPS\Db::i()->select( 'COUNT(*)', $contentItemClass::$databaseTable, $where )->join( 'blog_blogs', "blog_entries.entry_blog_id=blog_blogs.blog_id" )->first();
}
else
{
$contentItemClass = static::$contentItemClass;
$limit = ( $offset !== NULL ) ? array( $offset, $limit ) : NULL;
return new \IPS\Patterns\ActiveRecordIterator( \IPS\Db::i()->select( '*', $contentItemClass::$databaseTable, $where, $contentItemClass::$databasePrefix . $contentItemClass::$databaseColumnId, $limit )->join( 'blog_blogs', "blog_entries.entry_blog_id=blog_blogs.blog_id" ), $contentItemClass );
}
}
}
applications/blog/sources/Entry/Comment.php
+3 -2
View File
@@ -21,7 +21,7 @@ if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
/**
* Blog Entry Comment Model
*/
class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory, \IPS\Content\Hideable, \IPS\Content\Searchable, \IPS\Content\Embeddable
class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory, \IPS\Content\Hideable, \IPS\Content\Searchable, \IPS\Content\Embeddable, \IPS\Content\Anonymous
{
use \IPS\Content\Reactable, \IPS\Content\Reportable;
@@ -58,7 +58,8 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
'edit_time' => 'edit_time',
'edit_member_name' => 'edit_member_name',
'edit_show' => 'edit_show',
'approved' => 'approved'
'approved' => 'approved',
'is_anon' => 'is_anon'
);
/**
applications/blog/sources/Entry/Entry.php
+33 -3
View File
@@ -34,7 +34,8 @@ class _Entry extends \IPS\Content\Item implements
\IPS\Content\Searchable,
\IPS\Content\Embeddable,
\IPS\Content\FuturePublishing,
\IPS\Content\MetaData
\IPS\Content\MetaData,
\IPS\Content\Anonymous
{
use \IPS\Content\Reactable, \IPS\Content\Reportable;
@@ -95,7 +96,9 @@ class _Entry extends \IPS\Content\Item implements
'edit_time' => 'edit_time',
'edit_member_name' => 'edit_name',
'edit_show' => 'append_edit',
'edit_reason' => 'edit_reason'
'edit_reason' => 'edit_reason',
'is_anon' => 'is_anon',
'last_comment_anon' => 'last_poster_anon',
);
/**
@@ -443,7 +446,7 @@ class _Entry extends \IPS\Content\Item implements
$options[ $category->id ] = $category->name;
}
$return[ 'entry_category_id' ] = new \IPS\Helpers\Form\Select( 'entry_category_id', ( $item AND $item->category_id ) ? $item->category_id : ( \IPS\Request::i()->cat ? \IPS\Request::i()->cat : NULL ), FALSE, array( 'options' => $options ), NULL, NULL, NULL, "entry_category_id" );
$return[ 'entry_category_id' ] = new \IPS\Helpers\Form\Select( 'entry_category_id', ( $item AND $item->category_id ) ? $item->category_id : ( \IPS\Request::i()->cat ? \IPS\Request::i()->cat : NULL ), FALSE, array( 'options' => $options, 'parse' => 'normal' ), NULL, NULL, NULL, "entry_category_id" );
}
$return['blog_entry_new_category'] = new \IPS\Helpers\Form\Text( 'blog_entry_new_category', NULL, TRUE, array(), NULL, NULL, NULL, "blog_entry_new_category" );
@@ -736,6 +739,18 @@ class _Entry extends \IPS\Content\Item implements
return $result;
}
/**
* Delete Record
*
* @return void
*/
public function delete()
{
parent::delete();
$this->coverPhoto()->delete();
}
/**
* Get template for content tables
*
@@ -992,4 +1007,19 @@ class _Entry extends \IPS\Content\Item implements
return $this->category;
}
/**
* Move
*
* @param \IPS\Node\Model $container Container to move to
* @param bool $keepLink If TRUE, will keep a link in the source
* @return void
*/
public function move( \IPS\Node\Model $container, $keepLink=FALSE )
{
parent::move( $container, $keepLink );
$this->category_id = NULL;
$this->save();
}
}