Changeset 21926 for branches/version-2_12-dev/data/class/SC_UploadFile.php

Timestamp:

2012/06/19 18:01:38 (12 years ago)

Author:

pineray

Message:

#1669 #1859 初期化漏れ、無駄な変数等

File:

• branches/version-2_12-dev/data/class/SC_UploadFile.php (modified) (8 diffs)

branches/version-2_12-dev/data/class/SC_UploadFile.php

@@ -218 +218 @@
     // 一時ファイルを保存ディレクトリに移す
     function moveTempFile() {
-        $cnt = 0;
         $objImage = new SC_Image_Ex($this->temp_dir);
 
-        foreach ($this->keyname as $val) {
+        for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
             if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') {
 
@@ -235 +234 @@
                 }
             }
-            $cnt++;
         }
     }
@@ -241 +239 @@
     // ダウンロード一時ファイルを保存ディレクトリに移す
     function moveTempDownFile() {
-        $cnt = 0;
         $objImage = new SC_Image_Ex($this->temp_dir);
-        foreach ($this->keyname as $val) {
+        for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
             if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') {
                 $objImage->moveTempImage($this->temp_file[$cnt], $this->save_dir);
@@ -254 +251 @@
                 }
             }
-            $cnt++;
         }
     }
@@ -347 +343 @@
     function getFormDownFile() {
         $arrRet = '';
-        $cnt = 0;
-        foreach ($this->keyname as $val) {
+        for ($cnt = 0; $cnt < count($this->keyname); $cnt++) {
             if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') {
                 $arrRet = $this->temp_file[$cnt];
@@ -354 +349 @@
                 $arrRet = $this->save_file[$cnt];
             }
-            $cnt++;
         }
         return $arrRet;
@@ -375 +369 @@
     function getDBFileList() {
         $cnt = 0;
+        $dbFileList = array();
         foreach ($this->keyname as $val) {
             if (isset($this->temp_file[$cnt]) && $this->temp_file[$cnt] != '') {
-                $arrRet[$val] = $this->temp_file[$cnt];
+                $dbFileList[$val] = $this->temp_file[$cnt];
             } else {
-                $arrRet[$val] = isset($this->save_file[$cnt]) ? $this->save_file[$cnt] : '';
-            }
-            $cnt++;
-        }
-        return $arrRet;
+                $dbFileList[$val] = isset($this->save_file[$cnt]) ? $this->save_file[$cnt] : '';
+            }
+            $cnt++;
+        }
+        return $dbFileList;
     }
 
@@ -405 +400 @@
 
     // DBで保存されたダウンロードファイル名をセットする(setDBDownFileと統合予定)
-    function setPostFileList($arrPost,$arrVal) {
-        $cnt = 0;
-        foreach ($this->keyname as $val) {
+    function setPostFileList($arrPost) {
+        for ($cnt = 0;$cnt < count($this->keyname); $cnt++) {
             if (isset($arrPost['temp_down_realfilename:' . ($cnt+1)])) {
                 $this->temp_file[$cnt] = $arrPost['temp_down_realfilename:' . ($cnt+1)];
             }
-            $cnt++;
         }
     }