From d192f2f1bc1227938d3144381ef311c7e07b47b0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 15 Jul 2009 20:38:37 +0800
Subject: Fix for ticket #545. Changed get_db_info.html.php to not display the
 database information request form until the var directory is successfully
 tested as writable.  This prevents users from thinking they can enter the
 database information prior to successfully accessing the var directory.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 installer/views/get_db_info.html.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'installer/views')

diff --git a/installer/views/get_db_info.html.php b/installer/views/get_db_info.html.php
index 7835f246..94c19585 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>
@@ -87,3 +88,4 @@
     </table>
   </fieldset>
 </form>
+<? endif ?>
-- 
cgit v1.2.3


From f6973431b7f8df24c081a03c7c989f621ab2a708 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 15 Jul 2009 21:48:47 +0800
Subject: 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>
---
 installer/views/get_db_info.html.php    | 43 ++++-----------------------------
 installer/views/install.html.php        |  3 ++-
 installer/views/var_dir_status.html.php | 30 +++++++++++++++++++++++
 installer/web.php                       | 21 ++++++++++------
 4 files changed, 50 insertions(+), 47 deletions(-)
 create mode 100644 installer/views/var_dir_status.html.php

(limited to 'installer/views')

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 ?>
diff --git a/installer/views/install.html.php b/installer/views/install.html.php
index a0eddaf3..31112c28 100644
--- a/installer/views/install.html.php
+++ b/installer/views/install.html.php
@@ -8,7 +8,8 @@
     <div id="outer">
       <img src="../modules/gallery/images/gallery.png" />
       <div id="inner">
-        <?php print $content ?>
+        <?= $content ?>
+        <?= empty($database_form) ? "" : $database_form ?>
       </div>
       <div id="footer">
         <p>
