Index: /branches/version-2_5-dev/data/plugin/bingo/SC_Plugin_bingo.php
===================================================================
--- /branches/version-2_5-dev/data/plugin/bingo/SC_Plugin_bingo.php	(revision 19805)
+++ /branches/version-2_5-dev/data/plugin/bingo/SC_Plugin_bingo.php	(revision 20032)
@@ -40,6 +40,6 @@
     }
 
-    function is_enable($class_name) {
-//        parent::is_enable($class_name);
+    function isEnable($class_name) {
+//        parent::isEnable($class_name);
 
         $arrEnableClass = array(
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php	(revision 19805)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php	(revision 20032)
@@ -52,5 +52,5 @@
             require_once DATA_REALDIR."plugin/{$plugin_name}/{$plugin_class_name}.php";
 
-            $code_str = "\$is_enable = {$plugin_class_name}::is_enable(\$class_name);";
+            $code_str = "\$is_enable = {$plugin_class_name}::isEnable(\$class_name);";
             eval($code_str);
             if ($is_enable) {
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 20024)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 20032)
@@ -875,5 +875,5 @@
      * @return void
      */
-    function sfCategory_Count($objQuery = NULL, $is_force_all_count = false){
+    function sfCountCategory($objQuery = NULL, $is_force_all_count = false){
         $objProduct = new SC_Product();
         
@@ -1643,5 +1643,5 @@
      * @return void
      */
-    function sfMaker_Count($objQuery){
+    function sfCountMaker($objQuery){
         $sql = "";
 
Index: /branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- /branches/version-2_5-dev/data/class/util/SC_Utils.php	(revision 20001)
+++ /branches/version-2_5-dev/data/class/util/SC_Utils.php	(revision 20032)
@@ -1137,5 +1137,5 @@
 
     // PHPのmb_convert_encoding関数をSmartyでも使えるようにする
-    function sf_mb_convert_encoding($str, $encode = 'CHAR_CODE') {
+    function sfMbConvertEncoding($str, $encode = 'CHAR_CODE') {
         return  mb_convert_encoding($str, $encode);
     }
Index: /branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php
===================================================================
--- /branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php	(revision 19805)
+++ /branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php	(revision 20032)
@@ -58,5 +58,5 @@
         $bkupPath = DATA_REALDIR . 'downloads/backup/update_' . time() . '/';
         $bkupPathFile = $bkupPath . 'files/';
-        $this->mkdir_p($bkupPathFile . 'dummy');
+        $this->lfMkdirRecursive($bkupPathFile . 'dummy');
 
         $arrLog = array(
@@ -149,5 +149,5 @@
                         if (!$handle) {
                             // ディレクトリ作成を行ってリトライ
-                            $this->mkdir_p($out);
+                            $this->lfMkdirRecursive($out);
                             $handle = @fopen($out, "w");
                             if (!$handle) {
@@ -216,5 +216,5 @@
      * @param string $path 絶対パス
      */
-    function mkdir_p($path){
+    function lfMkdirRecursive($path){
         $path = dirname($path);
         
Index: /branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_View.php	(revision 19996)
+++ /branches/version-2_5-dev/data/class/SC_View.php	(revision 20032)
@@ -52,5 +52,5 @@
         $this->_smarty->register_modifier("sfCutString", array("SC_Utils_Ex", "sfCutString"));
         $this->_smarty->plugins_dir=array("plugins", $viewDir . "../smarty_extends");
-        $this->_smarty->register_modifier("sf_mb_convert_encoding", array("SC_Utils_Ex", "sf_mb_convert_encoding"));
+        $this->_smarty->register_modifier("sfMbConvertEncoding", array("SC_Utils_Ex", "sfMbConvertEncoding"));
         $this->_smarty->register_modifier("sfGetEnabled", array("SC_Utils_Ex", "sfGetEnabled"));
         $this->_smarty->register_modifier("sfGetCategoryId", array("SC_Utils_Ex", "sfGetCategoryId"));
Index: /branches/version-2_5-dev/data/class/SC_Fpdf.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Fpdf.php	(revision 20013)
+++ /branches/version-2_5-dev/data/class/SC_Fpdf.php	(revision 20032)
@@ -43,8 +43,8 @@
         $this->width_cell = array(110.3,12,21.7,24.5);
 
-        $this->label_cell[] = $this->sjis_conv("商品名 / 商品コード / [ 規格 ]");
-        $this->label_cell[] = $this->sjis_conv("数量");
-        $this->label_cell[] = $this->sjis_conv("単価");
-        $this->label_cell[] = $this->sjis_conv("金額(税込)");
+        $this->label_cell[] = $this->lfConvSjis("商品名 / 商品コード / [ 規格 ]");
+        $this->label_cell[] = $this->lfConvSjis("数量");
+        $this->label_cell[] = $this->lfConvSjis("単価");
+        $this->label_cell[] = $this->lfConvSjis("金額(税込)");
 
         $this->arrMessage = array(
@@ -156,14 +156,14 @@
 
         $this->pdf->SetFont('SJIS', 'B', 15);
-        $this->pdf->Cell(0, 10, $this->sjis_conv($this->tpl_title), 0, 2, 'C', 0, '');  //文書タイトル（納品書・請求書）
+        $this->pdf->Cell(0, 10, $this->lfConvSjis($this->tpl_title), 0, 2, 'C', 0, '');  //文書タイトル（納品書・請求書）
         $this->pdf->Cell(0, 66, '', 0, 2, 'R', 0, '');
         $this->pdf->Cell(5, 0, '', 0, 0, 'R', 0, '');
-        $this->pdf->Cell(67, 8, $this->sjis_conv(number_format($this->arrDisp['payment_total'])." 円"), 0, 2, 'R', 0, '');
+        $this->pdf->Cell(67, 8, $this->lfConvSjis(number_format($this->arrDisp['payment_total'])." 円"), 0, 2, 'R', 0, '');
         $this->pdf->Cell(0, 45, '', 0, 2, '', 0, '');
 
         $this->pdf->SetFont('SJIS', '', 8);
 
-        $monetary_unit = $this->sjis_conv("円");
-        $point_unit = $this->sjis_conv("Pt");
+        $monetary_unit = $this->lfConvSjis("円");
+        $point_unit = $this->lfConvSjis("Pt");
 
         // 購入商品情報
@@ -179,12 +179,12 @@
             $data[2] = $data[0] * $data[1];
 
-            $arrOrder[$i][0]  = $this->sjis_conv($this->arrDisp['product_name'][$i]." / ");
-            $arrOrder[$i][0] .= $this->sjis_conv($this->arrDisp['product_code'][$i]." / ");
+            $arrOrder[$i][0]  = $this->lfConvSjis($this->arrDisp['product_name'][$i]." / ");
+            $arrOrder[$i][0] .= $this->lfConvSjis($this->arrDisp['product_code'][$i]." / ");
             if ($this->arrDisp['classcategory_name1'][$i]) {
-                $arrOrder[$i][0] .= $this->sjis_conv(" [ ".$this->arrDisp['classcategory_name1'][$i]);
+                $arrOrder[$i][0] .= $this->lfConvSjis(" [ ".$this->arrDisp['classcategory_name1'][$i]);
                 if ($this->arrDisp['classcategory_name2'][$i] == "") {
                     $arrOrder[$i][0] .= " ]";
                 } else {
-                    $arrOrder[$i][0] .= $this->sjis_conv(" * ".$this->arrDisp['classcategory_name2'][$i]." ]");
+                    $arrOrder[$i][0] .= $this->lfConvSjis(" * ".$this->arrDisp['classcategory_name2'][$i]." ]");
                 }
             }
@@ -203,5 +203,5 @@
         $arrOrder[$i][0] = "";
         $arrOrder[$i][1] = "";
-        $arrOrder[$i][2] = $this->sjis_conv("商品合計");
+        $arrOrder[$i][2] = $this->lfConvSjis("商品合計");
         $arrOrder[$i][3] = number_format($this->arrDisp['subtotal']).$monetary_unit;
 
@@ -209,5 +209,5 @@
         $arrOrder[$i][0] = "";
         $arrOrder[$i][1] = "";
-        $arrOrder[$i][2] = $this->sjis_conv("送料");
+        $arrOrder[$i][2] = $this->lfConvSjis("送料");
         $arrOrder[$i][3] = number_format($this->arrDisp['deliv_fee']).$monetary_unit;
 
@@ -215,5 +215,5 @@
         $arrOrder[$i][0] = "";
         $arrOrder[$i][1] = "";
-        $arrOrder[$i][2] = $this->sjis_conv("手数料");
+        $arrOrder[$i][2] = $this->lfConvSjis("手数料");
         $arrOrder[$i][3] = number_format($this->arrDisp['charge']).$monetary_unit;
 
@@ -221,5 +221,5 @@
         $arrOrder[$i][0] = "";
         $arrOrder[$i][1] = "";
-        $arrOrder[$i][2] = $this->sjis_conv("値引き");
+        $arrOrder[$i][2] = $this->lfConvSjis("値引き");
         $arrOrder[$i][3] = "- ".number_format(($this->arrDisp['use_point'] * POINT_VALUE) + $this->arrDisp['discount']).$monetary_unit;
 
@@ -227,5 +227,5 @@
         $arrOrder[$i][0] = "";
         $arrOrder[$i][1] = "";
-        $arrOrder[$i][2] = $this->sjis_conv("請求金額");
+        $arrOrder[$i][2] = $this->lfConvSjis("請求金額");
         $arrOrder[$i][3] = number_format($this->arrDisp['payment_total']).$monetary_unit;
 
@@ -241,5 +241,5 @@
             $arrOrder[$i][0] = "";
             $arrOrder[$i][1] = "";
-            $arrOrder[$i][2] = $this->sjis_conv("利用ポイント");
+            $arrOrder[$i][2] = $this->lfConvSjis("利用ポイント");
             $arrOrder[$i][3] = number_format($this->arrDisp['use_point']).$point_unit;
 
@@ -247,5 +247,5 @@
             $arrOrder[$i][0] = "";
             $arrOrder[$i][1] = "";
-            $arrOrder[$i][2] = $this->sjis_conv("加算ポイント");
+            $arrOrder[$i][2] = $this->lfConvSjis("加算ポイント");
             $arrOrder[$i][3] = number_format($this->arrDisp['add_point']).$point_unit;
 
@@ -253,5 +253,5 @@
             $arrOrder[$i][0] = "";
             $arrOrder[$i][1] = "";
-            $arrOrder[$i][2] = $this->sjis_conv("所有ポイント");
+            $arrOrder[$i][2] = $this->lfConvSjis("所有ポイント");
             $arrOrder[$i][3] = number_format($this->arrDisp['point']).$point_unit;
         }
@@ -263,8 +263,8 @@
         $this->pdf->Cell(0, 10, '', 0, 1, 'C', 0, '');
         $this->pdf->SetFont('SJIS', '', 9);
-        $this->pdf->MultiCell(0, 6, $this->sjis_conv("＜ 備 考 ＞"), 'T', 2, 'L', 0, '');  //備考
+        $this->pdf->MultiCell(0, 6, $this->lfConvSjis("＜ 備 考 ＞"), 'T', 2, 'L', 0, '');  //備考
         $this->pdf->Ln();
         $this->pdf->SetFont('SJIS', '', 8);
-        $this->pdf->MultiCell(0, 4, $this->sjis_conv($this->arrData['etc1']."\n".$this->arrData['etc2']."\n".$this->arrData['etc3']), '', 2, 'L', 0, '');  //備考
+        $this->pdf->MultiCell(0, 4, $this->lfConvSjis($this->arrData['etc1']."\n".$this->arrData['etc2']."\n".$this->arrData['etc3']), '', 2, 'L', 0, '');  //備考
     }
 
@@ -278,5 +278,5 @@
                 $filename = "nouhinsyo.pdf";
             }
-            $this->pdf->Output($this->sjis_conv($filename), D);
+            $this->pdf->Output($this->lfConvSjis($filename), D);
         } else {
             $this->pdf->Output();
@@ -334,5 +334,5 @@
 
     // 文字コードSJIS変換 -> japanese.phpで使用出来る文字コードはSJIS-winのみ
-    function sjis_conv($conv_str) {
+    function lfConvSjis($conv_str) {
         return (mb_convert_encoding($conv_str, "SJIS-win", CHAR_CODE));
     }
Index: /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 19805)
+++ /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 20032)
@@ -189,6 +189,6 @@
                         echo "■" . $regist . "件のレコードを登録しました。";
                         // カテゴリ件数カウント関数の実行
-                        $objDb->sfCategory_Count($objQuery);
-                        $objDb->sfMaker_Count($objQuery);
+                        $objDb->sfCountCategory($objQuery);
+                        $objDb->sfCountMaker($objQuery);
                     } else {
                         $objQuery->rollback();
Index: /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php	(revision 20017)
+++ /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php	(revision 20032)
@@ -133,6 +133,6 @@
 
             // 件数カウントバッチ実行
-            $objDb->sfCategory_Count($objQuery);
-            $objDb->sfMaker_Count($objQuery);
+            $objDb->sfCountCategory($objQuery);
+            $objDb->sfCountMaker($objQuery);
         }
 
@@ -256,5 +256,5 @@
 
                         // 件数カウントバッチ実行
-                        $objDb->sfCategory_Count($objQuery);
+                        $objDb->sfCountCategory($objQuery);
 
                         break;
Index: /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	(revision 19951)
+++ /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php	(revision 20032)
@@ -198,6 +198,6 @@
 
                 // 件数カウントバッチ実行
-                $objDb->sfCategory_Count($objQuery);
-                $objDb->sfMaker_Count($objQuery);
+                $objDb->sfCountCategory($objQuery);
+                $objDb->sfCountMaker($objQuery);
                 // 一時ファイルを本番ディレクトリに移動する
                 // TODO: SC_UploadFile::moveTempFileの画像削除条件見直し要
Index: /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 19999)
+++ /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 20032)
@@ -245,6 +245,6 @@
                     echo "■" . $regist . "件のレコードを登録しました。";
                     // 商品件数カウント関数の実行
-                    $this->objDb->sfCategory_Count($objQuery);
-                    $this->objDb->sfMaker_Count($objQuery);
+                    $this->objDb->sfCountCategory($objQuery);
+                    $this->objDb->sfCountMaker($objQuery);
                 } else {
                     $objQuery->rollback();
Index: /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 19993)
+++ /branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	(revision 20032)
@@ -313,5 +313,5 @@
 
         // 件数カウントバッチ実行
-        $objDb->sfCategory_Count($objQuery);
+        $objDb->sfCountCategory($objQuery);
         $objQuery->commit();
     }
@@ -529,5 +529,5 @@
         if (NOSTOCK_HIDDEN === true) {
             // 件数カウントバッチ実行
-            $objDb->sfCategory_Count($objQuery);
+            $objDb->sfCountCategory($objQuery);
         }
     }
Index: /branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl	(revision 19802)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl	(revision 20032)
@@ -25,9 +25,9 @@
 <!--{* channel要素 *}-->
 <channel>
-<title><!--{$title|sf_mb_convert_encoding:$encode}--></title>
-<shop_name><!--{$arrSiteInfo.shop_name|sf_mb_convert_encoding:$encode}--></shop_name>
-<shop_kana><!--{$arrSiteInfo.shop_kana|sf_mb_convert_encoding:$encode}--></shop_kana>
+<title><!--{$title|sfMbConvertEncoding:$encode}--></title>
+<shop_name><!--{$arrSiteInfo.shop_name|sfMbConvertEncoding:$encode}--></shop_name>
+<shop_kana><!--{$arrSiteInfo.shop_kana|sfMbConvertEncoding:$encode}--></shop_kana>
 <site_url><!--{$smarty.const.HTTP_URL}--></site_url>
-<description><!--{section name=cnt loop=$arrProduct}--><!--{$arrProduct[cnt].product_id|sf_mb_convert_encoding:$encode}-->,<!--{/section}--></description>
+<description><!--{section name=cnt loop=$arrProduct}--><!--{$arrProduct[cnt].product_id|sfMbConvertEncoding:$encode}-->,<!--{/section}--></description>
 <language>ja</language>
 <docs>http://backend.userland.com/rss</docs>
@@ -37,5 +37,5 @@
 		<link><!--{$smarty.const.HTTP_URL}-->rss/product.php?product_id=<!--{$arrProduct[cnt].product_id}--></link>
 		<!--{foreach key=key item=item from=$arrProductKeys}-->
-			<<!--{$item}-->><!--{$arrProduct[cnt][$item]|h|sf_mb_convert_encoding:$encode}--></<!--{$item}-->>
+			<<!--{$item}-->><!--{$arrProduct[cnt][$item]|h|sfMbConvertEncoding:$encode}--></<!--{$item}-->>
 		<!--{/foreach}-->
 	</item>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl	(revision 19802)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl	(revision 20032)
@@ -23,7 +23,7 @@
 <rss version="2.0">
     <channel>
-        <title><!--{$site_title|sf_mb_convert_encoding:$encode|h}--></title>
+        <title><!--{$site_title|sfMbConvertEncoding:$encode|h}--></title>
         <link><!--{$smarty.const.HTTP_URL}--></link>
-        <description><!--{$description|sf_mb_convert_encoding:$encode|h}--></description>
+        <description><!--{$description|sfMbConvertEncoding:$encode|h}--></description>
         <language>ja</language>
         <managingEditor><!--{$email|h}--></managingEditor>
@@ -41,6 +41,6 @@
                     <link><!--{$arrNews[cnt].news_url|h}--></link>
                 <!--{/if}-->
-                <title><!--{ $arrNews[cnt].news_title|sf_mb_convert_encoding:$encode|escape }--></title>
-                <description><!--{$arrNews[cnt].news_comment|truncate:256|sf_mb_convert_encoding:$encode|h}--></description>
+                <title><!--{ $arrNews[cnt].news_title|sfMbConvertEncoding:$encode|escape }--></title>
+                <description><!--{$arrNews[cnt].news_comment|truncate:256|sfMbConvertEncoding:$encode|h}--></description>
                 <pubDate><!--{$arrNews[cnt].news_date|h}--></pubDate>
             </item>
Index: /branches/version-2_5-dev/test/createEcCubeData-v25.php
===================================================================
--- /branches/version-2_5-dev/test/createEcCubeData-v25.php	(revision 19693)
+++ /branches/version-2_5-dev/test/createEcCubeData-v25.php	(revision 20032)
@@ -72,5 +72,5 @@
 
 $objDb = new SC_Helper_DB_Ex();
-$objDb->sfCategory_Count(NULL, true);
+$objDb->sfCountCategory(NULL, true);
 
 //$objData->objQuery->rollback();