From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 18 Oct 2019 19:14:46 +0000 (+0200)
Subject: login/edit: remaining access from user object
X-Git-Tag: v4.1~21
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/6212e202d229f2301931f72cea4370d4e931ed1d

login/edit: remaining access from user object

Some optional code paths broken by commit v3.9-8-g882347cba8 (2019-06-28)
[auth: store global user metadata in User object].
---

diff --git a/login/edit.inc.php b/login/edit.inc.php
index 77bfc9b..f2bd27b 100644
--- a/login/edit.inc.php
+++ b/login/edit.inc.php
@@ -2,7 +2,7 @@
 $cols = [
 	'username' => [
 		'label' => 'login',
-		'value' => $user['name'],
+		'value' => $user->login,
 		'target' => NULL,
 		'attr' => [
 			'pattern' => "[a-z0-9-]+",
@@ -39,7 +39,7 @@ $cols = [
 	],
 ];
 
-if (isset($user['pass'])) {
+if (isset($user->pass)) {
 	$cols['newpass'] = [
 		'label' => 'wachtwoord',
 		'input' => <<<'EOT'
diff --git a/widget/login/edit.php b/widget/login/edit.php
index 829631e..d8114ff 100644
--- a/widget/login/edit.php
+++ b/widget/login/edit.php
@@ -194,7 +194,7 @@ foreach ($cols as $col => &$colconf) {
 	print "\t";
 	printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
 	if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
-		$target = $user['dir'] . '/' . $colconf['filename'];
+		$target = $user->dir . '/' . $colconf['filename'];
 		printf('<a href="/%s"><img src="/thumb/%s/%s?%s" /></a><br />',
 			$target,
 			200, $target, filemtime($target)