X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuser.php;h=3997a8a61f12584da6469808d767fb93c53c2db6;hb=0adff6f6b893bd7562547bb00021f358383f51ba;hp=bf29daf1a649e371418b08487f018187aa7efab1;hpb=db2e20eb2e94b7faf7e52c249eefeffc246ef829;p=friendica.git

diff --git a/include/user.php b/include/user.php
index bf29daf1a6..3997a8a61f 100644
--- a/include/user.php
+++ b/include/user.php
@@ -27,11 +27,19 @@ function create_user($arr) {
 	$openid_url = ((x($arr,'openid_url')) ? notags(trim($arr['openid_url'])) : '');
 	$photo      = ((x($arr,'photo'))      ? notags(trim($arr['photo']))      : '');
 	$password   = ((x($arr,'password'))   ? trim($arr['password'])           : '');
+	$password1  = ((x($arr,'password1'))  ? trim($arr['password1'])          : '');
+	$confirm    = ((x($arr,'confirm'))    ? trim($arr['confirm'])            : '');
 	$blocked    = ((x($arr,'blocked'))    ? intval($arr['blocked'])  : 0);
 	$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_submit_url'))) ? $publish : 0);
+	$netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0);
+
+	if ($password1 != $confirm) {
+		$result['message'] .= t('Passwords do not match. Password unchanged.') . EOL;
+		return $result;
+	} elseif ($password1 != "")
+		$password = $password1;
 
 	$tmp_str = $openid_url;
 
@@ -40,7 +48,7 @@ function create_user($arr) {
 			$result['message'] .= t('An invitation is required.') . EOL;
 			return $result;
 		}
-		$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
+		$r = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1", dbesc($invite_id));
 		if(! results($r)) {
 			$result['message'] .= t('Invitation could not be verified.') . EOL;
 			return $result;
@@ -58,7 +66,7 @@ function create_user($arr) {
 			require_once('library/openid.php');
 			$openid = new LightOpenID;
 			$openid->identity = $openid_url;
-			$openid->returnUrl = $a->get_baseurl() . '/openid';
+			$openid->returnUrl = z_root() . '/openid';
 			$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
 			$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
 			try {
@@ -128,11 +136,12 @@ function create_user($arr) {
 
 	$nickname = $arr['nickname'] = strtolower($nickname);
 
-	if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
-		$result['message'] .= t('Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.') . EOL;
+	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`
-               	WHERE `nickname` = '%s' LIMIT 1",
-               	dbesc($nickname)
+		WHERE `nickname` = '%s' LIMIT 1",
+		dbesc($nickname)
 	);
 	if(count($r))
 		$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
@@ -141,8 +150,8 @@ function create_user($arr) {
 	// but could be a security issue for federated platforms.
 
 	$r = q("SELECT * FROM `userd`
-               	WHERE `username` = '%s' LIMIT 1",
-               	dbesc($nickname)
+		WHERE `username` = '%s' LIMIT 1",
+		dbesc($nickname)
 	);
 	if(count($r))
 		$result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
@@ -189,8 +198,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`, `service_class` )
-		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s' )",
+		`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', '' )",
 		dbesc(generate_user_guid()),
 		dbesc($username),
 		dbesc($new_password_encoded),
@@ -229,8 +238,8 @@ function create_user($arr) {
 	 */
 
 	$r = q("SELECT `uid` FROM `user`
-               	WHERE `nickname` = '%s' ",
-               	dbesc($nickname)
+		WHERE `nickname` = '%s' ",
+		dbesc($nickname)
 	);
 	if((count($r) > 1) && $newuid) {
 		$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
@@ -247,8 +256,8 @@ function create_user($arr) {
 			t('default'),
 			1,
 			dbesc($username),
-			dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
-			dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
+			dbesc(z_root() . "/photo/profile/{$newuid}.jpg"),
+			dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"),
 			intval($publish),
 			intval($netpublish)
 
@@ -261,22 +270,23 @@ function create_user($arr) {
 			return $result;
 		}
 		$r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
-			`request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
-			VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
+			`addr`, `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
+			VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
 			intval($newuid),
 			datetime_convert(),
 			dbesc($username),
 			dbesc($nickname),
-			dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
-			dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
-			dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
-			dbesc($a->get_baseurl() . "/profile/$nickname"),
-			dbesc(normalise_link($a->get_baseurl() . "/profile/$nickname")),
-			dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
-			dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
-			dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
-			dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
-			dbesc($a->get_baseurl() . "/poco/$nickname"),
+			dbesc(z_root() . "/photo/profile/{$newuid}.jpg"),
+			dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"),
+			dbesc(z_root() . "/photo/micro/{$newuid}.jpg"),
+			dbesc(z_root() . "/profile/$nickname"),
+			dbesc(normalise_link(z_root() . "/profile/$nickname")),
+			dbesc($nickname . '@' . substr(z_root(), strpos(z_root(),'://') + 3 )),
+			dbesc(z_root() . "/dfrn_request/$nickname"),
+			dbesc(z_root() . "/dfrn_notify/$nickname"),
+			dbesc(z_root() . "/dfrn_poll/$nickname"),
+			dbesc(z_root() . "/dfrn_confirm/$nickname"),
+			dbesc(z_root() . "/poco/$nickname"),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert())
@@ -288,23 +298,23 @@ function create_user($arr) {
 		require_once('include/group.php');
 		group_add($newuid, t('Friends'));
 
-		$r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'",
+		$r = q("SELECT `id` FROM `group` WHERE `uid` = %d AND `name` = '%s'",
 			intval($newuid),
 			dbesc(t('Friends'))
 		);
 		if($r && count($r)) {
 			$def_gid = $r[0]['id'];
 
-			q("UPDATE user SET def_gid = %d WHERE uid = %d",
+			q("UPDATE `user` SET `def_gid` = %d WHERE `uid` = %d",
 				intval($r[0]['id']),
 				intval($newuid)
 			);
 		}
 
 		if(get_config('system', 'newuser_private') && $def_gid) {
-			q("UPDATE user SET allow_gid = '%s' WHERE uid = %d",
-			   dbesc("<" . $def_gid . ">"),
-			   intval($newuid)
+			q("UPDATE `user` SET `allow_gid` = '%s' WHERE `uid` = %d",
+				dbesc("<" . $def_gid . ">"),
+				intval($newuid)
 			);
 		}
 
@@ -382,7 +392,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
 		The login details are as follows:
 			Site Location:	%3$s
 			Login Name:	%1$s
-			Password:	%5$
+			Password:	%5$s
 
 		You may change your password from your account "Settings" page after logging
 		in.
@@ -407,7 +417,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
 		$preamble = sprintf($preamble, $username, $sitename);
 		$body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
-		notification(array(
+		return notification(array(
 			'type' => "SYSTEM_EMAIL",
 			'to_email' => $email,
 			'subject'=> sprintf( t('Registration details for %s'), $sitename),