Version 4.3.0

applications/blog/api/blogs.php

@@ -33,12 +33,14 @@ class _blogs extends \IPS\Node\Api\NodeController
 	 * GET /blog/blogs
 	 * Get list of blogs
 	 *
+	 * @note		For requests using an OAuth Access Token for a particular member, only blogs that are not disabled and not belonging to a particular club or social group will be included
 	 * @apiparam	string	owners	Comma-delimited list of member IDs - if provided, only blogs owned by those members are returned (can be used in conjection with groups or set to 0 to exclude member-created blogs)
 	 * @apiparam	string	groups	Comma-delimited list of group IDs - if provided, only blogs owned by those groups are returned (can be used in conjection with members or set to 0 to exclude group blogs)
 	 * @apiparam	int		pinned	If 1, only blogs which are pinned are returned, if 0 only not pinned
 	 * @apiparam	string	sortBy	What to sort by. Can be 'count_entries' for number of entries, 'last_edate' for last entry date or do not specify for ID
 	 * @apiparam	string	sortDir	Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
 	 * @apiparam	int		page	Page number
+	 * @apiparam	int		perPage	Number of results per page - defaults to 25
 	 * @return		\IPS\Api\PaginatedResponse<IPS\blog\Entry>
 	 */
 	public function GETindex()
@@ -65,6 +67,12 @@ class _blogs extends \IPS\Node\Api\NodeController
 		{
 			$where[] = array( 'blog_pinned=?', intval( \IPS\Request::i()->pinned ) );
 		}
+		
+		/* Permission */
+		if ( $this->member )
+		{
+			$where[] = array( 'blog_disabled=0 AND blog_social_group IS NULL AND blog_club_id IS NULL' );
+		}
 	
 		/* Sort */
 		if ( isset( \IPS\Request::i()->sortBy ) and in_array( \IPS\Request::i()->sortBy, array( 'count_entries', 'last_edate' ) ) )
@@ -83,7 +91,9 @@ class _blogs extends \IPS\Node\Api\NodeController
 			\IPS\Db::i()->select( '*', 'blog_blogs', $where, "{$sortBy} {$sortDir}" ),
 			isset( \IPS\Request::i()->page ) ? \IPS\Request::i()->page : 1,
 			'IPS\blog\Blog',
-			\IPS\Db::i()->select( 'COUNT(*)', 'blog_blogs', $where )->first()
+			\IPS\Db::i()->select( 'COUNT(*)', 'blog_blogs', $where )->first(),
+			$this->member,
+			isset( \IPS\Request::i()->perPage ) ? \IPS\Request::i()->perPage : NULL
 		);
 	}
 	
@@ -92,7 +102,7 @@ class _blogs extends \IPS\Node\Api\NodeController
 	 * Get information about a specific blog
 	 *
 	 * @param		int		$id			ID Number
-	 * @throws		2B302/1	INVALID_ID	The blog ID does not exist
+	 * @throws		2B302/1	INVALID_ID	The blog ID does not exist or the authorized user does not have permission to view it
 	 * @return		\IPS\blog\Blog
 	 */
 	public function GETitem( $id )
@@ -106,9 +116,27 @@ class _blogs extends \IPS\Node\Api\NodeController
 	 *
 	 * @param		int		$id			ID Number
 	 * @return		void
+	 * @throws		2B302/2	INVALID_ID		The blog ID does not exist or the authorized user does not have permission to view it
+	 * @throws		2B302/3	NO_PERMISSION	The authorized user does not have permission to delete the blog
 	 */
 	public function DELETEitem( $id )
 	{
-		return $this->_delete( $id );
+		$class = $this->class;
+		
+		try
+		{
+			$blog = $this->member ? $class::loadAndCheckPerms( $id ) : $class::load( $id );
+			if ( !$blog->canDelete( $this->member ) )
+			{
+				throw new \IPS\Api\Exception( 'INVALID_ID', '2B302/3', 404 );
+			}
+			$blog->delete();
+
+			return new \IPS\Api\Response( 200, NULL );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B302/2', 404 );
+		}
 	}
 }