diff --git a/installer/views/var_dir_status.html.php b/installer/views/var_dir_status.html.php
new file mode 100644
index 00000000..8211e13c
--- /dev/null
+++ b/installer/views/var_dir_status.html.php
@@ -0,0 +1,30 @@
+<?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 (empty($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>
+    <br /><br/>
+    <i>(Please fix the photo storage problem before continuing)</i>
+  </p>
+  <?php else: ?>
+  <p class="success">
+    We've found a place to store your photos:
+    <code class="location"> <?= VARPATH ?> </code>
+  </p>
+  <?php endif ?>
+</fieldset>
+
diff --git a/installer/web.php b/installer/web.php
index 78784539..fd75d352 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -20,6 +20,12 @@
 if (installer::already_installed()) {
   $content = render("success.html.php");
 } else {
+  $config = array("host" => empty($_POST["dbhost"]) ? "localhost" : $_POST["dbhost"],
+                  "user" => empty($_POST["dbuser"]) ? "root" : $_POST["dbuser"],
+                  "password" => empty($_POST["dbpass"]) ? "" : $_POST["dbpass"],
+                  "dbname" => empty($_POST["dbname"]) ? "gallery3" : $_POST["dbname"],
+                  "prefix" => empty($_POST["prefix"]) ? "" : $_POST["prefix"],
+                  "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
   switch (@$_GET["step"]) {
   default:
   case "welcome":
@@ -27,18 +33,13 @@ if (installer::already_installed()) {
     if ($errors) {
       $content = render("environment_errors.html.php", array("errors" => $errors));
     } else {
-      $content = render("get_db_info.html.php");
+      $request_db_info = $is_var_writable = installer::var_writable();
+      $content = render("var_dir_status.html.php", array("writable" => $is_var_writable));
     }
     break;
 
   case "save_db_info":
-    $config = array("host" => $_POST["dbhost"],
-                    "user" => $_POST["dbuser"],
-                    "password" => $_POST["dbpass"],
-                    "dbname" => $_POST["dbname"],
-                    "prefix" => $_POST["prefix"],
-                    "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
-
+    $request_db_info = true;
     if (!installer::connect($config)) {
       $content = render("invalid_db_info.html.php");
     } else if (!installer::select_db($config)) {
@@ -58,6 +59,7 @@ if (installer::already_installed()) {
         $content = render("success.html.php", array("user" => $user, "password" => $password));
 
         installer::create_private_key($config);
+        $request_db_info = false;
       } catch (Exception $e) {
         $content = oops($e->getMessage());
       }
@@ -66,6 +68,9 @@ if (installer::already_installed()) {
   }
 }
 
+if (empty($errors) && !empty($request_db_info)) {
+  $database_form = render("get_db_info.html.php", $config);
+}
 include("views/install.html.php");
 
 function render($view, $args=array()) {
-- 
cgit v1.2.3


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 +++++++++++++++++++++++++++++----
 installer/views/install.html.php        |  3 +--
 installer/views/var_dir_status.html.php | 30 -----------------------
 installer/web.php                       | 21 ++++++----------
 4 files changed, 47 insertions(+), 50 deletions(-)
 delete mode 100644 installer/views/var_dir_status.html.php

(limited to 'installer/views')

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 ?>
diff --git a/installer/views/install.html.php b/installer/views/install.html.php
index 31112c28..a0eddaf3 100644
--- a/installer/views/install.html.php
+++ b/installer/views/install.html.php
@@ -8,8 +8,7 @@
     <div id="outer">
       <img src="../modules/gallery/images/gallery.png" />
       <div id="inner">
-        <?= $content ?>
-        <?= empty($database_form) ? "" : $database_form ?>
+        <?php print $content ?>
       </div>
       <div id="footer">
         <p>
diff --git a/installer/views/var_dir_status.html.php b/installer/views/var_dir_status.html.php
deleted file mode 100644
index 8211e13c..00000000
--- a/installer/views/var_dir_status.html.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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 (empty($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>
-    <br /><br/>
-    <i>(Please fix the photo storage problem before continuing)</i>
-  </p>
-  <?php else: ?>
-  <p class="success">
-    We've found a place to store your photos:
-    <code class="location"> <?= VARPATH ?> </code>
-  </p>
-  <?php endif ?>
-</fieldset>
-
diff --git a/installer/web.php b/installer/web.php
index fd75d352..78784539 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -20,12 +20,6 @@
 if (installer::already_installed()) {
   $content = render("success.html.php");
 } else {
-  $config = array("host" => empty($_POST["dbhost"]) ? "localhost" : $_POST["dbhost"],
-                  "user" => empty($_POST["dbuser"]) ? "root" : $_POST["dbuser"],
-                  "password" => empty($_POST["dbpass"]) ? "" : $_POST["dbpass"],
-                  "dbname" => empty($_POST["dbname"]) ? "gallery3" : $_POST["dbname"],
-                  "prefix" => empty($_POST["prefix"]) ? "" : $_POST["prefix"],
-                  "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
   switch (@$_GET["step"]) {
   default:
   case "welcome":
@@ -33,13 +27,18 @@ if (installer::already_installed()) {
     if ($errors) {
       $content = render("environment_errors.html.php", array("errors" => $errors));
     } else {
-      $request_db_info = $is_var_writable = installer::var_writable();
-      $content = render("var_dir_status.html.php", array("writable" => $is_var_writable));
+      $content = render("get_db_info.html.php");
     }
     break;
 
   case "save_db_info":
-    $request_db_info = true;
+    $config = array("host" => $_POST["dbhost"],
+                    "user" => $_POST["dbuser"],
+                    "password" => $_POST["dbpass"],
+                    "dbname" => $_POST["dbname"],
+                    "prefix" => $_POST["prefix"],
+                    "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
+
     if (!installer::connect($config)) {
       $content = render("invalid_db_info.html.php");
     } else if (!installer::select_db($config)) {
@@ -59,7 +58,6 @@ if (installer::already_installed()) {
         $content = render("success.html.php", array("user" => $user, "password" => $password));
 
         installer::create_private_key($config);
-        $request_db_info = false;
       } catch (Exception $e) {
         $content = oops($e->getMessage());
       }
@@ -68,9 +66,6 @@ if (installer::already_installed()) {
   }
 }
 
-if (empty($errors) && !empty($request_db_info)) {
-  $database_form = render("get_db_info.html.php", $config);
-}
 include("views/install.html.php");
 
 function render($view, $args=array()) {
-- 
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')

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')

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


From 1ce8643b8056266139552045fcdb48bbdb9c665b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 28 Aug 2009 15:17:07 -0700
Subject: Fix for #440.  Basically add a check that the mysql version is >
 5.0.0. It was felt that actually listing the requirements might be
 overwhelming to novice users.

---
 installer/installer.php                     | 7 +++++++
 installer/views/invalid_db_version.html.php | 5 +++++
 installer/web.php                           | 2 ++
 3 files changed, 14 insertions(+)
 create mode 100644 installer/views/invalid_db_version.html.php

(limited to 'installer/views')

diff --git a/installer/installer.php b/installer/installer.php
index b0af561e..456cffaa 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -104,6 +104,13 @@ class installer {
       mysql_select_db($config["dbname"]);
   }
 
+  static function verify_version($config) {
+    $result = mysql_query("SHOW VARIABLES WHERE variable_name = \"version\"");
+    $row = mysql_fetch_object($result);
+    $version = substr($row->Value, 0, strpos($row->Value, "-"));
+    return version_compare($version, "5.0.0", ">=");
+  }
+
   static function db_empty($config) {
     $query = "SHOW TABLES IN {$config['dbname']} LIKE '{$config['prefix']}items'";
     return mysql_num_rows(mysql_query($query)) == 0;
diff --git a/installer/views/invalid_db_version.html.php b/installer/views/invalid_db_version.html.php
new file mode 100644
index 00000000..8776ac35
--- /dev/null
+++ b/installer/views/invalid_db_version.html.php
@@ -0,0 +1,5 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<h1> Uh oh! </h1>
+<p class="error">
+  The MySql database that you are referencing is less than the minimum version of 5.0.0.
+</p>
diff --git a/installer/web.php b/installer/web.php
index f31c0644..aceb5368 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -41,6 +41,8 @@ if (installer::already_installed()) {
 
     if (!installer::connect($config)) {
       $content = render("invalid_db_info.html.php");
+    } else if (!installer::verify_version($config)) {
+      $content = render("invalid_db_version.html.php");
     } else if (!installer::select_db($config)) {
       $content = render("missing_db.html.php");
     } else if (!installer::db_empty($config)) {
-- 
cgit v1.2.3


From fd954fe86e2852c245dd599f9476fdf8ea3642e4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 13:43:29 -0700
Subject: Print out the version of MySQL that we found along with our error
 message, which should resolve http://gallery.menalto.com/node/90646

---
 installer/installer.php                     | 8 ++++++--
 installer/views/invalid_db_version.html.php | 2 +-
 installer/web.php                           | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'installer/views')

diff --git a/installer/installer.php b/installer/installer.php
index 456cffaa..58d264ec 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -104,11 +104,15 @@ class installer {
       mysql_select_db($config["dbname"]);
   }
 
-  static function verify_version($config) {
+  static function verify_mysql_version($config) {
+    return version_compare(installer::mysql_version($config), "5.0.0", ">=");
+  }
+
+  static function mysql_version($config) {
     $result = mysql_query("SHOW VARIABLES WHERE variable_name = \"version\"");
     $row = mysql_fetch_object($result);
     $version = substr($row->Value, 0, strpos($row->Value, "-"));
-    return version_compare($version, "5.0.0", ">=");
+    return $version;
   }
 
   static function db_empty($config) {
diff --git a/installer/views/invalid_db_version.html.php b/installer/views/invalid_db_version.html.php
index 8776ac35..5b021ba2 100644
--- a/installer/views/invalid_db_version.html.php
+++ b/installer/views/invalid_db_version.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <h1> Uh oh! </h1>
 <p class="error">
-  The MySql database that you are referencing is less than the minimum version of 5.0.0.
+  Gallery requires at least MySQL version 5.0.0.  You're using version <?= installer::mysql_version($config) ?>
 </p>
diff --git a/installer/web.php b/installer/web.php
index aceb5368..eb0211a6 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -41,7 +41,7 @@ if (installer::already_installed()) {
 
     if (!installer::connect($config)) {
       $content = render("invalid_db_info.html.php");
-    } else if (!installer::verify_version($config)) {
+    } else if (!installer::verify_mysql_version($config)) {
       $content = render("invalid_db_version.html.php");
     } else if (!installer::select_db($config)) {
       $content = render("missing_db.html.php");
-- 
cgit v1.2.3