From 1ced97807c9214d8a7059277f4fa45fe2a10983e Mon Sep 17 00:00:00 2001
From: patrick <patrick@algolibre.io>
Date: Thu, 30 Jan 2025 03:29:35 +0000
Subject: [PATCH] Fix user methods like deleting accounts

---
 user.inc.php      | 19 ++++++++++---------
 user_activate.php |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/user.inc.php b/user.inc.php
index c297fdf3..d51616dd 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -217,9 +217,9 @@ function user_load($user, $uid = false)
 	$q->execute();
 
 	if ($q->rowCount() != 1) {
-		echo "Query [$query] returned " . $q->rowCount() . " rows\n";
+		/*echo "Query [$query] returned " . $q->rowCount() . " rows\n";
 		echo '<pre>';
-		print_r(debug_backtrace());
+		print_r(debug_backtrace());*/
 		return false;
 	}
 
@@ -690,14 +690,14 @@ function user_purge($u, $type = false)
 }
 
 /* Duplicate a row in the users table, or any one of the users_* tables. */
-function user_dupe_row($db, $key, $val, $newval)
+function user_dupe_row($table, $key, $val, $newval)
 {
 	global $config, $pdo;
-	$nullfields = array('deleteddatetime');  /* Fields that can be null */
-	$q = $pdo->prepare("SELECT * FROM $db WHERE $key='$val'");
+	$nullfields = array('id','sex','deleteddatetime');  /* Fields that can be null */
+	$q = $pdo->prepare("SELECT * FROM $table WHERE $key='$val'");
 	$q->execute();
 	if ($q->rowCount() != 1) {
-		echo "ERROR duplicating row in $db: $key=$val NOT FOUND.\n";
+		echo "ERROR duplicating row in $table: $key=$val NOT FOUND.\n";
 		exit;
 	}
 	$i = $q->fetch(PDO::FETCH_ASSOC);
@@ -715,12 +715,12 @@ function user_dupe_row($db, $key, $val, $newval)
 	$keys = '`' . join('`,`', array_keys($i)) . '`';
 	$vals = join(',', array_values($i));
 
-	$q = "INSERT INTO $db ($keys) VALUES ($vals)";
+	$q = "INSERT INTO $table ($keys) VALUES ($vals)";
 	$r = $pdo->prepare($q);
 	$r->execute();
 	show_pdo_errors_if_any($pdo);
 
-	$id = $pdo->errorInfo();
+	$id = $pdo->lastInsertId();
 	return $id;
 }
 
@@ -748,13 +748,14 @@ function user_dupe($u, $new_year)
 		echo "Cannot duplicate user ID {$u['id']}, they are deleted.  Undelete them first.\n";
 		exit;
 	}
-	print ($r->year);
+
 	if ($r->year == $new_year) {
 		echo "Cannot duplicate user ID {$u['id']}, they already exist in year $new_year\n";
 		exit;
 	}
 
 	$id = user_dupe_row('users', 'id', $u['id'], NULL);
+
 	$q = $pdo->prepare("UPDATE users SET year = $new_year WHERE id = $id");
 	$q->execute();
 	/* Load the new user */
diff --git a/user_activate.php b/user_activate.php
index 1a69d6ab..aadfcc45 100644
--- a/user_activate.php
+++ b/user_activate.php
@@ -68,7 +68,7 @@ switch (get_value_from_array($_GET, 'action')) {
 		// okay here we go, lets get rid of them completely, since this is what theyve asked for
 		message_push(happy(i18n('Account successfully deleted. Goodbye')));
 		user_delete($u);
-		if ($_SESSION['embed'] == true)
+		if (get_value_from_array($_SESSION, 'embed') == true)
 			display_messages();
 		else
 			header('location: user_login.php?action=logout');