diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-03-31 23:55:24 +0200 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-03-31 23:55:24 +0200 |
| commit | f5e7a053fe74f4b00d7a68c6ea06472c400bdba6 (patch) | |
| tree | 631d68021a1288a7b814701a5ea9855f6ea00d60 /lib/api/kolab_api_service_user.php | |
| parent | 9abe372a0aa14187f1a3e098d2f2b7c99f746c09 (diff) | |
| download | webadmin-f5e7a053fe74f4b00d7a68c6ea06472c400bdba6.tar.gz | |
Improve handling of optional form fields
Diffstat (limited to 'lib/api/kolab_api_service_user.php')
| -rw-r--r-- | lib/api/kolab_api_service_user.php | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/lib/api/kolab_api_service_user.php b/lib/api/kolab_api_service_user.php index 4695fdf..21276e2 100644 --- a/lib/api/kolab_api_service_user.php +++ b/lib/api/kolab_api_service_user.php @@ -65,7 +65,10 @@ class kolab_api_service_user extends kolab_api_service if (isset($uta['form_fields'])) { foreach ($uta['form_fields'] as $key => $value) { - if (!isset($postdata[$key]) || empty($postdata[$key])) { + if ( + (!isset($postdata[$key]) || empty($postdata[$key])) && + !(array_key_exists('optional', $value) && $value['optional']) + ) { throw new Exception("Missing input value for $key", 345); } else { @@ -77,11 +80,13 @@ class kolab_api_service_user extends kolab_api_service if (isset($uta['auto_form_fields'])) { foreach ($uta['auto_form_fields'] as $key => $value) { if (empty($postdata[$key])) { - $postdata['attributes'] = array($key); - $res = $form_service->generate($getdata, $postdata); - $postdata[$key] = $res[$key]; + if (!array_key_exists('optional', $value) || $value['optional']) { + $postdata['attributes'] = array($key); + $res = $form_service->generate($getdata, $postdata); + $postdata[$key] = $res[$key]; + $user_attributes[$key] = $postdata[$key]; + } } - $user_attributes[$key] = $postdata[$key]; } } @@ -164,7 +169,10 @@ class kolab_api_service_user extends kolab_api_service if (isset($uta['form_fields'])) { foreach ($uta['form_fields'] as $key => $value) { - if (!isset($postdata[$key]) || empty($postdata[$key])) { + if ( + (!isset($postdata[$key]) || empty($postdata[$key])) && + !(array_key_exists('optional', $value) && $value['optional']) + ) { throw new Exception("Missing input value for $key", 345); } else { @@ -176,21 +184,21 @@ class kolab_api_service_user extends kolab_api_service if (isset($uta['auto_form_fields'])) { foreach ($uta['auto_form_fields'] as $key => $value) { if (empty($postdata[$key])) { - $postdata['attributes'] = array($key); - $res = $form_service->generate($getdata, $postdata); - $postdata[$key] = $res[$key]; + if (!array_key_exists('optional', $value) || $value['optional']) { + $postdata['attributes'] = array($key); + $res = $form_service->generate($getdata, $postdata); + $postdata[$key] = $res[$key]; + $user_attributes[$key] = $postdata[$key]; + } + } else { + $user_attributes[$key] = $postdata[$key]; } - $user_attributes[$key] = $postdata[$key]; } } if (isset($uta['fields'])) { foreach ($uta['fields'] as $key => $value) { - if (!isset($postdata[$key]) || empty($postdata[$key])) { - $user_attributes[$key] = $uta['fields'][$key]; - } else { - $user_attributes[$key] = $postdata[$key]; - } + $user_attributes[$key] = $uta['fields'][$key]; } $user_attributes[$unique_attr] = $postdata[$unique_attr]; |