From 133ab8c713b28e41c2628f02f176ef8b5a0b524d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 14 Apr 2011 17:48:26 +0400 Subject: replace references to ttrss-logo.png with logo.png --- register.php | 102 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'register.php') diff --git a/register.php b/register.php index bd80a4df3..fb6261baf 100644 --- a/register.php +++ b/register.php @@ -11,18 +11,18 @@ require_once "sanity_check.php"; require_once "config.php"; require_once "db.php"; - - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + + init_connection($link); /* 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($link, "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($link, "DELETE FROM ttrss_users WHERE last_login IS NULL AND created < DATE_SUB(NOW(), INTERVAL 1 DAY) AND access_level = 0"); } @@ -37,7 +37,7 @@ $result = db_query($link, "SELECT id FROM ttrss_users WHERE LOWER(login) = LOWER('$login')"); - + $is_registered = db_num_rows($result) > 0; print ""; @@ -74,11 +74,11 @@ return false; } - var query = "register.php?action=check&login=" + + var query = "register.php?action=check&login=" + param_escape(login); new Ajax.Request(query, { - onComplete: function(transport) { + onComplete: function(transport) { try { @@ -93,7 +93,7 @@ } else { new Effect.Highlight(f.login, {startcolor : '#ff0000'}); f.sub_btn.disabled = true; - } + } } catch (e) { exception_error("checkUsername_callback", e); } @@ -140,7 +140,7 @@ -

@@ -169,9 +169,9 @@ } ?> - -

- + +

@@ -198,12 +198,12 @@ "; ?> - + @@ -211,43 +211,43 @@ "; return; } - + if ($test == "four" || $test == "4") { - + $result = db_query($link, "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 + + 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 + + $result = db_query($link, "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); - + $reg_text = "Hi!\n". "\n". "You are receiving this message, because you (or somebody else) have opened\n". @@ -262,82 +262,82 @@ "it will be deleted in 24 hours.\n". "\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 = 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); - + $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 = "lib/phpmailer/"; $mail->SetLanguage("en", "lib/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(); - + print_notice(__("Account created successfully.")); - + print "

"; - + } - + } - + } else { print_error('Plese check the form again, you have failed the robot test.'); print "

"; - + } } ?> -- cgit v1.2.3