From fee8c6ceab0f66d83e5c62eae44ee7c624847972 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 27 Oct 2008 20:11:32 +0000
Subject: First version of the commandline update script

---
 installer/index.php         | 17 +++--------------
 installer/rcube_install.php | 24 +-----------------------
 installer/utils.php         | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 37 deletions(-)
 create mode 100644 installer/utils.php

(limited to 'installer')

diff --git a/installer/index.php b/installer/index.php
index c7f69e3f5..ea8374165 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -1,4 +1,5 @@
 <?php
+
 ini_set('error_reporting', E_ALL&~E_NOTICE);
 ini_set('display_errors', 1);
 
@@ -12,21 +13,9 @@ $include_path .= ini_get('include_path');
 
 set_include_path($include_path);
 
-session_start();
+require_once 'utils.php';
 
-/**
- * Use PHP5 autoload for dynamic class loading
- * (copy from program/incllude/iniset.php)
- */
-function __autoload($classname)
-{
-  $filename = preg_replace(
-      array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
-      array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
-      $classname
-  );
-  include_once $filename. '.php';
-}
+session_start();
 
 $RCI = rcube_install::get_instance();
 $RCI->load_config();
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 808994dca..12afc15f7 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -130,7 +130,7 @@ class rcube_install
    */
   function create_config($which, $force = false)
   {
-    $out = file_get_contents("../config/{$which}.inc.php.dist");
+    $out = file_get_contents(RCMAIL_CONFIG_DIR . "/{$which}.inc.php.dist");
     
     if (!$out)
       return '[Warning: could not read the template file]';
@@ -542,25 +542,3 @@ class rcube_install
   
 }
 
-
-/**
- * Shortcut function for htmlentities()
- *
- * @param string String to quote
- * @return string The html-encoded string
- */
-function Q($string)
-{
-  return htmlentities($string);
-}
-
-
-/**
- * Fake rinternal error handler to catch errors
- */
-function raise_error($p)
-{
-  $rci = rcube_install::get_instance();
-  $rci->raise_error($p);
-}
-
diff --git a/installer/utils.php b/installer/utils.php
new file mode 100644
index 000000000..76a335762
--- /dev/null
+++ b/installer/utils.php
@@ -0,0 +1,40 @@
+<?php
+
+
+/**
+ * Use PHP5 autoload for dynamic class loading
+ * (copy from program/incllude/iniset.php)
+ */
+function __autoload($classname)
+{
+  $filename = preg_replace(
+      array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
+      array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+      $classname
+  );
+  include_once $filename. '.php';
+}
+
+
+/**
+ * Shortcut function for htmlentities()
+ *
+ * @param string String to quote
+ * @return string The html-encoded string
+ */
+function Q($string)
+{
+  return htmlentities($string);
+}
+
+
+/**
+ * Fake rinternal error handler to catch errors
+ */
+function raise_error($p)
+{
+  $rci = rcube_install::get_instance();
+  $rci->raise_error($p);
+}
+
+
-- 
cgit v1.2.3