diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-04-17 13:42:54 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-04-17 13:42:54 +0200 |
| commit | 453660644ed1c80c837b567db24da70416bec66c (patch) | |
| tree | cd0d649eb7feda0f757d9bc7898344987e2e6fb1 | |
| parent | 7fbcafdda445482309ba9b2fde05fa1b5b4f92d1 (diff) | |
| parent | 0ddf4f196ef1c83555694f5a763641ebe1a97ee4 (diff) | |
| download | nextcloud-server-453660644ed1c80c837b567db24da70416bec66c.tar.gz nextcloud-server-453660644ed1c80c837b567db24da70416bec66c.zip | |
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
| -rw-r--r-- | templates/installation.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/templates/installation.php b/templates/installation.php index ca4ea0e5d24..be4693288b2 100644 --- a/templates/installation.php +++ b/templates/installation.php @@ -27,24 +27,26 @@ <p><label class="left">Database</label></p> <p><input type="radio" name="dbtype" value='sqlite' id="sqlite" checked="checked" /><label for="sqlite">SQLite</label> <input type="radio" name="dbtype" value='mysql' id="mysql"><label for="mysql">MySQL</label></p> - <?php endif;?> - <?php if($_['hasMySQL']): ?> <div id="use_mysql"> - <p><input type="text" name="dbuser" value="admin / username" /></p> - <p><input type="password" name="dbpass" value="password" /></p> - <p><input type="text" name="dbname" value="database name" /></p> + <p><input type="text" name="dbuser" value="admin / username" /></p> + <p><input type="password" name="dbpass" value="password" /></p> + <p><input type="text" name="dbname" value="database name" /></p> <?php endif;?> <?php if($_['hasMySQL'] and !$_['hasSQLite']): ?> - <input type='hidden' name='dbtype' value='mysql'/> + <input type='hidden' name='dbtype' value='mysql'/> <?php endif;?> <?php if(!$_['hasMySQL'] and $_['hasSQLite']): ?> - <input type='hidden' name='dbtype' value='sqlite'/> + <input type='hidden' name='dbtype' value='sqlite'/> <?php endif;?> - <?php if($_['hasMySQL']): ?> + <?php if($_['hasMySQL'] and $_['hasSQLite']): ?> <p><label class="left">Host</label></p><p><input type="text" name="dbhost" value="localhost" /></p> <p><label class="left">Table prefix</label></p><p><input type="text" name="dbtableprefix" value="oc_" /></p> </div> <?php endif;?> + <?php if($_['hasMySQL'] and !$_['hasSQLite']): ?> + <p><label class="left">Host</label></p><p><input type="text" name="dbhost" value="localhost" /></p> + <p><label class="left">Table prefix</label></p><p><input type="text" name="dbtableprefix" value="oc_" /></p> + <?php endif;?> </div> </fieldset> <fieldset> |