diff options
| author | Frank Karlitschek <frank@dev.(none)> | 2010-03-29 16:29:51 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@dev.(none)> | 2010-03-29 16:29:51 +0200 |
| commit | 6602a61a38ab4bc29405c9e27b1c5ab62e457fb2 (patch) | |
| tree | 06ce6e0cbbb0a1b0aa12e6bbcc42ce577bb4e515 /inc/templates/configform.php | |
| parent | 2a75c0d04495c5f05fdaaebf94d38ea6d0a3f062 (diff) | |
| download | nextcloud-server-6602a61a38ab4bc29405c9e27b1c5ab62e457fb2.tar.gz nextcloud-server-6602a61a38ab4bc29405c9e27b1c5ab62e457fb2.zip | |
fix merge problem
Diffstat (limited to 'inc/templates/configform.php')
| -rwxr-xr-x | inc/templates/configform.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/templates/configform.php b/inc/templates/configform.php index 5d44d8f2795..9b3cee53f1f 100755 --- a/inc/templates/configform.php +++ b/inc/templates/configform.php @@ -12,12 +12,12 @@ if(!isset($fillDB)) $fillDB=true; } ?> <tr><td>admin login:</td><td><input type="text" name="adminlogin" size="30" class="formstyle" value="<?php echo($CONFIG_ADMINLOGIN);?>"></input></td></tr> -<tr><td>admin password:</td><td><input type="password" name="adminpassword" size="30" class="formstyle"></input></td><td>(leave empty to keep current pass +<tr><td>admin password:</td><td><input type="password" name="adminpassword" size="30" class="formstyle"></input></td><td>(leave empty to keep current password)</td></tr> <tr><td>retype admin password:</td><td><input type="password" name="adminpassword2" size="30" class="formstyle"></input></td></tr> -<tr><td>data directory:</td><td><input type="text" name="datadirectory" size="30" class="formstyle" value="<?php echo($CONFIG_DATADIRECTORY);?>"></input>< -<tr><td>force ssl:</td><td><input type="checkbox" name="forcessl" size="30" class="formstyle" value='<?php echo($CONFIG_HTTPFORCESSL);?>'></input></td></t +<tr><td>data directory:</td><td><input type="text" name="datadirectory" size="30" class="formstyle" value="<?php echo($CONFIG_DATADIRECTORY);?>"></input></td></tr> +<tr><td>force ssl:</td><td><input type="checkbox" name="forcessl" size="30" class="formstyle" value='<?php echo($CONFIG_HTTPFORCESSL);?>'></input></td></tr> <tr><td>date format:</td><td><input type="text" name="dateformat" size="30" class="formstyle" value='<?php echo($CONFIG_DATEFORMAT);?>'></input></td></tr> <tr><td>database name:</td><td><input type="text" name="dbname" size="30" class="formstyle" value='<?php echo($CONFIG_DBNAME);?>'></input></td></tr> -<tr><td>automaticly fill initial database:</td><td><input type="checkbox" name="filldb" size="30" class="formstyle" value='1' <?php if($FIRSTRUN) echo 'ch +<tr><td>automaticly fill initial database:</td><td><input type="checkbox" name="filldb" size="30" class="formstyle" value='1' <?php if($FIRSTRUN) echo 'checked'; ?>></input></td></tr> <tr><td></td><td><input type="submit" name="set_config" alt="save" value="save" class="formstyle" /></td></tr> </table></form> |