]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #7842 from Xenopathic/files_external_config_optional
authorRobin McCorkell <rmccorkell@karoshi.org.uk>
Fri, 28 Mar 2014 10:02:28 +0000 (10:02 +0000)
committerRobin McCorkell <rmccorkell@karoshi.org.uk>
Fri, 28 Mar 2014 10:02:28 +0000 (10:02 +0000)
Enable the use of 'optional' on password fields for mount configuration

1  2 
apps/files_external/templates/settings.php

index 5e84fa8a25286969b241ac21c9070564249139d5,ecbde442de0543d9aa866be8360fdab41f39aae5..802386663764bdacc9fc8f3ae3989ab3abd365fb
                                                        data-class="<?php p($mount['class']); ?>"><?php p($mount['backend']); ?></td>
                                        <?php endif; ?>
                                        <td class ="configuration" width="100%">
 -                                              <?php if (isset($mount['configuration'])): ?>
 -                                                      <?php foreach ($mount['configuration'] as $parameter => $value): ?>
 +                                              <?php if (isset($mount['options'])): ?>
 +                                                      <?php foreach ($mount['options'] as $parameter => $value): ?>
                                                                <?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
-                                                                       <?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
-                                                                       <?php if (strpos($placeholder, '*') !== false): ?>
+                                                                       <?php
+                                                                               $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter];
+                                                                               $is_optional = FALSE;
+                                                                               if (strpos($placeholder, '&') === 0) {
+                                                                                       $is_optional = TRUE;
+                                                                                       $placeholder = substr($placeholder, 1);
+                                                                               }
+                                                                       ?>
+                                                                       <?php if (strpos($placeholder, '*') === 0): ?>
                                                                                <input type="password"
+                                                                                          <?php if ($is_optional): ?> class="optional"<?php endif; ?>
                                                                                           data-parameter="<?php p($parameter); ?>"
                                                                                           value="<?php p($value); ?>"
                                                                                           placeholder="<?php p(substr($placeholder, 1)); ?>" />