Version 4.5.0

applications/calendar/api/calendars.php

@@ -12,7 +12,7 @@
 namespace IPS\calendar\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,6 +32,7 @@ class _calendars extends \IPS\Node\Api\NodeController
 	 * GET /calendar/calendars
 	 * Get list of calendars
 	 *
+	 * @apiparam	int		clubs			0|1 Include club calendars, default: 1
 	 * @apiparam	int		page			Page number
 	 * @apiparam	int		perPage			Number of results per page - defaults to 25
 	 * @note		For requests using an OAuth Access Token for a particular member, only calendars the authorized user can view will be included
@@ -75,10 +76,17 @@ class _calendars extends \IPS\Node\Api\NodeController
 	 * @apiparam	int			approve_comments	0|1 Comments must be approved
 	 * @apiparam	int			allow_reviews		0|1 Allow reviews
 	 * @apiparam	int			approve_reviews		0|1 Reviews must be approved
+	 * @apiparam	object		permissions			An object with the keys as permission options (view, read, add, reply, review, askrsvp, rsvp) and values as permissions to use (which may be * to grant access to all groups, or an array of group IDs to permit access to)
 	 * @return		\IPS\calendar\Calendar
+	 * @throws		1L364/2	NO_TITLE	A title for the calendar must be supplied
 	 */
 	public function POSTindex()
 	{
+		if ( !\IPS\Request::i()->title )
+		{
+			throw new \IPS\Api\Exception( 'NO_TITLE', '1L364/2', 400 );
+		}
+
 		return new \IPS\Api\Response( 201, $this->_create()->apiOutput( $this->member ) );
 	}
 
@@ -94,6 +102,8 @@ class _calendars extends \IPS\Node\Api\NodeController
 	 * @apiparam	int			approve_comments	0|1 Comments must be approved
 	 * @apiparam	int			allow_reviews		0|1 Allow reviews
 	 * @apiparam	int			approve_reviews		0|1 Reviews must be approved
+	 * @apiparam	object		permissions			An object with the keys as permission options (view, read, add, reply, review, askrsvp, rsvp) and values as permissions to use (which may be * to grant access to all groups, or an array of group IDs to permit access to)
+	 * @param		int		$id			ID Number
 	 * @return		\IPS\calendar\Calendar
 	 */
 	public function POSTitem( $id )
@@ -101,7 +111,7 @@ class _calendars extends \IPS\Node\Api\NodeController
 		$class = $this->class;
 		$calendar = $class::load( $id );
 
-		return new \IPS\Api\Response( 201, $this->_createOrUpdate( $calendar )->apiOutput( $this->member ) );
+		return new \IPS\Api\Response( 200, $this->_createOrUpdate( $calendar )->apiOutput( $this->member ) );
 	}
 
 	/**
@@ -120,17 +130,12 @@ class _calendars extends \IPS\Node\Api\NodeController
 	/**
 	 * Create or update node
 	 *
-	 * @param	\IPS\node\Model	$node				The node
+	 * @param	\IPS\node\Model	$calendar				The node
 	 * @return	\IPS\node\Model
 	 */
 	protected function _createOrUpdate( \IPS\node\Model $calendar )
 	{
-		if ( !\IPS\Request::i()->title )
-		{
-			throw new \IPS\Api\Exception( 'NO_TITLE', '', 400 );
-		}
-
-		if ( isset( \IPS\Request::i()->title ) )
+		if ( \IPS\Request::i()->title )
 		{
 			\IPS\Lang::saveCustom( 'calendar', 'calendar_calendar_' . $calendar->id, \IPS\Request::i()->title );
 			$calendar->title_seo	= \IPS\Http\Url\Friendly::seoTitle( \IPS\Request::i()->title );