X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=register.php;h=8bbce99328b31186e01c1a416712db8501c3dc89;hb=08bee97858f374352357fbfd4969bf7ebf4c2f85;hp=0dc91e96e46896b4120240f312bebc75eae21a2f;hpb=3972bf598195efba3e73ae1fef3faceabeb50308;p=tt-rss.git
diff --git a/register.php b/register.php
index 0dc91e96..8bbce993 100644
--- a/register.php
+++ b/register.php
@@ -7,19 +7,18 @@
set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
get_include_path());
- require_once 'lib/phpmailer/class.phpmailer.php';
-
+ require_once "autoload.php";
require_once "functions.php";
require_once "sessions.php";
require_once "sanity_check.php";
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_connection($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
-
-
-
-
+
+
+
+
-
+
-
+
+
+
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");
} ?>
@@ -242,9 +243,9 @@
0;
@@ -273,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) {
@@ -289,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".
@@ -306,32 +307,12 @@
"\n".
"If that wasn't you, just ignore this message. Thanks.";
- $mail = new PHPMailer();
-
- $mail->PluginDir = "lib/phpmailer/";
- $mail->SetLanguage("en", "lib/phpmailer/language/");
-
- $mail->CharSet = "UTF-8";
-
- $mail->From = SMTP_FROM_ADDRESS;
- $mail->FromName = SMTP_FROM_NAME;
- $mail->AddAddress($email);
-
- if (SMTP_HOST) {
- $mail->Host = SMTP_HOST;
- $mail->Mailer = "smtp";
- $mail->Username = SMTP_LOGIN;
- $mail->Password = SMTP_PASSWORD;
- }
-
- // $mail->IsHTML(true);
- $mail->Subject = "Registration information for Tiny Tiny RSS";
- $mail->Body = $reg_text;
- // $mail->AltBody = $digest_text;
+ $mailer = new Mailer();
+ $rc = $mailer->mail(["to_address" => $email,
+ "subject" => "Registration information for Tiny Tiny RSS",
+ "message" => $reg_text]);
- $rc = $mail->Send();
-
- if (!$rc) print_error($mail->ErrorInfo);
+ if (!$rc) print_error($mailer->error());
$reg_text = "Hi!\n".
"\n".
@@ -340,30 +321,12 @@
"Login: $login\n".
"Email: $email\n";
- $mail = new PHPMailer();
-
- $mail->PluginDir = "lib/phpmailer/";
- $mail->SetLanguage("en", "lib/phpmailer/language/");
-
- $mail->CharSet = "UTF-8";
+ $mailer = new Mailer();
+ $rc = $mailer->mail(["to_address" => REG_NOTIFY_ADDRESS,
+ "subject" => "Registration notice for Tiny Tiny RSS",
+ "message" => $reg_text]);
- $mail->From = SMTP_FROM_ADDRESS;
- $mail->FromName = SMTP_FROM_NAME;
- $mail->AddAddress(REG_NOTIFY_ADDRESS);
-
- if (SMTP_HOST) {
- $mail->Host = SMTP_HOST;
- $mail->Mailer = "smtp";
- $mail->Username = SMTP_LOGIN;
- $mail->Password = SMTP_PASSWORD;
- }
-
- // $mail->IsHTML(true);
- $mail->Subject = "Registration notice for Tiny Tiny RSS";
- $mail->Body = $reg_text;
- // $mail->AltBody = $digest_text;
-
- $rc = $mail->Send();
+ if (!$rc) print_error($mailer->error());
print_notice(__("Account created successfully."));
@@ -395,6 +358,7 @@
+
+
-