Version 5.0.0 beta 1
This commit is contained in:
1 parent
25ddeb65d6
commit
15c7beabc5
6736 files changed
+627902
-497943
No files matched your search
@@ -11,52 +11,64 @@
|
||||
namespace IPS\core;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
|
||||
use InvalidArgumentException;
|
||||
use IPS\Helpers\Form;
|
||||
use IPS\Helpers\Form\Checkbox;
|
||||
use IPS\Helpers\Form\Member as FormMember;
|
||||
use IPS\Member;
|
||||
use IPS\Patterns\ActiveRecord;
|
||||
use IPS\Request;
|
||||
use IPS\Settings;
|
||||
use OutOfRangeException;
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ignore Record
|
||||
*/
|
||||
class _Ignore extends \IPS\Patterns\ActiveRecord
|
||||
class Ignore extends ActiveRecord
|
||||
{
|
||||
/**
|
||||
* @brief Database Table
|
||||
*/
|
||||
public static $databaseTable = 'core_ignored_users';
|
||||
public static ?string $databaseTable = 'core_ignored_users';
|
||||
|
||||
/**
|
||||
* @brief Database Prefix
|
||||
*/
|
||||
public static $databasePrefix = 'ignore_';
|
||||
public static string $databasePrefix = 'ignore_';
|
||||
|
||||
/**
|
||||
* @brief Multiton Store
|
||||
*/
|
||||
protected static $multitons;
|
||||
protected static array $multitons;
|
||||
|
||||
/**
|
||||
* @brief [ActiveRecord] Database ID Fields
|
||||
*/
|
||||
protected static $databaseIdFields = array( 'ignore_ignore_id' );
|
||||
protected static array $databaseIdFields = array( 'ignore_ignore_id' );
|
||||
|
||||
/**
|
||||
* @brief [ActiveRecord] Multiton Map
|
||||
*/
|
||||
protected static $multitonMap = array();
|
||||
protected static array $multitonMap = array();
|
||||
|
||||
/**
|
||||
* Get types
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function types()
|
||||
public static function types() : array
|
||||
{
|
||||
$types = array( 'topics', 'messages', 'mentions' );
|
||||
|
||||
if( \IPS\Settings::i()->signatures_enabled )
|
||||
if( Settings::i()->signatures_enabled )
|
||||
{
|
||||
$types[] = 'signatures';
|
||||
}
|
||||
@@ -67,31 +79,31 @@ class _Ignore extends \IPS\Patterns\ActiveRecord
|
||||
/**
|
||||
* Display Form
|
||||
*
|
||||
* @return \IPS\Helpers\Form
|
||||
* @return Form
|
||||
*/
|
||||
public static function form()
|
||||
public static function form() : Form
|
||||
{
|
||||
$ignore = NULL;
|
||||
try
|
||||
{
|
||||
$ignore = static::load( \IPS\Request::i()->id, 'ignore_ignore_id', array( 'ignore_owner_id=?', \IPS\Member::loggedIn()->member_id ) );
|
||||
$ignore = static::load( Request::i()->id, 'ignore_ignore_id', array( 'ignore_owner_id=?', Member::loggedIn()->member_id ) );
|
||||
}
|
||||
catch( \OutOfRangeException $e )
|
||||
catch( OutOfRangeException $e )
|
||||
{
|
||||
if ( \IPS\Request::i()->id )
|
||||
if ( Request::i()->id )
|
||||
{
|
||||
$ignore = new static;
|
||||
$ignore->ignore_id = \IPS\Request::i()->id;
|
||||
$ignore->ignore_id = Request::i()->id;
|
||||
}
|
||||
}
|
||||
|
||||
$form = new \IPS\Helpers\Form( 'ignore_form', $ignore ? 'ignore_edit' : 'ignore_submit' );
|
||||
$form->class = 'ipsForm_vertical';
|
||||
$form->add( new \IPS\Helpers\Form\Member( 'member', $ignore ? \IPS\Member::load( $ignore->ignore_id ) : NULL, TRUE, array( 'placeholder' => \IPS\Member::loggedIn()->language()->addToStack('ignore_placeholder') ) ) );
|
||||
$form = new Form( 'ignore_form', $ignore ? 'ignore_edit' : 'ignore_submit' );
|
||||
$form->class = 'ipsForm--vertical ipsForm--ignore-record';
|
||||
$form->add( new FormMember( 'member', $ignore ? Member::load( $ignore->ignore_id ) : NULL, TRUE, array( 'placeholder' => Member::loggedIn()->language()->addToStack('ignore_placeholder') ) ) );
|
||||
|
||||
foreach ( static::types() as $type )
|
||||
{
|
||||
$form->add( new \IPS\Helpers\Form\Checkbox( "ignore_{$type}", $ignore ? $ignore->$type : NULL ) );
|
||||
$form->add( new Checkbox( "ignore_{$type}", $ignore ? $ignore->$type : NULL ) );
|
||||
}
|
||||
|
||||
return $form;
|
||||
@@ -101,30 +113,30 @@ class _Ignore extends \IPS\Patterns\ActiveRecord
|
||||
* Create from form
|
||||
*
|
||||
* @param array $values Values from form
|
||||
* @return \IPS\core\Ignore
|
||||
* @return Ignore
|
||||
*/
|
||||
public static function createFromForm( $values )
|
||||
public static function createFromForm( array $values ) : static
|
||||
{
|
||||
try
|
||||
{
|
||||
$obj = static::load( $values['member']->member_id, 'ignore_ignore_id', array( 'ignore_owner_id=?', \IPS\Member::loggedIn()->member_id ) );
|
||||
$obj = static::load( $values['member']->member_id, 'ignore_ignore_id', array( 'ignore_owner_id=?', Member::loggedIn()->member_id ) );
|
||||
}
|
||||
catch ( \OutOfRangeException $e )
|
||||
catch ( OutOfRangeException $e )
|
||||
{
|
||||
$obj = new static;
|
||||
}
|
||||
|
||||
if ( $values['member']->member_id == \IPS\Member::loggedIn()->member_id )
|
||||
if ( $values['member']->member_id == Member::loggedIn()->member_id )
|
||||
{
|
||||
throw new \InvalidArgumentException( 'cannot_ignore_self' );
|
||||
throw new InvalidArgumentException( 'cannot_ignore_self' );
|
||||
}
|
||||
|
||||
if ( !$values['member']->canBeIgnored() )
|
||||
{
|
||||
throw new \InvalidArgumentException( 'cannot_ignore_that_member' );
|
||||
throw new InvalidArgumentException( 'cannot_ignore_that_member' );
|
||||
}
|
||||
|
||||
$obj->owner_id = \IPS\Member::loggedIn()->member_id;
|
||||
$obj->owner_id = Member::loggedIn()->member_id;
|
||||
$obj->ignore_id = $values['member']->member_id;
|
||||
|
||||
foreach ( static::types() as $type )
|
||||
@@ -134,8 +146,8 @@ class _Ignore extends \IPS\Patterns\ActiveRecord
|
||||
|
||||
$obj->save();
|
||||
|
||||
\IPS\Member::loggedIn()->members_bitoptions['has_no_ignored_users'] = FALSE;
|
||||
\IPS\Member::loggedIn()->save();
|
||||
Member::loggedIn()->members_bitoptions['has_no_ignored_users'] = FALSE;
|
||||
Member::loggedIn()->save();
|
||||
|
||||
return $obj;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user