+
";
return;
}
?>
-
-
-
-
0) {
- $result = db_query($link, "SELECT COUNT(*) AS cu FROM ttrss_users");
+ $result = db_query( "SELECT COUNT(*) AS cu FROM ttrss_users");
$num_users = db_fetch_result($result, 0, "cu");
} ?>
-
+
+
+
+
+
+
+
+
+
-
-
-
-
- "; ?>
-
-
-
+
+ ";
return;
}
-
+
if ($test == "four" || $test == "4") {
-
- $result = db_query($link, "SELECT id FROM ttrss_users WHERE
+
+ $result = db_query( "SELECT id FROM ttrss_users WHERE
login = '$login'");
-
+
$is_registered = db_num_rows($result) > 0;
-
+
if ($is_registered) {
print_error(__('Sorry, this username is already taken.'));
- print "";
} else {
-
+
$password = make_password();
-
- $pwd_hash = encrypt_password($password, $login);
-
- db_query($link, "INSERT INTO ttrss_users
- (login,pwd_hash,access_level,last_login, email, created)
- VALUES ('$login', '$pwd_hash', 0, null, '$email', NOW())");
-
- $result = db_query($link, "SELECT id FROM ttrss_users WHERE
+
+ $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+ $pwd_hash = encrypt_password($password, $salt, true);
+
+ db_query( "INSERT INTO ttrss_users
+ (login,pwd_hash,access_level,last_login, email, created, salt)
+ VALUES ('$login', '$pwd_hash', 0, null, '$email', NOW(), '$salt')");
+
+ $result = db_query( "SELECT id FROM ttrss_users WHERE
login = '$login' AND pwd_hash = '$pwd_hash'");
-
+
if (db_num_rows($result) != 1) {
print_error(__('Registration failed.'));
- print "";
} else {
-
+
$new_uid = db_fetch_result($result, 0, "id");
-
- initialize_user($link, $new_uid);
-
+
+ initialize_user( $new_uid);
+
$reg_text = "Hi!\n".
"\n".
"You are receiving this message, because you (or somebody else) have opened\n".
@@ -265,96 +306,59 @@
"it will be deleted in 24 hours.\n".
"\n".
"If that wasn't you, just ignore this message. Thanks.";
-
- $mail = new PHPMailer();
-
- $mail->PluginDir = "phpmailer/";
- $mail->SetLanguage("en", "phpmailer/language/");
-
- $mail->CharSet = "UTF-8";
-
- $mail->From = DIGEST_FROM_ADDRESS;
- $mail->FromName = DIGEST_FROM_NAME;
- $mail->AddAddress($email);
-
- if (DIGEST_SMTP_HOST) {
- $mail->Host = DIGEST_SMTP_HOST;
- $mail->Mailer = "smtp";
- $mail->Username = DIGEST_SMTP_LOGIN;
- $mail->Password = DIGEST_SMTP_PASSWORD;
- }
-
- // $mail->IsHTML(true);
- $mail->Subject = "Registration information for Tiny Tiny RSS";
- $mail->Body = $reg_text;
- // $mail->AltBody = $digest_text;
-
- $rc = $mail->Send();
-
- if (!$rc) print_error($mail->ErrorInfo);
-
+
+ $mailer = new Mailer();
+ $rc = $mailer->mail(["to_address" => $email,
+ "subject" => "Registration information for Tiny Tiny RSS",
+ "message" => $reg_text]);
+
+ if (!$rc) print_error($mailer->error());
+
$reg_text = "Hi!\n".
"\n".
"New user had registered at your Tiny Tiny RSS installation.\n".
"\n".
"Login: $login\n".
"Email: $email\n";
-
- $mail = new PHPMailer();
-
- $mail->PluginDir = "phpmailer/";
- $mail->SetLanguage("en", "phpmailer/language/");
-
- $mail->CharSet = "UTF-8";
-
- $mail->From = DIGEST_FROM_ADDRESS;
- $mail->FromName = DIGEST_FROM_NAME;
- $mail->AddAddress(REG_NOTIFY_ADDRESS);
-
- if (DIGEST_SMTP_HOST) {
- $mail->Host = DIGEST_SMTP_HOST;
- $mail->Mailer = "smtp";
- $mail->Username = DIGEST_SMTP_LOGIN;
- $mail->Password = DIGEST_SMTP_PASSWORD;
- }
-
- // $mail->IsHTML(true);
- $mail->Subject = "Registration notice for Tiny Tiny RSS";
- $mail->Body = $reg_text;
- // $mail->AltBody = $digest_text;
-
- $rc = $mail->Send();
-
+
+ $mailer = new Mailer();
+ $rc = $mailer->mail(["to_address" => REG_NOTIFY_ADDRESS,
+ "subject" => "Registration notice for Tiny Tiny RSS",
+ "message" => $reg_text]);
+
+ if (!$rc) print_error($mailer->error());
+
print_notice(__("Account created successfully."));
-
- print "";
-
+
}
-
+
}
-
+
} else {
print_error('Plese check the form again, you have failed the robot test.');
- print "";
-
+
}
}
?>
-
+
- "; ?>
-
+
+
+
-