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 77bfc9b5bd246df94271defa965a27a992841265..f2bd27b3e784bd2c96140b4923fb43882b327184 100644 (file)
--- 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 829631e875da16065cf069026ea26fbb4364d3da..d8114ff07b065bb8f8b056453442ddc9a0225c7e 100644 (file)
--- 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)