From f738902107b118e8edb444e4bec2f98b7c5ea97a Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 16 Feb 2016 21:46:24 +0100 Subject: @hubdomain also for auto-create-channel + adding css wrapper (ongoing work) --- mod/register.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/register.php') diff --git a/mod/register.php b/mod/register.php index 49b010cc7..411d34d64 100644 --- a/mod/register.php +++ b/mod/register.php @@ -246,6 +246,7 @@ function register_content(&$a) { '$label_name' => t('Channel Name'), '$help_name' => t('Enter your name'), '$label_nick' => t('Choose a short nickname'), + '$nick_hub' => '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')), '$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'), -- cgit v1.2.3 From d49afead676f1a5b04daccd5852086e515fcc876 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 16 Feb 2016 18:36:29 -0800 Subject: allow redirection to site workflow page even if auto channel create is applied --- mod/register.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mod/register.php') diff --git a/mod/register.php b/mod/register.php index 411d34d64..795de3f57 100644 --- a/mod/register.php +++ b/mod/register.php @@ -145,6 +145,7 @@ function register_post(&$a) { authenticate_success($result['account'],true,false,true); $new_channel = false; + $next_page = 'new_channel'; if(get_config('system','auto_channel_create') || UNO) { $new_channel = auto_channel_create($result['account']['account_id']); @@ -156,10 +157,10 @@ function register_post(&$a) { else $new_channel = false; } - if(! $new_channel) { - if(! strlen($next_page = get_config('system','workflow_register_next'))) - $next_page = 'new_channel'; + $x = get_config('system','workflow_register_next'); + if($x) { + $next_page = $x; $_SESSION['workflow'] = true; } -- cgit v1.2.3 From cd8b7687c1ffc8fa912126eaf61b3898954d1b4c Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Wed, 17 Feb 2016 20:47:52 +0100 Subject: More clarification about privacy of private content. Changed Channel Name to simply Name when registering/creating an account or channel. First time when people see this they get confused (by experience on my hubs). This will even be more with UNO. --- mod/register.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/register.php') diff --git a/mod/register.php b/mod/register.php index 795de3f57..77ddfb4b1 100644 --- a/mod/register.php +++ b/mod/register.php @@ -244,7 +244,7 @@ function register_content(&$a) { '$label_invite' => t('Please enter your invitation code'), '$invite_code' => $invite_code, '$auto_create' => $auto_create, - '$label_name' => t('Channel Name'), + '$label_name' => t('Name'), '$help_name' => t('Enter your name'), '$label_nick' => t('Choose a short nickname'), '$nick_hub' => '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')), -- cgit v1.2.3