diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-08-17 17:35:37 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-08-17 17:35:37 +0200 |
| commit | bdf42473a0341f291cd256323d122aa80bb0cb0b (patch) | |
| tree | 922a5ba24a34d7ea89673019e82f68436edb7091 /mod/register.php | |
| parent | 6c423feed2d8bc5bd36d2a1cbac073915e523749 (diff) | |
| parent | db03b1ab173d61b1ee75271dac1e48f3475ad42c (diff) | |
| download | volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.gz volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.bz2 volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'mod/register.php')
| -rw-r--r-- | mod/register.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/register.php b/mod/register.php index 0906395d2..5fceebd4b 100644 --- a/mod/register.php +++ b/mod/register.php @@ -201,7 +201,7 @@ function register_post(&$a) { $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`, `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` ) VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )", - dbesc(generate_guid()), + dbesc(generate_user_guid()), dbesc($username), dbesc($new_password_encoded), dbesc($email), @@ -373,7 +373,7 @@ function register_post(&$a) { if($res) { info( t('Registration successful. Please check your email for further instructions.') . EOL ) ; - goaway($a->get_baseurl()); + goaway(z_root()); } else { notice( t('Failed to send email message. Here is the message that failed.') . $email_tpl . EOL ); @@ -382,7 +382,7 @@ function register_post(&$a) { elseif($a->config['register_policy'] == REGISTER_APPROVE) { if(! strlen($a->config['admin_email'])) { notice( t('Your registration can not be processed.') . EOL); - goaway($a->get_baseurl()); + goaway(z_root()); } $hash = random_string(); @@ -428,7 +428,7 @@ function register_post(&$a) { if($res) { info( t('Your registration is pending approval by the site owner.') . EOL ) ; - goaway($a->get_baseurl()); + goaway(z_root()); } } @@ -501,7 +501,7 @@ function register_content(&$a) { } - $license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'); + $license = cc_license(); $o = get_markup_template("register.tpl"); |