diff --git a/db-updater.php b/db-updater.php
index fb40fa75bbc5d83f1555b6b427f90532e144c707..6df74a864e64c29161e29c20b139cb31672a70a2 100644
--- a/db-updater.php
+++ b/db-updater.php
@@ -4,15 +4,15 @@
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);
login_sequence($link);
-
+
$owner_uid = $_SESSION["uid"];
-
- if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
+
+ if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
render_login_form($link);
exit;
@@ -36,7 +36,7 @@ function confirmOP() {
}
</script>
-<div class="floatingLogo"><img src="images/ttrss_logo.png"></div>
+<div class="floatingLogo"><img src="images/logo.png"></div>
<h1><?php echo __("Database Updater") ?></h1>
@@ -45,7 +45,7 @@ function confirmOP() {
$result = "";
while(!feof($fp)) {
$tmp = fgetc($fp);
-
+
if($tmp == $delim) {
return $result;
}
@@ -53,27 +53,27 @@ function confirmOP() {
}
return $result;
}
-
+
$op = $_POST["op"];
-
+
$result = db_query($link, "SELECT schema_version FROM ttrss_version");
$version = db_fetch_result($result, 0, "schema_version");
-
+
$update_files = glob("schema/versions/".DB_TYPE."/*sql");
$update_versions = array();
-
+
foreach ($update_files as $f) {
$m = array();
preg_match_all("/schema\/versions\/".DB_TYPE."\/(\d*)\.sql/", $f, $m,
PREG_PATTERN_ORDER);
-
+
if ($m[1][0]) {
$update_versions[$m[1][0]] = $f;
}
}
-
+
ksort($update_versions, SORT_NUMERIC);
-
+
$latest_version = max(array_keys($update_versions));
if ($version == $latest_version) {
@@ -81,7 +81,7 @@ function confirmOP() {
if ($version != SCHEMA_VERSION) {
print_error(__("Could not update database"));
- print "<p>" .
+ print "<p>" .
__("Could not find necessary schema file, need version:") .
" " . SCHEMA_VERSION . __(", found: ") . $latest_version . "</p>";
@@ -94,33 +94,33 @@ function confirmOP() {
return;
}
-
+
if (!$op) {
print_warning(__("Please backup your database before proceeding."));
-
+
print "<p>" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>).", $version, $latest_version) . "</p>";
-
+
/* print "<p>Available incremental updates:";
-
+
foreach (array_keys($update_versions) as $v) {
if ($v > $version) {
print " <a href='$update_versions[$v]'>$v</a>";
}
} */
-
+
print "</p>";
-
+
print "<form method='POST'>
<input type='hidden' name='op' value='do'>
<input type='submit' onclick='return confirmOP()' value='".__("Perform updates")."'>
</form>";
-
+
} else if ($op == "do") {
-
+
print "<p>".__("Performing updates...")."</p>";
-
+
$num_updates = 0;
-
+
foreach (array_keys($update_versions) as $v) {
if ($v == $version + 1) {
print "<p>".T_sprintf("Updating to version %d...", $v)."</p>";
@@ -135,32 +135,32 @@ function confirmOP() {
}
}
fclose($fp);
-
+
print "<p>".__("Checking version... ");
-
+
$result = db_query($link, "SELECT schema_version FROM ttrss_version");
$version = db_fetch_result($result, 0, "schema_version");
-
+
if ($version == $v) {
print __("OK!");
} else {
print "<b>".__("ERROR!")."</b>";
return;
}
-
+
$num_updates++;
}
}
-
+
print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema
version <b>%d</b>.", $num_updates, $version)."</p>";
-
+
print "<form method=\"GET\" action=\"logout.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>";
}
-
+
?>
</body>
diff --git a/opml.php b/opml.php
index 66856497689451fcbe24f646f66079c5d9c1e714..40ea2637a379da8b3580de8e849c68e90c392494 100644
--- a/opml.php
+++ b/opml.php
@@ -158,7 +158,7 @@
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head>
<body>
- <div class=\"floatingLogo\"><img src=\"images/ttrss_logo.png\"></div>
+ <div class=\"floatingLogo\"><img src=\"images/logo.png\"></div>
<h1>".__('OPML Utility')."</h1>";
db_query($link, "BEGIN");
diff --git a/register.php b/register.php
index bd80a4df30eeb921615ea47e5f7313367b3ebab2..fb6261bafc28c3378e0e59a819540406cf803fac 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 "<result>";
@@ -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 @@
<body>
-<div class="floatingLogo"><img src="images/ttrss_logo.png"></div>
+<div class="floatingLogo"><img src="images/logo.png"></div>
<h1><?php echo __("Create new account") ?></h1>
@@ -169,9 +169,9 @@
} ?>
<?php if (!$action) { ?>
-
- <p><?php echo __('Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent.') ?></p>
-
+
+ <p><?php echo __('Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent.') ?></p>
+
<form action="register.php" method="POST" name="register_form">
<input type="hidden" name="action" value="do_register">
<table>
@@ -198,12 +198,12 @@
</form>"; ?>
<?php } else if ($action == "do_register") { ?>
-
+
<?php
$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."));
print "<p><form method=\"GET\" action=\"tt-rss.php\">
@@ -211,43 +211,43 @@
</form>";
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 "<p><form method=\"GET\" action=\"tt-rss.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>";
} 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 "<p><form method=\"GET\" action=\"tt-rss.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>";
} 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 "<p><form method=\"GET\" action=\"tt-rss.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>";
-
+
}
-
+
}
-
+
} else {
print_error('Plese check the form again, you have failed the robot test.');
print "<p><form method=\"GET\" action=\"tt-rss.php\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>";
-
+
}
}
?>