X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=register.php;h=a6f42c65df865aaf49ea2abf84961c1e2f915ee3;hb=d35bd9a2336d058f0bb9d60a02b54bea0531ba39;hp=bf7ca4c0abb3c5a9c3afff5c78fb9fe3983ce12a;hpb=a53f3dc42201fa79811cb3846670b5beabac3550;p=tt-rss.git
diff --git a/register.php b/register.php
index bf7ca4c0..a6f42c65 100644
--- a/register.php
+++ b/register.php
@@ -4,30 +4,66 @@
// 1) templates/register_notice.txt - displayed above the registration form
// 2) register_expire_do.php - contains user expiration queries when necessary
- error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
- $action = $_REQUEST["action"];
-
- define('MAX_USERS', 55);
+ 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 "functions.php";
require_once "config.php";
require_once "db.php";
-
- $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
- init_connection($link);
+ startup_gettext();
+
+ $action = $_REQUEST["action"];
+
+ if (!init_plugins()) return;
+
+ if ($_REQUEST["format"] == "feed") {
+ header("Content-Type: text/xml");
+
+ print '';
+ print "
+ ".htmlspecialchars(SELF_URL_PATH . "/register.php")."
+ Tiny Tiny RSS registration slots
+
+ ";
+
+ if (ENABLE_REGISTRATION) {
+ $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;
+ if ($num_users < 0) $num_users = 0;
+ $reg_suffix = "enabled";
+ } else {
+ $num_users = 0;
+ $reg_suffix = "disabled";
+ }
+
+ print "
+ ".htmlspecialchars(SELF_URL_PATH)."/register.php?$num_users"."
+ ";
+
+ print "$num_users slots are currently available, registration $reg_suffix";
+ print "$num_users slots are currently available, registration $reg_suffix";
+
+ print "";
+
+ print "";
+
+ return;
+ }
/* 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");
}
@@ -38,11 +74,11 @@
if ($action == "check") {
header("Content-Type: application/xml");
- $login = trim(db_escape_string($_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;
print "";
@@ -59,10 +95,11 @@
Create new account
-
-
-
-
+
+
+
+
+