[Svn] r2306 - in trunk/roundcubemail: installer program/include

trac at roundcube.net trac at roundcube.net
Sat Feb 21 19:57:51 CET 2009


Author: alec
Date: 2009-02-21 12:57:47 -0600 (Sat, 21 Feb 2009)
New Revision: 2306

Modified:
   trunk/roundcubemail/installer/index.php
   trunk/roundcubemail/program/include/main.inc
   trunk/roundcubemail/program/include/rcube_shared.inc
Log:
#1485741: fix installer after some last changes


Modified: trunk/roundcubemail/installer/index.php
===================================================================
--- trunk/roundcubemail/installer/index.php	2009-02-21 18:09:38 UTC (rev 2305)
+++ trunk/roundcubemail/installer/index.php	2009-02-21 18:57:47 UTC (rev 2306)
@@ -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];

Modified: trunk/roundcubemail/program/include/main.inc
===================================================================
--- trunk/roundcubemail/program/include/main.inc	2009-02-21 18:09:38 UTC (rev 2305)
+++ trunk/roundcubemail/program/include/main.inc	2009-02-21 18:57:47 UTC (rev 2306)
@@ -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;
-}
-
 ?>

Modified: trunk/roundcubemail/program/include/rcube_shared.inc
===================================================================
--- trunk/roundcubemail/program/include/rcube_shared.inc	2009-02-21 18:09:38 UTC (rev 2305)
+++ trunk/roundcubemail/program/include/rcube_shared.inc	2009-02-21 18:57:47 UTC (rev 2306)
@@ -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;
+}
+
 ?>

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list