Changeset 18719 for branches/version-2_4/data

Timestamp:

2010/06/21 15:35:34 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100621054701-91y7wze51nhch4je

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/helper/SC_Helper_CSV.php 15535@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_CSV.php
data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 16251@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fsystem%2FLC_Page_Admin_System_Bkup.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20100621063531-bkg4neoa8q5vx7lu

bzr:revno:

1926

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/class/helper/SC_Helper_CSV.php ohkouchi@loop-az.jp-20100203051523-uw0bf8tqp0fz8bro
data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2:17505
data/class/util/SC_Utils.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18532

bzr:timestamp:

2010-06-21 15:35:31.579999924 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-21T06:35:31.580000Z

Message:

merged r18685

• CSVダウンロードで"が入っているときのエスケープ処理を修正(#755)

Location:

branches/version-2_4/data/class

Files:

• helper/SC_Helper_CSV.php (modified) (3 diffs)
• pages/admin/system/LC_Page_Admin_System_Bkup.php (modified) (3 diffs)
• util/SC_Utils.php (modified) (1 diff)

branches/version-2_4/data/class/helper/SC_Helper_CSV.php

@@ -266 +266 @@
                 break;
             }
-
-            $tmp = ereg_replace("[\",]", " ", $tmp);
+            $tmp = ereg_replace("\"", "\"\"", $tmp);
             $line .= "\"".$tmp."\",";
         }
@@ -297 +296 @@
             }
 
-            $tmp = ereg_replace("[\",]", " ", $tmp);
+            $tmp = ereg_replace("\"", "\"\"", $tmp);
             $line .= "\"".$tmp."\",";
         }
@@ -320 +319 @@
             }
 
-            $tmp = ereg_replace("[\",]", " ", $tmp);
+            $tmp = ereg_replace("\"", "\"\"", $tmp);
             $line .= "\"".$tmp."\",";
         }

branches/version-2_4/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php

@@ -240 +240 @@
                     $data = "";
                     foreach($arrData as $data_key => $data_val){
-                        //$val = str_replace("\"", "\\\"", $val);
                         $data .= $this->lfGetCSVList($arrData[$data_key]);
 
@@ -343 +342 @@
             foreach($array as $key => $val) {
                 $val = mb_convert_encoding($val, CHAR_CODE, CHAR_CODE);
-                $val = str_replace("\"", "\\\"", $val);
+                $val = str_replace("\"", "\"\"", $val);
                 $line .= "\"".$val."\",";
             }
@@ -591 +590 @@
             }
             $sql .= " );";
-            $data = str_replace("\\\"", "\"", $data);
             $err = $objQuery->query($sql, $data);
 

branches/version-2_4/data/class/util/SC_Utils.php

@@ -543 +543 @@
             foreach($array as $key => $val) {
                 $val = mb_convert_encoding($val, CHAR_CODE, CHAR_CODE);
+                $val = ereg_replace("\"", "\"\"", $val);
                 $line .= "\"".$val."\",";
             }