<?php
+use Friendica\Core\System;
+
require_once('include/config.php');
require_once('include/network.php');
require_once('include/plugin.php');
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 {
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');
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 ($r) {
$r = q("SELECT * FROM `user`
WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
dbesc($username),
);
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;
}
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;
}
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