login/edit: password option in label

[minimedit.git] / login / edit.php

diff --git a/login/edit.php b/login/edit.php
index bb2278faf2b02f22250656a9b6f2158d8329111a..4e52506bdf839fdb0699c00cd1bf4b5de3212cb2 100644 (file)
--- a/login/edit.php
+++ b/login/edit.php
@@ -22,9 +22,10 @@ $cols = [
 ];
 
 foreach ($cols as $col => &$colconf) {
-       $colpath = "{$user['dir']}/$col.txt";
+       $filetype = @$colconf['type'] == 'file' ? 'jpg' : 'txt';
+       $colpath = "{$user['dir']}/$col.$filetype";
        if (file_exists($colpath)) {
-               $colconf['value'] = @$colconf['type'] == 'file' ? '' :
+               $colconf['value'] = $filetype != 'txt' ? '' :
                        file_get_contents($colpath);
        }
        if (file_exists($user['dir']) and !is_writable($user['dir'])) {
@@ -84,6 +85,10 @@ if ($_POST) {
                if (!@move_uploaded_file($val['tmp_name'], $cols[$col]['target'])) {
                        $colwarn[$col] = "Fout bij opslaan.";
                }
+               foreach (@glob('thumb/*/') as $thumbres) {
+                       # attempt to remove old derivations
+                       @unlink($thumbres.'/'.$cols[$col]['target']);
+               }
                $cols[$col]['value'] = '';
        }
 
@@ -108,46 +113,59 @@ if ($_POST) {
        Geef een e-mailadres op waarmee we u kunnen bereiken indien nodig.
        Wij zullen dit adres nooit vrij- of doorgeven.
        </p>
+       <ul class="grid">
 <?php
 foreach ($cols as $col => &$colconf) {
        print "\t";
-       printf('<label for="%s">%s:</label> ', $col, ucfirst($colconf['label']));
+       printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
+       if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
+               printf('<a href="/%s"><img src="/thumb/%s/%s?%s" /></a><br />',
+                       $colconf['target'],
+                       200, $colconf['target'], filemtime($colconf['target'])
+               );
+       }
        print "<input";
        if (empty($colconf['target'])) print ' readonly';
-       printf(' type="%s" name="%s" id="%1$s" value="%s"',
+       printf(' type="%s" name="%s" id="%2$s" value="%s"',
                @$colconf['type'] ?: 'text',
                $col,
                htmlspecialchars(@$colconf['value'])
        );
+       if (@$colconf['type'] == 'file') {
+               printf(' accept="%s"', 'image/jpeg');
+       }
        print ' placeholder="Niet ingesteld"';
        print " />";
 
        if ($error = @$colwarn[$col]) {
                print " <span class=warn>$error</span>\n";
        }
-       print "<br />\n";
+       print "</li>\n";
 }
 
 if (isset($user['pass'])) {
+?>
+       <li><label for="newpass">Wachtwoord:</label>
+<?php
        if ($hide = empty($_POST['newpass'])) {
 ?>
-       <p><a onclick="document.getElementById('pass').removeAttribute('hidden'); this.remove()">Wachtwoord wijzigen</a></p>
+               <a onclick="document.getElementById('pass').removeAttribute('hidden'); this.remove()">Wijzigen</a>
 <?php
        }
 ?>
-       <div id="pass"<?php if ($hide) print ' hidden'; ?>>
-               <label for="newpass">Wachtwoord:</label>
-               <input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
-               <input type="password" name="newpass" value="" placeholder="Nieuw wachtwoord" />
-               <input type="password" name="passconf" value="" placeholder="Nogmaals" />
+               <span id="pass"<?php if ($hide) print ' hidden'; ?>>
+                       <input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
+                       <input type="password" name="newpass" value="" placeholder="Nieuw wachtwoord" />
+                       <input type="password" name="passconf" value="" placeholder="Nogmaals" />
 <?php
        if ($error = @$colwarn['pass']) {
                print " <span class=warn>$error</span>\n";
        }
 ?>
-       </div>
+       </li>
 <?php
 }
 ?>
-       <input type="submit" value="Opslaan" />
+       </ul>
+       <p><input type="submit" value="Opslaan" /></p>
 </form>