// if we got this far, it must be good
$confirm_hash = substr(md5($password1 . util_randbytes() . microtime()),0,16);
db_begin();
- $result = db_query_params('INSERT INTO users (user_name,user_pw,unix_pw,realname,firstname,lastname,email,add_date,status,confirm_hash,mail_siteupdates,mail_va,language,timezone,jabber_address,jabber_only,unix_box,address,address2,phone,fax,title,ccode,theme_id,tooltips,shell)
- VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26)',
- $result = db_query_params('INSERT INTO users (user_name,user_pw,unix_pw,realname,firstname,lastname,email,add_date,status,confirm_hash,mail_siteupdates,mail_va,language,timezone,unix_box,address,address2,phone,fax,title,ccode,theme_id,tooltips)
- VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23)',
++ $result = db_query_params('INSERT INTO users (user_name,user_pw,unix_pw,realname,firstname,lastname,email,add_date,status,confirm_hash,mail_siteupdates,mail_va,language,timezone,unix_box,address,address2,phone,fax,title,ccode,theme_id,tooltips,shell)
++ VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24)',
array($unix_name,
md5($password1),
account_genunixpw($password1),
setcookie("sf_user_hash",'',0,'/');
}
*/
- // Refresh page if language or theme changed
- $refresh = ($language != $u->getLanguage() || $theme_id != $u->getThemeID());
-
- if (!$u->update($firstname, $lastname, $language, $timezone, $mail_site, $mail_va, $use_ratings,
- '',0,$theme_id,$address,$address2,$phone,$fax,$title,$ccode,$use_tooltips)) {
- form_release_key(getStringFromRequest('form_key'));
- $error_msg = $u->getErrorMessage();
- $refresh_url = '/account/?error_msg='.urlencode($error_msg);
- } else {
- $feedback = _('Updated');
- $refresh_url = '/account/?feedback='.urlencode($feedback);
- }
-
- if ($refresh) {
- session_redirect($refresh_url);
+ // Refresh page if language or theme changed
+ $refresh = ($language != $u->getLanguage() || $theme_id != $u->getThemeID());
+
+ if (!$u->update($firstname, $lastname, $language, $timezone, $mail_site, $mail_va, $use_ratings,
- $jabber_address,$jabber_only,$theme_id,$address,$address2,$phone,$fax,$title,$ccode,$use_tooltips)) {
++ '',0,$theme_id,$address,$address2,$phone,$fax,$title,$ccode,$use_tooltips)) {
+ form_release_key(getStringFromRequest('form_key'));
+ $error_msg = $u->getErrorMessage();
+ $refresh_url = '/account/?error_msg='.urlencode($error_msg);
+ } else {
+ $feedback = _('Updated');
+ $refresh_url = '/account/?feedback='.urlencode($feedback);
+ }
+
+ if ($refresh) {
+ session_redirect($refresh_url);
+ }
}
}
$new_user = new GFUser();
$register = $new_user->create($unix_name,$firstname,$lastname,$password1,$password2,
- $email,$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,$theme_id,'',
+ $email,$mail_site,$mail_va,$language_id,$timezone,'',0,$theme_id,'',
$address,$address2,$phone,$fax,$title,$ccode,$send_mail);
if ($register) {
- site_header(array('title'=>'Register Confirmation'));
+ site_header(array('title'=>_('Register Confirmation')));
</p>
<p>
@<?php
- echo _('Email Address:') . utils_requiredField() . "<br />\n<em>";
+ echo _('Email Address') . _(': ') . utils_requiredField() . "<br />\n<em>";
printf(_('This email address will be verified before account activation. You will receive a mail forward account at <loginname@%1$s> that will forward to this address.'), forge_get_config('users_host')); ?></em>
-<br /><input size="30" type="text" name="email" value="<?php print(htmlspecialchars($email)); ?>" />
+<br /><label for="email">
+ <input id="email" size="40" type="text" name="email" value="<?php print(htmlspecialchars($email)); ?>"/>
+</label>
</p>
<p>
- <?php
- if (forge_get_config('use_jabber')) {
- echo _('Jabber Address:').'<br />
- <input size="30" type="text" name="jabber_address" value="'.
- htmlspecialchars($jabber_address) .'" /><br />
- <input type="checkbox" name="jabber_only" value="1" />
- '._('Send auto-generated notices only to my Jabber address').'.';
- }
- ?>
- </p>
- <p>
-<?php echo _('Address:'); ?><br />
-<input type="text" name="address" value="<?php echo htmlspecialchars($address); ?>" size="80" />
+<?php echo _('Address')._(':'); ?><br />
+ <label for="address">
+ <input id="address" type="text" name="address" value="<?php echo htmlspecialchars($address); ?>" size="80"/>
+ </label>
</p>
<p>
-<?php echo _('Address:'); ?><br />
-<input type="text" name="address2" value="<?php echo htmlspecialchars($address2); ?>" size="80" />
+<?php echo _('Address (continued)')._(':'); ?><br />
+ <label for="address2">
+ <input id="address2" type="text" name="address2" value="<?php echo htmlspecialchars($address2); ?>" size="80"/>
+ </label>
</p>
<p>
-<?php echo _('Phone:'); ?><br />
-<input type="text" name="phone" value="<?php echo htmlspecialchars($phone); ?>" size="20" />
+<?php echo _('Phone')._(':'); ?><br />
+ <label for="phone">
+ <input id="phone" type="text" name="phone" value="<?php echo htmlspecialchars($phone); ?>" size="20"/>
+ </label>
</p>
<p>
-<?php echo _('FAX:'); ?><br />
-<input type="text" name="fax" value="<?php echo htmlspecialchars($fax); ?>" size="20" />
+<?php echo _('Fax')._(':'); ?><br />
+ <label for="fax">
+ <input id="fax" type="text" name="fax" value="<?php echo htmlspecialchars($fax); ?>" size="20"/>
+ </label>
</p>
<p>
-<input type="checkbox" name="mail_site" value="1" checked="checked" />
-<?php echo _('Receive Email about Site Updates <i>(Very low traffic and includes security notices. Highly Recommended.)</i>'); ?>
+ <label for="mail_site">
+ <input id="mail_site" type="checkbox" name="mail_site" value="1" checked="checked"/>
+ </label>
+ <?php echo _('Receive Email about Site Updates <i>(Very low traffic and includes security notices. Highly Recommended.)</i>'); ?>
</p>
<p>
-<input type="checkbox" name="mail_va" value="1" />
-<?php echo _('Receive additional community mailings. <i>(Low traffic.)</i>'); ?>
+ <label for="mail_va">
+ <input id="mail_va" type="checkbox" name="mail_va" value="1"/>
+ </label>
+ <?php echo _('Receive additional community mailings. <i>(Low traffic.)</i>'); ?>
</p>
<?php if (forge_get_config('user_registration_accept_conditions')) { ?>
<p>