Version 5.0.0 beta 1

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

No files matched your search

+68 -50
View File
@@ -12,26 +12,42 @@
namespace IPS\cms\Media;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use InvalidArgumentException;
use IPS\cms\Media;
use IPS\Helpers\Form;
use IPS\Helpers\Form\Node;
use IPS\Helpers\Form\Text;
use IPS\Http\Url;
use IPS\Http\Url\Friendly;
use IPS\Member;
use IPS\Node\Model;
use IPS\Request;
use OutOfRangeException;
use function count;
use function defined;
use function func_get_args;
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;
}
/**
* @brief Folder Model
*/
class _Folder extends \IPS\Node\Model
class Folder extends Model
{
/**
* Munge different record types
*
* @return array
*/
public static function munge()
public static function munge() : array
{
$rows = array();
$args = \func_get_args();
$args = func_get_args();
foreach( $args as $arg )
{
@@ -49,73 +65,73 @@ class _Folder extends \IPS\Node\Model
/**
* @brief [ActiveRecord] Multiton Store
*/
protected static $multitons;
protected static array $multitons;
/**
* @brief [ActiveRecord] Database Table
*/
public static $databaseTable = 'cms_media_folders';
public static ?string $databaseTable = 'cms_media_folders';
/**
* @brief [ActiveRecord] Database Prefix
*/
public static $databasePrefix = 'media_folder_';
public static string $databasePrefix = 'media_folder_';
/**
* @brief [ActiveRecord] ID Database Column
*/
public static $databaseColumnId = 'id';
public static string $databaseColumnId = 'id';
/**
* @brief [ActiveRecord] Database ID Fields
*/
protected static $databaseIdFields = array('media_folder_path');
protected static array $databaseIdFields = array('media_folder_path');
/**
* @brief [ActiveRecord] Multiton Map
*/
protected static $multitonMap = array();
protected static array $multitonMap = array();
/**
* @brief [Node] Parent ID Database Column
*/
public static $databaseColumnParent = 'parent';
public static ?string $databaseColumnParent = 'parent';
/**
* @brief [Node] Parent ID Root Value
* @note This normally doesn't need changing though some legacy areas use -1 to indicate a root node
*/
public static $databaseColumnParentRootValue = 0;
public static int $databaseColumnParentRootValue = 0;
/**
* @brief [Node] Order Database Column
*/
public static $databaseColumnOrder = 'path';
public static ?string $databaseColumnOrder = 'path';
/**
* @brief [Node] Automatically set position for new nodes
*/
public static $automaticPositionDetermination = FALSE;
public static bool $automaticPositionDetermination = FALSE;
/**
* @brief [Node] Node Title
*/
public static $nodeTitle = 'folder';
public static string $nodeTitle = 'folder';
/**
* @brief [Node] Subnode class
*/
public static $subnodeClass = 'IPS\cms\Media';
public static ?string $subnodeClass = 'IPS\cms\Media';
/**
* @brief [Node] Show forms modally?
*/
public static $modalForms = TRUE;
public static bool $modalForms = TRUE;
/**
* @brief [Node] Restrictions
*/
protected static $restrictions = array(
protected static ?array $restrictions = array(
'app' => 'cms',
'module' => 'pages',
'all' => 'media_manage',
@@ -125,9 +141,9 @@ class _Folder extends \IPS\Node\Model
/**
* [Node] Get Title
*
* @return string|null
* @return string
*/
protected function get__title()
protected function get__title(): string
{
return $this->name;
}
@@ -137,7 +153,7 @@ class _Folder extends \IPS\Node\Model
*
* @return string
*/
public function getSortableName()
public function getSortableName() : string
{
return $this->name;
}
@@ -145,11 +161,11 @@ class _Folder extends \IPS\Node\Model
/**
* [Node] Get buttons to display in tree
*
* @param string $url Base URL
* @param bool $subnode Is this a subnode?
* @return array
* @param Url $url Base URL
* @param bool $subnode Is this a subnode?
* @return array
*/
public function getButtons( $url, $subnode=FALSE )
public function getButtons( Url $url, bool $subnode=FALSE ): array
{
$buttons = parent::getButtons( $url, $subnode );
$return = array();
@@ -163,14 +179,14 @@ class _Folder extends \IPS\Node\Model
{
$buttons['add']['icon'] = 'folder-open';
$buttons['add']['title'] = 'cms_add_media_folder';
$buttons['add']['data'] = array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('cms_add_media_folder') );
$buttons['add']['data'] = array( 'ipsDialog' => '', 'ipsDialog-title' => Member::loggedIn()->language()->addToStack('cms_add_media_folder') );
$buttons['add']['link'] = $url->setQueryString( array( 'subnode' => 0, 'do' => 'form', 'parent' => $this->_id ) );
$buttons['add_page'] = array(
'icon' => 'plus-circle',
'title' => 'cms_add_media',
'link' => $url->setQueryString( array( 'subnode' => 1, 'do' => 'add', 'parent' => $this->_id ) ),
'data' => array( 'ipsDialog' => '', 'ipsDialog-title' => \IPS\Member::loggedIn()->language()->addToStack('cms_add_media') )
'data' => array( 'ipsDialog' => '', 'ipsDialog-title' => Member::loggedIn()->language()->addToStack('cms_add_media') )
);
}
@@ -201,42 +217,44 @@ class _Folder extends \IPS\Node\Model
/**
* [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
{
/* Build form */
$form->add( new \IPS\Helpers\Form\Text( 'media_folder_name', $this->id ? $this->name : '', TRUE, array( 'maxLength' => 64 ), function( $val )
$form->add( new Text( 'media_folder_name', $this->id ? $this->name : '', TRUE, array( 'maxLength' => 64 ), function( $val )
{
try
{
$test = \IPS\cms\Media\Folder::load( \IPS\Http\Url\Friendly::seoTitle( $val ), 'media_folder_name' );
$test = Folder::load( Friendly::seoTitle( $val ), 'media_folder_name' );
if ( ! empty( \IPS\Request::i()->id ) and $test->id != \IPS\Request::i()->id )
if ( ! empty( Request::i()->id ) and $test->id != Request::i()->id )
{
throw new \InvalidArgumentException('content_folder_name_in_use');
throw new InvalidArgumentException('content_folder_name_in_use');
}
}
catch ( \OutOfRangeException $e )
catch ( OutOfRangeException $e )
{
}
} ) );
$form->add( new \IPS\Helpers\Form\Node( 'media_folder_parent', $this->parent ? $this->parent : 0, FALSE, array(
$form->add( new Node( 'media_folder_parent', $this->parent ? $this->parent : 0, FALSE, array(
'class' => '\IPS\cms\Media\Folder',
'zeroVal' => 'node_no_parent',
'permissionCheck' => function( $node )
{
if ( ! isset( \IPS\Request::i()->id ) )
if ( ! isset( Request::i()->id ) )
{
return true;
}
if ( ! isset( \IPS\Request::i()->parent ) )
if ( ! isset( Request::i()->parent ) )
{
return $node->id != \IPS\Request::i()->id;
return $node->id != Request::i()->id;
}
return true;
}
) ) );
}
@@ -244,12 +262,12 @@ class _Folder extends \IPS\Node\Model
/**
* @brief Original parent ID
*/
protected $origParentId;
protected int $origParentId;
/**
* @brief Original parent Name
*/
protected $origName;
protected string $origName;
/**
* [Node] Format form values from add/edit form for save
@@ -257,15 +275,15 @@ class _Folder extends \IPS\Node\Model
* @param array $values Values from the form
* @return array
*/
public function formatFormValues( $values )
public function formatFormValues( array $values ): array
{
if ( ! $this->id )
{
$this->save();
}
$this->origParentId = $this->parent;
$this->origName = $this->name;
$this->origParentId = (int) $this->parent;
$this->origName = (string) $this->name;
if ( isset( $values['media_folder_parent'] ) AND ( ! empty( $values['media_folder_parent'] ) OR $values['media_folder_parent'] === 0 ) )
{
@@ -275,7 +293,7 @@ class _Folder extends \IPS\Node\Model
if( isset( $values['media_folder_name'] ) )
{
$values['name'] = \IPS\Http\Url\Friendly::seoTitle( $values['media_folder_name'] );
$values['name'] = Friendly::seoTitle( $values['media_folder_name'] );
unset( $values['media_folder_name'] );
}
@@ -288,7 +306,7 @@ class _Folder extends \IPS\Node\Model
* @param array $values Values from the form
* @return void
*/
public function postSaveForm( $values )
public function postSaveForm( array $values ) : void
{
if ( $this->origParentId !== $values['parent'] OR $this->origName !== $values['name'] )
{
@@ -302,7 +320,7 @@ class _Folder extends \IPS\Node\Model
* @param boolean $recursivelyCheck Recursively reset up and down the tree
* @return void
*/
public function resetPath( $recursivelyCheck=true )
public function resetPath( bool $recursivelyCheck=true ) : void
{
$path = array();
@@ -311,13 +329,13 @@ class _Folder extends \IPS\Node\Model
$path[] = $obj->name;
}
$this->path = ( \count( $path ) ) ? implode( '/', $path ) . '/' . $this->name : $this->name;
$this->path = ( count( $path ) ) ? implode( '/', $path ) . '/' . $this->name : $this->name;
/* Save path update */
parent::save();
/* Update media */
\IPS\cms\Media::resetPath( $this->id );
Media::resetPath( $this->id );
if ( $recursivelyCheck === true )
{
@@ -341,7 +359,7 @@ class _Folder extends \IPS\Node\Model
*
* @return void
*/
protected function _recursivelyResetChildPaths()
protected function _recursivelyResetChildPaths() : void
{
foreach( $this->children( NULL, NULL, FALSE ) as $child )
{