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

Version 5.0.0 beta 1

Browse Source
This commit is contained in:
Neo committed 2025-12-19 16:27:35 -08:00
1 parent 25ddeb65d6
commit 15c7beabc5
6736 files changed
+627902 -497943
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/blog/sources/Blog/Blog.php
+377 -271
View File
File diff suppressed because it is too large. Load diff
applications/blog/sources/Blog/ProfileTable.php
+13 -8
View File
@@ -12,24 +12,29 @@
namespace IPS\blog\Blog;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use IPS\Http\Url;
use IPS\Member;
use function defined;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Blog Profile Table Helper
*/
class _ProfileTable extends Table
class ProfileTable extends Table
{
/**
* Constructor
*
* @param \IPS\Http\Url $url Base URL
* @param Url|null $url Base URL
* @return void
*/
public function __construct( \IPS\Http\Url $url=NULL )
public function __construct( Url $url=NULL )
{
parent::__construct( $url );
}
@@ -37,17 +42,17 @@ class _ProfileTable extends Table
/**
* Get rows
*
* @param array $advancedSearchValues Values from the advanced search form
* @param array|null $advancedSearchValues Values from the advanced search form
* @return array
*/
public function getRows( $advancedSearchValues )
public function getRows( array $advancedSearchValues = NULL ): array
{
$rows = parent::getRows( $advancedSearchValues );
$return = array();
foreach( $rows AS $row )
{
if ( $row->owner() instanceof \IPS\Member )
if ( $row->owner() instanceof Member )
{
$return['owner'][ $row->id ] = $row;
}
applications/blog/sources/Blog/Table.php
+46 -31
View File
@@ -12,33 +12,52 @@
namespace IPS\blog\Blog;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use IPS\blog\Blog;
use IPS\Db;
use IPS\Helpers\Table\Table as TableHelper;
use IPS\Http\Url;
use IPS\Member;
use IPS\Member\Club;
use IPS\Node\Model;
use IPS\Settings;
use IPS\Theme;
use function defined;
use function in_array;
use function is_array;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Blog Table Helper
*/
class _Table extends \IPS\Helpers\Table\Table
class Table extends TableHelper
{
/**
* @brief Container
*/
protected $container;
protected ?Model $container = NULL;
/**
* @brief Where clauses
*/
public ?array $where;
/**
* Constructor
*
* @param \IPS\Http\Url $url Base URL
* @param Url|null $url Base URL
* @return void
*/
public function __construct( \IPS\Http\Url $url=NULL )
public function __construct( Url $url=NULL )
{
/* Init */
parent::__construct( $url );
$this->rowsTemplate = array( \IPS\Theme::i()->getTemplate( 'browse', 'blog' ), 'rows' );
$this->rowsTemplate = array( Theme::i()->getTemplate( 'browse', 'blog' ), 'rows' );
/* Set available sort options */
foreach ( array( 'last_edate', 'rating_total', 'num_views' ) as $k )
@@ -55,44 +74,40 @@ class _Table extends \IPS\Helpers\Table\Table
/**
* Set owner
*
* @param \IPS\Member $member The member to filter by
* @param Member $member The member to filter by
* @return void
*/
public function setOwner( \IPS\Member $member )
public function setOwner( Member $member ) : void
{
$this->where[] = array( '(' . \IPS\Db::i()->findInSet( 'blog_groupblog_ids', $member->groups ) . ' OR ' . 'blog_member_id=? )', $member->member_id );
$this->where[] = array( '(' . Db::i()->findInSet( 'blog_groupblog_ids', $member->groups ) . ' OR ' . 'blog_member_id=? )', $member->member_id );
}
/**
* Get rows
*
* @param array $advancedSearchValues Values from the advanced search form
* @param array|null $advancedSearchValues Values from the advanced search form
* @return array
*/
public function getRows( $advancedSearchValues )
public function getRows( array $advancedSearchValues = NULL ): array
{
/* Init */
$class = "IPS\\blog\\Blog";
$subquery = NULL;
/* Check sortBy */
$this->sortBy = \in_array( $this->sortBy, $this->sortOptions ) ? $this->sortBy : 'blog_name';
$this->sortBy = in_array( $this->sortBy, $this->sortOptions ) ? $this->sortBy : 'blog_name';
/* What are we sorting by? */
$sortBy = 'blog_pinned DESC, ' . $this->sortBy . ' ' . ( mb_strtolower( $this->sortDirection ) == 'asc' ? 'asc' : 'desc' );
$sortBy = 'blog_pinned DESC, ' . $this->sortBy . ' ' . ( ( $this->sortDirection and mb_strtolower( $this->sortDirection ) == 'asc' ) ? 'asc' : 'desc' );
/* Specify filter in where clause */
$where = isset( $this->where ) ? \is_array( $this->where ) ? $this->where : array( $this->where ) : array();
$where = isset( $this->where ) ? is_array( $this->where ) ? $this->where : array( $this->where ) : array();
$where[] = array( 'blog_disabled=0' );
if ( $this->filter and isset( $this->filters[ $this->filter ] ) )
{
$where[] = \is_array( $this->filters[ $this->filter ] ) ? $this->filters[ $this->filter ] : array( $this->filters[ $this->filter ] );
$where[] = is_array( $this->filters[ $this->filter ] ) ? $this->filters[ $this->filter ] : array( $this->filters[ $this->filter ] );
}
/* Exclude private blogs unless we have permission to view them */
if ( \IPS\Member::loggedIn()->member_id )
if ( Member::loggedIn()->member_id )
{
$where[] = array( '( blog_social_group IS NULL OR blog_member_id=? OR blog_social_group IN(?) )', \IPS\Member::loggedIn()->member_id, \IPS\Db::i()->select( 'group_id', 'core_sys_social_group_members', array( 'member_id=?', \IPS\Member::loggedIn()->member_id ) ) );
$where[] = array( '( blog_social_group IS NULL OR blog_member_id=? OR blog_social_group IN(?) )', Member::loggedIn()->member_id, Db::i()->select( 'group_id', 'core_sys_social_group_members', array( 'member_id=?', Member::loggedIn()->member_id ) ) );
}
else
{
@@ -100,21 +115,21 @@ class _Table extends \IPS\Helpers\Table\Table
}
/* Exclude club blogs unless we have permission to view them */
if ( \IPS\Settings::i()->club_nodes_in_apps )
if ( Settings::i()->club_nodes_in_apps )
{
if ( \IPS\Member::loggedIn()->member_id )
if ( Member::loggedIn()->member_id )
{
$where[] = array(
'( blog_club_id IS NULL OR blog_club_id IN(?) OR blog_club_id IN(?) )',
\IPS\Db::i()->select( 'id', 'core_clubs', array( \IPS\Db::i()->in( 'type', array( \IPS\Member\Club::TYPE_PUBLIC, \IPS\Member\Club::TYPE_OPEN, \IPS\Member\Club::TYPE_READONLY ) ) ) ),
\IPS\Db::i()->select( 'club_id', 'core_clubs_memberships', array( "member_id=? AND status IN('" . \IPS\Member\Club::STATUS_MEMBER . "','" . \IPS\Member\Club::STATUS_MODERATOR . "','" . \IPS\Member\Club::STATUS_LEADER . "')", \IPS\Member::loggedIn()->member_id ) ),
Db::i()->select( 'id', 'core_clubs', array( Db::i()->in( 'type', array( Club::TYPE_PUBLIC, Club::TYPE_OPEN, Club::TYPE_READONLY ) ) ) ),
Db::i()->select( 'club_id', 'core_clubs_memberships', array( "member_id=? AND status IN('" . Club::STATUS_MEMBER . "','" . Club::STATUS_MODERATOR . "','" . Club::STATUS_LEADER . "')", Member::loggedIn()->member_id ) ),
);
}
else
{
$where[] = array(
'( blog_club_id IS NULL OR blog_club_id IN(?) )',
\IPS\Db::i()->select( 'id', 'core_clubs', array( \IPS\Db::i()->in( 'type', array( \IPS\Member\Club::TYPE_PUBLIC, \IPS\Member\Club::TYPE_OPEN, \IPS\Member\Club::TYPE_READONLY ) ) ) ),
Db::i()->select( 'id', 'core_clubs', array( Db::i()->in( 'type', array( Club::TYPE_PUBLIC, Club::TYPE_OPEN, Club::TYPE_READONLY ) ) ) ),
);
}
}
@@ -124,16 +139,16 @@ class _Table extends \IPS\Helpers\Table\Table
}
/* Get Count */
$count = \IPS\Db::i()->select( 'COUNT(*) as cnt', 'blog_blogs', $where )->first();
$count = Db::i()->select( 'COUNT(*) as cnt', 'blog_blogs', $where )->first();
$this->pages = ceil( $count / $this->limit );
/* Get results */
$it = \IPS\Db::i()->select( '*', 'blog_blogs', $where, $sortBy, array( ( $this->limit * ( $this->page - 1 ) ), $this->limit ) );
$it = Db::i()->select( '*', 'blog_blogs', $where, $sortBy, array( ( $this->limit * ( $this->page - 1 ) ), $this->limit ) );
$rows = iterator_to_array( $it );
foreach( $rows as $index => $row )
{
$rows[ $index ] = \IPS\blog\Blog::constructFromData( $row );
$rows[ $index ] = Blog::constructFromData( $row );
}
/* Return */
@@ -146,7 +161,7 @@ class _Table extends \IPS\Helpers\Table\Table
* @param array|NULL $advancedSearchValues Advanced search values
* @return array
*/
public function getHeaders( $advancedSearchValues )
public function getHeaders( array $advancedSearchValues=NULL ): array
{
return array();
}
applications/blog/sources/Category/Category.php
+103 -60
View File
@@ -12,73 +12,96 @@
namespace IPS\blog;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use BadMethodCallException;
use IPS\Content\Item;
use IPS\Content\ViewUpdates;
use IPS\Db;
use IPS\File;
use IPS\Helpers\Form;
use IPS\Helpers\Form\Node;
use IPS\Helpers\Form\Translatable;
use IPS\Http\Url;
use IPS\Http\Url\Friendly;
use IPS\IPS;
use IPS\Lang;
use IPS\Member;
use IPS\Node\Model;
use IPS\Patterns\ActiveRecordIterator;
use IPS\Request;
use IPS\Theme;
use function count;
use function defined;
use function get_called_class;
use function get_class;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Blog Category
*/
class _Category extends \IPS\Node\Model
class Category extends Model
{
use \IPS\Content\ViewUpdates;
use ViewUpdates;
/**
* @brief [ActiveRecord] Multiton Store
*/
protected static $multitons;
protected static array $multitons;
/**
* @brief [ActiveRecord] Database Table
*/
public static $databaseTable = 'blog_categories';
public static ?string $databaseTable = 'blog_categories';
/**
* @brief [ActiveRecord] Database Prefix
*/
public static $databasePrefix = 'category_';
public static string $databasePrefix = 'category_';
/**
* @brief [Node] Parent ID Database Column
*/
public static $databaseColumnParent = 'parent';
public static ?string $databaseColumnParent = 'parent';
/**
* @brief [Node] Order Database Column
*/
public static $databaseColumnOrder = 'position';
public static ?string $databaseColumnOrder = 'position';
/**
* @brief [Node] Node Title
*/
public static $nodeTitle = 'blog_categories';
public static string $nodeTitle = 'blog_categories';
/**
* @brief [Node] Subnode class
*/
public static $subnodeClass = 'IPS\blog\Blog';
public static ?string $subnodeClass = 'IPS\blog\Blog';
/**
* @brief Content Item Class
*/
public static $contentItemClass = 'IPS\blog\Entry';
public static ?string $contentItemClass = 'IPS\blog\Entry';
/**
* @brief [Node] Title prefix. If specified, will look for a language key with "{$key}_title" as the key
*/
public static $titleLangPrefix = 'blog_category_';
public static ?string $titleLangPrefix = 'blog_category_';
/**
* @brief [Node] Description suffix. If specified, will look for a language key with "{$titleLangPrefix}_{$id}_{$descriptionLangSuffix}" as the key
*/
public static $descriptionLangSuffix = '_desc';
public static ?string $descriptionLangSuffix = '_desc';
/**
* @brief SEO Title Column
*/
public static $seoTitleColumn = 'seo_name';
public static string $seoTitleColumn = 'seo_name';
/**
* @brief [Node] ACP Restrictions
@@ -96,7 +119,7 @@ class _Category extends \IPS\Node\Model
'prefix' => 'foo_', // [Optional] Rather than specifying each key in the map, you can specify a prefix, and it will automatically look for restrictions with the key "[prefix]_add/edit/permissions/delete"
* @endcode
*/
protected static $restrictions = array(
protected static ?array $restrictions = array(
'app' => 'blog',
'module' => 'categories',
'prefix' => 'categories_',
@@ -105,21 +128,28 @@ class _Category extends \IPS\Node\Model
/**
* @brief The class of the ACP \IPS\Node\Controller that manages this node type
*/
protected static $acpController = "IPS\\blog\\modules\\admin\\blogs\\blogs";
protected static ?string $acpController = "IPS\\blog\\modules\\admin\\blogs\\blogs";
/**
* Determines if this class can be extended via UI Extension
*
* @var bool
*/
public static bool $canBeExtended = true;
/**
* [Node] Add/Edit Form
*
* @param \IPS\Helpers\Form $form The form
* @param Form $form The form
* @return void
*/
public function form( &$form )
public function form( Form &$form ) : void
{
$form->addHeader('category_basic_settings');
$form->add( new \IPS\Helpers\Form\Translatable( 'category_name', NULL, TRUE, array( 'app' => 'blog', 'key' => $this->id ? "blog_category_{$this->id}" : NULL ) ) );
$form->add( new Translatable( 'category_name', NULL, TRUE, array( 'app' => 'blog', 'key' => $this->id ? "blog_category_{$this->id}" : NULL ) ) );
\IPS\Member::loggedIn()->language()->words['category_desc'] = \IPS\Member::loggedIn()->language()->addToStack('blog_category_desc');
$form->add( new \IPS\Helpers\Form\Translatable( 'category_desc', NULL, FALSE, array(
Member::loggedIn()->language()->words['category_desc'] = Member::loggedIn()->language()->addToStack('blog_category_desc');
$form->add( new Translatable( 'category_desc', NULL, FALSE, array(
'app' => 'blog',
'key' => ( $this->id ? "blog_category_{$this->id}_desc" : NULL ),
'editor' => array(
@@ -130,17 +160,19 @@ class _Category extends \IPS\Node\Model
)
) ) );
$class = \get_called_class();
$class = get_called_class();
$form->add( new \IPS\Helpers\Form\Node( 'category_parent', $this->id ? $this->parent : 0, TRUE, array('disableCopy' => true,'class' => 'IPS\blog\Category', 'subnodes' => FALSE, 'zeroVal' => 'no_parent', 'permissionCheck' => function( $node ) use ( $class )
$form->add( new Node( 'category_parent', $this->id ? $this->parent : 0, TRUE, array( 'class' => 'IPS\blog\Category', 'subnodes' => FALSE, 'zeroVal' => 'no_parent', 'permissionCheck' => function( $node ) use ( $class )
{
if( isset( $class::$subnodeClass ) AND $class::$subnodeClass AND $node instanceof $class::$subnodeClass )
{
return FALSE;
}
return !isset( \IPS\Request::i()->id ) or ( $node->id != \IPS\Request::i()->id and !$node->isChildOf( $node::load( \IPS\Request::i()->id ) ) );
return !isset( Request::i()->id ) or ( $node->id != Request::i()->id and !$node->isChildOf( $node::load( Request::i()->id ) ) );
} ) ) );
parent::form( $form );
}
/**
@@ -149,7 +181,7 @@ class _Category extends \IPS\Node\Model
* @param array $values Values from the form
* @return array
*/
public function formatFormValues( $values )
public function formatFormValues( array $values ): array
{
if( isset( $values['category_parent'] ) )
{
@@ -159,7 +191,7 @@ class _Category extends \IPS\Node\Model
if ( !$this->id )
{
$this->save();
\IPS\File::claimAttachments( 'blog-new-category', $this->id, NULL, 'bcategory', TRUE );
File::claimAttachments( 'blog-new-category', $this->id, NULL, 'bcategory', TRUE );
}
elseif( isset( $values['category_name'] ) OR isset( $values['category_desc'] ) )
{
@@ -168,15 +200,15 @@ class _Category extends \IPS\Node\Model
if( isset( $values['category_name'] ) )
{
\IPS\Lang::saveCustom( 'blog', "blog_category_{$this->id}", $values['category_name'] );
$values['seo_name'] = \IPS\Http\Url\Friendly::seoTitle( $values['category_name'][ \IPS\Lang::defaultLanguage() ] );
Lang::saveCustom( 'blog', "blog_category_{$this->id}", $values['category_name'] );
$values['seo_name'] = Friendly::seoTitle( $values['category_name'][ Lang::defaultLanguage() ] );
unset( $values['category_name'] );
}
if( isset( $values['category_desc'] ) )
{
\IPS\Lang::saveCustom( 'blog', "blog_category_{$this->id}_desc", $values['category_desc'] );
Lang::saveCustom( 'blog', "blog_category_{$this->id}_desc", $values['category_desc'] );
unset( $values['category_desc'] );
}
@@ -187,19 +219,19 @@ class _Category extends \IPS\Node\Model
/**
* @brief Cached URL
*/
protected $_url = NULL;
protected mixed $_url = NULL;
/**
* Get URL
*
* @return \IPS\Http\Url
* @return Url|string|null
*/
public function url()
public function url(): Url|string|null
{
if( $this->_url === NULL )
{
$seoTitleColumn = static::$seoTitleColumn;
$this->_url = \IPS\Http\Url::internal( "app=blog&module=blogs&controller=browse&id={$this->id}", 'front', 'blog_category', $this->$seoTitleColumn );
$this->_url = Url::internal( "app=blog&module=blogs&controller=browse&id={$this->id}", 'front', 'blog_category', $this->$seoTitleColumn ? $this->$seoTitleColumn : '-' );
}
return $this->_url;
@@ -210,9 +242,9 @@ class _Category extends \IPS\Node\Model
*
* @return string
*/
public function link()
public function link(): string
{
return \IPS\Theme::i()->getTemplate( 'global', 'blog' )->blogCategoryLink( $this );
return Theme::i()->getTemplate( 'global', 'blog' )->blogCategoryLink( $this );
}
/**
@@ -221,33 +253,43 @@ class _Category extends \IPS\Node\Model
* @param array $indexData Data from the search index
* @param array $itemData Basic data about the item. Only includes columns returned by item::basicDataColumns()
* @param array|NULL $containerData Basic data about the container. Only includes columns returned by container::basicDataColumns()
* @return \IPS\Http\Url
* @return Url
*/
public static function urlFromIndexData( $indexData, $itemData, $containerData )
public static function urlFromIndexData( array $indexData, array $itemData, ?array $containerData ): Url
{
return \IPS\Http\Url::internal( "app=blog&module=blogs&controller=browse&category={$indexData['index_container_id']}", 'front', 'blog_category', \IPS\Member::loggedIn()->language()->addToStack( 'blog_category_' . $indexData['index_container_id'], FALSE, array( 'seotitle' => TRUE ) ) );
return Url::internal( "app=blog&module=blogs&controller=browse&category={$indexData['index_container_id']}", 'front', 'blog_category', Member::loggedIn()->language()->addToStack( 'blog_category_' . $indexData['index_container_id'], FALSE, array( 'seotitle' => TRUE ) ) );
}
/**
* [Node] Get Node Icon
*
* @return string|null
*/
protected function get__icon(): string|null
{
return ( $this->parent > 0 ) ? 'caret-down' : NULL ;
}
/**
* Get output for API
*
* @param \IPS\Member|NULL $authorizedMember The member making the API request or NULL for API Key / client_credentials
* @param Member|NULL $authorizedMember The member making the API request or NULL for API Key / client_credentials
* @return array
* @apiresponse int id ID number
* @apiresponse string name Name
* @apiresponse string url URL
* @apiresponse string class Node class
*/
public function apiOutput( \IPS\Member $authorizedMember = NULL )
public function apiOutput( Member $authorizedMember = NULL ): array
{
$return = array(
'id' => $this->id,
'name' => $this->_title,
'url' => (string) $this->url(),
'class' => \get_class( $this ),
'class' => get_class( $this ),
);
if ( \IPS\IPS::classUsesTrait( \get_called_class(), 'IPS\Content\ClubContainer' ) AND $this->club() )
if ( IPS::classUsesTrait( get_called_class(), 'IPS\Content\ClubContainer' ) AND $this->club() )
{
$return['public'] = ( $this->isPublic() ) ? 1 : 0;
}
@@ -258,16 +300,17 @@ class _Category extends \IPS\Node\Model
/**
* Retrieve the content item count
*
* @param null|array $data Data array for mass move/delete
* @param array|null $data Data array for mass move/delete
* @return null|int
*/
public function getContentItemCount( $data=NULL )
public function getContentItemCount( array $data=NULL ): ?int
{
if ( !isset( static::$contentItemClass ) )
{
return false;
return null;
}
/* @var Item $contentItemClass */
$contentItemClass = static::$contentItemClass;
$idColumn = static::$databaseColumnId;
@@ -279,7 +322,7 @@ class _Category extends \IPS\Node\Model
$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" );
$select = Db::i()->select( 'COUNT(*)', $contentItemClass::$databaseTable, $where )->join( 'blog_blogs', "blog_entries.entry_blog_id=blog_blogs.blog_id" );
return (int) $select->first();
}
@@ -287,26 +330,27 @@ class _Category extends \IPS\Node\Model
/**
* 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
* @param int|null $limit The limit
* @param int|null $offset The offset
* @param array $additionalWhere Where Additional where clauses
* @param bool|int $countOnly If TRUE, will get the number of results
* @return ActiveRecordIterator|int
* @throws BadMethodCallException
*/
public function getContentItems( $limit, $offset, $additionalWhere = array(), $countOnly=FALSE )
public function getContentItems( ?int $limit, ?int $offset, array $additionalWhere = array(), bool|int $countOnly=FALSE ): ActiveRecordIterator|int
{
if ( !isset( static::$contentItemClass ) )
{
throw new \BadMethodCallException;
throw new BadMethodCallException;
}
/* @var Item $contentItemClass */
$contentItemClass = static::$contentItemClass;
$where = array();
$where[] = array( 'blog_blogs.blog_category_id=?', $this->_id );
if ( \count( $additionalWhere ) )
if ( count( $additionalWhere ) )
{
foreach( $additionalWhere AS $clause )
{
@@ -316,13 +360,12 @@ class _Category extends \IPS\Node\Model
if ( $countOnly )
{
return \IPS\Db::i()->select( 'COUNT(*)', $contentItemClass::$databaseTable, $where )->join( 'blog_blogs', "blog_entries.entry_blog_id=blog_blogs.blog_id" )->first();
return 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 );
return new ActiveRecordIterator( 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/Category.php
+40 -25
View File
@@ -12,59 +12,76 @@
namespace IPS\blog\Entry;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use IPS\blog\Blog;
use IPS\Db;
use IPS\Http\Url;
use IPS\Member;
use IPS\Node\Model;
use IPS\Theme;
use function defined;
use function get_class;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Blog Category
*/
class _Category extends \IPS\Node\Model
class Category extends Model
{
/**
* @brief [ActiveRecord] Multiton Store
*/
protected static $multitons;
protected static array $multitons;
/**
* @brief [ActiveRecord] Database Table
*/
public static $databaseTable = 'blog_entry_categories';
public static ?string $databaseTable = 'blog_entry_categories';
/**
* @brief [ActiveRecord] Database Prefix
*/
public static $databasePrefix = 'entry_category_';
public static string $databasePrefix = 'entry_category_';
/**
* @brief [Node] Order Database Column
*/
public static $databaseColumnOrder = 'position';
public static ?string $databaseColumnOrder = 'position';
/**
* @brief [Node] Node Title
*/
public static $nodeTitle = 'blog_entry_categories';
public static string $nodeTitle = 'blog_entry_categories';
/**
* @brief Cached URL
*/
protected $_url = NULL;
protected mixed $_url = NULL;
/**
* Determines if this class can be extended via UI Extension
*
* @var bool
*/
public static bool $canBeExtended = true;
/**
* Get URL
*
* @return \IPS\Http\Url
* @return Url|string|null
*/
public function url()
public function url(): Url|string|null
{
$blog = \IPS\blog\Blog::load( $this->blog_id );
$blog = Blog::load( $this->blog_id );
if( $this->_url === NULL )
{
$this->_url = \IPS\Http\Url::internal( "app=blog&module=blogs&controller=view&id={$blog->id}&cat={$this->id}", 'front', 'blogs_blog_cat', array( $blog->seo_name, $this->seo_name ) );
$this->_url = Url::internal( "app=blog&module=blogs&controller=view&id={$blog->id}&cat={$this->id}", 'front', 'blogs_blog_cat', array( $blog->seo_name, $this->seo_name ) );
}
return $this->_url;
@@ -75,15 +92,15 @@ class _Category extends \IPS\Node\Model
*
* @return string
*/
public function link()
public function link(): string
{
return \IPS\Theme::i()->getTemplate( 'global' )->categoryLink( $this );
return Theme::i()->getTemplate( 'global' )->categoryLink( $this );
}
/**
* Get output for API
*
* @param \IPS\Member|NULL $authorizedMember The member making the API request or NULL for API Key / client_credentials
* @param Member|NULL $authorizedMember The member making the API request or NULL for API Key / client_credentials
* @return array
* @apiresponse int id ID number
* @apiresponse string name Name
@@ -91,31 +108,29 @@ class _Category extends \IPS\Node\Model
* @apiresponse string class Node class
* @apiresponse int position Node order
*/
public function apiOutput( \IPS\Member $authorizedMember = NULL )
public function apiOutput( Member $authorizedMember = NULL ): array
{
$return = array(
return array(
'id' => $this->id,
'name' => $this->name,
'url' => (string) $this->url(),
'class' => \get_class( $this ),
'class' => get_class( $this ),
'position' => $this->position
);
return $return;
}
/**
* [ActiveRecord] Save Changed Columns
*
* @return void
* @return void
*/
public function save()
public function save(): void
{
if( !$this->id )
{
$this->position = \IPS\Db::i()->select( 'MAX(entry_category_position)', 'blog_entry_categories', array( 'entry_category_blog_id=?', $this->blog_id ))->first() + 1;
$this->position = Db::i()->select( 'MAX(entry_category_position)', 'blog_entry_categories', array( 'entry_category_blog_id=?', $this->blog_id ))->first() + 1;
}
return parent::save();
parent::save();
}
}
applications/blog/sources/Entry/Comment.php
+63 -38
View File
@@ -12,43 +12,67 @@
namespace IPS\blog\Entry;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use BadMethodCallException;
use IPS\Content;
use IPS\Content\Anonymous;
use IPS\Content\Comment as ContentComment;
use IPS\Content\EditHistory;
use IPS\Content\Embeddable;
use IPS\Content\Filter;
use IPS\Content\Hideable;
use IPS\Content\Featurable;
use IPS\Content\Reactable;
use IPS\Content\Reportable;
use IPS\Content\Shareable;
use IPS\Db;
use IPS\Member;
use IPS\Member\Club;
use IPS\Node\Model;
use IPS\Output;
use IPS\Settings;
use IPS\Theme;
use function defined;
use function in_array;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Blog Entry Comment Model
*/
class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory, \IPS\Content\Hideable, \IPS\Content\Searchable, \IPS\Content\Embeddable, \IPS\Content\Anonymous
class Comment extends ContentComment implements Embeddable,
Filter
{
use \IPS\Content\Reactable, \IPS\Content\Reportable;
use Featurable, Reactable, Reportable, Anonymous, Shareable, EditHistory, Hideable;
/**
* @brief [ActiveRecord] Multiton Store
*/
protected static $multitons;
protected static array $multitons;
/**
* @brief [Content\Comment] Item Class
*/
public static $itemClass = 'IPS\blog\Entry';
public static ?string $itemClass = 'IPS\blog\Entry';
/**
* @brief [ActiveRecord] Database Table
*/
public static $databaseTable = 'blog_comments';
public static ?string $databaseTable = 'blog_comments';
/**
* @brief [ActiveRecord] Database Prefix
*/
public static $databasePrefix = 'comment_';
public static string $databasePrefix = 'comment_';
/**
* @brief Database Column Map
*/
public static $databaseColumnMap = array(
public static array $databaseColumnMap = array(
'item' => 'entry_id',
'author' => 'member_id',
'author_name' => 'member_name',
@@ -65,87 +89,87 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
/**
* @brief Application
*/
public static $application = 'blog';
public static string $application = 'blog';
/**
* @brief Title
*/
public static $title = 'blog_entry_comment';
public static string $title = 'blog_entry_comment';
/**
* @brief Icon
*/
public static $icon = 'file-text';
public static string $icon = 'pen-to-square';
/**
* @brief [Content] Key for hide reasons
*/
public static $hideLogKey = 'blog-entries';
public static ?string $hideLogKey = 'blog-entries';
/**
* Get items with permission check
*
* @param array $where Where clause
* @param string $order MySQL ORDER BY clause (NULL to order by date)
* @param int|array $limit Limit clause
* @param string $permissionKey A key which has a value in the permission map (either of the container or of this class) matching a column ID in core_permission_index
* @param mixed $includeHiddenItems Include hidden comments? NULL to detect if currently logged in member has permission, -1 to return public content only, TRUE to return unapproved content and FALSE to only return unapproved content the viewing member submitted
* @param string|null $order MySQL ORDER BY clause (NULL to order by date)
* @param int|array|null $limit Limit clause
* @param string|null $permissionKey A key which has a value in the permission map (either of the container or of this class) matching a column ID in core_permission_index
* @param mixed $includeHiddenComments Include hidden comments? NULL to detect if currently logged in member has permission, -1 to return public content only, TRUE to return unapproved content and FALSE to only return unapproved content the viewing member submitted
* @param int $queryFlags Select bitwise flags
* @param \IPS\Member $member The member (NULL to use currently logged in member)
* @param Member|null $member The member (NULL to use currently logged in member)
* @param bool $joinContainer If true, will join container data (set to TRUE if your $where clause depends on this data)
* @param bool $joinComments If true, will join comment data (set to TRUE if your $where clause depends on this data)
* @param bool $joinReviews If true, will join review data (set to TRUE if your $where clause depends on this data)
* @param bool $countOnly If true will return the count
* @param array|null $joins Additional arbitrary joins for the query
* @return array|NULL|\IPS\Content\Comment If $limit is 1, will return \IPS\Content\Comment or NULL for no results. For any other number, will return an array.
* @param array|null $joins Additional arbitrary joins for the query
* @return array|NULL|Comment If $limit is 1, will return \IPS\Content\Comment or NULL for no results. For any other number, will return an array.
*/
public static function getItemsWithPermission( $where=array(), $order=NULL, $limit=10, $permissionKey='read', $includeHiddenItems=\IPS\Content\Hideable::FILTER_AUTOMATIC, $queryFlags=0, \IPS\Member $member=NULL, $joinContainer=FALSE, $joinComments=FALSE, $joinReviews=FALSE, $countOnly=FALSE, $joins=NULL )
public static function getItemsWithPermission( array $where=array(), string $order= null, int|array|null $limit=10, string|null $permissionKey='read', mixed $includeHiddenComments= Filter::FILTER_AUTOMATIC, int $queryFlags=0, Member|null $member= null, bool $joinContainer=FALSE, bool $joinComments=FALSE, bool $joinReviews=FALSE, bool $countOnly=FALSE, array|null $joins= null ): mixed
{
if ( \in_array( $permissionKey, array( 'view', 'read' ) ) )
if ( in_array( $permissionKey, array( 'view', 'read' ) ) )
{
$joinContainer = TRUE;
$member = $member ?: \IPS\Member::loggedIn();
$member = $member ?: Member::loggedIn();
if ( $member->member_id )
{
$where[] = array( '( blog_blogs.blog_social_group IS NULL OR blog_blogs.blog_member_id=' . $member->member_id . ' OR ( ' . \IPS\Content::socialGroupGetItemsWithPermissionWhere( 'blog_blogs.blog_social_group', $member ) . ' ) )' );
$where[] = array( '( blog_blogs.blog_social_group IS NULL OR blog_blogs.blog_member_id=' . $member->member_id . ' OR ( ' . Content::socialGroupGetItemsWithPermissionWhere( 'blog_blogs.blog_social_group', $member ) . ' ) )' );
}
else
{
$where[] = array( "(" . \IPS\Content::socialGroupGetItemsWithPermissionWhere( 'blog_blogs.blog_social_group', $member ) . " OR blog_blogs.blog_social_group IS NULL )" );
$where[] = array( "(" . Content::socialGroupGetItemsWithPermissionWhere( 'blog_blogs.blog_social_group', $member ) . " OR blog_blogs.blog_social_group IS NULL )" );
}
if ( \IPS\Settings::i()->clubs )
if ( Settings::i()->clubs )
{
$joins[] = array( 'from' => 'core_clubs', 'where' => 'core_clubs.id=blog_blogs.blog_club_id' );
if ( $member->member_id )
{
if ( !$member->modPermission( 'can_access_all_clubs' ) )
{
$where[] = array('( blog_blogs.blog_club_id IS NULL OR ' . \IPS\Db::i()->in( 'blog_blogs.blog_club_id', $member->clubs() ) . ' OR core_clubs.type=? OR core_clubs.type=? OR core_clubs.type=? )', \IPS\Member\Club::TYPE_PUBLIC, \IPS\Member\Club::TYPE_READONLY, \IPS\Member\Club::TYPE_OPEN );
$where[] = array('( blog_blogs.blog_club_id IS NULL OR ' . Db::i()->in( 'blog_blogs.blog_club_id', $member->clubs() ) . ' OR core_clubs.type=? OR core_clubs.type=? OR core_clubs.type=? )', Club::TYPE_PUBLIC, Club::TYPE_READONLY, Club::TYPE_OPEN );
}
}
else
{
$where[] = array( '( blog_blogs.blog_club_id IS NULL OR core_clubs.type=? OR core_clubs.type=? OR core_clubs.type=? )', \IPS\Member\Club::TYPE_PUBLIC, \IPS\Member\Club::TYPE_READONLY, \IPS\Member\Club::TYPE_OPEN );
$where[] = array( '( blog_blogs.blog_club_id IS NULL OR core_clubs.type=? OR core_clubs.type=? OR core_clubs.type=? )', Club::TYPE_PUBLIC, Club::TYPE_READONLY, Club::TYPE_OPEN );
}
}
}
return parent::getItemsWithPermission( $where, $order, $limit, $permissionKey, $includeHiddenItems, $queryFlags, $member, $joinContainer, $joinComments, $joinReviews, $countOnly, $joins );
return parent::getItemsWithPermission( $where, $order, $limit, $permissionKey, $includeHiddenComments, $queryFlags, $member, $joinContainer, $joinComments, $joinReviews, $countOnly, $joins );
}
/**
* Check Moderator Permission
*
* @param string $type 'edit', 'hide', 'unhide', 'delete', etc.
* @param \IPS\Member|NULL $member The member to check for or NULL for the currently logged in member
* @param \IPS\Node\Model|NULL $container The container
* @param Member|NULL $member The member to check for or NULL for the currently logged in member
* @param Model|NULL $container The container
* @return bool
*/
public static function modPermission( $type, \IPS\Member $member = NULL, \IPS\Node\Model $container = NULL )
public static function modPermission( string $type, Member $member = NULL, Model $container = NULL ): bool
{
$member = $member ?: \IPS\Member::loggedIn();
if ( \in_array( $type, array( 'edit', 'delete', 'lock' ) ) and $container and $container->member_id === $member->member_id )
$member = $member ?: Member::loggedIn();
if ( in_array( $type, array( 'edit', 'delete', 'lock' ) ) and $container and $container->member_id === $member->member_id )
{
return $member->group['g_blog_allowownmod'];
}
@@ -158,7 +182,7 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
*
* @return string
*/
public static function reactionType()
public static function reactionType(): string
{
return 'comment_id';
}
@@ -168,10 +192,11 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
*
* @param array $params Additional parameters to add to URL
* @return string
* @throws BadMethodCallException
*/
public function embedContent( $params )
public function embedContent( array $params ): string
{
\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'embed.css', 'blog', 'front' ) );
return \IPS\Theme::i()->getTemplate( 'global', 'blog' )->embedEntryComment( $this, $this->item(), $this->item()->container(), $this->url()->setQueryString( $params ) );
Output::i()->cssFiles = array_merge( Output::i()->cssFiles, Theme::i()->css( 'embed.css', 'blog', 'front' ) );
return Theme::i()->getTemplate( 'global', 'blog' )->embedEntryComment( $this, $this->item(), $this->item()->container(), $this->url()->setQueryString( $params ) );
}
}
applications/blog/sources/Entry/Entry.php
+350 -300
View File
File diff suppressed because it is too large. Load diff