diff options
| author | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-25 13:59:53 +0300 |
|---|---|---|
| committer | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-25 13:59:53 +0300 |
| commit | 94f895e98df73efe32a7c986a4b7844b0ab8fc01 (patch) | |
| tree | 92324c19bb13025d8f2f0087212348a039acbec6 /include/user.php | |
| parent | 00668aaa71336f48b141c443749a66c58a555503 (diff) | |
| parent | 7ea5917bf794c431fe304fa25380f19a6927cf63 (diff) | |
| download | volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.tar.gz volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.tar.bz2 volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.zip | |
Merge git://github.com/friendica/friendica
Diffstat (limited to 'include/user.php')
| -rw-r--r-- | include/user.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/user.php b/include/user.php index 2477438bf..383a3b3e1 100644 --- a/include/user.php +++ b/include/user.php @@ -147,13 +147,18 @@ function create_user($arr) { require_once('include/crypto.php'); - $keys = new_keypair(1024); + $keys = new_keypair(4096); if($keys === false) { $result['message'] .= t('SERIOUS ERROR: Generation of security keys failed.') . EOL; return $result; } + $default_service_class = get_config('system','default_service_class'); + if(! $default_service_class) + $default_service_class = ''; + + $prvkey = $keys['prvkey']; $pubkey = $keys['pubkey']; @@ -173,8 +178,8 @@ function create_user($arr) { $spubkey = $sres['pubkey']; $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`, - `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` ) - VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )", + `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class` ) + VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s' )", dbesc(generate_user_guid()), dbesc($username), dbesc($new_password_encoded), @@ -187,7 +192,8 @@ function create_user($arr) { dbesc($sprvkey), dbesc(datetime_convert()), intval($verified), - intval($blocked) + intval($blocked), + dbesc($default_service_class) ); if($r) { |