--- a/decir/install.php	Wed Oct 24 18:30:03 2007 -0400
+++ b/decir/install.php	Tue Nov 13 19:39:50 2007 -0500
@@ -20,6 +20,62 @@
   exit;
 }
 
+function install_decir()
+{
+  global $db, $session, $paths, $template, $plugins; // Common objects
+  if ( $session->auth_level < USER_LEVEL_ADMIN )
+    die('Snotty son of a b**** you are being today...');
+  
+  // Build an array of queries
+  $schema = @file_get_contents( DECIR_ROOT . '/install.sql' );
+  if ( !$schema )
+  {
+    echo '<pre>Decir installation error: can\'t load schema file</pre>';
+    return false;
+  }
+  
+  // Variables
+  $schema = str_replace('{{TABLE_PREFIX}}', table_prefix, $schema);
+  
+  $schema = explode("\n", $schema);
+  
+  foreach ( $schema as $i => $sql )
+  {
+    $query =& $schema[$i];
+    $t = trim($query);
+    if ( empty($t) || preg_match('/^(\#|--)/i', $t) )
+    {
+      unset($schema[$i]);
+      unset($query);
+    }
+  }
+  
+  $schema = array_values($schema);
+  $schema = implode("\n", $schema);
+  $schema = explode(";\n", $schema);
+  
+  foreach ( $schema as $i => $sql )
+  {
+    $query =& $schema[$i];
+    if ( substr($query, ( strlen($query) - 1 ), 1 ) != ';' )
+    {
+      $query .= ';';
+    }
+  }
+  
+  foreach ( $schema as $sql )
+  {
+    $q = $db->sql_query($sql);
+    if ( !$q )
+    {
+      echo '<pre>Decir installation failed: ' . $db->get_error() . '</pre>';
+      return false;
+    }
+  }
+  
+  return true;
+}
+
 if ( $v = getConfig('decir_version') )
 {
   $mode = 'upgrade';
@@ -32,30 +88,46 @@
 
 $page = ( isset($_POST['step']) && in_array($_POST['step'], array('welcome', 'install', 'finish')) ) ? $_POST['step'] : 'welcome';
 
-$template->header();
-
-switch($page)
+if ( $page == 'finish' )
+{
+  require('forum_index.php');
+}
+else
 {
-  case 'welcome':
-    ?>
-    <h3>Welcome to Decir, the Enano bulletin board suite.</h3>
-    <p>Before you can use your forum, we'll need to run a few database queries to get the forum set up.</p>
-    <form action="<?php echo makeUrl($paths->page); ?>" method="post">
-      <input type="hidden" name="step" value="install" />
-      <input type="submit" value="Continue" style="display: block; margin: 0 auto;" />
-    </form>
-    <?php
-    break;
-  case 'install':
-    setConfig('decir_version', ENANO_DECIR_VERSION);
-    ?>
-    <form action="<?php echo makeUrl($paths->page); ?>" method="post">
-      <input type="hidden" name="step" value="finish" />
-      <input type="submit" name="do_install_finish" value="Next &gt;" style="display: block; margin: 0 auto;" />
-    </form>
-    <?php
-    break;
+
+  $template->header();
+  
+  switch($page)
+  {
+    case 'welcome':
+      ?>
+      <h3>Welcome to Decir, the Enano bulletin board suite.</h3>
+      <p>Before you can use your forum, we'll need to run a few database queries to get the forum set up.</p>
+      <form action="<?php echo makeUrl($paths->page); ?>" method="post">
+        <input type="hidden" name="step" value="install" />
+        <input type="submit" value="Continue" style="display: block; margin: 0 auto;" />
+      </form>
+      <?php
+      break;
+    case 'install':
+      $result = install_decir();
+      if ( $result ):
+        setConfig('decir_version', ENANO_DECIR_VERSION);
+        setConfig('decir_install_date', time());
+        ?>
+        <p>Decir has been successfully installed.</p>
+        <form action="<?php echo makeUrl($paths->page); ?>" method="post">
+          <input type="hidden" name="step" value="finish" />
+          <input type="submit" name="do_install_finish" value="Next &gt;" style="display: block; margin: 0 auto;" />
+        </form>
+        <?php
+      else:
+        echo 'ERROR: Decir installation failed.';
+      endif;
+      break;
+  }
+  
+$template->footer();
+  
 }
 
-$template->footer();
-