summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--installer/index.php3
-rw-r--r--program/include/main.inc25
-rw-r--r--program/include/rcube_shared.inc26
3 files changed, 28 insertions, 26 deletions
diff --git a/installer/index.php b/installer/index.php
index f7a5cea4b..549b6f007 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -13,6 +13,7 @@ $include_path .= ini_get('include_path');
set_include_path($include_path);
+require_once 'rcube_shared.inc';
require_once 'utils.php';
session_start();
@@ -105,7 +106,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
</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 5c055740f..928ab3531 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1233,29 +1233,4 @@ class rcube_base_replacer
}
}
-/**
- * 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 c1c056109..74bfdbafe 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -599,4 +599,30 @@ function rc_detect_encoding($string, $failover='')
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;
+}
+
?>