Version 4.7.0

applications/core/modules/front/clubs/view.php

@@ -31,6 +31,14 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 	 * @brief	The logged in user's status
 	 */
 	protected $memberStatus;
+
+	/**
+	 * @brief These properties are used to specify datalayer context properties.
+	 *
+	 */
+	public static $dataLayerContext = array(
+		'community_area' =>  [ 'value' => 'clubs', 'odkUpdate' => 'true']
+	);
 	
 	/**
 	 * Execute
@@ -135,15 +143,6 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		{
 			\IPS\Output::i()->redirect( (string) $firstTab[ $key ]['href'] );
 		}
-
-		/* If this is a closed club, and we don't have permission to read it, show the member page instead */
-		if ( $this->club->type == \IPS\Member\Club::TYPE_CLOSED && !$this->club->canRead() )
-		{
-			$this->members();
-			return;
-		}
-		else
-		{
 			if( $key == 'club_members' )
 			{
 				$this->members();
@@ -153,7 +152,6 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 				$this->overview();
 			}
 			return;
-		}
 	}
 
 	/**
@@ -1124,7 +1122,6 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 					{
 						\IPS\Output::i()->redirect( $this->club->url()->setQueryString( 'rulesAcknowledged', 1 ), 'accepted' );
 					}
-
 				}
 
 				$this->club->acknowledgeRules( \IPS\Member::loggedIn() );
@@ -1553,7 +1550,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		/* Build Form */
 		$form = new \IPS\Helpers\Form;
 		$form->class = 'ipsForm_vertical';
-		$node->clubForm( $form );
+		$node->clubForm( $form, $this->club );
 		
 		/* Handle submissions */
 		if ( $values = $form->values() )
@@ -1584,13 +1581,14 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		
 		/* Load */
 		$class = \IPS\Request::i()->type;
-		
-		if( !$class instanceof \IPS\Node\Model )
-		{
-			throw new \Exception;
-		}
+
 		try
 		{
+			if ( !\in_array( 'IPS\Node\Model', class_parents( $class ) ) )
+			{
+				throw new \Exception;
+			}
+
 			$node = $class::load( (int) \IPS\Request::i()->node );
 			$club = $node->club();
 			if ( !$club or $club->id !== $this->club->id )