X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuser.php;h=7eb1058dc05655a9a174b460748ab4ae44ddd9e7;hb=1ff217cc1373099b0e52ba8de5ab4a1335b0f184;hp=df871c5468ac7d3abb7087adb87635b453633d25;hpb=b580c238445100e95b2b43343a82d0e5f7a14630;p=friendica.git diff --git a/include/user.php b/include/user.php index df871c5468..7eb1058dc0 100644 --- a/include/user.php +++ b/include/user.php @@ -1,6 +1,8 @@ false, 'user' => null, 'password' => '', 'message' => ''); - $using_invites = get_config('system','invitation_only'); - $num_invites = get_config('system','number_invites'); + $using_invites = Config::get('system','invitation_only'); + $num_invites = Config::get('system','number_invites'); $invite_id = ((x($arr,'invite_id')) ? notags(trim($arr['invite_id'])) : ''); @@ -33,7 +35,7 @@ function create_user($arr) { $verified = ((x($arr,'verified')) ? intval($arr['verified']) : 0); $publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0); - $netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0); + $netpublish = ((strlen(Config::get('system','directory'))) ? $publish : 0); if ($password1 != $confirm) { $result['message'] .= t('Passwords do not match. Password unchanged.') . EOL; @@ -66,7 +68,7 @@ function create_user($arr) { require_once('library/openid.php'); $openid = new LightOpenID; $openid->identity = $openid_url; - $openid->returnUrl = z_root() . '/openid'; + $openid->returnUrl = System::baseUrl() . '/openid'; $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson'); $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); try { @@ -97,16 +99,9 @@ function create_user($arr) { if(mb_strlen($username) < 3) $result['message'] .= t('Name too short.') . EOL; - // I don't really like having this rule, but it cuts down - // on the number of auto-registrations by Russian spammers - - // Using preg_match was completely unreliable, due to mixed UTF-8 regex support - // $no_utf = get_config('system','no_utf'); - // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); - // So now we are just looking for a space in the full name. - $loose_reg = get_config('system','no_regfullname'); + $loose_reg = Config::get('system','no_regfullname'); if(! $loose_reg) { $username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8'); if(! strpos($username,' ')) @@ -174,32 +169,17 @@ function create_user($arr) { return $result; } - $default_service_class = get_config('system','default_service_class'); - if(! $default_service_class) - $default_service_class = ''; - - $prvkey = $keys['prvkey']; $pubkey = $keys['pubkey']; - /** - * - * Create another keypair for signing/verifying - * salmon protocol messages. We have to use a slightly - * less robust key because this won't be using openssl - * but the phpseclib. Since it is PHP interpreted code - * it is not nearly as efficient, and the larger keys - * will take several minutes each to process. - * - */ - + // Create another keypair for signing/verifying salmon protocol messages. $sres = new_keypair(512); $sprvkey = $sres['prvkey']; $spubkey = $sres['pubkey']; - $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`, - `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class`, `default-location` ) - VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s', '' )", + $r = q("INSERT INTO `user` (`guid`, `username`, `password`, `email`, `openid`, `nickname`, + `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `default-location`) + 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), @@ -212,8 +192,7 @@ function create_user($arr) { dbesc($sprvkey), dbesc(datetime_convert()), intval($verified), - intval($blocked), - dbesc($default_service_class) + intval($blocked) ); if ($r) { @@ -243,9 +222,7 @@ function create_user($arr) { ); if ((dbm::is_result($r)) && (count($r) > 1) && $newuid) { $result['message'] .= t('Nickname is already registered. Please choose another.') . EOL; - q("DELETE FROM `user` WHERE `uid` = %d", - intval($newuid) - ); + dba::delete('user', array('uid' => $newuid)); return $result; } @@ -256,8 +233,8 @@ function create_user($arr) { t('default'), 1, dbesc($username), - dbesc(z_root() . "/photo/profile/{$newuid}.jpg"), - dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"), + dbesc(System::baseUrl() . "/photo/profile/{$newuid}.jpg"), + dbesc(System::baseUrl() . "/photo/avatar/{$newuid}.jpg"), intval($publish), intval($netpublish) @@ -265,8 +242,7 @@ function create_user($arr) { if ($r === false) { $result['message'] .= t('An error occurred creating your default profile. Please try again.') . EOL; // Start fresh next time. - $r = q("DELETE FROM `user` WHERE `uid` = %d", - intval($newuid)); + dba::delete('user', array('uid' => $newuid)); return $result; } @@ -292,7 +268,7 @@ function create_user($arr) { ); } - if(get_config('system', 'newuser_private') && $def_gid) { + if(Config::get('system', 'newuser_private') && $def_gid) { q("UPDATE `user` SET `allow_gid` = '%s' WHERE `uid` = %d", dbesc("<" . $def_gid . ">"), intval($newuid) @@ -388,17 +364,17 @@ function user_create_self_contact($uid) { datetime_convert(), dbesc($user['username']), dbesc($user['nickname']), - dbesc(z_root()."/photo/profile/".$user['uid'].".jpg"), - dbesc(z_root()."/photo/avatar/".$user['uid'].".jpg"), - dbesc(z_root()."/photo/micro/".$user['uid'].".jpg"), - dbesc(z_root()."/profile/".$user['nickname']), - dbesc(normalise_link(z_root()."/profile/".$user['nickname'])), - dbesc($user['nickname'].'@'.substr(z_root(), strpos(z_root(),'://') + 3)), - dbesc(z_root()."/dfrn_request/".$user['nickname']), - dbesc(z_root()."/dfrn_notify/".$user['nickname']), - dbesc(z_root()."/dfrn_poll/".$user['nickname']), - dbesc(z_root()."/dfrn_confirm/".$user['nickname']), - dbesc(z_root()."/poco/".$user['nickname']), + dbesc(System::baseUrl()."/photo/profile/".$user['uid'].".jpg"), + dbesc(System::baseUrl()."/photo/avatar/".$user['uid'].".jpg"), + dbesc(System::baseUrl()."/photo/micro/".$user['uid'].".jpg"), + dbesc(System::baseUrl()."/profile/".$user['nickname']), + dbesc(normalise_link(System::baseUrl()."/profile/".$user['nickname'])), + dbesc($user['nickname'].'@'.substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3)), + dbesc(System::baseUrl()."/dfrn_request/".$user['nickname']), + dbesc(System::baseUrl()."/dfrn_notify/".$user['nickname']), + dbesc(System::baseUrl()."/dfrn_poll/".$user['nickname']), + dbesc(System::baseUrl()."/dfrn_confirm/".$user['nickname']), + dbesc(System::baseUrl()."/poco/".$user['nickname']), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(datetime_convert()) @@ -422,7 +398,7 @@ function send_register_pending_eml($email, $sitename, $username) { $body = sprintf($body, $username, $sitename); return notification(array( - 'type' => "SYSTEM_EMAIL", + 'type' => SYSTEM_EMAIL, 'to_email' => $email, 'subject'=> sprintf( t('Registration at %s'), $sitename), 'body' => $body)); @@ -468,7 +444,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor $body = sprintf($body, $email, $sitename, $siteurl, $username, $password); return notification(array( - 'type' => "SYSTEM_EMAIL", + 'type' => SYSTEM_EMAIL, 'to_email' => $email, 'subject'=> sprintf( t('Registration details for %s'), $sitename), 'preamble'=> $preamble,