From 761952d424ded8848335116beef962c39c551bc4 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Fri, 11 Mar 2016 20:31:50 +0100
Subject: Fix l10n of "more"

Use __() instead of _() to make the string translatable.

Fixes FS#48529.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/stats/updates_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
index 4e2d39d..580583b 100644
--- a/web/template/stats/updates_table.php
+++ b/web/template/stats/updates_table.php
@@ -1,4 +1,4 @@
-<h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&amp;SO=d"><?= _('more') ?></a>)</span></h3>
+<h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&amp;SO=d"><?= __('more') ?></a>)</span></h3>
 
 <a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a>
 
-- 
cgit v1.2.3-54-g00ecf


From 32c8d0c3f837950518f886ed9baef00e98740049 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Sun, 13 Mar 2016 11:37:48 +0100
Subject: Store last login address as plain text

Directly store the information contained in $_SERVER['REMOTE_ADDR']
instead of using ip2long() which does not support IPv6 addresses. Note
that the LastLoginIPAddress field is designed to be used by the
administrator on rare occasions only (e.g. to fight spam) and is not
displayed anywhere.

Fixes FS#48557.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 schema/aur-schema.sql     | 2 +-
 upgrading/4.2.1.txt       | 5 +++++
 web/lib/acctfuncs.inc.php | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 upgrading/4.2.1.txt

diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql
index 1a141c1..aa5ed9d 100644
--- a/schema/aur-schema.sql
+++ b/schema/aur-schema.sql
@@ -35,7 +35,7 @@ CREATE TABLE Users (
 	IRCNick VARCHAR(32) NOT NULL DEFAULT '',
 	PGPKey VARCHAR(40) NULL DEFAULT NULL,
 	LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0,
-	LastLoginIPAddress INTEGER UNSIGNED NOT NULL DEFAULT 0,
+	LastLoginIPAddress VARCHAR(40) NULL DEFAULT NULL,
 	InactivityTS BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	CommentNotify TINYINT(1) NOT NULL DEFAULT 1,
diff --git a/upgrading/4.2.1.txt b/upgrading/4.2.1.txt
new file mode 100644
index 0000000..83c8d46
--- /dev/null
+++ b/upgrading/4.2.1.txt
@@ -0,0 +1,5 @@
+1. Convert the LastLoginIPAddress column to VARCHAR(40):
+
+----
+ALTER TABLE Users MODIFY LastLoginIPAddress VARCHAR(40) NULL DEFAULT NULL;
+----
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index b39420f..2d70f65 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -554,8 +554,8 @@ function try_login() {
 	}
 
 	$q = "UPDATE Users SET LastLogin = UNIX_TIMESTAMP(), ";
-	$q.= "LastLoginIPAddress = " . $dbh->quote(ip2long($_SERVER['REMOTE_ADDR'])) . " ";
-	$q.= "WHERE ID = '$userID'";
+	$q.= "LastLoginIPAddress = " . $dbh->quote($_SERVER['REMOTE_ADDR']) . " ";
+	$q.= "WHERE ID = $userID";
 	$dbh->exec($q);
 
 	/* Set the SID cookie. */
-- 
cgit v1.2.3-54-g00ecf