diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-17 16:23:15 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-17 16:48:41 +0400 |
| commit | 6322ac79a020ab584d412d782d62b2ee77d7c6cf (patch) | |
| tree | b2e64a140a3bc9d9ce649ee67f8a687b6511d9f4 /register.php | |
| parent | aca75cb5cb323535099c7aef46a78ea3cec082f2 (diff) | |
remove $link
Diffstat (limited to 'register.php')
| -rw-r--r-- | register.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/register.php b/register.php index d7c60d4f0..a8fdb483a 100644 --- a/register.php +++ b/register.php @@ -19,7 +19,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins($link)) return; + if (!init_plugins()) return; if ($_REQUEST["format"] == "feed") { header("Content-Type: text/xml"); @@ -32,7 +32,7 @@ <link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>"; 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 +60,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 +74,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; @@ -200,7 +200,7 @@ ?> <?php if (REG_MAX_USERS > 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 +244,9 @@ <?php } else if ($action == "do_register") { ?> <?php - $login = mb_strtolower(trim(db_escape_string($link, $_REQUEST["login"]))); - $email = trim(db_escape_string($link, $_REQUEST["email"])); - $test = trim(db_escape_string($link, $_REQUEST["turing_test"])); + $login = mb_strtolower(trim(db_escape_string( $_REQUEST["login"]))); + $email = trim(db_escape_string( $_REQUEST["email"])); + $test = trim(db_escape_string( $_REQUEST["turing_test"])); if (!$login || !$email || !$test) { print_error(__("Your registration information is incomplete.")); @@ -258,7 +258,7 @@ 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; @@ -275,11 +275,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 +291,7 @@ $new_uid = db_fetch_result($result, 0, "id"); - initialize_user($link, $new_uid); + initialize_user( $new_uid); $reg_text = "Hi!\n". "\n". |