From 33495256407e9cad69cc44c4da96b4f5cfdba1d6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 15 Jul 2009 20:58:20 -0700
Subject: Revert "Fix for ticket #544."

This reverts commit f6973431b7f8df24c081a03c7c989f621ab2a708.
---
 installer/views/get_db_info.html.php | 43 +++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

(limited to 'installer/views/get_db_info.html.php')

diff --git a/installer/views/get_db_info.html.php b/installer/views/get_db_info.html.php
index adc775a4..94c19585 100644
--- a/installer/views/get_db_info.html.php
+++ b/installer/views/get_db_info.html.php
@@ -1,4 +1,32 @@
 <?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>
@@ -13,7 +41,7 @@
           Database Name
         </td>
         <td>
-          <input name="dbname" value="<?= $dbname ?>"/>
+          <input name="dbname" value="gallery3"/>
         </td>
       </tr>
       <tr>
@@ -21,7 +49,7 @@
           User
         </td>
         <td>
-          <input name="dbuser" value="<?= $user ?>"/>
+          <input name="dbuser" value="root"/>
         </td>
       </tr>
       <tr>
@@ -29,7 +57,7 @@
           Password
         </td>
         <td>
-          <input name="dbpass" value="<?= $password ?>"/>
+          <input name="dbpass" value=""/>
         </td>
       </tr>
       <tr>
@@ -37,7 +65,7 @@
           Host
         </td>
         <td>
-          <input name="dbhost" value="<?= $host ?>"/>
+          <input name="dbhost" value="localhost"/>
         </td>
       </tr>
       <tr>
@@ -45,14 +73,19 @@
           Table Prefix
         </td>
         <td>
-          <input name="prefix" value="<?= $prefix ?>"/>
+          <input name="prefix" value=""/>
         </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 ?>
-- 
cgit v1.2.3


From 9b69dc823741856197f397d144affe16d9e32d9a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 15 Jul 2009 20:58:22 -0700
Subject: Revert "Fix for ticket #545."

This reverts commit d192f2f1bc1227938d3144381ef311c7e07b47b0.
---
 installer/views/get_db_info.html.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'installer/views/get_db_info.html.php')

diff --git a/installer/views/get_db_info.html.php b/installer/views/get_db_info.html.php
index 94c19585..7835f246 100644
--- a/installer/views/get_db_info.html.php
+++ b/installer/views/get_db_info.html.php
@@ -26,7 +26,6 @@
   <?php endif ?>
 </fieldset>
 
-<?php if (installer::var_writable()): ?>
 <form method="post" action="index.php?step=save_db_info">
   <fieldset>
     <legend>Database</legend>
@@ -88,4 +87,3 @@
     </table>
   </fieldset>
 </form>
-<? endif ?>
-- 
cgit v1.2.3


From 39fa93eec7f81a32b63c4ecff2b64ae34ad365d3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 15 Jul 2009 21:06:42 -0700
Subject: Simpler solution for #545.  Just don't show the form if the storage
 dir isn't set up yet

---
 installer/views/get_db_info.html.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'installer/views/get_db_info.html.php')

diff --git a/installer/views/get_db_info.html.php b/installer/views/get_db_info.html.php
index 7835f246..ada0793c 100644
--- a/installer/views/get_db_info.html.php
+++ b/installer/views/get_db_info.html.php
@@ -26,6 +26,7 @@
   <?php endif ?>
 </fieldset>
 
+<?php if (installer::var_writable()): ?>
 <form method="post" action="index.php?step=save_db_info">
   <fieldset>
     <legend>Database</legend>
@@ -77,13 +78,10 @@
       </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>
+<?php endif ?>
-- 
cgit v1.2.3