+ This is your basic account information, and will be used to login to the Build
+ Your Own Browser application. Your e-mail address will be used for account
+ verification, status notifications, and password resets, and must be a valid
+ address. If you are creating a customized version of Firefox for distribution
+ by an organization, you must use an email account using that organization's
+ domain name to ensure your submissions are approved.
+
+
* = Required field
+
+
+
+
+ We require information about you and, if applicable, the organization you
+ represent. It helps us understand who is using BYOB, and to give us additional
+ ways to contact you should the need arise. This information is used solely by
+ Mozilla, and will never be shared with or sold to anyone else.
+
',
+ form::field('input', 'login_name', 'Login name', array('class'=>'required'), array(
+ "Enter the account name you will use to login to BYOB (4-12 ",
+ "characters in length; alphanumeric, underscore, and hyphens only)"
+ )),
+ form::field('input', 'email', 'Email', array('class'=>'required'), array(
+ )),
+ form::field('input', 'email_confirm', 'Email (confirm)', array('class'=>'required'), array(
+ "Enter a vaild email address. Verification will be ",
+ "required before your account is activated. If you are ",
+ "representing an organization, you must use an account with ",
+ "that organization's domain name or your submissions may be ",
+ "rejected."
+ )),
+ form::field('password', 'password', 'Password', array('class'=>'required'), array(
+ )),
+ form::field('password', 'password_confirm', 'Password (confirm)', array('class'=>'required'), array(
+ "Enter your password here. Passwords must be a minimum ",
+ "of six characters in length. If you forget your password, reset ",
+ "information will be sent to the email address above."
+ )),
+ )),
+ form::fieldset('Account Details', array('class'=>'account'), array(
+ '
' . slot::get('account_details_intro') . '
',
+ form::field('input', 'first_name', 'First Name', array('class'=>'required'), array(
+ 'Your given name.'
+ )),
+ form::field('input', 'last_name', 'Last Name', array('class'=>'required'), array(
+ 'Your surname.'
+ )),
+
+ form::field('checkbox', 'is_personal', 'Personal account?', array('value'=>'1'), array(
+ "Please check this box if you are using the versions of ",
+ "Firefox you create for personal use (i.e. sharing with ",
+ "friends and family, etc.)"
+ )),
+
+ form::field('dropdown', 'org_type', 'Organization Type', array(
+ 'options' => array(
+ 'corp' => 'Corporation',
+ 'nonprofit' => 'Non-Profit',
+ 'other' => 'Other',
+ ),
+ 'class'=>'required'
+ )),
+ form::field('input', 'org_type_other', '(other)'),
+ form::field('input', 'org_name', 'Organization Name', array('class'=>'required'), array(
+ "Please enter the full, legal name of the organization you represent here."
+ )),
+
+ form::field('input', 'phone', 'Phone', array('class'=>'required'), array(
+ 'Your daytime contact number, with country code (US/Canada is "1").'
+ )),
+ form::field('input', 'fax', 'Fax', array(), array(
+ 'Your fax number, with country code (US/Canada is "1")'
+ )),
+ form::field('input', 'website', 'Website', array(), array(
+ 'Please provide the URL for your organizational or personal website.'
+ )),
+
+ form::field('input', 'address_1', 'Street Address 1', array('class'=>'required')),
+ form::field('input', 'address_2', 'Street Address 2'),
+ form::field('input', 'city', 'City', array('class'=>'required')),
+ form::field('dropdown', 'state', 'State', array('class'=>'required', 'options'=>$state_list)),
+ form::field('input', 'zip', 'Zip / Postal Code', array('class'=>'required', 'class'=>'required'), array(
+ )),
+ form::field('dropdown', 'country', 'Country', array('class'=>'required', 'options'=>$country_list), array(
+ "Please provide your current mailing address or, if you are ",
+ "representing an organization, your organization's mailing address ",
+ "here."
+ )),
+ )),
+ form::fieldset('finish', array(), array(
+ '
+ Your account has been created, but is not yet active. An email containing
+ information on how to activate your account has been sent to the address you
+ provided. You must activate your account before you can login to the Build Your
+ Own Browser application. Please check your email for this information, and
+ activate your account.
+
+
+
+ If you do not receive this email within twenty-four hours, please contact us at
+ byob-help@mozilla.com. If you are using any spam prevention software, please
+ ensure that byob-registration@mozilla.com is whitelisted.
+
+
+
+ You can also use the button below to re-send the account activation email:
+
+ Welcome to Mozilla's Build Your Own Browser (BYOB) web application.
+ Your account has been successfully activated, and we've logged you in.
+ We've also set a cookie for you that will keep you logged in to the
+ application, so if you're using a computer that isn't always under your
+ control, you should log out when you're finished using BYOB by using the
+ "logout" link in the upper-right corner of every page.
+
To get started building your own browser,
- register and
- login!
-
+
+ Welcome to Mozilla's Build Your Own Browser (BYOB) web application, a
+ web-based tool that allows you to lightly customize versions of Firefox
+ that you'd like to distribute to other people. To get started, we require
+ that you create an account and
+ login to the application.
+ All of the customized versions of Firefox you create with BYOB will be
+ associated with, and accessible through, this account. Registration takes just
+ a couple of minutes, requires information about you and the organization
+ you represent, if applicable.
+
-
Welcome back!
+
+ Welcome back to Mozilla's Build Your Own Browser (BYOB) web application, a
+ web-based tool that allows you to lightly customize versions of Firefox
+ that you'd like to distribute to other people.
+
0 );
+ $.each([ 'org_name', 'org_type', 'org_type_other' ], function() {
+ if (checked) {
+ $('#'+this).attr('disabled', true)
+ .parent().removeClass('required');
+ } else {
+ $('#'+this).removeAttr('disabled');
+ $('#'+this).parent().addClass('required');
+ }
+ });
+ };
+ org_personal.each(personal_cb).change(personal_cb);
var org_type_other = org_fieldset.find('#org_type_other');
diff --git a/modules/auth_profiles/controllers/auth_profiles.php b/modules/auth_profiles/controllers/auth_profiles.php
index eafc84b..e0612bd 100644
--- a/modules/auth_profiles/controllers/auth_profiles.php
+++ b/modules/auth_profiles/controllers/auth_profiles.php
@@ -27,7 +27,8 @@ class Auth_Profiles_Controller extends Local_Controller
}
}
- $this->login_model = new Login_Model();
+ $this->login_model = new Login_Model();
+ $this->profile_model = new Profile_Model();
}
/**
@@ -62,32 +63,28 @@ class Auth_Profiles_Controller extends Local_Controller
public function register()
{
$form_data = form::validate(
- $this, $this->login_model,
+ $this, $this->profile_model,
'validate_registration', 'form_errors_auth'
);
if (null===$form_data) return;
- $new_login = $this->login_model
- ->register_with_profile($form_data);
+ $new_profile = $this->profile_model
+ ->register_with_login($form_data);
- if (!empty($new_login->email_verification_token)) {
+ if (!empty($new_profile->email_verification_token)) {
email::send_view(
- $new_login->new_email,
+ $new_profile->new_email,
'auth_profiles/register_email',
array(
'email_verification_token' =>
- $new_login->email_verification_token,
+ $new_profile->email_verification_token,
'login_name' =>
- $new_login->login_name
+ $new_profile->login_name
)
);
}
- Session::instance()->set_flash(
- 'message',
- 'Check your email to verify your address before login.'
- );
-
- return url::redirect('login');
+ $this->view->login_name = $new_profile->login_name;
+ $this->view->set_filename('auth_profiles/register_success');
}
/**
@@ -233,6 +230,8 @@ class Auth_Profiles_Controller extends Local_Controller
)
);
$this->view->email_sent = TRUE;
+ $this->view->login_name = $params['login_name'];
+ $this->view->set_filename('auth_profiles/register_success');
}
$this->view->login = $login;
@@ -243,6 +242,11 @@ class Auth_Profiles_Controller extends Local_Controller
*/
public function verifyemail()
{
+ if (false !== $this->input->get('success', false)) {
+ $this->view->valid_token = true;
+ return;
+ }
+
$token = ('post' == request::method()) ?
$this->input->post('email_verification_token') :
$this->input->get('email_verification_token');
@@ -253,21 +257,13 @@ class Auth_Profiles_Controller extends Local_Controller
$this->view->invalid_token = true;
return;
}
- $login->change_email($new_email);
+ //$login->change_email($new_email);
// TODO: Make auto-login on email verification configurable?
- if (!authprofiles::is_logged_in()) {
-
- $profile = $login->find_default_profile_for_login();
- $login->login();
- authprofiles::login($login->login_name, $login, $profile);
- Session::instance()->set_flash(
- 'message',
- 'Email address verified. Welcome!'
- );
-
- return url::redirect('/home');
- }
+ $profile = $login->find_default_profile_for_login();
+ $login->login();
+ authprofiles::login($login->login_name, $login, $profile);
+ url::redirect(url::current().'?success=true');
}
diff --git a/modules/auth_profiles/models/auth_login.php b/modules/auth_profiles/models/auth_login.php
index 21dbf66..07ce598 100644
--- a/modules/auth_profiles/models/auth_login.php
+++ b/modules/auth_profiles/models/auth_login.php
@@ -88,44 +88,6 @@ class Auth_Login_Model extends ORM
return true;
}
-
- /**
- * Create a new login and associated profile.
- */
- public function register_with_profile($data, $force_email_verified=false)
- {
- $profile_data = array(
- 'login_name' => $data['login_name'],
- 'email' => ($force_email_verified) ? $data['email'] : '',
- 'created' => gmdate('c', time())
- );
-
- $new_login = ORM::factory('login')->set($profile_data)->save();
-
- $new_login->change_password($data['password']);
-
- $profile_data['id'] = $new_login->id;
-
- if (!$force_email_verified) {
- $profile_data['new_email'] = $data['email'];
- $profile_data['email_verification_token'] =
- $new_login->set_email_verification_token($data['email']);
- }
-
- $new_profile = ORM::factory('profile')->set($data)->save();
-
- $new_login->add($new_profile);
- $new_login->save();
-
- $data = array(
- 'login' => $new_login->as_array(),
- 'profile' => $new_profile->as_array()
- );
- Event::run('auth_profiles.registered', $data);
-
- return arr::to_object($profile_data);
- }
-
/**
* Find the default profile for this login, usually the first registered.
* @TODO: Change point for future multiple profiles per login
@@ -307,38 +269,6 @@ class Auth_Login_Model extends ORM
}
- /**
- * Replace incoming data with registration validator and return whether
- * validation was successful.
- *
- * @param array Form data to validate
- * @return boolean Validation success
- */
- public function validate_registration(&$data)
- {
- $profile_model = new Profile_Model();
-
- $data = Validation::factory($data)
- ->pre_filter('trim')
- ->add_rules('login_name',
- 'required', 'length[3,64]', 'valid::alpha_dash',
- array($this, 'is_login_name_available'))
- ->add_rules('email',
- 'required', 'length[3,255]', 'valid::email',
- array($this, 'is_email_available'))
- ->add_rules('email_confirm',
- 'required', 'valid::email', 'matches[email]')
- ->add_rules('password', 'required')
- ->add_rules('password_confirm', 'required', 'matches[password]')
- ->add_rules('screen_name',
- 'required', 'length[3,64]', 'valid::alpha_dash',
- array($profile_model, 'is_screen_name_available'))
- ->add_rules('full_name', 'required', 'valid::standard_text')
- ->add_rules('captcha', 'required', 'Captcha::valid')
- ;
- return $data->validate();
- }
-
/**
* Replace incoming data with login validator and return whether
* validation was successful.
diff --git a/modules/auth_profiles/models/auth_profile.php b/modules/auth_profiles/models/auth_profile.php
index dcd1481..91aff5b 100644
--- a/modules/auth_profiles/models/auth_profile.php
+++ b/modules/auth_profiles/models/auth_profile.php
@@ -95,6 +95,76 @@ class Auth_Profile_Model extends ORM
}
+ /**
+ * Create a new login and associated profile.
+ */
+ public function register_with_login($data, $force_email_verified=false)
+ {
+ $profile_data = array(
+ 'login_name' => $data['login_name'],
+ 'email' => ($force_email_verified) ? $data['email'] : '',
+ 'created' => gmdate('c', time())
+ );
+
+ $new_login = ORM::factory('login')->set($profile_data)->save();
+
+ $new_login->change_password($data['password']);
+
+ $profile_data['id'] = $new_login->id;
+
+ if (!$force_email_verified) {
+ $profile_data['new_email'] = $data['email'];
+ $profile_data['email_verification_token'] =
+ $new_login->set_email_verification_token($data['email']);
+ }
+
+ $new_profile = ORM::factory('profile')->set($data)->save();
+
+ $new_login->add($new_profile);
+ $new_login->save();
+
+ $data = array(
+ 'login' => $new_login->as_array(),
+ 'profile' => $new_profile->as_array()
+ );
+ Event::run('auth_profiles.registered', $data);
+
+ return arr::to_object($profile_data);
+ }
+
+
+ /**
+ * Replace incoming data with registration validator and return whether
+ * validation was successful.
+ *
+ * @param array Form data to validate
+ * @return boolean Validation success
+ */
+ public function validate_registration(&$data)
+ {
+ $login_model = new Login_Model();
+
+ $data = Validation::factory($data)
+ ->pre_filter('trim')
+ ->add_rules('login_name',
+ 'required', 'length[3,64]', 'valid::alpha_dash',
+ array($this, 'is_login_name_available'))
+ ->add_rules('email',
+ 'required', 'length[3,255]', 'valid::email',
+ array($this, 'is_email_available'))
+ ->add_rules('email_confirm',
+ 'required', 'valid::email', 'matches[email]')
+ ->add_rules('password', 'required')
+ ->add_rules('password_confirm', 'required', 'matches[password]')
+ ->add_rules('screen_name',
+ 'required', 'length[3,64]', 'valid::alpha_dash',
+ array($profile_model, 'is_screen_name_available'))
+ ->add_rules('full_name', 'required', 'valid::standard_text')
+ ->add_rules('captcha', 'required', 'Captcha::valid')
+ ;
+ return $data->validate();
+ }
+
/**
* Validate form data for profile creation, optionally saving it if valid.
*/
diff --git a/modules/auth_profiles/views/auth_profiles/register_success.php b/modules/auth_profiles/views/auth_profiles/register_success.php
new file mode 100644
index 0000000..99aacce
--- /dev/null
+++ b/modules/auth_profiles/views/auth_profiles/register_success.php
@@ -0,0 +1 @@
+Check your email to verify your address before login.
diff --git a/modules/lmo_utils/helpers/MY_form.php b/modules/lmo_utils/helpers/MY_form.php
index 2d4088e..c381779 100644
--- a/modules/lmo_utils/helpers/MY_form.php
+++ b/modules/lmo_utils/helpers/MY_form.php
@@ -121,6 +121,10 @@ class form extends form_Core
{
if (null == $params) $params = array();
+ $params_class = (isset($params['class'])) ?
+ $params['class'] : '';
+ unset($params['class']);
+
if ('checkbox' == $type) {
// For checkboxes, the checked attribute is the significant thing.
$value = form::value($name, @$params['checked']);
@@ -137,9 +141,8 @@ class form extends form_Core
} else {
$classes = array($type);
- if (!empty($params['class'])) {
- $classes[] = $params['class'];
- unset($params['class']);
+ if (!empty($params_class)) {
+ $classes[] = $params_class;
}
if ('checkbox' == $type) {
@@ -180,6 +183,8 @@ class form extends form_Core
// List item classes consist of the name of the field type, along
// with 'error' if field present in $form::errors
$classes = array($type);
+ if (!empty($params_class))
+ $classes[] = $params_class;
if ('input' == $type)
$classes[] = isset($params['type']) ? $params['type'] : 'text';
if (!empty(self::$errors) && array_key_exists($name, self::$errors))