diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-03-31 13:12:04 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-03-31 13:12:04 +0200 |
| commit | 2be2a5d2c5d8cbc671c4f301eb337fee20023538 (patch) | |
| tree | 4b6870b52f5606883d239485f6e971b77bdbb956 /apps/files_external/templates | |
| parent | 6ac85480f7bffeb65fcbc5820ea7bd4ecd8f21ad (diff) | |
| parent | 65e3f634000a2142f412b85d0443f241bb64a9ab (diff) | |
| download | nextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.tar.gz nextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.zip | |
external storage: fix merge conflict, indentation
Diffstat (limited to 'apps/files_external/templates')
| -rw-r--r-- | apps/files_external/templates/settings.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 8b01b7677e5..a2bdbcf4632 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -43,29 +43,32 @@ <?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)); ?>" /> - <?php elseif (strpos($placeholder, '!') !== false): ?> + <?php elseif (strpos($placeholder, '!') === 0): ?> <label><input type="checkbox" data-parameter="<?php p($parameter); ?>" <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?> /><?php p(substr($placeholder, 1)); ?></label> - <?php elseif (strpos($placeholder, '&') !== false): ?> - <input type="text" - class="optional" - data-parameter="<?php p($parameter); ?>" - value="<?php p($value); ?>" - placeholder="<?php p(substr($placeholder, 1)); ?>" /> - <?php elseif (strpos($placeholder, '#') !== false): ?> + <?php elseif (strpos($placeholder, '#') === 0): ?> <input type="hidden" data-parameter="<?php p($parameter); ?>" value="<?php p($value); ?>" /> <?php else: ?> <input type="text" + <?php if ($is_optional): ?> class="optional"<?php endif; ?> data-parameter="<?php p($parameter); ?>" value="<?php p($value); ?>" placeholder="<?php p($placeholder); ?>" /> |