From 37ca5ac56d2b663ad046d3c46f62f3a095be7613 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 7 Nov 2007 18:08:29 +0000
Subject: [PATCH] bug #1823045 [import] Error importing file with lowercase
 "delimiter"

---
 ChangeLog                | 1 +
 libraries/import/sql.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3375cb673..bfb2ce961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1777249 [display] Do not underline links in left panel (in default
   themes)
 - bug #1826022 [privileges] unable to add user (MySQL 3.23) since PMA 2.11.2
+- bug #1823045 [import] Error importing file with lowercase "delimiter"
 
 2.11.2.0 (2007-10-27)
 - patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index f0a38da0c..13fa84ddf 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -108,7 +108,8 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
         if ($p7 === FALSE) {
             $p7 = $big_value;
         }
-        $p8 = strpos($buffer, 'DELIMITER', $i);
+        // catch also "delimiter"
+        $p8 = stripos($buffer, 'DELIMITER', $i);
         if ($p8 === FALSE || $p8 >= ($len - 11) || $buffer[$p8 + 9] > ' ') {
             $p8 = $big_value;
         }
@@ -222,7 +223,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
             }
         }
        // Change delimiter, if redefined, and skip it (don't send to server!)
-       if ((substr($buffer, $i, 9) == "DELIMITER") && ($buffer[$i + 9] <= ' ') && ($i<$len-11) && (!(strpos($buffer,"\n",$i+11)===FALSE))) {
+       if ((strtoupper(substr($buffer, $i, 9)) == "DELIMITER") && ($buffer[$i + 9] <= ' ') && ($i<$len-11) && (!(strpos($buffer,"\n",$i+11)===FALSE))) {
            $new_line_pos = strpos($buffer, "\n", $i + 10);
            $sql_delimiter = substr($buffer, $i+10, $new_line_pos - $i -10);
            $i= $new_line_pos + 1;