<?php
-require_once('include/config.php');
+use Friendica\Core\Config;
+use Friendica\Core\System;
+
require_once('include/network.php');
require_once('include/plugin.php');
require_once('include/text.php');
$a = get_app();
$result = array('success' => 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'])) : '');
$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;
$tmp_str = $openid_url;
- if ($using_invites) {
- if (! $invite_id) {
+ if($using_invites) {
+ if(! $invite_id) {
$result['message'] .= t('An invitation is required.') . EOL;
return $result;
}
$r = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1", dbesc($invite_id));
- if (! results($r)) {
+ if(! results($r)) {
$result['message'] .= t('Invitation could not be verified.') . EOL;
return $result;
}
}
- if ((! x($username)) || (! x($email)) || (! x($nickname))) {
- if ($openid_url) {
- if (! validate_url($tmp_str)) {
+ if((! x($username)) || (! x($email)) || (! x($nickname))) {
+ if($openid_url) {
+ if(! validate_url($tmp_str)) {
$result['message'] .= t('Invalid OpenID url') . EOL;
return $result;
}
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 {
return;
}
- if (! validate_url($tmp_str))
+ if(! validate_url($tmp_str))
$openid_url = '';
// collapse multiple spaces in name
$username = preg_replace('/ +/',' ',$username);
- if (mb_strlen($username) > 48)
+ if(mb_strlen($username) > 48)
$result['message'] .= t('Please use a shorter name.') . EOL;
- if (mb_strlen($username) < 3)
+ 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');
- if (! $loose_reg) {
+ $loose_reg = Config::get('system','no_regfullname');
+ if(! $loose_reg) {
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
- if (! strpos($username,' '))
+ if(! strpos($username,' '))
$result['message'] .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
}
- if (! allowed_email($email))
+ if(! allowed_email($email))
$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
- if ((! valid_email($email)) || (! validate_email($email)))
+ if((! valid_email($email)) || (! validate_email($email)))
$result['message'] .= t('Not a valid email address.') . EOL;
// Disallow somebody creating an account using openid that uses the admin email address,
$adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
- //if ((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
- if ((x($a->config,'admin_email')) && in_array(strtolower($email), $adminlist) && strlen($openid_url)) {
+ //if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
+ if((x($a->config,'admin_email')) && in_array(strtolower($email), $adminlist) && strlen($openid_url)) {
$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
dbesc($email)
);
$nickname = $arr['nickname'] = strtolower($nickname);
- if (! preg_match("/^[a-z0-9][a-z0-9\_]*$/",$nickname))
+ if(! preg_match("/^[a-z0-9][a-z0-9\_]*$/",$nickname))
$result['message'] .= t('Your "nickname" can only contain "a-z", "0-9" and "_".') . EOL;
$r = q("SELECT `uid` FROM `user`
if (dbm::is_result($r))
$result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
- if (strlen($result['message'])) {
+ if(strlen($result['message'])) {
return $result;
}
$keys = new_keypair(4096);
- if ($keys === false) {
+ 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'];
- /**
- *
- * 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),
dbesc($sprvkey),
dbesc(datetime_convert()),
intval($verified),
- intval($blocked),
- dbesc($default_service_class)
+ intval($blocked)
);
if ($r) {
);
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;
}
- if (x($newuid) !== false) {
+ if(x($newuid) !== false) {
$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
intval($newuid),
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)
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;
}
);
}
- 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)
}
// if we have no OpenID photo try to look up an avatar
- if (! strlen($photo))
+ if(! strlen($photo))
$photo = avatar_img($email);
// unless there is no avatar-plugin loaded
- if (strlen($photo)) {
+ if(strlen($photo)) {
require_once('include/Photo.php');
$photo_failure = false;
$img = new Photo($img_str, $type);
- if ($img->is_valid()) {
+ if($img->is_valid()) {
$img->scaleImageSquare(175);
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())
$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));
$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,
projects / friendica.git / blobdiff