From 0ff63513c2c172ba9986b5d3f077951b1c47a328 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 21 Feb 2009 13:57:47 -0500
Subject: [PATCH] #1485741: fix installer after some last changes
---
program/include/rcube_shared.inc | 26 ++++++++++++++++++++++++++
program/include/main.inc | 25 -------------------------
installer/index.php | 3 ++-
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index f7a5cea..549b6f0 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -13,6 +13,7 @@
set_include_path($include_path);
+require_once 'rcube_shared.inc';
require_once 'utils.php';
session_start();
@@ -105,7 +106,7 @@
</ol>
<?php
-$include_steps = array('welcome.html', 'check.php', 'config.php', 'test.php');
+$include_steps = array('./welcome.html', './check.php', './config.php', './test.php');
if ($include_steps[$RCI->step]) {
include $include_steps[$RCI->step];
diff --git a/program/include/main.inc b/program/include/main.inc
index 5c05574..928ab35 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1233,29 +1233,4 @@
}
}
-/**
- * Explode quoted string
- *
- * @param string Delimiter expression string for preg_match()
- * @param string Input string
- */
-function rcube_explode_quoted_string($delimiter, $string)
-{
- $result = array();
- $strlen = strlen($string);
-
- for ($q=$p=$i=0; $i < $strlen; $i++) {
- if ($string[$i] == "\"" && $string[$i-1] != "\\") {
- $q = $q ? false : true;
- }
- else if (!$q && preg_match("/$delimiter/", $string[$i])) {
- $result[] = substr($string, $p, $i - $p);
- $p = $i + 1;
- }
- }
-
- $result[] = substr($string, $p);
- return $result;
-}
-
?>
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index c1c0561..74bfdba 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -599,4 +599,30 @@
return $result ? $result : $failover;
}
+
+/**
+ * Explode quoted string
+ *
+ * @param string Delimiter expression string for preg_match()
+ * @param string Input string
+ */
+function rcube_explode_quoted_string($delimiter, $string)
+{
+ $result = array();
+ $strlen = strlen($string);
+
+ for ($q=$p=$i=0; $i < $strlen; $i++) {
+ if ($string[$i] == "\"" && $string[$i-1] != "\\") {
+ $q = $q ? false : true;
+ }
+ else if (!$q && preg_match("/$delimiter/", $string[$i])) {
+ $result[] = substr($string, $p, $i - $p);
+ $p = $i + 1;
+ }
+ }
+
+ $result[] = substr($string, $p);
+ return $result;
+}
+
?>
--
Gitblit v1.9.1