Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -r2480 -r2487
--- trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2480)
+++ trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2487)
@@ -200,7 +200,7 @@
 			switch ($object->GetDBField('Status')){
 				case 1:
 						$this->Application->EmailEventAdmin('USER.ADD', $object->GetID());
-						$this->Application->EmailEventUser('USER.ADD', $object->GetID());						
+						$this->Application->EmailEventUser('USER.ADD', $object->GetID());
 					break;
 				case 2:
 						$this->Application->EmailEventAdmin('USER.ADD.PENDING', $object->GetID());
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -r2480 -r2487
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2480)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2487)
@@ -200,7 +200,7 @@
 			switch ($object->GetDBField('Status')){
 				case 1:
 						$this->Application->EmailEventAdmin('USER.ADD', $object->GetID());
-						$this->Application->EmailEventUser('USER.ADD', $object->GetID());						
+						$this->Application->EmailEventUser('USER.ADD', $object->GetID());
 					break;
 				case 2:
 						$this->Application->EmailEventAdmin('USER.ADD.PENDING', $object->GetID());
Index: trunk/kernel/units/config_general/config_general_config.php
===================================================================
diff -u -r1566 -r2487
--- trunk/kernel/units/config_general/config_general_config.php	(.../config_general_config.php)	(revision 1566)
+++ trunk/kernel/units/config_general/config_general_config.php	(.../config_general_config.php)	(revision 2487)
@@ -7,7 +7,13 @@
 					'EventHandlerClass'	=>	Array('class'=>'ConfigGeneralEventHandler','file'=>'config_general_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'ConfigGeneralTagProcessor','file'=>'config_general_tag_processor.php','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
-					'hooks'				=>	Array(),
+					'AggregateTags' => Array(
+															Array(
+																'AggregateTo' => 'm',
+																'AggregatedTagName' => 'AllowAffiliateRegistration',
+																'LocalTagName' => 'AllowAffiliateRegistration',
+															),
+													),
 					'QueryString'		=>	Array(
 												1	=>	'id',
 												2	=>	'page',
Index: trunk/kernel/units/config_general/config_general_tag_processor.php
===================================================================
diff -u -r1566 -r2487
--- trunk/kernel/units/config_general/config_general_tag_processor.php	(.../config_general_tag_processor.php)	(revision 1566)
+++ trunk/kernel/units/config_general/config_general_tag_processor.php	(.../config_general_tag_processor.php)	(revision 2487)
@@ -89,7 +89,12 @@
 			return $this->Application->ParseBlock($params);
 		}
 		return "";
-	}	
+	}
+	
+	function AllowAffiliateRegistration($params)
+	{
+		return $this->Application->ConfigValue('Comm_RegisterAsAffiliate') ? 1 : 0;
+	}
 }
 
 ?>
\ No newline at end of file
Index: trunk/kernel/units/users/users_tag_processor.php
===================================================================
diff -u -r1996 -r2487
--- trunk/kernel/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 1996)
+++ trunk/kernel/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 2487)
@@ -124,6 +124,20 @@
 			return $this->Application->ConfigValue('Smtp_AdminMailFrom');
 		}
 			
+		function AffiliatePlanChecked($params)
+		{
+			static $checked = false;
+			if(!$checked)
+			{
+				$checked = true;
+				return 1;
+			}
+			else 
+			{
+				return 0;
+			}
+		}
+		
 	}
 	
 	
Index: trunk/core/units/users/users_tag_processor.php
===================================================================
diff -u -r1996 -r2487
--- trunk/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 1996)
+++ trunk/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 2487)
@@ -124,6 +124,20 @@
 			return $this->Application->ConfigValue('Smtp_AdminMailFrom');
 		}
 			
+		function AffiliatePlanChecked($params)
+		{
+			static $checked = false;
+			if(!$checked)
+			{
+				$checked = true;
+				return 1;
+			}
+			else 
+			{
+				return 0;
+			}
+		}
+		
 	}