diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-15 21:48:47 +0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-15 21:56:15 +0800 |
| commit | f6973431b7f8df24c081a03c7c989f621ab2a708 (patch) | |
| tree | fd91ad84c80781e84a6e1e5d819e091200ebb807 /installer/views/get_db_info.html.php | |
| parent | d192f2f1bc1227938d3144381ef311c7e07b47b0 (diff) | |
Fix for ticket #544.
* Separate the portion of get_db_info.html.php that displays the status
of the var directory into a separate view var_dir_status.html.php
* Change the processing to always generate the database information request
screen unless there is an environment error, the var directory is not writable
and the install was successful
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
Diffstat (limited to 'installer/views/get_db_info.html.php')
| -rw-r--r-- | installer/views/get_db_info.html.php | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/installer/views/get_db_info.html.php b/installer/views/get_db_info.html.php index 94c19585..adc775a4 100644 --- a/installer/views/get_db_info.html.php +++ b/installer/views/get_db_info.html.php @@ -1,32 +1,4 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<h1> Welcome! </h1> -<p> - Installing Gallery is very easy. We just need to know how to talk - to your MySQL database, and we need a place to store your photos on - your web host. -</p> - - -<fieldset> - <legend>Photo Storage</legend> - <?php if (!installer::var_writable()): ?> - <p class="error"> - We're having trouble creating a place for your photos. Can you - help? Please create a directory called "var" using <code>mkdir var</code> in your - gallery3 directory, then run <code>chmod 777 var</code>. That - should fix it. - <br/><br/> - <a href="index.php">Check again</a> - </p> - <?php else: ?> - <p class="success"> - We've found a place to store your photos: - <code class="location"> <?= VARPATH ?> </code> - </p> - <?php endif ?> -</fieldset> - -<?php if (installer::var_writable()): ?> <form method="post" action="index.php?step=save_db_info"> <fieldset> <legend>Database</legend> @@ -41,7 +13,7 @@ Database Name </td> <td> - <input name="dbname" value="gallery3"/> + <input name="dbname" value="<?= $dbname ?>"/> </td> </tr> <tr> @@ -49,7 +21,7 @@ User </td> <td> - <input name="dbuser" value="root"/> + <input name="dbuser" value="<?= $user ?>"/> </td> </tr> <tr> @@ -57,7 +29,7 @@ Password </td> <td> - <input name="dbpass" value=""/> + <input name="dbpass" value="<?= $password ?>"/> </td> </tr> <tr> @@ -65,7 +37,7 @@ Host </td> <td> - <input name="dbhost" value="localhost"/> + <input name="dbhost" value="<?= $host ?>"/> </td> </tr> <tr> @@ -73,19 +45,14 @@ Table Prefix </td> <td> - <input name="prefix" value=""/> + <input name="prefix" value="<?= $prefix ?>"/> </td> </tr> <tr> <td colspan="2"> - <?php if (installer::var_writable()): ?> <input type="submit" value="Continue"/> - <?php else: ?> - <i class="error">(Please fix the photo storage problem before continuing)</i> - <?php endif ?> </td> </tr> </table> </fieldset> </form> -<? endif ?> |