Version 4.5.0

system/Node/Api/NodeController.php

@@ -11,7 +11,7 @@
 namespace IPS\Node\Api;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -32,7 +32,7 @@ class _NodeController extends \IPS\Api\Controller
 	{
 		$class = $this->class;
 		
-		if ( $this->member and in_array( 'IPS\Node\Permissions', class_implements( $class ) ) )
+		if ( $this->member and \in_array( 'IPS\Node\Permissions', class_implements( $class ) ) )
 		{
 			$where[] = array( '(' . \IPS\Db::i()->findInSet( 'core_permission_index.perm_' . $class::$permissionMap['view'], $this->member->permissionArray() ) . ' OR ' . 'core_permission_index.perm_' . $class::$permissionMap['view'] . '=? )', '*' );
 			if ( $class::$databaseColumnEnabledDisabled )
@@ -40,9 +40,17 @@ class _NodeController extends \IPS\Api\Controller
 				$where[] = array( $class::$databasePrefix . $class::$databaseColumnEnabledDisabled . '=1' );
 			}
 		}
+
+		/* Exclude clubs? */
+		if ( \IPS\IPS::classUsesTrait( $class, 'IPS\Content\ClubContainer' ) AND isset( \IPS\Request::i()->clubs ) AND !\IPS\Request::i()->clubs )
+		{
+			$where[] = array( $class::$databasePrefix . $class::clubIdColumn() . ' IS NULL' );
+		}
 		
-		$select = \IPS\Db::i()->select( '*', $class::$databaseTable, $where, $class::$databaseColumnOrder ? $class::$databasePrefix . $class::$databaseColumnOrder . " asc" : NULL, NULL, NULL, NULL, \IPS\Db::SELECT_SQL_CALC_FOUND_ROWS );
-		if ( $this->member and in_array( 'IPS\Node\Permissions', class_implements( $class ) ) )
+		$select = \IPS\Db::i()->select( '*', $class::$databaseTable, $where, $class::$databaseColumnOrder ? $class::$databasePrefix . $class::$databaseColumnOrder . " asc" : NULL );
+
+		/* Return permissions */
+		if ( \in_array( 'IPS\Node\Permissions', class_implements( $class ) ) )
 		{
 			$select->join( 'core_permission_index', array( "core_permission_index.app=? AND core_permission_index.perm_type=? AND core_permission_index.perm_type_id=" . $class::$databaseTable . "." . $class::$databasePrefix . $class::$databaseColumnId, $class::$permApp, $class::$permType ) );
 		}
@@ -53,7 +61,7 @@ class _NodeController extends \IPS\Api\Controller
 			$select,
 			isset( \IPS\Request::i()->page ) ? \IPS\Request::i()->page : 1,
 			$class,
-			$select->count( TRUE ),
+			$select->count(),
 			$this->member,
 			isset( \IPS\Request::i()->perPage ) ? \IPS\Request::i()->perPage : NULL
 		);
@@ -81,17 +89,50 @@ class _NodeController extends \IPS\Api\Controller
 	/**
 	 * View
 	 *
-	 * @param	int	$id	ID Number
-	 * @throws	1S359/1	INVALID_ID	The member ID does not exist
+	 * @param	int			$id						ID Number
+	 * @param	int|NULL	$deleteChildrenOrMove	-1 to delete all child nodes, or the new parent node ID to move the children to
+	 * @throws	1S359/1	INVALID_ID		The node ID does not exist
+	 * @throws	1S359/2	INVALID_TARGET	The target node cannot be deleted because the new parent node does not exist
+	 * @throws	1S359/3	HAS_CHILDREN	The target node cannot be deleted because it has children (pass deleteChildrenOrMove in the request to specify how to handle the children)
 	 * @return	\IPS\Api\Response
 	 */
-	protected function _delete( $id )
+	protected function _delete( $id, $deleteChildrenOrMove = NULL )
 	{
 		$class = $this->class;
 
 		try
 		{
-			$class::load( $id )->delete();
+			$node = $class::load( $id );
+
+			if ( $node->hasChildren( NULL, NULL, TRUE ) )
+			{
+				/* -1 means delete everything */
+				if ( $deleteChildrenOrMove AND $deleteChildrenOrMove == -1 )
+				{
+					$node->deleteOrMoveFormSubmit( array( 'node_move_children' => FALSE ) );
+				}
+				else if ( $deleteChildrenOrMove )
+				{
+					try
+					{
+						$target = $class::load( $deleteChildrenOrMove );
+						$node->deleteOrMoveFormSubmit( array( 'node_move_children' => TRUE, 'node_destination' => $target->_id ) );
+					}
+					catch ( \OutOfRangeException $e )
+					{
+						throw new \IPS\Api\Exception( 'INVALID_TARGET', '1S359/2', 404 );
+					}
+				}
+				/* Or return an exception if no action was set */
+				if ( !$deleteChildrenOrMove )
+				{
+					throw new \IPS\Api\Exception( 'HAS_CHILDREN', '1S359/3', 404 );
+				}
+			}
+			else
+			{
+				$node->delete();
+			}
 
 			return new \IPS\Api\Response( 200, NULL );
 		}
@@ -111,6 +152,25 @@ class _NodeController extends \IPS\Api\Controller
 	{
 		$node->save();
 
+		if( $node instanceof \IPS\Node\Permissions AND isset( \IPS\Request::i()->permissions ) AND \IPS\Request::i()->permissions )
+		{
+			$insert = array(
+				'app'			=> $node::$permApp,
+				'perm_type'		=> $node::$permType,
+				'perm_type_id'	=> $node->_id,
+			);
+
+			foreach( $node::$permissionMap as $key => $field )
+			{
+				if( isset( \IPS\Request::i()->permissions[ $key ] ) )
+				{
+					$insert[ 'perm_' . $field ] = \is_array( \IPS\Request::i()->permissions[ $key ] ) ? implode( ',', \IPS\Request::i()->permissions[ $key ] ) : \IPS\Request::i()->permissions[ $key ];
+				}
+			}
+
+			$node->setPermissions( $insert );
+		}
+
 		/* Return */
 		return $node;
 	}