X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=register.php;h=8bbce99328b31186e01c1a416712db8501c3dc89;hb=07fd4f8d9d4f301f5ad88ff9e80f042fc3eb0c36;hp=ce1b1ed512592294986afd03425dee1b58803ce2;hpb=6ef8ec84cb66b053edf84e8738a04089f8ca1b07;p=tt-rss.git diff --git a/register.php b/register.php index ce1b1ed5..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 'classes/ttrssmailer.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"); @@ -27,12 +26,12 @@ print ''; print " ".htmlspecialchars(SELF_URL_PATH . "/register.php")." - <?php echo get_site_title() ?> registration slots + Tiny Tiny RSS registration slots "; 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,28 +307,27 @@ "\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($mailer->error()); - if (!$rc) print_error($mail->ErrorInfo); - - unset($reg_text); - unset($mail); - unset($rc); $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 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); - + + $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 "

@@ -358,6 +358,7 @@ +
+ -