Changeset 7d7f67d in github

Timestamp:

Sep 21, 2008 8:50:15 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

34b8b1e

Parents:

2fd6c21

Message:

Apply changes of installer script to trunk

Location:

installer

Files:

• config.php (modified) (1 diff)
• index.php (modified) (1 diff)
• rcube_install.php (modified) (2 diffs)

installer/config.php

@@ -31 +31 @@
   
   echo '<div><em>main.inc.php (<a href="index.php?_getfile=main">download</a>)</em></div>';
-  echo $textbox->show($RCI->create_config('main'));
+  echo $textbox->show(($_SESSION['main.inc.php'] = $RCI->create_config('main')));
   
   echo '<div style="margin-top:1em"><em>db.inc.php (<a href="index.php?_getfile=db">download</a>)</em></div>';
-  echo $textbox->show($RCI->create_config('db'));
+  echo $textbox->show($_SESSION['db.inc.php'] = $RCI->create_config('db'));
 
   echo '<p class="hint">Of course there are more options to configure.

installer/index.php

@@ -32 +32 @@
 $RCI->load_config();
 
-if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db')))
-{
-  header('Content-type: text/plain');
-  header('Content-Disposition: attachment; filename="'.$_GET['_getfile'].'.inc.php"');
-  echo $RCI->create_config($_GET['_getfile']);
-  exit;
+if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db'))) {
+  $filename = $_GET['_getfile'] . '.inc.php';
+  if (!empty($_SESSION[$filename])) {
+    header('Content-type: text/plain');
+    header('Content-Disposition: attachment; filename="'.$filename.'"');
+    echo $_SESSION[$filename];
+    exit;
+  }
+  else {
+    header('HTTP/1.0 404 Not found');
+    die("The requested configuration was not found. Please run the installer from the beginning.");
+  }
 }
 

installer/rcube_install.php

@@ -130 +130 @@
       if ($prop == 'debug_level') {
         $val = 0;
-        if (isset($value))
-          foreach ($value as $dbgval)
+        if (is_array($value))
+          foreach ($value as $dbgval)
             $val += intval($dbgval);
-        $value = $val;
+        $value = $val;
       }
       else if ($which == 'db' && $prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
@@ -140 +140 @@
         else
           $value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'], 
-                    rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']),
-                    $_POST['_dbhost'], $_POST['_dbname']);
+            rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']), $_POST['_dbhost'], $_POST['_dbname']);
       }
       else if ($prop == 'smtp_auth_type' && $value == '0') {