more fixes to installation templates

diff --git a/templates/installation.php b/templates/installation.php
index ca4ea0e5d24ee867282e91e3f706ba04c8791dba..be4693288b259d298f7086e49fb4a477de63082a 100644 (file)
--- 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>