Changeset 21926

Timestamp:

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

Author:

pineray

Message:

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

Location:

branches/version-2_12-dev/data/class

Files:

• SC_Fpdf.php (modified) (3 diffs)
• SC_Image.php (modified) (1 diff)
• SC_MobileEmoji.php (modified) (1 diff)
• SC_MobileImage.php (modified) (1 diff)
• SC_Product.php (modified) (2 diffs)
• SC_SelectSql.php (modified) (4 diffs)
• SC_SendMail.php (modified) (1 diff)
• SC_UploadFile.php (modified) (8 diffs)
• SC_View.php (modified) (2 diffs)
• helper/SC_Helper_FPDI.php (modified) (1 diff)

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

@@ -64 +64 @@
 
         // PDFを読み込んでページ数を取得
-        $pageno = $this->setSourceFile($this->tpl_pdf);
+        $this->pageno = $this->setSourceFile($this->tpl_pdf);
     }
 
@@ -81 +81 @@
         if (SC_Utils_Ex::sfIsInt($arrData['order_id'])) {
             $this->disp_mode = true;
-            $order_id = $arrData['order_id'];
         }
 
@@ -141 +140 @@
 
     function setOrderData() {
+        $arrOrder = array();
         // DBから受注情報を読み込む
         $this->lfGetOrderData($this->arrData['order_id']);

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

@@ -85 +85 @@
 
         //拡張子取得
-        if (!$ext) {
-            $array_ext = explode('.', $FromImgPath);
-            $ext = $array_ext[count($array_ext) - 1];
-        }
+        $array_ext = explode('.', $FromImgPath);
+        $ext = $array_ext[count($array_ext) - 1];
 
         $MW = $ThmMaxWidth;

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

@@ -56 +56 @@
         }
 
-        static $arrMap;
-        if (!isset($arrMap)) {
+        static $arrMap = array();
+        if (empty($arrMap)) {
             $arrMap = @include_once dirname(__FILE__) . "/../include/mobile_emoji_map_$carrier.inc";
         }

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

@@ -48 +48 @@
 
             // HTML中のIMGタグを取得する
+            $images = array();
             $pattern = '/<img\s+[^<>]*src=[\'"]?([^>"\'\s]+)[\'"]?[^>]*>/i';
             $result = preg_match_all($pattern, $buffer, $images);

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

@@ -548 +548 @@
      */
     function setPriceTaxTo($arrProducts) {
-        foreach ($arrProducts as $key => $val) {
+        foreach (array_keys($arrProducts) as $key) {
             $arrProducts[$key]['price01_min_format'] = number_format($arrProducts[$key]['price01_min']);
             $arrProducts[$key]['price01_max_format'] = number_format($arrProducts[$key]['price01_max']);
@@ -599 +599 @@
      */
     function alldtlSQL($where_products_class = '') {
-        $where_clause = '';
         if (!SC_Utils_Ex::isBlank($where_products_class)) {
             $where_products_class = 'AND (' . $where_products_class . ')';

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

@@ -122 +122 @@
     // checkboxなどで同一カラム内で単一、もしくは複数選択肢が有る場合　例: AND ( sex = xxx OR sex = xxx OR sex = xxx) AND ...
     function setItemTerm($arr, $ItemStr) {
-
+        $return = array();
         foreach ($arr as $data) {
 
@@ -147 +147 @@
     //　NULL値が必要な場合
     function setItemTermWithNull($arr, $ItemStr) {
-
-        $item = " ${ItemStr} IS NULL ";
+        $return = array();
+        $item = " {$ItemStr} IS NULL ";
 
         if ($arr) {
             foreach ($arr as $data) {
                 if ($data != '不明') {
-                    $item .= " OR ${ItemStr} = ?";
+                    $item .= " OR {$ItemStr} = ?";
                     $return[] = $data;
                 }
@@ -159 +159 @@
         }
 
-        $item = "(${item}) ";
+        $item = "({$item}) ";
         $this->setWhere($item);
         return $return;
@@ -165 +165 @@
     // NULLもしくは''で検索する場合
     function setItemTermWithNullAndSpace($arr, $ItemStr) {
+        $return = array();
         $count = count($arr);
-        $item = " ${ItemStr} IS NULL OR ${ItemStr} = '' ";
+        $item = " {$ItemStr} IS NULL OR {$ItemStr} = '' ";
         $i = 1;
         if ($arr) {
             foreach ($arr as $data) {
                 if ($i == $count) break;
-                $item .= " OR ${ItemStr} = ?";
+                $item .= " OR {$ItemStr} = ?";
                 $return[] = $data;
                 $i ++;
             }
         }
-        $item = "(${item}) ";
+        $item = "({$item}) ";
         $this->setWhere($item);
         return $return;

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

@@ -200 +200 @@
     function getBaseHeader() {
         //-- 送信するメールの内容と送信先
+        $arrHeader = array();
         $arrHeader['MIME-Version'] = '1.0';
         $arrHeader['To'] = $this->to;

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++;
         }
     }

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

@@ -78 +78 @@
 
     // テンプレートの処理結果を取得
-    function fetch($template, $no_error=false) {
+    function fetch($template) {
         return $this->_smarty->fetch($template);
     }
@@ -192 +192 @@
     /* サイト初期設定 */
     function initpath() {
-
+        $array = array();
         $array['tpl_mainnavi'] = realpath(dirname(__FILE__)) . '/../Smarty/templates/frontparts/mainnavi.tpl';
 

branches/version-2_12-dev/data/class/helper/SC_Helper_FPDI.php

@@ -164 +164 @@
         // Data
         $fill = 0;
+        $h = 4;
         foreach ($data as $row) {
             $h = 4;