X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=register.php;h=8bbce99328b31186e01c1a416712db8501c3dc89;hp=d7c60d4f01674886ab78c5d2ec926a56d61b2e27;hb=HEAD;hpb=404e2e3603c852a3f82a21c14b8888005e2b3f99
diff --git a/register.php b/register.php
index d7c60d4f..8bbce993 100644
--- a/register.php
+++ b/register.php
@@ -7,7 +7,6 @@
set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
get_include_path());
- require_once 'classes/ttrssmailer.php';
require_once "autoload.php";
require_once "functions.php";
require_once "sessions.php";
@@ -15,11 +14,11 @@
require_once "config.php";
require_once "db.php";
- $action = $_REQUEST["action"];
+ startup_gettext();
- $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+ $action = $_REQUEST["action"];
- if (!init_plugins($link)) return;
+ if (!init_plugins()) return;
if ($_REQUEST["format"] == "feed") {
header("Content-Type: text/xml");
@@ -32,7 +31,7 @@
";
if (ENABLE_REGISTRATION) {
- $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");
$num_users = REG_MAX_USERS - $num_users;
@@ -60,10 +59,10 @@
/* Remove users which didn't login after receiving their registration information */
if (DB_TYPE == "pgsql") {
- db_query($link, "DELETE FROM ttrss_users WHERE last_login IS NULL
+ db_query( "DELETE FROM ttrss_users WHERE last_login IS NULL
AND created < NOW() - INTERVAL '1 day' AND access_level = 0");
} else {
- db_query($link, "DELETE FROM ttrss_users WHERE last_login IS NULL
+ db_query( "DELETE FROM ttrss_users WHERE last_login IS NULL
AND created < DATE_SUB(NOW(), INTERVAL 1 DAY) AND access_level = 0");
}
@@ -74,9 +73,9 @@
if ($action == "check") {
header("Content-Type: application/xml");
- $login = trim(db_escape_string($link, $_REQUEST['login']));
+ $login = trim(db_escape_string( $_REQUEST['login']));
- $result = db_query($link, "SELECT id FROM ttrss_users WHERE
+ $result = db_query( "SELECT id FROM ttrss_users WHERE
LOWER(login) = LOWER('$login')");
$is_registered = db_num_rows($result) > 0;
@@ -95,10 +94,10 @@
Create new account
-
-
-
-
+
+
+
+
-
+
@@ -200,7 +199,7 @@
?>
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");
} ?>
@@ -244,9 +243,9 @@
0;
@@ -275,11 +274,11 @@
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true);
- db_query($link, "INSERT INTO ttrss_users
+ 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($link, "SELECT id FROM ttrss_users WHERE
+ $result = db_query( "SELECT id FROM ttrss_users WHERE
login = '$login' AND pwd_hash = '$pwd_hash'");
if (db_num_rows($result) != 1) {
@@ -291,7 +290,7 @@
$new_uid = db_fetch_result($result, 0, "id");
- initialize_user($link, $new_uid);
+ initialize_user( $new_uid);
$reg_text = "Hi!\n".
"\n".
@@ -308,15 +307,13 @@
"\n".
"If that wasn't you, just ignore this message. Thanks.";
- $mail = new ttrssMailer();
- $mail->IsHTML(false);
- $rc = $mail->quickMail($email, "", "Registration information for Tiny Tiny RSS", $reg_text, false);
+ $mailer = new Mailer();
+ $rc = $mailer->mail(["to_address" => $email,
+ "subject" => "Registration information for Tiny Tiny RSS",
+ "message" => $reg_text]);
- if (!$rc) print_error($mail->ErrorInfo);
+ if (!$rc) print_error($mailer->error());
- unset($reg_text);
- unset($mail);
- unset($rc);
$reg_text = "Hi!\n".
"\n".
"New user had registered at your Tiny Tiny RSS installation.\n".
@@ -324,11 +321,12 @@
"Login: $login\n".
"Email: $email\n";
+ $mailer = new Mailer();
+ $rc = $mailer->mail(["to_address" => REG_NOTIFY_ADDRESS,
+ "subject" => "Registration notice for Tiny Tiny RSS",
+ "message" => $reg_text]);
- $mail = new ttrssMailer();
- $mail->IsHTML(false);
- $rc = $mail->quickMail(REG_NOTIFY_ADDRESS, "", "Registration notice for Tiny Tiny RSS", $reg_text, false);
- if (!$rc) print_error($mail->ErrorInfo);
+ if (!$rc) print_error($mailer->error());
print_notice(__("Account created successfully."));
@@ -364,4 +362,3 @@
-