login/edit: column visibility option to restrict to admins

[minimedit.git] / login / edit.php

diff --git a/login/edit.php b/login/edit.php
index 15b0a2a7dbebd8ded892b98a882bd9d5ee1cef8a..8f39f09df5ee36f9d05c5ef2ce297f4d692b4450 100644 (file)
--- a/login/edit.php
+++ b/login/edit.php
@@ -17,14 +17,24 @@ and !empty($Place['user']) and $Place['user'] !== $User['name']) {
 require_once('edit.inc.php');
 
 foreach ($cols as $col => &$colconf) {
+       if (isset($colconf['visible'])) {
+               if ($colconf['visible'] == 'admin' and empty($User['admin'])) {
+                       $colconf['visible'] = FALSE;
+                       continue;
+               }
+       }
+       else {
+               $colconf['visible'] = TRUE;
+       }
+
        if (!isset($colconf['filename'])) {
                continue;  # exceptional storage
        }
 
        if (isset($colconf['values'])) {
                if (!file_exists($colconf['filename'])) {
+                       $colconf['visible'] = FALSE;
                        continue;
-                       #TODO: drop key
                }
                $tags = [];
                foreach (glob($colconf['filename'] . '/*') as $tag) {
@@ -32,9 +42,6 @@ foreach ($cols as $col => &$colconf) {
                        $target = "$tag/{$user['name']}";
                        $val = file_exists($target);
                        $tags[$tagname] = ['value' => $val];
-                       if (empty($User['admin'])) {
-                               continue;  # forbidden
-                       }
                        if (!is_writable($tag)) {
                                continue;  # locked tag directory
                        }
@@ -123,27 +130,19 @@ if ($_POST) {
                if (!isset($cols[$col]) and @$cols[$col]['type'] == 'file') {
                        continue; # unknown
                }
-               switch ($val['error']) {
-               case UPLOAD_ERR_OK:
-                       break;
-               case UPLOAD_ERR_NO_FILE:
-                       continue 2; # current
-               default:
-                       $colwarn[$col] = "Afbeelding niet goed ontvangen.";
-                       continue 2;
-               }
                if (empty($cols[$col]['target'])) {
                        $colwarn[$col] = "Kan niet worden aangepast.";
                        continue;
                }
-               if (!@move_uploaded_file($val['tmp_name'], $cols[$col]['target'])) {
-                       $colwarn[$col] = "Fout bij opslaan.";
+               try {
+                       require_once('upload.inc.php');
+                       $target = userupload($val, NULL, $cols[$col]['target']);
+                       if (!$target) continue;
+                       $cols[$col]['value'] = '';
                }
-               foreach (@glob('thumb/*/') as $thumbres) {
-                       # attempt to remove old derivations
-                       @unlink($thumbres.'/'.$cols[$col]['target']);
+               catch (Exception $e) {
+                       $colwarn[$col] = ucfirst($e->getMessage()).'.';
                }
-               $cols[$col]['value'] = '';
        }
 
        if (!empty($_POST['newpass'])) {
@@ -166,6 +165,10 @@ if ($_POST) {
        <ul class="grid">
 <?php
 foreach ($cols as $col => &$colconf) {
+       if (!$colconf['visible']) {
+               continue;
+       }
+
        print "\t";
        printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
        if (@$colconf['type'] == 'file' and isset($colconf['value'])) {