Changeset 18508 for branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php

Timestamp:

2010/01/25 12:07:25 (12 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100125015817-xzmo8rhn3o3trlbp

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 15472@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_UploadCSV.php
data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 17194@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_UploadCSVCategory.php

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100125030721-a5hx7s5jyb64x3ta

bzr:revno:

2144

bzr:revprop:branch-nick:

branches/comu-ver2

bzr:root:

branches/comu-ver2

bzr:text-parents:

data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18275
data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18462

bzr:timestamp:

2010-01-25 12:07:21.280999899 +0900

bzr:user-agent:

bzr2.0.1+bzr-svn1.0.1

svn:original-date:

2010-01-25T03:07:21.281000Z

Message:

r18501 merged

• CSVアップロードで無限ループの可能性があるのを修正(#566)

File:

• branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (modified) (2 diffs)

branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php

@@ -112 +112 @@
                 $enc_filepath = SC_Utils_Ex::sfEncodeFile($filepath,
                                                           CHAR_CODE, CSV_TEMP_DIR);
+                $fp = fopen($enc_filepath, "r");
+
+                // 無効なファイルポインタが渡された場合はエラー表示
+                if ($fp === false) {
+                    SC_Utils_Ex::sfDispError("");
+                }
 
                 // レコード数を得る
-                $rec_count = $this->lfCSVRecordCount($enc_filepath);
-
-                $fp = fopen($enc_filepath, "r");
+                $rec_count = $this->lfCSVRecordCount($fp);
+
                 $line = 0;      // 行数
                 $regist = 0;    // 登録数
@@ -493 +498 @@
      * CSVのカウント数を得る.
      *
-     * @param string $file_name ファイルパス
+     * @param resource $fp fopenを使用して作成したファイルポインタ
      * @return integer CSV のカウント数
      */
-    function lfCSVRecordCount($file_name) {
+    function lfCSVRecordCount($fp) {
 
         $count = 0;
-        $fp = fopen($file_name, "r");
         while(!feof($fp)) {
             $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
             $count++;
         }
-
-        return $count-1;
+        // ファイルポインタを戻す
+        if (rewind($fp)) {
+            return $count-1;
+        } else {
+            SC_Utils_Ex::sfDispError("");
+        }
     }