Add missing database and account fields

Commits 6ec4a35 (Send notifications when changing ownership, 2016-02-21)
and e3670ef (Add a homepage field to accounts, 2016-06-02) forgot to
change some usages of display_account_form() and process_account_form()
to account for the new parameter. The former also forgot to add the new
column to the database schema.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>

3 files changed, 44 insertions, 11 deletions

diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql
index 7edf94c6..1affc25e 100644
--- a/schema/aur-schema.sql
+++ b/schema/aur-schema.sql
@@ -41,6 +41,7 @@ CREATE TABLE Users (
 	RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	CommentNotify TINYINT(1) NOT NULL DEFAULT 1,
 	UpdateNotify TINYINT(1) NOT NULL DEFAULT 0,
+	OwnershipNotify TINYINT(1) NOT NULL DEFAULT 1,
 	PRIMARY KEY (ID),
 	UNIQUE (Username),
 	UNIQUE (Email),
diff --git a/web/html/account.php b/web/html/account.php
index 8d92b2c3..2892f046 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -34,9 +34,10 @@ if ($action == "UpdateAccount") {
 			in_request("U"), in_request("T"), in_request("S"),
 			in_request("E"), in_request("H"), in_request("P"),
 			in_request("C"), in_request("R"), in_request("L"),
-			in_request("I"), in_request("K"), in_request("PK"),
-			in_request("J"), in_request("CN"), in_request("UN"),
-			in_request("ID"), $row["Username"]);
+			in_request("HP"), in_request("I"), in_request("K"),
+			in_request("PK"), in_request("J"), in_request("CN"),
+			in_request("UN"), in_request("ON"), in_request("ID"),
+			$row["Username"]);
 	}
 }
 
@@ -95,6 +96,7 @@ if (isset($_COOKIE["AURSID"])) {
 					$row["InactivityTS"] ? 1 : 0,
 					$row["CommentNotify"],
 					$row["UpdateNotify"],
+					$row["OwnershipNotify"],
 					$row["ID"],
 					$row["Username"]);
 			} else {
@@ -146,6 +148,7 @@ if (isset($_COOKIE["AURSID"])) {
 				in_request("J"),
 				in_request("CN"),
 				in_request("UN"),
+				in_request("ON"),
 				in_request("ID"),
 				$row["Username"]);
 		}
diff --git a/web/html/register.php b/web/html/register.php
index 3155449c..6c6d52e6 100644
--- a/web/html/register.php
+++ b/web/html/register.php
@@ -20,18 +20,47 @@ echo '<h2>' . __('Register') . '</h2>';
 
 if (in_request("Action") == "NewAccount") {
 	list($success, $message) = process_account_form(
-			"new", "NewAccount", in_request("U"), 1, 0,
-			in_request("E"), in_request("H"), '', '', in_request("R"),
-			in_request("L"), in_request("I"), in_request("K"),
-			in_request("PK"), 0, in_request("CN"), in_request("UN"));
+		"new",
+		"NewAccount",
+		in_request("U"),
+		1,
+		0,
+		in_request("E"),
+		in_request("H"),
+		'',
+		'',
+		in_request("R"),
+		in_request("L"),
+		in_request("HP"),
+		in_request("I"),
+		in_request("K"),
+		in_request("PK"),
+		0,
+		in_request("CN"),
+		in_request("UN"),
+		in_request("ON"));
 
 	print $message;
 
 	if (!$success) {
-		display_account_form("NewAccount", in_request("U"), 1, 0,
-			in_request("E"), in_request("H"), '', '', in_request("R"),
-			in_request("L"), in_request("I"), in_request("K"),
-			in_request("PK"), 0, in_request("CN"), in_request("UN"));
+		display_account_form("NewAccount",
+			in_request("U"),
+			1,
+			0,
+			in_request("E"),
+			in_request("H"),
+			'',
+			'',
+			in_request("R"),
+			in_request("L"),
+			in_request("HP"),
+			in_request("I"),
+			in_request("K"),
+			in_request("PK"),
+			0,
+			in_request("CN"),
+			in_request("UN"),
+			in_request("ON"));
 	}
 } else {
 	print '<p>' . __("Use this form to create an account.") . '</p>';