Changeset 17575 for branches/comu-ver2/data/class/pages

Timestamp:

2008/08/28 14:48:13 (18 years ago)

Author:

Seasoft

Message:

merge 17337,17338,17339,17343,17344,17346,17370,17371

Location:

branches/comu-ver2/data/class/pages

Files:

• admin/contents/LC_Page_Admin_Contents_CsvSql.php (modified) (2 diffs)
• admin/customer/LC_Page_Admin_Customer.php (modified) (2 diffs)
• admin/design/LC_Page_Admin_Design_Template.php (modified) (1 diff)
• admin/mail/LC_Page_Admin_Mail.php (modified) (1 diff)
• frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php (modified) (1 diff)

branches/comu-ver2/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php

@@ -148 +148 @@
                 $header .= "\n";
 
-                $data = $this->lfGetCSVData($arrCsvOutputData, $arrKey);
+                $data = SC_Utils_Ex::getCSVData($arrCsvOutputData, $arrKey);
                 // CSV出力
                 SC_Utils_Ex::sfCSVDownload($header.$data);
@@ -411 +411 @@
         return $ret;
     }
-
-
-    //---- CSV出力用データ取得
-    function lfGetCSVData( $array, $arrayIndex){
-        $return = "";
-        for ($i=0; $i<count($array); $i++){
-            for ($j=0; $j<count($array[$i]); $j++ ){
-                if ( $j > 0 ) $return .= ",";
-                $return .= "\"";
-                if ( $arrayIndex ){
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";
-                } else {
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
-                }
-            }
-            $return .= "\n";
-        }
-
-        return $return;
-    }
 }
 ?>

branches/comu-ver2/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -315 +315 @@
 
                     //-　CSV出力
-                    $data = $this->lfGetCSVData($this->search_data, $arrColumn);
+                    $data = SC_Utils_Ex::getCSVData($this->search_data, $arrColumn);
 
                     SC_Utils_Ex::sfCSVDownload($header.$data);
@@ -531 +531 @@
         }
     }
-
-    //---- CSV出力用データ取得
-    function lfGetCSVData( $array, $arrayIndex){
-
-        for ($i=0; $i<count($array); $i++){
-
-            for ($j=0; $j<count($array[$i]); $j++ ){
-                if ( $j > 0 ) $return .= ",";
-                $return .= "\"";
-                if ( $arrayIndex ){
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";
-                } else {
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
-                }
-            }
-            $return .= "\n";
-        }
-
-        return $return;
-    }
 }
 ?>

branches/comu-ver2/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php

@@ -296 +296 @@
         $templates_dir = SMARTY_TEMPLATES_DIR. $template_code. "/";
         SC_Utils_Ex::sfDelFile($templates_dir);
+        // コンパイル削除
+        $templates_c_dir = DATA_PATH. "Smarty/templates_c/". $template_code. "/";
+        SC_Utils_Ex::sfDelFile($templates_c_dir);
         // ユーザーデータ削除
         $user_dir = USER_TEMPLATE_PATH. $template_code. "/";

branches/comu-ver2/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -425 +425 @@
 
         if ( $result ){
-            $return = $this->lfGetCSVData( $result, $arrTitle);
-        }
-        return $return;
-    }
-
-    //---- CSV出力用データ取得
-    function lfGetCSVData( $array, $arrayIndex){
-
-        for ($i=0; $i<count($array); $i++){
-
-            for ($j=0; $j<count($array[$i]); $j++ ){
-                if ( $j > 0 ) $return .= ",";
-                $return .= "\"";
-                if ( $arrayIndex ){
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";
-                } else {
-                    $return .= mb_ereg_replace("<","＜",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
-                }
-            }
-            $return .= "\n";
+            $return = SC_Utils_Ex::getCSVData( $result, $arrTitle);
         }
         return $return;

branches/comu-ver2/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php

@@ -64 +64 @@
             // 文字サイズを制限する
             foreach($arrRet as $key => $val) {
-                $arrRet[$key] = SC_Utils_Ex::sfCutString($val, SEARCH_CATEGORY_LEN);
+                $arrRet[$key] = SC_Utils_Ex::sfCutString($val, SEARCH_CATEGORY_LEN, false);
             }
         }