login/edit: build input html from prepared attributes

[minimedit.git] / login / edit.php

diff --git a/login/edit.php b/login/edit.php
index fe70ef95144dc5e348584c4ed0f09d3eaae388d6..6dfbfab5caf8f6ac00f563ad06c8ea9f40604278 100644 (file)
--- a/login/edit.php
+++ b/login/edit.php
@@ -85,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'] = '';
        }
 
@@ -109,55 +113,73 @@ 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" /></a><br />',
+               printf('<a href="/%s"><img src="/thumb/%s/%s?%s" /></a><br />',
                        $colconf['target'],
-                       200, $colconf['target']
+                       200, $colconf['target'], filemtime($colconf['target'])
                );
        }
-       print "<input";
-       if (empty($colconf['target'])) print ' readonly';
-       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');
+
+       {
+               $attrs = [
+                       'type'        => @$colconf['type'] ?: 'text',
+                       'name'        => $col,
+                       'id'          => $col,
+                       'value'       => htmlspecialchars(@$colconf['value']),
+                       'placeholder' => "Niet ingesteld",
+                       'readonly'    => empty($colconf['target']),
+               ];
+               if (@$colconf['type'] == 'file') {
+                       $attrs['accept'] = "image/jpeg";
+               }
+
+               print '<input';
+               foreach ($attrs as $attr => $attrval) {
+                       if ($attrval === FALSE) {
+                               continue;
+                       }
+                       print ' ' . $attr;
+                       if ($attrval !== TRUE) {
+                               printf('="%s"', $attrval);
+                       }
+               }
+               print ' />';
        }
-       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>