diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-31 22:46:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-31 22:46:13 -0400 |
| commit | ed8c5954a9189569a94e9a519f86ca2c8c88db50 (patch) | |
| tree | 1fdb0401ee9bf7156477841d8d69f8316122499e /mod/register.php | |
| parent | 6b086cd266f5e93c5b254f7a661747d889169505 (diff) | |
| parent | e6fd6bfd89ada9b5aeea8fcac1614546deba85aa (diff) | |
| download | volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.tar.gz volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.tar.bz2 volse-hubzilla-ed8c5954a9189569a94e9a519f86ca2c8c88db50.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
more error handling
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
handle escaped file chars in display and search
escape % in file_tag_query as it is ultimately embedded in a sprintf
diabook-themes: move "common tabs" to left side on settings page
move the common tabs to right_aside in diabook-derivates
register hooks for a COPA plugin
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
bug fix in diabook-aerith and -red
bug-fixes in diabook-derivates
settings for unknown private mail acceptance
* master:
Diffstat (limited to 'mod/register.php')
| -rwxr-xr-x | mod/register.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mod/register.php b/mod/register.php index 6d0e2700b..630c0a675 100755 --- a/mod/register.php +++ b/mod/register.php @@ -8,6 +8,8 @@ function register_post(&$a) { $verified = 0; $blocked = 1; + $arr = array('post' => $_POST); + call_hooks('register_post', $arr); $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailes) { @@ -218,8 +220,8 @@ function register_post(&$a) { $spubkey = $spkey["key"]; $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 )", + `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` ) + VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )", dbesc(generate_user_guid()), dbesc($username), dbesc($new_password_encoded), @@ -540,6 +542,11 @@ function register_content(&$a) { $license = ''; $o = get_markup_template("register.tpl"); + + $arr = array('template' => $o); + + call_hooks('register_form',$arr); + $o = replace_macros($o, array( '$oidhtml' => $oidhtml, '$invitations' => get_config('system','invitation_only'), |