Version 5.0.0 beta 1
This commit is contained in:
Neo committed
1 parent
25ddeb65d6
commit
15c7beabc5
6736 files changed
+627902
-497943
No files matched your search
@@ -11,9 +11,18 @@
|
||||
namespace IPS\Content;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
|
||||
use IPS\core\Achievements\Recognize;
|
||||
use IPS\Member;
|
||||
use IPS\Settings;
|
||||
use OutOfRangeException;
|
||||
use UnderflowException;
|
||||
use function count;
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -26,11 +35,16 @@ trait Recognizable
|
||||
/**
|
||||
* Can this member "unrecognize" the content author?
|
||||
*
|
||||
* @param \IPS\Member|NULL $member The member to check for (NULL for currently logged in member)
|
||||
* @param Member|NULL $member The member to check for (NULL for currently logged in member)
|
||||
* @return boolean
|
||||
*/
|
||||
public function canRemoveRecognize( ?\IPS\Member $member=NULL ): bool
|
||||
public function canRemoveRecognize( ?Member $member=NULL ): bool
|
||||
{
|
||||
if( !$this->actionEnabled( 'unrecognize', $member ) )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Already recognized? (First quick check when built from item::comments() */
|
||||
$isRecognized = FALSE;
|
||||
if ( isset( $this->recognized ) and $this->recognized )
|
||||
@@ -39,18 +53,14 @@ trait Recognizable
|
||||
}
|
||||
|
||||
/* Not there, try loading from content */
|
||||
if ( ! $isRecognized )
|
||||
if ( ! $isRecognized and ( !isset( $this->recognized ) or $this->recognized !== false ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
$recognize = \IPS\core\Achievements\Recognize::loadFromContent( $this );
|
||||
Recognize::loadFromContent( $this );
|
||||
$isRecognized = TRUE;
|
||||
}
|
||||
catch ( \Exception $e )
|
||||
{
|
||||
/* An error, or it doesn't exist */
|
||||
$isRecognized = FALSE;
|
||||
}
|
||||
catch ( OutOfRangeException | UnderflowException ){}
|
||||
}
|
||||
|
||||
if ( ! $isRecognized )
|
||||
@@ -58,7 +68,7 @@ trait Recognizable
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
$member = $member ?: \IPS\Member::loggedIn();
|
||||
$member = $member ?: Member::loggedIn();
|
||||
|
||||
/* Moderator check */
|
||||
return $this->canModerateRecognized( $member );
|
||||
@@ -67,13 +77,18 @@ trait Recognizable
|
||||
/**
|
||||
* Can this member "recognize" the content author?
|
||||
*
|
||||
* @param \IPS\Member|NULL $member The member to check for (NULL for currently logged in member)
|
||||
* @param Member|NULL $member The member to check for (NULL for currently logged in member)
|
||||
* @return boolean
|
||||
*/
|
||||
public function canRecognize( ?\IPS\Member $member=NULL ): bool
|
||||
public function canRecognize( ?Member $member=NULL ): bool
|
||||
{
|
||||
if( !$this->actionEnabled( 'recognize', $member ) )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Are achievements enabled? */
|
||||
if ( !\IPS\Settings::i()->achievements_enabled )
|
||||
if ( !Settings::i()->achievements_enabled )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
@@ -84,7 +99,7 @@ trait Recognizable
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
$member = $member ?: \IPS\Member::loggedIn();
|
||||
$member = $member ?: Member::loggedIn();
|
||||
|
||||
/* Moderator check */
|
||||
if ( ! $this->canModerateRecognized( $member ) )
|
||||
@@ -109,12 +124,12 @@ trait Recognizable
|
||||
/**
|
||||
* Check to see if we have moderator permissions
|
||||
*
|
||||
* @param $member
|
||||
* @param Member|null $member
|
||||
* @return bool
|
||||
*/
|
||||
protected function canModerateRecognized( $member )
|
||||
public function canModerateRecognized( ?Member $member ): bool
|
||||
{
|
||||
$member = $member ?: \IPS\Member::loggedIn();
|
||||
$member = $member ?: Member::loggedIn();
|
||||
|
||||
/* Moderator check */
|
||||
if ( ! $member->modPermission('can_recognize_content') )
|
||||
@@ -122,7 +137,7 @@ trait Recognizable
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ( $member->modPermission('can_recognize_content') != '*' AND ! \count( $member->modPermission('can_recognize_content_options') ) )
|
||||
if ( $member->modPermission('can_recognize_content') != '*' AND ! count( $member->modPermission('can_recognize_content_options') ) )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
@@ -133,13 +148,13 @@ trait Recognizable
|
||||
/**
|
||||
* Should we show this recognized data?
|
||||
*
|
||||
* @param \IPS\Member|null $viewing
|
||||
* @param Member|null $viewing
|
||||
* @return bool
|
||||
*/
|
||||
public function showRecognized( ?\IPS\Member $viewing=NULL ): bool
|
||||
public function showRecognized( ?Member $viewing=NULL ): bool
|
||||
{
|
||||
$viewing = $viewing ?: \IPS\Member::loggedIn();
|
||||
if ( isset( $this->recognized ) )
|
||||
$viewing = $viewing ?: Member::loggedIn();
|
||||
if ( isset( $this->recognized ) and $this->recognized )
|
||||
{
|
||||
if ( $this->recognized->public or ( ( $viewing->member_id == $this->recognized->member_id ) OR ( $viewing->modPermission('can_recognize_content') ) ) )
|
||||
{
|
||||
@@ -154,9 +169,9 @@ trait Recognizable
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function removeRecognize()
|
||||
public function removeRecognize(): void
|
||||
{
|
||||
\IPS\core\Achievements\Recognize::loadFromContent( $this )->delete();
|
||||
Recognize::loadFromContent( $this )->delete();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -166,39 +181,44 @@ trait Recognizable
|
||||
*/
|
||||
public function recognizedBlurb(): array
|
||||
{
|
||||
if( !isset( $this->recognized ) or $this->recognized === false )
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
$return = [ 'message' => NULL ];
|
||||
$return['main'] = \IPS\Member::loggedIn()->language()->addToStack( 'recognize_blurb_main', FALSE, [ 'htmlsprintf' => [ \IPS\Member::loggedIn()->language()->addToStack( $this::$title . '_lc' ), $this->recognized->_given_by->link() ] ] );
|
||||
$return['main'] = Member::loggedIn()->language()->addToStack( 'recognize_blurb_main', FALSE, [ 'htmlsprintf' => [ Member::loggedIn()->language()->addToStack( $this::$title . '_lc' ), $this->recognized->_given_by->link() ] ] );
|
||||
if ( $this->recognized->badge and $this->recognized->points )
|
||||
{
|
||||
if ( $this->author()->member_id === \IPS\Member::loggedIn()->member_id )
|
||||
if ( $this->author()->member_id === Member::loggedIn()->member_id )
|
||||
{
|
||||
$return['awards'] = \IPS\Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points_and_badge', FALSE, ['htmlsprintf' => [$this->recognized->badge()->_title, $this->recognized->points]] );
|
||||
$return['awards'] = Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points_and_badge', FALSE, ['htmlsprintf' => [$this->recognized->badge()->_title, $this->recognized->points]] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$return['awards'] = \IPS\Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points_and_badge_third', FALSE, ['htmlsprintf' => [$this->author()->name, $this->recognized->badge()->_title, $this->recognized->points]] );
|
||||
$return['awards'] = Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points_and_badge_third', FALSE, ['htmlsprintf' => [$this->author()->name, $this->recognized->badge()->_title, $this->recognized->points]] );
|
||||
}
|
||||
}
|
||||
else if ( $this->recognized->points )
|
||||
{
|
||||
if ( $this->author()->member_id === \IPS\Member::loggedIn()->member_id )
|
||||
if ( $this->author()->member_id === Member::loggedIn()->member_id )
|
||||
{
|
||||
$return['awards'] = \IPS\Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points', FALSE, [ 'sprintf' => [ $this->recognized->points ] ] );
|
||||
$return['awards'] = Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points', FALSE, [ 'sprintf' => [ $this->recognized->points ] ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$return['awards'] = \IPS\Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points_third', FALSE, [ 'sprintf' => [ $this->author()->name, $this->recognized->points ] ] );
|
||||
$return['awards'] = Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_points_third', FALSE, [ 'sprintf' => [ $this->author()->name, $this->recognized->points ] ] );
|
||||
}
|
||||
}
|
||||
else if ( $this->recognized->badge )
|
||||
{
|
||||
if ( $this->author()->member_id === \IPS\Member::loggedIn()->member_id )
|
||||
if ( $this->author()->member_id === Member::loggedIn()->member_id )
|
||||
{
|
||||
$return['awards'] = \IPS\Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_badge', FALSE, [ 'htmlsprintf' => [ $this->recognized->badge()->_title ] ] );
|
||||
$return['awards'] = Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_badge', FALSE, [ 'htmlsprintf' => [ $this->recognized->badge()->_title ] ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$return['awards'] = \IPS\Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_badge_third', FALSE, [ 'htmlsprintf' => [ $this->author()->name, $this->recognized->badge()->_title ] ] );
|
||||
$return['awards'] = Member::loggedIn()->language()->addToStack( 'recognize_blurb_awarded_badge_third', FALSE, [ 'htmlsprintf' => [ $this->author()->name, $this->recognized->badge()->_title ] ] );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user