Merge pull request #15 from redmatrix/master

updating from original codebase

1 files changed, 51 insertions, 13 deletions

diff --git a/mod/register.php b/mod/register.php
index 2e9967c60..853728e10 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once('include/identity.php');
 
 function register_init(&$a) {
 
@@ -97,15 +98,22 @@ function register_post(&$a) {
 	require_once('include/security.php');
 
 
+	if($_REQUEST['name'])
+		set_aconfig($result['account']['account_id'],'register','channel_name',$_REQUEST['name']);
+	if($_REQUEST['nickname'])
+		set_aconfig($result['account']['account_id'],'register','channel_address',$_REQUEST['nickname']);
+	if($_REQUEST['permissions_role'])
+		set_aconfig($result['account']['account_id'],'register','permissions_role',$_REQUEST['permissions_role']);
+
+
  	$using_invites = intval(get_config('system','invitation_only'));
 	$num_invites   = intval(get_config('system','number_invites'));
 	$invite_code   = ((x($_POST,'invite_code'))  ? notags(trim($_POST['invite_code']))  : '');
 
 	if($using_invites && $invite_code) {
 		q("delete * from register where hash = '%s'", dbesc($invite_code));
-// @FIXME - this total needs to be stored by account, but pconfig operates on channels
-// This also needs to be considered when using 'invites_remaining' in mod/invite.php
-//		set_pconfig($result['account']['account_id'],'system','invites_remaining',$num_invites);
+		// @FIXME - this also needs to be considered when using 'invites_remaining' in mod/invite.php
+		set_aconfig($result['account']['account_id'],'system','invites_remaining',$num_invites);
 	}
 
 	if($policy == REGISTER_OPEN ) {
@@ -113,7 +121,7 @@ function register_post(&$a) {
 			$res = verify_email_address($result);
 		}
 		else {
-			$res = send_verification_email($result['email'],$result['password']);
+			$res = send_register_success_email($result['email'],$result['password']);
 		}
 		if($res) {
 			info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
@@ -135,28 +143,43 @@ function register_post(&$a) {
 	}
 
 	authenticate_success($result['account'],true,false,true);
+	
+	$new_channel = false;
+
+	if(get_config('system','auto_channel_create')) {
+		$new_channel = auto_channel_create($result['account']['account_id']);
+		if($new_channel['success']) {
+			$channel_id = $new_channel['channel']['channel_id'];
+			change_channel($channel_id);
+			$next_page = '~';
+		}
+		else
+			$new_channel = false;
+	}
+	if(! $new_channel) {
+		if(! strlen($next_page = get_config('system','workflow_register_next')))
+			$next_page = 'new_channel';
 
-	if(! strlen($next_page = get_config('system','workflow_register_next')))
-		$next_page = 'new_channel';
+		$_SESSION['workflow'] = true;
+	}
 
-	$_SESSION['workflow'] = true;
-	
 	goaway(z_root() . '/' . $next_page);
 
 }
 
 
 
-
-
-
-
 function register_content(&$a) {
 
 	$registration_is = '';
 	$other_sites = '';
 
 	if(get_config('system','register_policy') == REGISTER_CLOSED) {
+		if(get_config('system','directory_mode') == DIRECTORY_MODE_STANDALONE) {
+			notice( t('Registration on this site is disabled.')  . EOL);
+			return;
+		}
+
 		require_once('mod/pubsites.php');
 		return pubsites_content($a);
 	}
@@ -200,7 +223,12 @@ function register_content(&$a) {
 	$password     = ((x($_REQUEST,'password'))    ? trim($_REQUEST['password'])                :  "" );
 	$password2    = ((x($_REQUEST,'password2'))   ? trim($_REQUEST['password2'])               :  "" );
 	$invite_code  = ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) :  "" );
+	$name         = ((x($_REQUEST,'name'))        ? escape_tags(trim($_REQUEST['name']))       :  "" );
+	$nickname     = ((x($_REQUEST,'nickname'))    ? strip_tags(trim($_REQUEST['nickname']))    :  "" );
+	$privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role']         :  "" );
 
+	$auto_create = get_config('system','auto_channel_create');
+	$default_role = get_config('system','default_permissions_role');
 
 	require_once('include/bbcode.php');
 
@@ -214,7 +242,17 @@ function register_content(&$a) {
 		'$invite_desc'  => t('Membership on this site is by invitation only.'),
 		'$label_invite' => t('Please enter your invitation code'),
 		'$invite_code'  => $invite_code,
-
+		'$auto_create'  => $auto_create,
+		'$label_name'   => t('Channel Name'),
+		'$help_name'    => t('Enter your name'),
+		'$label_nick'   => t('Choose a short nickname'),
+		'$nick_desc'    => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'),
+		'$name'         => $name,
+		'$help_role'    => t('Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'),
+		'$role' => array('permissions_role' , t('Channel Type'), ($privacy_role) ? $privacy_role : 'social', '<a href="help/roles" target="_blank">'.t('Read more about roles').'</a>',get_roles()),
+		'$default_role' => $default_role,
+		'$nickname'     => $nickname,
+		'$submit'       => t('Create'),
 		'$label_email'  => t('Your email address'),
 		'$label_pass1'  => t('Choose a password'),
 		'$label_pass2'  => t('Please re-enter your password'),